refactor: update FundingController and FundingService to use query pa…

…rameters instead of body for API Fnd006 requests
academic-relations · Jan 24, 2025 · e71257b · e71257b
1 parent 7c05c26
commit e71257b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git 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<ApiFnd006ResponseOk> {
     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
@@ -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,15 +316,15 @@ export default class FundingService {
   async getStudentFundingActivityDuration(
     studentId: number,
     param: ApiFnd006RequestParam,
-    body: ApiFnd006RequestBody,
+    query: ApiFnd006RequestQuery,
   ): Promise<ApiFnd006ResponseOk> {
     const user = await this.userPublicService.getStudentById({ id: studentId });
     if (!user) {
       throw new HttpException("Student not found", HttpStatus.NOT_FOUND);
     }
 
     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
@@ -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),