SIMSBIOHUB-633: Revamp CSV Imports - Critter

api/src/paths/project/{projectId}/survey/{surveyId}/critters/import.ts

@@ -4,11 +4,11 @@
 import { getDBConnection } from '../../../../../../database/db';
 import { csvFileSchema } from '../../../../../../openapi/schemas/file';
 import { authorizeRequestHandler } from '../../../../../../request-handlers/security/authorization';
-import { ImportCrittersStrategy } from '../../../../../../services/import-services/critter/import-critters-strategy';
-import { importCSV } from '../../../../../../services/import-services/import-csv';
+import { ImportCrittersService } from '../../../../../../services/import-services/critter/import-critters-service';
 import { getLogger } from '../../../../../../utils/logger';
 import { parseMulterFile } from '../../../../../../utils/media/media-utils';
 import { getFileFromRequest } from '../../../../../../utils/request';
+import { constructXLSXWorkbook, getDefaultWorksheet } from '../../../../../../utils/xlsx-utils/worksheet-utils';
 
 const defaultLog = getLogger('/api/project/{projectId}/survey/{surveyId}/critters/import');
 
@@ -83,29 +83,56 @@
   },
   responses: {
     200: {
-      description: 'Import OK',
+      description: 'Import OK'
+    },
+    400: {
+      $ref: '#/components/responses/400'
+    },
+    422: {
+      description: 'CSV validation errors',
       content: {
         'application/json': {
           schema: {
             type: 'object',
             additionalProperties: false,
-            required: ['survey_critter_ids'],
+            required: ['validation_errors'],
             properties: {
-              survey_critter_ids: {
+              validation_errors: {
                 type: 'array',
                 items: {
-                  type: 'integer',
-                  minimum: 1
+                  type: 'object',
+                  additionalProperties: false,
+                  required: ['error', 'solution', 'rowIndex', 'header'],
+                  properties: {
+                    error: {
+                      type: 'string'
+                    },
+                    solution: {
+                      type: 'string'
+                    },
+                    cell: {
+                      oneOf: [{ type: 'string' }, { type: 'number' }]
+                    },
+                    header: {
+                      type: 'string'
+                    },
+                    rowIndex: {
+                      type: 'number'
+                    },
+                    values: {
+                      type: 'array',
+                      items: {
+                        oneOf: [{ type: 'string' }, { type: 'number' }]
+                      }
+                    }
+                  }
                 }
               }
             }
           }
         }
       }
     },
-    400: {
-      $ref: '#/components/responses/400'
-    },
     401: {
       $ref: '#/components/responses/401'
     },
@@ -133,19 +160,23 @@
 
     const connection = getDBConnection(req.keycloak_token);
 
+    const mediaFile = parseMulterFile(rawFile);
+    const worksheet = getDefaultWorksheet(constructXLSXWorkbook(mediaFile));
+
     try {
       await connection.open();
 
-      // Critter CSV import strategy - child of CSVImportStrategy
-      const importCsvCritters = new ImportCrittersStrategy(connection, surveyId);
+      const importService = new ImportCrittersService(connection, worksheet, surveyId);
 
-      const surveyCritterIds = await importCSV(parseMulterFile(rawFile), importCsvCritters);
+      const errors = await importService.importCSVWorksheet();
 
-      defaultLog.info({ label: 'importCritterCsv', message: 'result', survey_critter_ids: surveyCritterIds });
+      if (errors.length) {
+        return res.status(422).json({ validation_errors: errors });
+      }
 
       await connection.commit();
 
-      return res.status(200).json({ survey_critter_ids: surveyCritterIds });
+      return res.status(200).send();
     } catch (error) {
       defaultLog.error({ label: 'importCritterCsv', message: 'error', error });
       await connection.rollback();