Merge pull request #1387 from academic-relations/1386-fix-api-act-028

refactor: update activity summary type and response handling
academic-relations · Jan 25, 2025 · 54d751a · 54d751a
2 parents 59eaa6c + c313caa
commit 54d751a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/packages/api/src/feature/activity/service/activity.activity-term.service.ts b/packages/api/src/feature/activity/service/activity.activity-term.service.ts
@@ -120,7 +120,6 @@ export default class ActivityActivityTermService {
     const semesters = await this.clubPublicService.getClubsExistedSemesters({
       clubId: query.clubId,
     });
-    console.log("asdfAsdf", semesters);
     const activityTerms: ApiAct009ResponseOk["terms"] = [];
     await Promise.all(
       semesters.map(async semester => {

diff --git a/packages/api/src/feature/activity/service/activity.service.ts b/packages/api/src/feature/activity/service/activity.service.ts
@@ -1453,10 +1453,10 @@ export default class ActivityService {
       club: clubMap.get(activity.club.id),
       chargedExecutive: activity.chargedExecutive?.id
         ? executiveMap.get(activity.chargedExecutive.id)
-        : undefined,
+        : null,
       commentedExecutive: activity.commentedExecutive?.id
         ? executiveMap.get(activity.commentedExecutive.id)
-        : undefined,
+        : null,
     }));
 
     return {

diff --git a/packages/interface/src/api/activity/endpoint/apiAct028.ts b/packages/interface/src/api/activity/endpoint/apiAct028.ts
@@ -3,7 +3,7 @@ import { z } from "zod";
 
 import { zExecutiveSummary } from "@sparcs-clubs/interface/api/user/type/user.type";
 
-import { zActivitySummaryExecutiveResponse } from "../type/activity.type";
+import { zActivitySummaryResponse } from "../type/activity.type";
 
 const url = (executiveId: number) =>
   `/executive/activities/executives/executive/${executiveId}/brief`;
@@ -22,7 +22,12 @@ const requestBody = z.object({});
 const responseBodyMap = {
   [HttpStatusCode.Ok]: z.object({
     chargedExecutive: zExecutiveSummary,
-    activities: zActivitySummaryExecutiveResponse.array(),
+    activities: zActivitySummaryResponse
+      .extend({
+        chargedExecutive: zExecutiveSummary.nullable(),
+        commentedExecutive: zExecutiveSummary.nullable(),
+      })
+      .array(),
   }),
 };
 

diff --git a/packages/interface/src/api/activity/type/activity.type.ts b/packages/interface/src/api/activity/type/activity.type.ts
@@ -20,6 +20,8 @@ export const zActivitySummary = z.object({
   activityTypeEnum: z.nativeEnum(ActivityTypeEnum),
   club: zClubSummary.pick({ id: true }),
   name: z.string().max(255),
+  chargedExecutive: zExecutiveSummary.pick({ id: true }).optional(),
+  commentedExecutive: zExecutiveSummary.pick({ id: true }).optional(),
   commentedAt: z.coerce.date().nullable(),
   editedAt: z.coerce.date(),
   updatedAt: z.coerce.date(),
@@ -29,12 +31,6 @@ export const zActivitySummaryResponse = zActivitySummary.extend({
   club: zClubSummary,
 });
 
-export const zActivitySummaryExecutiveResponse =
-  zActivitySummaryResponse.extend({
-    chargedExecutive: zExecutiveSummary.optional(),
-    commentedExecutive: zExecutiveSummary.optional(),
-  });
-
 // TODO: 수정 필요
 export const zActivityD = z.object({
   id: z.coerce.number().int().min(1),
@@ -44,7 +40,4 @@ export const zActivityD = z.object({
 
 export type IActivitySummary = z.infer<typeof zActivitySummary>;
 export type IActivityResponseSummary = z.infer<typeof zActivitySummaryResponse>;
-export type IActivitySummaryExecutiveResponse = z.infer<
-  typeof zActivitySummaryExecutiveResponse
->;
 export type IActivityD = z.infer<typeof zActivityD>;