Resolve merge conflicts & unit tests

app/src/controllers/submission.ts

@@ -378,6 +378,10 @@ const controller = {
         req.currentContext
       );
 
+      // Create contacts
+      if (req.body.contacts)
+        await contactService.upsertContacts(submission.activityId, req.body.contacts, req.currentContext);
+
       // Create new submission
       const result = await submissionService.createSubmission({
         ...submission,

app/src/db/prisma/schema.prisma

@@ -299,6 +299,19 @@ model submission {
   @@schema("public")
 }
 
+model submission_draft {
+  submission_draft_id String    @id @db.Uuid
+  activity_id         String
+  data                Json      @db.Json
+  created_by          String?   @default("00000000-0000-0000-0000-000000000000")
+  created_at          DateTime? @default(now()) @db.Timestamptz(6)
+  updated_by          String?
+  updated_at          DateTime? @db.Timestamptz(6)
+  activity            activity  @relation(fields: [activity_id], references: [activity_id], onDelete: Cascade, map: "submission_draft_activity_id_foreign")
+
+  @@schema("public")
+}
+
 model user {
   user_id           String             @id @db.Uuid
   identity_id       String?            @db.Uuid
@@ -483,52 +496,6 @@ model subject_group {
   @@schema("yars")
 }
 
-model activity_contact {
-  activity_id String
-  contact_id  String    @db.Uuid
-  created_by  String?   @default("00000000-0000-0000-0000-000000000000")
-  created_at  DateTime? @default(now()) @db.Timestamptz(6)
-  updated_by  String?
-  updated_at  DateTime? @db.Timestamptz(6)
-  activity    activity  @relation(fields: [activity_id], references: [activity_id], onDelete: Cascade, map: "activity_contact_activity_id_foreign")
-  contact     contact   @relation(fields: [contact_id], references: [contact_id], onDelete: Cascade, map: "activity_contact_contact_id_foreign")
-
-  @@id([activity_id, contact_id])
-  @@schema("public")
-}
-
-model contact {
-  contact_id                     String             @id @db.Uuid
-  user_id                        String?            @db.Uuid
-  first_name                     String?
-  last_name                      String?
-  phone_number                   String?
-  email                          String?
-  contact_preference             String?
-  contact_applicant_relationship String?
-  created_by                     String?            @default("00000000-0000-0000-0000-000000000000")
-  created_at                     DateTime?          @default(now()) @db.Timestamptz(6)
-  updated_by                     String?
-  updated_at                     DateTime?          @db.Timestamptz(6)
-  activity_contact               activity_contact[]
-  user                           user?              @relation(fields: [user_id], references: [user_id], onDelete: Cascade, map: "contact_user_id_foreign")
-
-  @@schema("public")
-}
-
-model submission_draft {
-  submission_draft_id String    @id @db.Uuid
-  activity_id         String
-  data                Json      @db.Json
-  created_by          String?   @default("00000000-0000-0000-0000-000000000000")
-  created_at          DateTime? @default(now()) @db.Timestamptz(6)
-  updated_by          String?
-  updated_at          DateTime? @db.Timestamptz(6)
-  activity            activity  @relation(fields: [activity_id], references: [activity_id], onDelete: Cascade, map: "submission_draft_activity_id_foreign")
-
-  @@schema("public")
-}
-
 view group_role_policy_vw {
   row_number      BigInt  @unique
   group_id        Int?

app/src/middleware/authorization.ts

@@ -8,6 +8,7 @@ import {
   noteService,
   permitService,
   submissionService,
+  submissionDraftService,
   userService,
   yarsService
 } from '../services';
@@ -112,7 +113,7 @@ const paramMap = new Map<string, (id: string) => any>([
   ['noteId', noteService.getNote],
   ['permitId', permitService.getPermit],
   ['submissionId', submissionService.getSubmission],
-  ['submissionDraftId', submissionService.getDraft]
+  ['submissionDraftId', submissionDraftService.getDraft]
 ]);
 
 /**