Merge dev into main

packages/api/src/drizzle/drizzle.provider.ts

@@ -1,6 +1,12 @@
 // dizzle.provider.ts
 
-import { drizzle } from "drizzle-orm/mysql2";
+import { ExtractTablesWithRelations } from "drizzle-orm";
+import { MySqlTransaction } from "drizzle-orm/mysql-core";
+import {
+  drizzle,
+  MySql2PreparedQueryHKT,
+  MySql2QueryResultHKT,
+} from "drizzle-orm/mysql2";
 import mysql from "mysql2/promise";
 
 import logger from "../common/util/logger";
@@ -83,3 +89,11 @@ export const drizzleProvider = [
     exports: [DrizzleAsyncProvider],
   },
 ];
+
+// transaction의 type
+export type DrizzleTransaction = MySqlTransaction<
+  MySql2QueryResultHKT,
+  MySql2PreparedQueryHKT,
+  Record<string, never>,
+  ExtractTablesWithRelations<Record<string, never>>
+>;

packages/api/src/drizzle/schema/funding.schema.ts

@@ -1,3 +1,5 @@
+import { FundingStatusEnum } from "@sparcs-clubs/interface/common/enum/funding.enum";
+
 import {
   boolean,
   datetime,
@@ -21,7 +23,9 @@ export const Funding = mysqlTable(
     activityDId: int("activity_d_id")
       .notNull()
       .references(() => ActivityD.id),
-    fundingStatusEnum: int("funding_status_enum").notNull(),
+    fundingStatusEnum: int("funding_status_enum")
+      .notNull()
+      .default(FundingStatusEnum.Applied),
     purposeActivityId: int("purpose_activity_id"),
     name: varchar("name", { length: 255 }).notNull(),
     expenditureDate: datetime("expenditure_date").notNull(),
@@ -134,6 +138,24 @@ export const FundingTradeDetailFile = mysqlTable(
   }),
 );
 
