fix: 🐛 netwhat 이름을 찾도록 conditionalProjectName 추가

- close #409
42Statistics · Dec 24, 2023 · 4aadcdc · 4aadcdc
1 parent b3861a2
commit 4aadcdc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/app/src/api/project/db/project.database.aggregate.ts b/app/src/api/project/db/project.database.aggregate.ts
@@ -24,6 +24,17 @@ export const conditionalProjectPreview = (
   },
 });
 
+export const conditionalProjectName = (
+  projectIdField: string,
+  projectField: string,
+) => ({
+  $cond: {
+    if: { $eq: [`$${projectIdField}`, NETWHAT_PREVIEW.id] },
+    then: NETWHAT_PREVIEW.name,
+    else: { $first: `$${projectField}.name` },
+  },
+});
+
 export const concatProjectUrl = (projectIdField: string) => ({
   $concat: [PROJECT_BASE_URL, '/', { $toString: `$${projectIdField}` }],
 });

diff --git a/app/src/dailyActivity/db/dailyActivity.database.dao.ts b/app/src/dailyActivity/db/dailyActivity.database.dao.ts
@@ -4,8 +4,12 @@ import type { Model } from 'mongoose';
 import { lookupEvents } from 'src/api/event/db/event.database.aggregate';
 import { events } from 'src/api/event/db/event.database.schema';
 import { events_users } from 'src/api/eventsUser/db/eventsUser.database.schema';
-import { lookupProjects } from 'src/api/project/db/project.database.aggregate';
 import { project } from 'src/api/project/db/project.database.schema';
+
+import {
+  conditionalProjectName,
+  lookupProjects,
+} from 'src/api/project/db/project.database.aggregate';
 import { scale_team } from 'src/api/scaleTeam/db/scaleTeam.database.schema';
 import { daily_logtimes } from 'src/dailyLogtime/db/dailyLogtime.database.schema';
 import {
@@ -170,7 +174,9 @@ export class DailyActivityDaoImpl implements DailyActivityDao {
             },
           },
           // todo: project collection 수정하고 s 삭제
-          projectName: { $first: `$${project.name}s.name` },
+          projectName: {
+            ...conditionalProjectName('team.projectId', `${project.name}s`),
+          },
           beginAt: '$beginAt',
           filledAt: '$filledAt',
         });