Merge pull request #12 from bcgov/EMSEDT-194_Dry_Run_File_Error_Check

EMSEDT-172 - Dry run file error check
bcgov · Jun 24, 2024 · defcca9 · defcca9
2 parents 273d932 + f68caa8
commit defcca9
Show file tree

Hide file tree

Showing 33 changed files with 758 additions and 300 deletions.
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -34,6 +34,7 @@
     "@nestjs/terminus": "^10.2.1",
     "@nestjs/testing": "^10.0.0",
     "@prisma/client": "^5.7.0",
+    "@types/multer": "^1.4.11",
     "axios": "^1.7.2",
     "dotenv": "^16.0.1",
     "express-prom-bundle": "^7.0.0",
@@ -49,6 +50,7 @@
     "reflect-metadata": "^0.2.0",
     "rimraf": "^5.0.0",
     "rxjs": "^7.8.0",
+    "sanitize-html": "^2.13.0",
     "swagger-ui-express": "^5.0.0",
     "winston": "^3.11.0"
   },

diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma
@@ -10,32 +10,32 @@ datasource db {
 
 /// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments
 model submission_status_code {
-  submission_status_code                                                           String             @id(map: "submission_status_code_pk") @db.VarChar(20)
-  description                                                                      String             @db.VarChar(250)
-  display_order                                                                    Int
-  active_ind                                                                       Boolean            @default(true)
-  create_user_id                                                                   String             @db.VarChar(200)
-  create_utc_timestamp                                                             DateTime           @db.Timestamp(6)
-  update_user_id                                                                   String             @db.VarChar(200)
-  update_utc_timestamp                                                             DateTime           @db.Timestamp(6)
-  file_submissions_file_submissions_submission_status_codeTosubmission_status_code file_submissions[] @relation("file_submissions_submission_status_codeTosubmission_status_code")
+  submission_status_code String            @id(map: "submission_status_code_pk") @db.VarChar(20)
+  description            String            @db.VarChar(250)
+  display_order          Int
+  active_ind             Boolean           @default(true)
+  create_user_id         String            @db.VarChar(200)
+  create_utc_timestamp   DateTime          @db.Timestamp(6)
+  update_user_id         String            @db.VarChar(200)
+  update_utc_timestamp   DateTime          @db.Timestamp(6)
+  file_submissions       file_submission[]
 }
 
-model file_submissions {
-  submission_id                                                                          String                 @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
-  file_name                                                                              String                 @db.VarChar(200)
-  submission_date                                                                        DateTime               @db.Timestamp(6)
-  submitter_user_id                                                                      String                 @db.VarChar(200)
-  submission_status_code                                                                 String                 @db.VarChar(10)
-  submitter_agency_name                                                                  String                 @db.VarChar(200)
-  sample_count                                                                           Int?
-  results_count                                                                          Int?
-  active_ind                                                                             Boolean                @default(true)
-  error_log                                                                              String?
-  organization_guid                                                                      String?                @db.Uuid
-  create_user_id                                                                         String                 @db.VarChar(200)
-  create_utc_timestamp                                                                   DateTime               @db.Timestamp(6)
-  update_user_id                                                                         String                 @db.VarChar(200)
-  update_utc_timestamp                                                                   DateTime               @db.Timestamp(6)
-  submission_status_code_file_submissions_submission_status_codeTosubmission_status_code submission_status_code @relation("file_submissions_submission_status_codeTosubmission_status_code", fields: [submission_status_code], references: [submission_status_code], onDelete: NoAction, onUpdate: NoAction, map: "submission_status_code_fk")
+model file_submission {
+  submission_id          String                 @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  file_name              String                 @db.VarChar(200)
+  submission_date        DateTime               @db.Timestamp(6)
+  submitter_user_id      String                 @db.VarChar(200)
+  submission_status_code String                 @db.VarChar(10)
+  submitter_agency_name  String                 @db.VarChar(200)
+  sample_count           Int?
+  results_count          Int?
+  active_ind             Boolean                @default(true)
+  error_log              String?
+  organization_guid      String?                @db.Uuid
+  create_user_id         String                 @db.VarChar(200)
+  create_utc_timestamp   DateTime               @db.Timestamp(6)
+  update_user_id         String                 @db.VarChar(200)
+  update_utc_timestamp   DateTime               @db.Timestamp(6)
+  submission_status      submission_status_code @relation(fields: [submission_status_code], references: [submission_status_code], onDelete: NoAction, onUpdate: NoAction, map: "submission_status_code_fk")
 }
diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts
@@ -15,7 +15,7 @@ import { TerminusModule } from "@nestjs/terminus";
 import { HealthController } from "./health.controller";
 import { JWTAuthModule } from "./auth/jwtauth.module";
 import { AdminModule } from "./admin/admin.module";
-import { DryrunModule } from "./dryrun/dryrun.module";
+import { FileSubmissionsModule } from './file_submissions/file_submissions.module';
 
 const DB_HOST = process.env.POSTGRES_HOST || "localhost";
 const DB_USER = process.env.POSTGRES_USER || "postgres";
@@ -53,9 +53,9 @@ function getMiddlewares() {
         middlewares: getMiddlewares(),
       },
     }),
-    DryrunModule,
     JWTAuthModule,
     AdminModule,
+    FileSubmissionsModule,
   ],
   controllers: [AppController, MetricsController, HealthController],
   providers: [AppService],

diff --git a/backend/src/dryrun/dryrun.controller.spec.ts b/backend/src/dryrun/dryrun.controller.spec.ts