TypeScript: 4. Finalize GraphQL resolvers [MEGA PR]

src/@types/graphql.ts

@@ -20,15 +20,15 @@ export type Scalars = {
 
 export type AutomationAction = {
   __typename?: 'AutomationAction';
-  alertRecipients?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  alertRecipients?: Maybe<Array<Scalars['String']['output']>>;
   categoryConfig?: Maybe<Scalars['JSONObject']['output']>;
   confThreshold?: Maybe<Scalars['Float']['output']>;
   mlModel?: Maybe<Scalars['String']['output']>;
   type: Scalars['String']['output'];
 };
 
 export type AutomationActionInput = {
-  alertRecipients?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  alertRecipients?: InputMaybe<Array<Scalars['String']['input']>>;
   categoryConfig?: InputMaybe<Scalars['JSONObject']['input']>;
   confThreshold?: InputMaybe<Scalars['Float']['input']>;
   mlModel?: InputMaybe<Scalars['String']['input']>;
@@ -66,7 +66,7 @@ export type Batch = {
   _id: Scalars['String']['output'];
   created?: Maybe<Scalars['Date']['output']>;
   dead?: Maybe<Scalars['Int']['output']>;
-  errors?: Maybe<Array<Maybe<BatchError>>>;
+  errors?: Maybe<Array<BatchError>>;
   imageErrors?: Maybe<Scalars['Int']['output']>;
   ingestionComplete?: Maybe<Scalars['Date']['output']>;
   originalFile?: Maybe<Scalars['String']['output']>;
@@ -148,9 +148,9 @@ export type CreateImageCommentInput = {
 };
 
 export type CreateImageErrorInput = {
-  batch?: InputMaybe<Scalars['String']['input']>;
+  batch: Scalars['String']['input'];
   error: Scalars['String']['input'];
-  image?: InputMaybe<Scalars['String']['input']>;
+  image: Scalars['String']['input'];
 };
 
 export type CreateImageInput = {
@@ -165,7 +165,7 @@ export type CreateImagePayload = {
 export type CreateInternalLabelInput = {
   bbox: Array<Scalars['Float']['input']>;
   conf?: InputMaybe<Scalars['Float']['input']>;
-  imageId?: InputMaybe<Scalars['ID']['input']>;
+  imageId: Scalars['ID']['input'];
   labelId: Scalars['String']['input'];
   mlModel: Scalars['String']['input'];
   mlModelVersion: Scalars['String']['input'];
@@ -179,9 +179,10 @@ export type CreateLabelInput = {
   _id?: InputMaybe<Scalars['ID']['input']>;
   bbox: Array<Scalars['Float']['input']>;
   conf?: InputMaybe<Scalars['Float']['input']>;
-  imageId?: InputMaybe<Scalars['ID']['input']>;
+  imageId: Scalars['ID']['input'];
   labelId: Scalars['String']['input'];
   labeledDate?: InputMaybe<Scalars['Date']['input']>;
+  mlModel?: InputMaybe<Scalars['String']['input']>;
   objectId?: InputMaybe<Scalars['ID']['input']>;
   userId?: InputMaybe<Scalars['ID']['input']>;
   validation?: InputMaybe<ValidationInput>;
@@ -223,7 +224,7 @@ export type CreateUploadPayload = {
   batch: Scalars['String']['output'];
   multipartUploadId?: Maybe<Scalars['String']['output']>;
   url?: Maybe<Scalars['String']['output']>;
-  urls?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  urls?: Maybe<Array<Scalars['String']['output']>>;
   user: Scalars['String']['output'];
 };
 
@@ -346,7 +347,7 @@ export type ExportStatusInput = {
 export type ExportStatusPayload = {
   __typename?: 'ExportStatusPayload';
   count?: Maybe<Scalars['Int']['output']>;
-  error?: Maybe<Array<Maybe<ExportError>>>;
+  error?: Maybe<Array<ExportError>>;
   meta?: Maybe<Scalars['JSONObject']['output']>;
   status: Scalars['String']['output'];
   url?: Maybe<Scalars['String']['output']>;
@@ -356,12 +357,12 @@ export type Filters = {
   __typename?: 'Filters';
   addedEnd?: Maybe<Scalars['Date']['output']>;
   addedStart?: Maybe<Scalars['Date']['output']>;
-  cameras?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  cameras?: Maybe<Array<Scalars['String']['output']>>;
   createdEnd?: Maybe<Scalars['Date']['output']>;
   createdStart?: Maybe<Scalars['Date']['output']>;
   custom?: Maybe<Scalars['String']['output']>;
-  deployments?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
-  labels?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  deployments?: Maybe<Array<Scalars['String']['output']>>;
+  labels?: Maybe<Array<Scalars['String']['output']>>;
   notReviewed?: Maybe<Scalars['Boolean']['output']>;
   reviewed?: Maybe<Scalars['Boolean']['output']>;
 };
@@ -374,7 +375,7 @@ export type FiltersInput = {
   createdStart?: InputMaybe<Scalars['Date']['input']>;
   custom?: InputMaybe<Scalars['String']['input']>;
   deployments?: InputMaybe<Array<Scalars['String']['input']>>;
-  labels?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  labels?: InputMaybe<Array<Scalars['String']['input']>>;
   reviewed?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
@@ -396,11 +397,11 @@ export type Image = {
   batchId?: Maybe<Scalars['String']['output']>;
   bucket: Scalars['String']['output'];
   cameraId: Scalars['String']['output'];
-  comments?: Maybe<Array<Maybe<ImageComment>>>;
+  comments?: Maybe<Array<ImageComment>>;
   dateAdded: Scalars['Date']['output'];
   dateTimeOriginal: Scalars['Date']['output'];
   deploymentId: Scalars['ID']['output'];
-  errors?: Maybe<Array<Maybe<ImageError>>>;
+  errors?: Maybe<Array<ImageError>>;
   fileTypeExtension: Scalars['String']['output'];
   imageBytes?: Maybe<Scalars['Int']['output']>;
   imageHeight?: Maybe<Scalars['Int']['output']>;
@@ -409,7 +410,7 @@ export type Image = {
   make: Scalars['String']['output'];
   mimeType?: Maybe<Scalars['String']['output']>;
   model?: Maybe<Scalars['String']['output']>;
-  objects?: Maybe<Array<Maybe<Object>>>;
+  objects?: Maybe<Array<Object>>;
   originalFileName?: Maybe<Scalars['String']['output']>;
   path?: Maybe<Scalars['String']['output']>;
   projectId: Scalars['String']['output'];
@@ -423,7 +424,7 @@ export type ImageAttempt = {
   _id: Scalars['ID']['output'];
   batch?: Maybe<Scalars['String']['output']>;
   created: Scalars['Date']['output'];
-  errors?: Maybe<Array<Maybe<ImageError>>>;
+  errors?: Maybe<Array<ImageError>>;
   metadata?: Maybe<ImageMetadata>;
   projectId: Scalars['String']['output'];
 };
@@ -438,7 +439,7 @@ export type ImageComment = {
 
 export type ImageCommentsPayload = {
   __typename?: 'ImageCommentsPayload';
-  comments?: Maybe<Array<Maybe<ImageComment>>>;
+  comments?: Maybe<Array<ImageComment>>;
 };
 
 export type ImageError = {
@@ -454,7 +455,7 @@ export type ImageError = {
 export type ImageErrorsConnection = {
   __typename?: 'ImageErrorsConnection';
   errors: Array<ImageError>;
-  pageInfo?: Maybe<PageInfo>;
+  pageInfo: PageInfoWithCount;
 };
 
 export type ImageErrorsFilterInput = {
@@ -513,7 +514,7 @@ export type LabelDiffsInput = {
 
 export type LabelList = {
   __typename?: 'LabelList';
-  categories?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  categories?: Maybe<Array<Scalars['String']['output']>>;
 };
 
 export type LabelUpdate = {
@@ -777,7 +778,7 @@ export type Object = {
   __typename?: 'Object';
   _id: Scalars['ID']['output'];
   bbox?: Maybe<Array<Scalars['Float']['output']>>;
-  labels?: Maybe<Array<Maybe<Label>>>;
+  labels?: Maybe<Array<Label>>;
   locked: Scalars['Boolean']['output'];
 };
 
@@ -789,7 +790,7 @@ export type ObjectDiffsInput = {
 export type ObjectInput = {
   _id: Scalars['ID']['input'];
   bbox?: InputMaybe<Array<Scalars['Float']['input']>>;
-  labels?: InputMaybe<Array<InputMaybe<CreateLabelInput>>>;
+  labels?: InputMaybe<Array<CreateLabelInput>>;
   locked: Scalars['Boolean']['input'];
 };
 
@@ -830,11 +831,11 @@ export type PointInput = {
 export type Project = {
   __typename?: 'Project';
   _id: Scalars['String']['output'];
-  automationRules?: Maybe<Array<Maybe<AutomationRule>>>;
-  availableMLModels?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
-  cameraConfigs?: Maybe<Array<Maybe<CameraConfig>>>;
+  automationRules?: Maybe<Array<AutomationRule>>;
+  availableMLModels?: Maybe<Array<Scalars['String']['output']>>;
+  cameraConfigs?: Maybe<Array<CameraConfig>>;
   description?: Maybe<Scalars['String']['output']>;
-  labels?: Maybe<Array<Maybe<ProjectLabel>>>;
+  labels?: Maybe<Array<ProjectLabel>>;
   name: Scalars['String']['output'];
   timezone: Scalars['String']['output'];
   views: Array<View>;
@@ -875,13 +876,13 @@ export type Query = {
   images?: Maybe<ImagesConnection>;
   imagesCount?: Maybe<ImagesCount>;
   labels?: Maybe<LabelList>;
-  mlModels?: Maybe<Array<Maybe<MlModel>>>;
-  projects?: Maybe<Array<Maybe<Project>>>;
+  mlModels?: Maybe<Array<MlModel>>;
+  projects?: Maybe<Array<Project>>;
   stats?: Maybe<Task>;
   task?: Maybe<Task>;
   tasks?: Maybe<TasksPayload>;
   users?: Maybe<UsersPayload>;
-  wirelessCameras?: Maybe<Array<Maybe<WirelessCamera>>>;
+  wirelessCameras?: Maybe<Array<WirelessCamera>>;
 };
 
 
@@ -1033,12 +1034,12 @@ export type RegisterCameraInput = {
 export type RegisterCameraPayload = {
   __typename?: 'RegisterCameraPayload';
   project?: Maybe<Project>;
-  wirelessCameras?: Maybe<Array<Maybe<WirelessCamera>>>;
+  wirelessCameras?: Maybe<Array<WirelessCamera>>;
 };
 
 export type StandardErrorPayload = {
   __typename?: 'StandardErrorPayload';
-  errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  errors?: Maybe<Array<Scalars['String']['output']>>;
   isOk?: Maybe<Scalars['Boolean']['output']>;
 };
 
@@ -1065,6 +1066,7 @@ export type Task = {
 
 export type TasksPayload = {
   __typename?: 'TasksPayload';
+  pageInfo: PageInfo;
   tasks: Array<Task>;
 };
 
@@ -1075,16 +1077,16 @@ export type UnregisterCameraInput = {
 export type UnregisterCameraPayload = {
   __typename?: 'UnregisterCameraPayload';
   project?: Maybe<Project>;
-  wirelessCameras?: Maybe<Array<Maybe<WirelessCamera>>>;
+  wirelessCameras?: Maybe<Array<WirelessCamera>>;
 };
 
 export type UpdateAutomationRulesInput = {
-  automationRules?: InputMaybe<Array<InputMaybe<AutomationRuleInput>>>;
+  automationRules: Array<AutomationRuleInput>;
 };
 
 export type UpdateAutomationRulesPayload = {
   __typename?: 'UpdateAutomationRulesPayload';
-  automationRules?: Maybe<Array<Maybe<AutomationRule>>>;
+  automationRules?: Maybe<Array<AutomationRule>>;
 };
 
 export type UpdateBatchInput = {
@@ -1148,12 +1150,12 @@ export type UpdateViewPayload = {
 
 export type User = {
   __typename?: 'User';
-  created: Scalars['String']['output'];
-  email: Scalars['String']['output'];
-  enabled: Scalars['Boolean']['output'];
+  created?: Maybe<Scalars['Date']['output']>;
+  email?: Maybe<Scalars['String']['output']>;
+  enabled?: Maybe<Scalars['Boolean']['output']>;
   roles: Array<UserRole>;
-  status: Scalars['String']['output'];
-  updated: Scalars['String']['output'];
+  status?: Maybe<Scalars['String']['output']>;
+  updated?: Maybe<Scalars['Date']['output']>;
   username: Scalars['String']['output'];
 };
 
@@ -1170,7 +1172,7 @@ export type UsersPayload = {
 
 export type Validation = {
   __typename?: 'Validation';
-  userId: Scalars['ID']['output'];
+  userId?: Maybe<Scalars['ID']['output']>;
   validated: Scalars['Boolean']['output'];
   validationDate: Scalars['Date']['output'];
 };
@@ -1183,9 +1185,9 @@ export type ValidationInput = {
 
 export type View = {
   __typename?: 'View';
-  _id: Scalars['String']['output'];
+  _id: Scalars['ID']['output'];
   description?: Maybe<Scalars['String']['output']>;
-  editable: Scalars['Boolean']['output'];
+  editable?: Maybe<Scalars['Boolean']['output']>;
   filters: Filters;
   name: Scalars['String']['output'];
 };

src/@types/mongo-cursor-pagination.d.ts

@@ -1,13 +1,10 @@
 declare module 'mongo-cursor-pagination' {
-  import { Model } from 'mongoose';
+  import { Model, PipelineStage } from 'mongoose';
 
   type Maybe<T> = T | null;
 
   export type AggregationInput = {
-    aggregation: Array<{
-      $match: Record<string, any>;
-      $set?: Record<string, any>;
-    }>;
+    aggregation: PipelineStage[];
     paginatedField?: Maybe<string>;
     sortAscending?: Maybe<boolean>;
     limit?: Maybe<number>;
@@ -20,6 +17,10 @@ declare module 'mongo-cursor-pagination' {
       page: number;
     }>;
     results: T[];
+    previous: Maybe<string>;
+    hasPrevious: boolean;
+    next: Maybe<string>;
+    hasNext: boolean;
   }
 
   const defaultExport: {

src/@types/mongodb-query-parser.d.ts

@@ -0,0 +1,3 @@
+declare module 'mongodb-query-parser' {
+  export const isFilterValid = (filter: string) => boolean;
+}

src/api/auth/authorization.ts

@@ -63,7 +63,7 @@ export interface User {
   aud: string;
   'cognito:username': string;
   is_superuser: boolean;
-  curr_project: string | null;
+  curr_project: string;
   projects: Record<string, { roles: string[] }>;
   curr_project_roles: string[];
 }

src/api/db/models/Batch.ts

@@ -12,14 +12,14 @@ import Batch, { BatchSchema } from '../schemas/Batch.js';
 import mongoose from 'mongoose';
 import BatchError, { BatchErrorSchema } from '../schemas/BatchError.js';
 import retry from 'async-retry';
-import { BaseAuthedModel, GenericResponse, MethodParams, roleCheck } from './utils-model.js';
+import { BaseAuthedModel, GenericResponse, MethodParams, roleCheck } from './utils.js';
 import { ImageErrorModel } from './ImageError.js';
 import { Context } from '../../handler.js';
 
 export class BatchModel {
   static async queryByFilter(
     input: gql.QueryBatchesInput,
-    context: Context,
+    context: Pick<Context, 'user'>,
   ): Promise<AggregationOutput<BatchSchemaWithErrors>> {
     try {
       const pipeline: Record<'$match', Record<string, any>>[] = [
@@ -56,7 +56,7 @@ export class BatchModel {
   }
 
   static async queryById(_id: string): Promise<mongoose.HydratedDocument<BatchSchemaWithErrors>> {
-    const query = { _id };
+    const query = { _id: { $eq: _id } };
     try {
       const batch = await Batch.findOne<mongoose.HydratedDocument<BatchSchemaWithErrors>>(query);
       if (!batch) throw new NotFoundError('Batch not found');
@@ -232,7 +232,7 @@ export class BatchModel {
 
   static async createUpload(
     input: gql.CreateUploadInput,
-    context: Context,
+    context: Pick<Context, 'user'>,
   ): Promise<gql.CreateUploadPayload> {
     try {
       const id = `batch-${randomUUID()}`;

src/api/db/models/BatchError.ts

@@ -2,7 +2,7 @@ import GraphQLError, { InternalServerError } from '../../errors.js';
 import { WRITE_IMAGES_ROLES } from '../../auth/roles.js';
 import BatchError, { BatchErrorSchema } from '../schemas/BatchError.js';
 import retry from 'async-retry';
-import { BaseAuthedModel, GenericResponse, MethodParams, roleCheck } from './utils-model.js';
+import { BaseAuthedModel, GenericResponse, MethodParams, roleCheck } from './utils.js';
 
 /**
  * BatchErrors are errors that are generated when an uploaded Zip fails