Features/forms response

CHANGELOG.md

@@ -32,6 +32,7 @@ Another example [here](https://co-pilot.dev/changelog)
 - Update changelog ([#104](https://github.com/chingu-x/chingu-dashboard-be/pull/104))
 - Update test.yml to run e2e tests on pull requests to the main branch [#105](https://github.com/chingu-x/chingu-dashboard-be/pull/105)
 - Update email templates to use domain in environment variables [#110](https://github.com/chingu-x/chingu-dashboard-be/pull/110)
+-Update /forms /forms/id response to include subQuestions [#115](https://github.com/chingu-x/chingu-dashboard-be/pull/115)
 - Add role and permission guard to some existing routes (features, forms, ideations, teams) [#112](https://github.com/chingu-x/chingu-dashboard-be/pull/112)
 
 ### Fixed

prisma/migrations/20240305172254_1222/migration.sql

@@ -0,0 +1,28 @@
+-- CreateTable
+CREATE TABLE "FormResponseCheckin" (
+    "id" SERIAL NOT NULL,
+    "voyageTeamMemberId" INTEGER NOT NULL,
+    "sprintId" INTEGER NOT NULL,
+    "adminComments" TEXT,
+    "feedbackSent" BOOLEAN NOT NULL DEFAULT false,
+    "responseGroupId" INTEGER NOT NULL,
+    "createdAt" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "FormResponseCheckin_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "FormResponseCheckin_responseGroupId_key" ON "FormResponseCheckin"("responseGroupId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "FormResponseCheckin_voyageTeamMemberId_sprintId_key" ON "FormResponseCheckin"("voyageTeamMemberId", "sprintId");
+
+-- AddForeignKey
+ALTER TABLE "FormResponseCheckin" ADD CONSTRAINT "FormResponseCheckin_voyageTeamMemberId_fkey" FOREIGN KEY ("voyageTeamMemberId") REFERENCES "VoyageTeamMember"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "FormResponseCheckin" ADD CONSTRAINT "FormResponseCheckin_sprintId_fkey" FOREIGN KEY ("sprintId") REFERENCES "Sprint"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "FormResponseCheckin" ADD CONSTRAINT "FormResponseCheckin_responseGroupId_fkey" FOREIGN KEY ("responseGroupId") REFERENCES "ResponseGroup"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

src/forms/forms.response.ts

@@ -66,6 +66,38 @@ class Response {
     responseGroupId: number;
 }
 
+class subQuestion {
+    @ApiProperty({ example: 1 })
+    id: number;
+
+    @ApiProperty({ example: 1 })
+    order: number;
+
+    @ApiProperty()
+    inputType: InputType;
+
+    @ApiProperty({ example: "Changes to be made for the next sprint?" })
+    text: string;
+
+    @Optional()
+    @ApiProperty({
+        example:
+            "Share your thoughts on what could be changed for the next sprint",
+    })
+    description: string;
+
+    @ApiProperty({ example: false })
+    answerRequired: boolean;
+
+    @Optional()
+    @ApiProperty({ example: null })
+    multipleAllowed: boolean;
+
+    @Optional()
+    @ApiProperty({ example: null })
+    optionGroup: OptionGroup;
+}
+
 class Question {
     @ApiProperty({ example: 1 })
     id: number;
@@ -97,8 +129,9 @@ class Question {
     @ApiProperty({ example: null })
     optionGroup: OptionGroup;
 
+    @Optional()
     @ApiProperty({ isArray: true })
-    responses: Response;
+    subQuestions: subQuestion;
 }
 
 export class FormResponse {

src/forms/forms.service.ts

@@ -1,5 +1,6 @@
 import { Injectable, NotFoundException } from "@nestjs/common";
 import { PrismaService } from "../prisma/prisma.service";
+import { Prisma, Question } from "@prisma/client";
 
 export const formSelect = {
     id: true,
@@ -12,6 +13,9 @@ export const formSelect = {
     title: true,
     description: true,
     questions: {
+        orderBy: {
+            order: "asc",
+        },
         select: {
             id: true,
             order: true,
@@ -35,31 +39,74 @@ export const formSelect = {
                     },
                 },
             },
+            subQuestions: true,
         },
     },
-};
+} as Prisma.FormSelect;
 
 @Injectable()
 export class FormsService {
     constructor(private prisma: PrismaService) {}
 
-    getAllForms() {
-        return this.prisma.form.findMany({
+    async getAllForms() {
+        const data = await this.prisma.form.findMany({
             select: formSelect,
         });
+
+        const subQuestionsIds = [];
+
+        data.forEach((form) => {
+            form.questions.forEach((question) => {
+                const currentQuestion = question as Question & {
+                    subQuestions: Question[];
+                };
+                currentQuestion.subQuestions.forEach((subQuestion) => {
+                    subQuestionsIds.push(subQuestion.id);
+                });
+            });
+        });
+
+        for (let i = 0; i < data.length; i++) {
+            const form = data[i];
+            const filteredQuestions = form.questions.filter(
+                (i) => !subQuestionsIds.includes(i.id),
+            );
+
+            form.questions = filteredQuestions;
+        }
+
+        return data;
     }
 
     async getFormById(formId: number) {
-        const form = await this.prisma.form.findUnique({
+        const data = await this.prisma.form.findUnique({
             where: {
                 id: formId,
             },
             select: formSelect,
         });
-        if (!form)
+        if (!data)
             throw new NotFoundException(
                 `Invalid formId: Form (id:${formId}) does not exist.`,
             );
-        return form;
+        const subQuestionsIds = [];
+
+        data.questions.forEach((question) => {
+            const currentQuestion = question as Question & {
+                subQuestions: Question[];
+            };
+            currentQuestion.subQuestions.forEach((subQuestion) => {
+                subQuestionsIds.push(subQuestion.id);
+            });
+        });
+
+        const filteredQuestions = data.questions.filter(
+            (i) => !subQuestionsIds.includes(i.id),
+        );
+
+        data.questions = filteredQuestions;
+
+        return data;
     }
 }
+//