feat(users): add support for projectSubmitted field in VoyageTeam ent…

…ity and response

fix(users): update user object with sprintCheckInIds and projectStatus
The migration.sql file adds a new column "projectSubmitted" to the VoyageTeam table in the database. This column is set to a default value of false. The schema.prisma file is updated to include the new "projectSubmitted" field in the VoyageTeam model. The users.select.ts file is modified to include the "projectSubmitted" field in the select query for private user details. The team.entity.ts file is updated to include the "projectSubmitted" field in the VoyageTeamEntity class. The users.response.ts file is modified to include the "projectSubmitted" field in the VoyageTeam class. The users.service.ts file is updated to fetch the "projectSubmitted" field from the database and update the user object with the sprintCheckInIds and projectStatus.

These changes are done to support the functionality of tracking whether a project has been submitted by a VoyageTeam. The "projectSubmitted" field allows for easy retrieval of this information and the updated user object provides the necessary data for displaying the project status to the user.

prisma/migrations/20240524022541_add_project_submitted_to_voyage_team_table/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "VoyageTeam" ADD COLUMN     "projectSubmitted" BOOLEAN DEFAULT false;

prisma/schema.prisma

@@ -180,19 +180,20 @@ model VoyageRole {
 }
 
 model VoyageTeam {
-  id            Int           @id @default(autoincrement())
-  voyage        Voyage?       @relation(fields: [voyageId], references: [id], onUpdate: Cascade, onDelete: SetNull)
-  voyageId      Int?
-  name          String        @unique
-  status        VoyageStatus? @relation(fields: [statusId], references: [id], onUpdate: Cascade, onDelete: SetNull)
-  statusId      Int?
-  repoUrl       String
-  repoUrlBE     String?
-  deployedUrl   String?
-  deployedUrlBE String?
-  tier          Tier?         @relation(fields: [tierId], references: [id], onUpdate: Cascade, onDelete: SetNull)
-  tierId        Int?
-  endDate       DateTime
+  id               Int           @id @default(autoincrement())
+  voyage           Voyage?       @relation(fields: [voyageId], references: [id], onUpdate: Cascade, onDelete: SetNull)
+  voyageId         Int?
+  name             String        @unique
+  projectSubmitted Boolean?      @default(false)
+  status           VoyageStatus? @relation(fields: [statusId], references: [id], onUpdate: Cascade, onDelete: SetNull)
+  statusId         Int?
+  repoUrl          String
+  repoUrlBE        String?
+  deployedUrl      String?
+  deployedUrlBE    String?
+  tier             Tier?         @relation(fields: [tierId], references: [id], onUpdate: Cascade, onDelete: SetNull)
+  tierId           Int?
+  endDate          DateTime
 
   createdAt DateTime @default(now()) @db.Timestamptz()
   updatedAt DateTime @updatedAt
@@ -292,7 +293,7 @@ model ProjectIdea {
   title              String
   description        String
   vision             String
-  isSelected         Boolean            @default(false)
+  isSelected         Boolean           @default(false)
 
   createdAt DateTime @default(now()) @db.Timestamptz()
   updatedAt DateTime @updatedAt

src/global/selects/users.select.ts

@@ -85,6 +85,7 @@ export const privateUserDetailSelect = {
             voyageTeam: {
                 select: {
                     name: true,
+                    projectSubmitted: false,
                     voyage: {
                         select: {
                             number: true,

src/teams/entities/team.entity.ts

@@ -11,6 +11,9 @@ export class VoyageTeamEntity implements VoyageTeam {
     @ApiProperty()
     name: string;
 
+    @ApiProperty()
+    projectSubmitted: boolean;
+
     @ApiProperty()
     statusId: number;
 

src/users/users.response.ts

@@ -51,6 +51,9 @@ class VoyageTeam {
     @ApiProperty({ example: "v47-tier2-team-4" })
     name: string;
 
+    @ApiProperty({ example: false })
+    projectSubmitted: boolean;
+
     @ApiProperty()
     voyage: Voyage;
 }

src/users/users.service.ts

@@ -74,30 +74,32 @@ export class UsersService {
             where: {
                 id: userId,
             },
-            select: privateUserDetailSelect,
-        });
-        // get voyageTeamMemberIds
-        const teamMemberId: number[] = (
-            await this.prisma.user.findUnique({
-                where: {
-                    id: userId,
-                },
-                select: {
-                    voyageTeamMembers: {
-                        select: {
-                            id: true,
-                        },
+            select: {
+                ...privateUserDetailSelect,
+                voyageTeamMembers: {
+                    select: {
+                        id: true,
+                        voyageTeamId: true,
+                        voyageTeam: true,
                     },
                 },
-            })
-        ).voyageTeamMembers.map((teamMemberId) => teamMemberId.id);
-
+            },
+        });
+        if (!user) throw new NotFoundException("User not found");
+        // get voyageTeamMemberIds
+        const teamMemberIds: number[] = user.voyageTeamMembers.map(
+            (teamMemberId) => teamMemberId.id,
+        );
+        // get voyageTeamId
+        const teamIds: number[] = user.voyageTeamMembers.map(
+            (voyageTeamId) => voyageTeamId.voyageTeamId,
+        );
         // get sprint checkin  Ids
         const sprintCheckInIds = (
             await this.prisma.formResponseCheckin.findMany({
                 where: {
                     voyageTeamMemberId: {
-                        in: teamMemberId,
+                        in: teamMemberIds,
                     },
                 },
                 select: {
@@ -106,11 +108,36 @@ export class UsersService {
             })
         ).map((sprintCheckInId) => sprintCheckInId.sprintId);
 
-        // update user object with sprintCheckInIds
-
-        const updatedUser = { ...user, sprintCheckIn: sprintCheckInIds };
+        const projectStatusTeamIds: number[] = (
+            await this.prisma.formResponseVoyageProject.findMany({
+                where: {
+                    voyageTeamId: {
+                        in: teamIds,
+                    },
+                },
+                select: {
+                    voyageTeamId: true,
+                },
+            })
+        ).map((projectStatusTeamId) => projectStatusTeamId.voyageTeamId);
+        // update user object with sprintCheckInIds and projectStatus
+        const updatedUser = {
+            ...user,
+            sprintCheckIn: sprintCheckInIds,
+            voyageTeamMembers: user.voyageTeamMembers.map((teamMember) => {
+                if (projectStatusTeamIds.includes(teamMember.voyageTeamId)) {
+                    return {
+                        ...teamMember,
+                        voyageTeam: {
+                            ...teamMember.voyageTeam,
+                            projectSubmitted: true,
+                        },
+                    };
+                }
+                return teamMember;
+            }),
+        };
 
-        if (!user) throw new NotFoundException("User not found");
         return this.formatUser(updatedUser);
     }