+export const FundingNonCorporateTransactionFile = mysqlTable(
+  "funding_non_corporate_transaction_file",
+  {
+    id: int("id").autoincrement().primaryKey().notNull(),
+    fundingId: int("funding_id").notNull(),
+    fileId: varchar("file_id", { length: 128 }).notNull(),
+    createdAt: timestamp("created_at").defaultNow().notNull(),
+    deletedAt: timestamp("deleted_at"),
+  },
+  table => ({
+    fundingForeignKey: foreignKey({
+      name: "non_corporate_transaction_file_funding_id_fk",
+      columns: [table.fundingId],
+      foreignColumns: [Funding.id],
+    }),
+  }),
+);
+
 export const FundingFoodExpenseFile = mysqlTable(
   "funding_food_expense_file",
   {
@@ -362,6 +384,8 @@ export const FundingFeedback = mysqlTable(
     fundingId: int("funding_id").notNull(),
     chargedExecutiveId: int("charged_executive_id").notNull(),
     feedback: text("feedback").notNull(),
+    fundingStatusEnum: int("funding_status_enum").notNull(), // Funding 에서 이관
+    approvedAmount: int("approved_amount").notNull(), // Funding 에서 이관
     createdAt: timestamp("created_at").defaultNow().notNull(),
     deletedAt: timestamp("deleted_at"),
   },

packages/api/src/feature/activity/repository/activity.repository.ts

@@ -73,7 +73,7 @@ export default class ActivityRepository {
   // 작성에 성공하면 True, 실패하면 False를 리턴합니다.
   async deleteActivity(contents: { activityId: number }): Promise<boolean> {
     const isDeletionSucceed = await this.db.transaction(async tx => {
-      const deletedAt = new Date();
+      const deletedAt = getKSTDate();
       const [activitySetResult] = await tx
         .update(Activity)
         .set({
@@ -457,7 +457,7 @@ export default class ActivityRepository {
     activityStatusEnumId: ActivityStatusEnum;
   }) {
     const isUpdateSucceed = await this.db.transaction(async tx => {
-      const deletedAt = new Date();
+      const deletedAt = getKSTDate();
 
       const [activitySetResult] = await tx
         .update(Activity)

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

@@ -1316,6 +1316,8 @@ export default class ActivityService {
           commentedExecutive,
           chargedExecutive,
           updatedAt: activity.updatedAt,
+          commentedAt: activity.commentedAt,
+          editedAt: activity.editedAt,
         };
       }),
     );

packages/api/src/feature/club/service/club.public.service.ts

@@ -170,6 +170,15 @@ export default class ClubPublicService {
     return true;
   }
 
+  async checkStudentDelegate(studentId: number, clubId: number) {
+    if (!(await this.isStudentDelegate(studentId, clubId))) {
+      throw new HttpException(
+        "It seems that you are not the delegate of the club.",
+        HttpStatus.FORBIDDEN,
+      );
+    }
+  }
+
   /**
    * @param clubStatusEnumId 동아리 상태 enum id의 배열
    * @param studentId 사용중인 학생 id

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

@@ -35,20 +35,35 @@ import apiFnd006, {
   ApiFnd006RequestQuery,
   ApiFnd006ResponseOk,
 } from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd006";
-import apiFnd007 from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd007";
+import apiFnd007, {
+  ApiFnd007ResponseOk,
+} from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd007";
+import apiFnd012, {
+  ApiFnd012RequestParam,
+  ApiFnd012RequestUrl,
+  ApiFnd012ResponseOk,
+} from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd012";
+import apiFnd013, {
+  ApiFnd013RequestBody,
+  ApiFnd013RequestParam,
+  ApiFnd013RequestUrl,
+  ApiFnd013ResponseCreated,
+} from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd013";
 
 import { ZodPipe } from "@sparcs-clubs/api/common/pipe/zod-pipe";
 
 import {
+  Executive,
   Public,
   Student,
 } from "@sparcs-clubs/api/common/util/decorators/method-decorator";
-import { GetStudent } from "@sparcs-clubs/api/common/util/decorators/param-decorator";
+import {
+  GetExecutive,
+  GetStudent,
+} from "@sparcs-clubs/api/common/util/decorators/param-decorator";
 
 import FundingService from "../service/funding.service";
 
-import type { ApiFnd007ResponseOk } from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd007";
-
 @Controller()
 export default class FundingController {
   constructor(private fundingService: FundingService) {}
@@ -132,4 +147,34 @@ export default class FundingController {
   async getPublicFundingsDeadline(): Promise<ApiFnd007ResponseOk> {
     return this.fundingService.getPublicFundingsDeadline();
   }
+
+  @Executive()
+  @Get(ApiFnd012RequestUrl)
+  @UsePipes(new ZodPipe(apiFnd012))
+  async getExecutiveFunding(
+    @GetExecutive() executive: GetExecutive,
+    @Param() param: ApiFnd012RequestParam,
+  ): Promise<ApiFnd012ResponseOk> {
+    return this.fundingService.getExecutiveFunding(
+      executive.executiveId,
+      param.id,
+    );
+  }
+
+  @Executive()
+  @Post(ApiFnd013RequestUrl)
+  @UsePipes(new ZodPipe(apiFnd013))
+  async postExecutiveFundingComment(
+    @GetExecutive() executive: GetExecutive,
+    @Param() param: ApiFnd013RequestParam,
+    @Body() body: ApiFnd013RequestBody,
+  ): Promise<ApiFnd013ResponseCreated> {
+    return this.fundingService.postExecutiveFundingComment(
+      executive.executiveId,
+      param.id,
+      body.fundingStatusEnum,
+      body.approvedAmount,
+      body.content,
+    );
+  }
 }

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

@@ -1,38 +1,53 @@
 import { IFundingComment } from "@sparcs-clubs/interface/api/funding/type/funding.type";
+import { FundingStatusEnum } from "@sparcs-clubs/interface/common/enum/funding.enum";
+import { InferSelectModel } from "drizzle-orm";
 
-export type FundingCommentDBResult = {
-  id: number;
-  fundingId: number;
-  chargedExecutiveId: number;
-  content: string;
-  createdAt: Date;
-};
+import { FundingFeedback } from "@sparcs-clubs/api/drizzle/schema/funding.schema";
+
+import { MFunding } from "./funding.model";
+import { VFundingSummary } from "./funding.summary.model";
+
+export type FundingCommentDBResult = InferSelectModel<typeof FundingFeedback>;
 
 export class MFundingComment implements IFundingComment {
   id: number;
 
-  fundingId: number;
+  funding: { id: number };
 
   chargedExecutive: {
     id: number;
   };
 
   content: string;
 
+  fundingStatusEnum: FundingStatusEnum;
+
+  approvedAmount: number;
+
   createdAt: Date;
 
   constructor(data: IFundingComment) {
     Object.assign(this, data);
   }
 
+  isFinalComment(funding: VFundingSummary | MFunding): boolean {
+    return (
+      funding.approvedAmount === this.approvedAmount &&
+      funding.fundingStatusEnum === this.fundingStatusEnum &&
+      funding.id === this.funding.id
+    );
+  }
+
   static fromDBResult(result: FundingCommentDBResult) {
     return new MFundingComment({
       id: result.id,
-      fundingId: result.fundingId,
+      funding: { id: result.fundingId },
       chargedExecutive: {
         id: result.chargedExecutiveId,
       },
-      content: result.content,
+      fundingStatusEnum: result.fundingStatusEnum,
+      approvedAmount: result.approvedAmount,
+      content: result.feedback,
       createdAt: result.createdAt,
     });
   }

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

@@ -7,6 +7,7 @@ import {
   INonCorporateTransaction,
   ITransportation,
 } from "@sparcs-clubs/interface/api/funding/type/funding.type";
+import { FundingStatusEnum } from "@sparcs-clubs/interface/common/enum/funding.enum";
 
 export type FundingDBResult = {
   funding: {
@@ -79,6 +80,7 @@ export type FundingDBResult = {
   fixtureSoftwareEvidenceFiles?: Array<{
     id: string;
   }>;
+  nonCorporateTransactionFiles?: Array<{ id: string }>;
   foodExpenseFiles?: Array<{ id: string }>;
   laborContractFiles?: Array<{ id: string }>;
   externalEventParticipationFeeFiles?: Array<{
@@ -98,11 +100,11 @@ export type FundingDBResult = {
 export class MFunding implements IFunding {
   id: number;
 
-  clubId: number;
+  club: { id: number };
 
-  activityDId: number;
+  activityD: { id: number };
 
-  fundingStatusEnum: number;
+  fundingStatusEnum: FundingStatusEnum;
 
   purposeActivity?: Pick<IActivitySummary, "id">;
 
@@ -177,9 +179,9 @@ export class MFunding implements IFunding {
   static fromDBResult(result: FundingDBResult) {
     return new MFunding({
       id: result.funding.id,
-      clubId: result.funding.clubId,
+      club: { id: result.funding.clubId },
       name: result.funding.name,
-      activityDId: result.funding.activityDId,
+      activityD: { id: result.funding.activityDId },
       fundingStatusEnum: result.funding.fundingStatusEnum,
       purposeActivity: result.funding.purposeActivityId
         ? {
@@ -261,6 +263,9 @@ export class MFunding implements IFunding {
             traderName: result.funding.traderName,
             traderAccountNumber: result.funding.traderAccountNumber,
             wasteExplanation: result.funding.wasteExplanation,
+            files: result.nonCorporateTransactionFiles.map(file => ({
+              id: file.id,
+            })),
           }
         : undefined,
       foodExpense: result.funding.isFoodExpense

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

@@ -0,0 +1,62 @@
+import { IFundingSummary } from "@sparcs-clubs/interface/api/funding/type/funding.type";
+import { InferSelectModel } from "drizzle-orm";
+
+import { Funding } from "@sparcs-clubs/api/drizzle/schema/funding.schema";
+
+import { MFunding } from "./funding.model";
+
+export type FundingSummaryDBResult = Pick<
+  InferSelectModel<typeof Funding>,
+  | "id"
+  | "name"
+  | "fundingStatusEnum"
+  | "expenditureAmount"
+  | "purposeActivityId"
+  | "approvedAmount"
+>;
+
+export class VFundingSummary implements IFundingSummary {
+  id: IFundingSummary["id"];
+
+  name: IFundingSummary["name"];
+
+  fundingStatusEnum: IFundingSummary["fundingStatusEnum"];
+
+  expenditureAmount: IFundingSummary["expenditureAmount"];
+
+  purposeActivity?: IFundingSummary["purposeActivity"];
+
+  approvedAmount?: IFundingSummary["approvedAmount"];
+
+  // 첫 번째 생성자: IFundingSummary로부터 초기화
+  constructor(fundingSummary: IFundingSummary);
+
+  // 두 번째 생성자: MFunding로부터 초기화
+  constructor(funding: MFunding);
+
+  constructor(param: IFundingSummary | MFunding) {
+    if (param instanceof MFunding) {
+      this.id = param.id;
+      this.name = param.name;
+      this.fundingStatusEnum = param.fundingStatusEnum;
+      this.expenditureAmount = param.expenditureAmount;
+      this.purposeActivity = param.purposeActivity;
+      this.approvedAmount = param.approvedAmount;
+    } else {
+      Object.assign(this, param);
+    }
+  }
+
+  static fromDBResult(result: FundingSummaryDBResult) {
+    return new VFundingSummary({
+      id: result.id,
+      name: result.name,
+      fundingStatusEnum: result.fundingStatusEnum,
+      expenditureAmount: result.expenditureAmount,
+      purposeActivity: result.purposeActivityId
+        ? { id: result.purposeActivityId }
+        : undefined,
+      approvedAmount: result.approvedAmount,
+    });
+  }
+}