refactor: ♻️ service 에서 model 의 type 을 반환하도록 변경

42Statistics · Nov 10, 2023 · acfca3b · acfca3b
1 parent 3d7fe54
commit acfca3b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/app/src/dailyActivity/dailyActivity.dto.ts b/app/src/dailyActivity/dailyActivity.dto.ts
@@ -26,14 +26,3 @@ export type FindDailyActivityRecordInput = {
 export type FindDailyActivityRecordOutput =
   | DailyLogtimeRecord
   | DailyDefaultRecord;
-
-export type FindUserDailyActivityByDateInput = {
-  userId: number;
-  start: Date;
-  end: Date;
-};
-
-export type FindUserDailyActivityByDateOutput = {
-  date: Date;
-  records: (Omit<DailyLogtimeRecord, 'date'> | DailyDefaultRecord)[];
-};
diff --git a/app/src/dailyActivity/dailyActivity.service.ts b/app/src/dailyActivity/dailyActivity.service.ts
@@ -1,22 +1,27 @@
 import { Injectable } from '@nestjs/common';
+import type { DateRange } from 'src/dateRange/dtos/dateRange.dto';
 import { DateWrapper } from 'src/dateWrapper/dateWrapper';
+import type { DailyActivity } from 'src/page/personal/general/models/personal.general.dailyActivity.model';
 import { DailyActivityDaoImpl } from './dailyActivity.dao';
 import {
   DailyActivityType,
   type DailyDefaultRecord,
   type DailyLogtimeRecord,
-  type FindUserDailyActivityByDateInput,
-  type FindUserDailyActivityByDateOutput,
 } from './dailyActivity.dto';
 
 @Injectable()
 export class DailyActivityService {
   constructor(private readonly dailyActivityDao: DailyActivityDaoImpl) {}
 
   async findAllUserDailyActivityByDate(
-    args: FindUserDailyActivityByDateInput,
-  ): Promise<FindUserDailyActivityByDateOutput[]> {
-    const records = await this.dailyActivityDao.findAllRecordByDate(args);
+    userId: number,
+    { start, end }: DateRange,
+  ): Promise<DailyActivity[]> {
+    const records = await this.dailyActivityDao.findAllRecordByDate({
+      userId,
+      start,
+      end,
+    });
 
     const recordMapByDate = records.reduce((recordMap, record) => {
       if (isDailyLogtimeRecord(record)) {
@@ -44,7 +49,7 @@ export class DailyActivityService {
       ]);
 
       return recordMap;
-    }, new Map<number, FindUserDailyActivityByDateOutput['records']>());
+    }, new Map<number, DailyActivity['records']>());
 
     return Array.from(recordMapByDate.entries())
       .sort(([a], [b]) => a - b)

diff --git a/app/src/page/personal/general/personal.general.resolver.ts b/app/src/page/personal/general/personal.general.resolver.ts
@@ -167,11 +167,10 @@ export class PersonalGeneralResolver {
     }
 
     const dailyActivities =
-      await this.dailyActiviyService.findAllUserDailyActivityByDate({
-        userId: root.userProfile.id,
-        start,
-        end,
-      });
+      await this.dailyActiviyService.findAllUserDailyActivityByDate(
+        root.userProfile.id,
+        { start, end },
+      );
 
     await this.cacheUtilService.set(cacheKey, dailyActivities);