-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1282 from academic-relations/api-refactor
활동 보고서 API 및 훅 호출 로직 리팩토링
- Loading branch information
Showing
17 changed files
with
341 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
packages/web/src/features/activity-report/hooks/useCreateActivityReport.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import { useMutation, useQueryClient } from "@tanstack/react-query"; | ||
|
|
||
| import { newActivityReportListQueryKey } from "../services/useGetNewActivityReportList"; | ||
| import usePostActivityReport from "../services/usePostActivityReport"; | ||
| import { ActivityReportFormData } from "../types/form"; | ||
|
|
||
| export const useCreateActivityReport = (clubId: number) => { | ||
| const queryClient = useQueryClient(); | ||
| const { mutateAsync: createActivityReport } = usePostActivityReport(); | ||
|
|
||
| return useMutation({ | ||
| mutationFn: (data: ActivityReportFormData) => | ||
| createActivityReport( | ||
| { | ||
| body: { | ||
| ...data, | ||
| clubId, | ||
| duration: data.durations, | ||
| evidenceFiles: data.evidenceFiles.map(file => ({ | ||
| uid: file.id, | ||
| })), | ||
| participants: data.participants.map(participant => ({ | ||
| studentId: participant.id, | ||
| })), | ||
| }, | ||
| }, | ||
| { | ||
| onSuccess: () => { | ||
| queryClient.invalidateQueries({ | ||
| queryKey: newActivityReportListQueryKey(clubId), | ||
| }); | ||
| }, | ||
| }, | ||
| ), | ||
| }); | ||
| }; |
58 changes: 58 additions & 0 deletions
58
packages/web/src/features/activity-report/hooks/useGetActivityReportDetail.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| import { useAuth } from "@sparcs-clubs/web/common/providers/AuthContext"; | ||
|
|
||
| import ProfessorApprovalEnum from "@sparcs-clubs/web/types/professorApproval"; | ||
|
|
||
| import { useGetActivityReport } from "../services/useGetActivityReport"; | ||
| import { CurrentActivityReport } from "../types/activityReport"; | ||
|
|
||
| const useGetActivityReportDetail = ( | ||
| activityId: number, | ||
| ): { | ||
| data: CurrentActivityReport; | ||
| isLoading: boolean; | ||
| isError: boolean; | ||
| } => { | ||
| const { profile } = useAuth(); | ||
| const { | ||
| data: activityReport, | ||
| isLoading, | ||
| isError, | ||
| } = useGetActivityReport(profile?.type ?? "undergraduate", activityId); | ||
|
|
||
| if (isLoading || isError || !activityReport) { | ||
| return { | ||
| data: {} as CurrentActivityReport, | ||
| isLoading, | ||
| isError, | ||
| }; | ||
| } | ||
|
|
||
| return { | ||
| data: { | ||
| ...activityReport, | ||
| id: activityId, | ||
| evidenceFiles: activityReport.evidenceFiles.map(file => ({ | ||
| id: file.fileId, | ||
| name: file.name, | ||
| url: file.url, | ||
| })), | ||
| participants: activityReport.participants.map(participant => ({ | ||
| id: participant.studentId, | ||
| name: participant.name, | ||
| studentNumber: participant.studentNumber, | ||
| })), | ||
| professorApproval: | ||
| activityReport.professorApprovedAt !== null | ||
| ? ProfessorApprovalEnum.Approved | ||
| : ProfessorApprovalEnum.Pending, | ||
| professorApprovedAt: | ||
| activityReport.professorApprovedAt !== null | ||
| ? activityReport.professorApprovedAt | ||
| : undefined, | ||
| }, | ||
| isLoading, | ||
| isError, | ||
| }; | ||
| }; | ||
|
|
||
| export default useGetActivityReportDetail; |
Oops, something went wrong.