Features/forms response

CHANGELOG.md

@@ -35,6 +35,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)
 - Refactor voyages endpoint paths to follow API naming conversion [#123](https://github.com/chingu-x/chingu-dashboard-be/pull/123)
 - Refactor resources PATCH and DELETE URI [#127](https://github.com/chingu-x/chingu-dashboard-be/pull/127)

src/forms/forms.response.ts

@@ -66,7 +66,7 @@ class Response {
     responseGroupId: number;
 }
 
-class Question {
+class BaseQuestion {
     @ApiProperty({ example: 1 })
     id: number;
 
@@ -97,8 +97,19 @@ class Question {
     @ApiProperty({ example: null })
     optionGroup: OptionGroup;
 
-    @ApiProperty({ isArray: true })
-    responses: Response;
+    @ApiProperty()
+    createdAt: Date;
+
+    @ApiProperty()
+    updatedAt: Date;
+}
+
+class SubQuestion extends BaseQuestion {}
+
+class Question extends BaseQuestion {
+    @Optional()
+    @ApiProperty({ isArray: true, type: SubQuestion })
+    subQuestions: SubQuestion[];
 }
 
 export class FormResponse {

src/forms/forms.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, NotFoundException } from "@nestjs/common";
 import { PrismaService } from "../prisma/prisma.service";
-import { Prisma } from "@prisma/client";
+import { Prisma, Question } from "@prisma/client";
 
 export const formSelect = {
     id: true,
@@ -39,6 +39,36 @@ export const formSelect = {
                     },
                 },
             },
+            subQuestions: {
+                select: {
+                    id: true,
+                    order: true,
+                    inputType: {
+                        select: {
+                            id: true,
+                            name: true,
+                        },
+                    },
+                    text: true,
+                    description: true,
+                    answerRequired: true,
+                    multipleAllowed: true,
+                    optionGroup: {
+                        select: {
+                            optionChoices: {
+                                select: {
+                                    id: true,
+                                    text: true,
+                                },
+                            },
+                        },
+                    },
+                    createdAt: true,
+                    updatedAt: true,
+                },
+            },
+            createdAt: true,
+            updatedAt: true,
         },
     },
 } as Prisma.FormSelect;
@@ -47,10 +77,34 @@ export const formSelect = {
 export class FormsService {
     constructor(private prisma: PrismaService) {}
 
-    getAllForms() {
-        return this.prisma.form.findMany({
+    async getAllForms() {
+        const forms = await this.prisma.form.findMany({
             select: formSelect,
         });
+
+        const subQuestionsIds = [];
+
+        forms.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 < forms.length; i++) {
+            const form = forms[i];
+            const filteredQuestions = form.questions.filter(
+                (i) => !subQuestionsIds.includes(i.id),
+            );
+
+            form.questions = filteredQuestions;
+        }
+
+        return forms;
     }
 
     async getFormById(formId: number) {
@@ -64,6 +118,23 @@ export class FormsService {
             throw new NotFoundException(
                 `Invalid formId: Form (id:${formId}) does not exist.`,
             );
+        const subQuestionsIds = [];
+
+        form.questions.forEach((question) => {
+            const currentQuestion = question as Question & {
+                subQuestions: Question[];
+            };
+            currentQuestion.subQuestions.forEach((subQuestion) => {
+                subQuestionsIds.push(subQuestion.id);
+            });
+        });
+
+        const filteredQuestions = form.questions.filter(
+            (i) => !subQuestionsIds.includes(i.id),
+        );
+
+        form.questions = filteredQuestions;
+
         return form;
     }
 }

yarn.lock

@@ -868,9 +868,9 @@
   integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==
 
 "@prisma/client@^5.3.1":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.11.0.tgz#d8e55fab85163415b2245fb408b9106f83c8106d"
-  integrity sha512-SWshvS5FDXvgJKM/a0y9nDC1rqd7KG0Q6ZVzd+U7ZXK5soe73DJxJJgbNBt2GNXOa+ysWB4suTpdK5zfFPhwiw==
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.12.0.tgz#4d1fb68074307bf9445d06ad387139301aa4bcc4"
+  integrity sha512-bk/+KPpRm0+IzqFCtAxrj+/TNiHzulspnO+OkysaYY/atc/eX0Gx8V3tTLxbHKVX0LKD4Hi8KKCcSbU1U72n7Q==
 
 "@prisma/debug@5.11.0":
   version "5.11.0"
@@ -5682,6 +5682,7 @@ wide-align@^1.1.2:
     string-width "^1.0.2 || 2 || 3 || 4"
 
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  name wrap-ansi-cjs
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==