Merge pull request #4022 from Northeastern-Electric-Racing/3926-subteam-projects

#3926 subteam projects

Author: chpy04

src/backend/src/prisma-query-args/teams.query-args.ts

@@ -13,7 +13,7 @@ export const getTeamQueryArgs = (organizationId: string) =>
       head: getUserQueryArgs(organizationId),
       leads: getUserQueryArgs(organizationId),
       userArchived: getUserQueryArgs(organizationId),
-      teamType: true,
+      teamType: { select: { teamTypeId: true, name: true } },
       projects: {
         where: {
           wbsElement: {
@@ -38,6 +38,9 @@ export const getTeamPreviewQueryArgs = (organizationId: string) =>
     include: {
       members: getUserQueryArgs(organizationId),
       head: getUserQueryArgs(organizationId),
-      leads: getUserQueryArgs(organizationId)
+      leads: getUserQueryArgs(organizationId),
+      teamType: {
+        select: { teamTypeId: true, name: true }
+      }
     }
   });

src/backend/src/transformers/teams.transformer.ts

@@ -2,7 +2,6 @@ import { Prisma } from '@prisma/client';
 import { Team, TeamPreview, TeamBase } from 'shared';
 import { getTeamBaseQueryArgs, TeamPreviewQueryArgs, TeamQueryArgs } from '../prisma-query-args/teams.query-args.js';
 import { userTransformer } from './user.transformer.js';
-import { teamTypeTransformer } from './team-types.transformer.js';
 import { projectGanttTransformer } from './projects.transformer.js';
 
 const teamTransformer = (team: Prisma.TeamGetPayload<TeamQueryArgs>): Team => {
@@ -17,7 +16,7 @@ const teamTransformer = (team: Prisma.TeamGetPayload<TeamQueryArgs>): Team => {
     leads: team.leads.map(userTransformer),
     userArchived: team.userArchived ? userTransformer(team.userArchived) : undefined,
     dateArchived: team.dateArchived ?? undefined,
-    teamType: team.teamType ? teamTypeTransformer(team.teamType) : undefined
+    teamType: team.teamType ?? undefined
   };
 };
 
@@ -28,7 +27,7 @@ export const teamBaseTransformer = (team: Prisma.TeamGetPayload<ReturnType<typeo
     slackId: team.slackId,
     description: team.description,
     dateArchived: team.dateArchived ?? undefined,
-    teamType: team.teamType ? teamTypeTransformer(team.teamType) : undefined
+    teamType: team.teamType ?? undefined
   };
 };
 
@@ -38,7 +37,8 @@ export const teamPreviewTransformer = (team: Prisma.TeamGetPayload<TeamPreviewQu
     leads: team.leads.map(userTransformer),
     members: team.members.map(userTransformer),
     head: userTransformer(team.head),
-    dateArchived: team.dateArchived ?? undefined
+    dateArchived: team.dateArchived ?? undefined,
+    teamType: team.teamType ?? undefined
   };
 };
 

src/shared/src/types/team-types.ts

@@ -3,7 +3,6 @@
  * See the LICENSE file in the repository root folder for details.
  */
 
-import { TeamType } from './calendar-types.js';
 import { ProjectGantt } from './project-types.js';
 import { User } from './user-types.js';
 
@@ -13,7 +12,10 @@ export interface TeamBase {
   slackId: string;
   description: string;
   dateArchived?: Date;
-  teamType?: TeamType;
+  teamType?: {
+    teamTypeId: string;
+    name: string;
+  };
 }
 
 export interface TeamPreview extends TeamBase {