diff --git a/packages/api/src/feature/funding/controller/funding.controller.ts b/packages/api/src/feature/funding/controller/funding.controller.ts index aaef04c85..5de88cdee 100644 --- a/packages/api/src/feature/funding/controller/funding.controller.ts +++ b/packages/api/src/feature/funding/controller/funding.controller.ts @@ -31,7 +31,6 @@ import apiFnd005, { ApiFnd005ResponseOk, } from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd005"; import apiFnd006, { - ApiFnd006RequestBody, ApiFnd006RequestParam, ApiFnd006ResponseOk, } from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd006"; @@ -117,12 +116,12 @@ export default class FundingController { async getStudentFundingActivityDuration( @GetStudent() user: GetStudent, @Param() param: ApiFnd006RequestParam, - @Body() body: ApiFnd006RequestBody, + @Query() query: ApiFnd006RequestQuery, ): Promise { return this.fundingService.getStudentFundingActivityDuration( user.studentId, param, - body, + query, ); } diff --git a/packages/api/src/feature/funding/service/funding.service.ts b/packages/api/src/feature/funding/service/funding.service.ts index 71264c3c4..953053c49 100644 --- a/packages/api/src/feature/funding/service/funding.service.ts +++ b/packages/api/src/feature/funding/service/funding.service.ts @@ -22,8 +22,8 @@ import { ApiFnd005ResponseOk, } from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd005"; import { - ApiFnd006RequestBody, ApiFnd006RequestParam, + ApiFnd006RequestQuery, ApiFnd006ResponseOk, } from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd006"; import { ApiFnd007ResponseOk } from "@sparcs-clubs/interface/api/funding/endpoint/apiFnd007"; @@ -288,12 +288,11 @@ export default class FundingService { throw new HttpException("Student not found", HttpStatus.NOT_FOUND); } - const now = getKSTDate(); - const thisSemester = await this.clubPublicService.dateToSemesterId(now); + const activityD = await this.activityPublicService.fetchLastActivityD(); const fundings = await this.fundingRepository.fetchSummaries( query.clubId, - thisSemester, + activityD.id, ); const activities = await this.activityPublicService.fetchSummaries( @@ -317,7 +316,7 @@ export default class FundingService { async getStudentFundingActivityDuration( studentId: number, param: ApiFnd006RequestParam, - body: ApiFnd006RequestBody, + query: ApiFnd006RequestQuery, ): Promise { const user = await this.userPublicService.getStudentById({ id: studentId }); if (!user) { @@ -325,7 +324,7 @@ export default class FundingService { } const fundings = await this.fundingRepository.fetchSummaries( - body.clubId, + query.clubId, param.activityDId, ); diff --git a/packages/interface/src/api/funding/endpoint/apiFnd006.ts b/packages/interface/src/api/funding/endpoint/apiFnd006.ts index 3c3c22782..8455be332 100644 --- a/packages/interface/src/api/funding/endpoint/apiFnd006.ts +++ b/packages/interface/src/api/funding/endpoint/apiFnd006.ts @@ -16,12 +16,12 @@ const requestParam = z.object({ activityDId: z.coerce.number().int().min(1), }); -const requestQuery = z.object({}); - -const requestBody = z.object({ +const requestQuery = z.object({ clubId: z.coerce.number().int().min(1), }); +const requestBody = z.object({}); + const responseBodyMap = { [HttpStatusCode.Ok]: z.object({ fundings: z.array(zFundingResponseSummary),