feat base repository and fix funding api for executive feedbacks

packages/api/src/common/repository/base.repository.ts

@@ -15,8 +15,8 @@ interface TableWithId {
   id: MySqlColumn<ColumnBaseConfig<ColumnDataType, string>>;
 }
 
-interface ModelStatic<T extends MEntity, D> {
-  fromDbResult(result: D): T;
+interface ModelWithFrom<T extends MEntity, D> {
+  from(result: D): T;
 }
 
 @Injectable()
@@ -30,7 +30,7 @@ export abstract class BaseRepository<
 
   constructor(
     protected table: T,
-    protected modelClass: ModelStatic<M, D>,
+    protected modelClass: ModelWithFrom<M, D>,
   ) {}
 
   async withTransaction<Result>(
@@ -44,7 +44,7 @@ export abstract class BaseRepository<
       .select()
       .from(this.table)
       .where(eq(this.table.id, id))
-      .then(rows => rows.map(row => this.modelClass.fromDbResult(row as D)));
+      .then(rows => rows.map(row => this.modelClass.from(row as D)));
 
     return (result[0] as M) ?? null;
   }
@@ -75,7 +75,7 @@ export abstract class BaseRepository<
       .from(this.table)
       .where(inArray(this.table.id, ids));
 
-    return result.map(row => this.modelClass.fromDbResult(row as D));
+    return result.map(row => this.modelClass.from(row as D));
   }
 
   async fetchAll(ids: number[]): Promise<M[]> {

packages/api/src/feature/funding/model/funding.comment.model.ts

@@ -38,7 +38,7 @@ export class MFundingComment extends MEntity implements IFundingComment {
     );
   }
 
-  static fromDbResult(result: FundingCommentDbResult): MFundingComment {
+  static from(result: FundingCommentDbResult): MFundingComment {
     return new MFundingComment({
       id: result.id,
       funding: { id: result.fundingId },

packages/api/src/feature/funding/repository/funding.comment.repository.ts

@@ -43,7 +43,7 @@ export default class FundingCommentRepository extends BaseRepository<
       .from(FundingFeedback)
       .where(eq(FundingFeedback.fundingId, arg1));
 
-    return result.map(row => MFundingComment.fromDbResult(row));
+    return result.map(row => MFundingComment.from(row));
   }
 
   async fetchAll(fundingId: number): Promise<MFundingComment[]>;

packages/api/src/feature/funding/service/funding.service.ts

@@ -218,14 +218,14 @@ export default class FundingService {
         executive => executive.id === comment.chargedExecutive.id,
       );
     });
-    funding.comments = comments.map(comment => ({
+    const commentResponses = comments.map(comment => ({
       ...comment,
       chargedExecutive: chargedExecutive.find(
         executive => executive.id === comment.chargedExecutive.id,
       ),
     }));
 
-    return funding;
+    return { funding, comments: commentResponses };
   }
 
   private async buildFundingResponse(
@@ -286,26 +286,11 @@ export default class FundingService {
       };
     }
 
-    const comments = await this.fundingCommentRepository.fetchAll(funding.id);
-
-    const chargedExecutive =
-      await this.userPublicService.fetchExecutiveSummaries(
-        comments.map(comment => comment.chargedExecutive.id),
-      );
-
-    const commentResponses = comments.map(comment => ({
-      ...comment,
-      chargedExecutive: chargedExecutive.find(
-        executive => executive.id === comment.chargedExecutive.id,
-      ),
-    }));
-
     return {
       ...funding,
       purposeActivity,
       ...resolvedFiles,
       transportation,
-      comments: commentResponses,
     };
   }
 
@@ -487,7 +472,7 @@ export default class FundingService {
     const funding = await this.fundingRepository.fetch(id); // TODO: 이거 이래도 되나? comments 필드가 없는데. 에러 안나나?
 
     const fundingResponse = await this.buildFundingResponse(funding);
-    return fundingResponse;
+    return { funding: fundingResponse, comments: [] };
   }
 
   /**

packages/interface/src/api/funding/endpoint/apiFnd002.ts

@@ -1,6 +1,7 @@
 import { HttpStatusCode } from "axios";
 import { z } from "zod";
 
+import { zFundingCommentResponse } from "../type/funding.comment.type";
 import { zFundingResponse } from "../type/funding.type";
 
 /**
@@ -20,7 +21,10 @@ const requestQuery = z.object({});
 const requestBody = z.object({});
 
 const responseBodyMap = {
-  [HttpStatusCode.Ok]: zFundingResponse,
+  [HttpStatusCode.Ok]: z.object({
+    funding: zFundingResponse,
+    comments: z.array(zFundingCommentResponse),
+  }),
 };
 
 const responseErrorMap = {};

packages/interface/src/api/funding/endpoint/apiFnd012.ts

@@ -1,6 +1,7 @@
 import { HttpStatusCode } from "axios";
 import { z } from "zod";
 
+import { zFundingCommentResponse } from "../type/funding.comment.type";
 import { zFundingResponse } from "../type/funding.type";
 
 /**
@@ -23,7 +24,10 @@ const requestQuery = z.object({});
 const requestBody = z.object({});
 
 const responseBodyMap = {
-  [HttpStatusCode.Ok]: zFundingResponse,
+  [HttpStatusCode.Ok]: z.object({
+    funding: zFundingResponse,
+    comments: z.array(zFundingCommentResponse),
+  }),
 };
 
 const responseErrorMap = {};

packages/interface/src/api/funding/endpoint/apiFnd013.ts

@@ -2,7 +2,7 @@ import { HttpStatusCode } from "axios";
 import { z } from "zod";
 
 import { zFundingCommentRequest } from "../type/funding.comment.type";
-import { zFunding } from "../type/funding.common.type";
+import { zFunding } from "../type/funding.type";
 
 /**
  * @version v0.1

packages/interface/src/api/funding/type/funding.comment.type.ts

@@ -4,7 +4,7 @@ import { zExecutiveSummary } from "@sparcs-clubs/interface/api/user/type/user.ty
 import { FundingStatusEnum } from "@sparcs-clubs/interface/common/enum/funding.enum";
 import zId from "@sparcs-clubs/interface/common/type/id.type";
 
-import { zFunding } from "./funding.common.type";
+import { zFunding } from "./funding.type";
 
 export const zFundingComment = z.object({
   id: zId,