Merge branch 'dev' of https://github.com/chingu-x/chingu-dashboard-be into feature/add-pre-defined-voyage-projects

Author: Ajen07

.gitignore

@@ -139,4 +139,5 @@ pgadmin-data
 .idea/
 
 # Misc system generated
-.DS_Store
+.DS_Store
+/.codebuddy/

README.md

@@ -36,6 +36,7 @@ BCRYPT_HASHING_ROUNDS=10
 
 MJ_APIKEY_PRIVATE={check Important Resources page}
 MJ_APIKEY_PUBLIC={check Important Resources page}
+MJ_ENV=local
 
 NODE_ENV=development
 

prisma/migrations/20250312231314_add_order_description_to_options_add_user_application_table/migration.sql

@@ -0,0 +1,45 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[userApplicationId]` on the table `User` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- AlterTable
+ALTER TABLE "OptionChoice" ADD COLUMN     "description" TEXT,
+ADD COLUMN     "order" INTEGER;
+
+-- AlterTable
+ALTER TABLE "Question" ADD COLUMN     "pageNumber" INTEGER;
+
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "userApplicationId" INTEGER;
+
+-- CreateTable
+CREATE TABLE "UserApplication" (
+    "id" SERIAL NOT NULL,
+    "userId" UUID NOT NULL,
+    "formId" INTEGER,
+    "responseGroupId" INTEGER,
+    "createdAt" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "UserApplication_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "UserApplication_userId_key" ON "UserApplication"("userId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "UserApplication_responseGroupId_key" ON "UserApplication"("responseGroupId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_userApplicationId_key" ON "User"("userApplicationId");
+
+-- AddForeignKey
+ALTER TABLE "UserApplication" ADD CONSTRAINT "UserApplication_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserApplication" ADD CONSTRAINT "UserApplication_formId_fkey" FOREIGN KEY ("formId") REFERENCES "Form"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserApplication" ADD CONSTRAINT "UserApplication_responseGroupId_fkey" FOREIGN KEY ("responseGroupId") REFERENCES "ResponseGroup"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/schema/form.prisma

@@ -23,6 +23,7 @@ model Form {
   formResponseMeetings FormResponseMeeting[]
   soloProjects         SoloProject[]
   voyageApplications   VoyageApplication[]
+  userApplications     UserApplication[]
 }
 
 model Question {
@@ -40,13 +41,14 @@ model Question {
   optionGroup      OptionGroup? @relation(fields: [optionGroupId], references: [id])
   parentQuestionId Int?
   parentQuestion   Question?    @relation("QuestionSubQuestion", fields: [parentQuestionId], references: [id])
+  pageNumber       Int?
+  parseConfig      Json?
 
   createdAt DateTime @default(now()) @db.Timestamptz()
   updatedAt DateTime @updatedAt
 
   responses    Response[]
   subQuestions Question[] @relation("QuestionSubQuestion")
-  parseConfig  Json?
 }
 
 model InputType {
@@ -68,22 +70,22 @@ model OptionGroup {
 
   optionChoices OptionChoice[]
   questions     Question[]
-
 }
 
 model OptionChoice {
   id            Int         @id @default(autoincrement())
   optionGroupId Int
   optionGroup   OptionGroup @relation(fields: [optionGroupId], references: [id], onDelete: Cascade)
   text          String
-  order         Int?
   description   String?
+  order         Int?
+  parseConfig   Json?
+
 
   createdAt DateTime @default(now()) @db.Timestamptz()
   updatedAt DateTime @updatedAt
 
   responses Response[]
-  parseConfig Json?
 }
 
 model Response {
@@ -114,6 +116,8 @@ model ResponseGroup {
   formResponseMeeting       FormResponseMeeting?
   formResponseCheckin       FormResponseCheckin?
   formResponseVoyageProject FormResponseVoyageProject?
+
+  UserApplication UserApplication[]
 }
 
 model FormResponseMeeting {

prisma/schema/user.prisma

@@ -12,20 +12,20 @@ model Gender {
 }
 
 model User {
-  id            String   @id @default(uuid()) @db.Uuid
-  email         String   @unique
-  emailVerified Boolean  @default(false)
-  password      String
-  firstName     String?
-  lastName      String?
-  avatar        String?
-  gender        Gender?  @relation(fields: [genderId], references: [id], onDelete: SetNull, onUpdate: Cascade)
-  genderId      Int?
-  countryCode   String?
-  timezone      String?
-  comment       String?
-  hasCompletedAssessment Boolean @default(false)
-  refreshToken  String[]
+  id                     String   @id @default(uuid()) @db.Uuid
+  email                  String   @unique
+  emailVerified          Boolean  @default(false)
+  password               String
+  firstName              String?
+  lastName               String?
+  avatar                 String?
+  gender                 Gender?  @relation(fields: [genderId], references: [id], onDelete: SetNull, onUpdate: Cascade)
+  genderId               Int?
+  countryCode            String?
+  timezone               String?
+  comment                String?
+  hasCompletedAssessment Boolean  @default(false)
+  refreshToken           String[]
 
   createdAt DateTime @default(now()) @db.Timestamptz()
   updatedAt DateTime @updatedAt
@@ -40,6 +40,8 @@ model User {
   roles                  UserRole[]
   oAuthProfiles          UserOAuthProfile[]
   comments               Comment[]
+  userApplicationId      Int?                    @unique
+  userApplication        UserApplication?
 }
 
 model Role {

prisma/schema/userApp.prisma

@@ -0,0 +1,13 @@
+// === User Application ===
+model UserApplication {
+  id              Int            @id @default(autoincrement())
+  userId          String         @unique @db.Uuid()
+  user            User           @relation(fields: [userId], references: [id], onDelete: Cascade)
+  formId          Int?
+  form            Form?          @relation(fields: [formId], references: [id], onDelete: SetNull)
+  responseGroupId Int?           @unique
+  responseGroup   ResponseGroup? @relation(fields: [responseGroupId], references: [id], onDelete: Restrict)
+
+  createdAt DateTime @default(now()) @db.Timestamptz()
+  updatedAt DateTime @updatedAt
+}

prisma/seed/data/genders.ts

@@ -9,7 +9,7 @@ export default [
     },
     {
         abbreviation: "T",
-        description: "trans",
+        description: "transgender",
     },
     {
         abbreviation: "NB",

prisma/seed/data/input-types.ts

@@ -35,4 +35,10 @@ export default [
     {
         name: "noInputText",
     },
+    {
+        name: "dropdown",
+    },
+    {
+        name: "dropdownCountryCode",
+    },
 ];

prisma/seed/forms/index.ts

@@ -8,6 +8,7 @@ import { populateVoyageSubmissionForm } from "./voyage-project-submission";
 import { prisma } from "../prisma-client";
 import { populateCheckinFormResponse } from "../responses/checkinform-responses";
 import { populateVoyageProjectSubmissionFormResponses } from "../responses/voyage-project-form-response";
+import { populateUserApplicationForm } from "@Prisma/seed/forms/user-app";
 
 export const populateFormsAndResponses = async () => {
     // test option choices for Voyage Application form
@@ -63,6 +64,7 @@ export const populateFormsAndResponses = async () => {
     await populateVoyageApplicationForm();
     await populateVoyageSubmissionForm();
     await populateVoyageProjectSubmissionFormResponses();
+    await populateUserApplicationForm();
 
     console.log("Forms, Questions and Responses populated.");
 };