Merge branch 'main' into openshift-vars

bcgov · Jan 9, 2025 · 7c9be6d · 7c9be6d
2 parents 70ec500 + c62c3dd
commit 7c9be6d
Show file tree

Hide file tree

Showing 11 changed files with 1,001 additions and 266 deletions.
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -40,6 +40,7 @@
     "axios": "^1.7.2",
     "basic-ftp": "^5.0.5",
     "class-validator": "^0.14.1",
+    "csv-parser": "^3.0.0",
     "csv-writer": "^1.6.0",
     "dotenv": "^16.0.1",
     "express-prom-bundle": "^7.0.0",

diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma
@@ -65,16 +65,6 @@ model aqi_mediums {
   update_utc_timestamp DateTime @db.Timestamp(6)
 }
 
-model aqi_units {
-  aqi_units_id         String   @id @db.Uuid
-  custom_id            String   @db.VarChar(200)
-  description          String?  @db.VarChar(2000)
-  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)
-}
-
 model aqi_collection_methods {
   aqi_collection_methods_id String   @id @db.Uuid
   custom_id                 String   @db.VarChar(200)
@@ -284,3 +274,43 @@ model aqi_obs_status {
   create_utc_timestamp DateTime         @db.Timestamp(6)
   file_submission      file_submission? @relation(fields: [file_submission_id], references: [submission_id], onDelete: NoAction, onUpdate: NoAction, map: "file_submission_id_fk")
 }
+
+model aqi_analysis_methods {
+  aqi_analysis_methods_id String   @id @db.Uuid
+  method_id               String   @db.VarChar(200)
+  method_name             String?  @db.VarChar(2000)
+  method_context          String?  @db.VarChar(2000)
+  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)
+}
+
+model aqi_units_xref {
+  edt_unit_guid        String   @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  ems_code             Int?
+  edt_unit_xref        String   @db.VarChar(255)
+  aqi_units_code       String   @db.VarChar(255)
+  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)
+}
+
+model aqi_tissue_types {
+  aqi_tissue_types_id  String   @id @db.Uuid
+  custom_id            String   @db.VarChar(200)
+  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)
+}
+
+model aqi_sampling_agency {
+  aqi_sampling_agency_id String   @id @db.Uuid
+  custom_id              String   @db.VarChar(200)
+  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)
+}