Skip to content

Commit

Permalink
fix: add suffix response at server response type
Browse files Browse the repository at this point in the history
  • Loading branch information
yougyung committed May 6, 2024
1 parent 05e3838 commit 511760c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions app/business/result/result.query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface ResultCategoryDetailLectures {
completed: boolean;
}

export interface ResultCategoryDetailInfo {
export interface ResultCategoryDetailResponse {
totalCredit: number;
takenCredit: number;
detailCategory: ResultCategoryDetailLectures[];
Expand All @@ -34,13 +34,13 @@ export interface ResultUserInfo {
graduated: boolean;
}

export interface Credit {
export interface CreditResponse {
category: keyof typeof RESULT_CATEGORY;
totalCredit: number;
takenCredit: number;
completed: boolean;
}
export const fetchResultCategoryDetailInfo = async (category: string): Promise<ResultCategoryDetailInfo> => {
export const fetchResultCategoryDetailInfo = async (category: string): Promise<ResultCategoryDetailResponse> => {
//FIX : category를 querystring으로 호출하는 건은 mock단계에서는 불필요할 것으로 예상, 실제 api 연결시 변경 예정
try {
const response = await fetch(API_PATH.resultCategoryDetailInfo, {
Expand All @@ -57,7 +57,7 @@ export const fetchResultCategoryDetailInfo = async (category: string): Promise<R
}
};

export const fetchCredits = async (): Promise<Credit[]> => {
export const fetchCredits = async (): Promise<CreditResponse[]> => {
try {
const response = await fetch(API_PATH.credits, {
headers: {
Expand Down
10 changes: 5 additions & 5 deletions app/mocks/db.mock.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { SearchLectures } from '../business/lecture/search-lecture.query';
import { TakenLectures } from '../business/lecture/taken-lecture.query';
import { Credit, ResultCategoryDetailInfo, ResultUserInfo } from '../business/result/result.query';
import { CreditResponse, ResultCategoryDetailResponse, ResultUserInfo } from '../business/result/result.query';
import { SignUpRequestBody, SignInRequestBody, UserInfoResponse } from '../business/user/user.type';
import { takenLectures, resultCategoryDetailInfo, resultUserInfo, credits, searchLectures } from './data.mock';

Expand All @@ -16,23 +16,23 @@ interface MockUser {

interface MockDatabaseState {
takenLectures: TakenLectures;
resultCategoryDetailInfo: ResultCategoryDetailInfo;
resultCategoryDetailInfo: ResultCategoryDetailResponse;
resultUserInfo: ResultUserInfo;
credits: Credit[];
credits: CreditResponse[];
users: MockUser[];
searchLectures: SearchLectures;
}

type MockDatabaseAction = {
getTakenLectures: () => TakenLectures;
getSearchLectures: () => SearchLectures;
getResultCategoryDetailInfo: () => ResultCategoryDetailInfo;
getResultCategoryDetailInfo: () => ResultCategoryDetailResponse;
addTakenLecture: (lectureId: number) => boolean;
deleteTakenLecture: (lectureId: number) => boolean;
getUser: (authId: string) => MockUser | undefined;
createUser: (user: SignUpRequestBody) => boolean;
signIn: (userData: SignInRequestBody) => boolean;
getCredits: () => Credit[];
getCredits: () => CreditResponse[];
getUserInfo: (authId: string) => UserInfoResponse;
getResultUserInfo: () => ResultUserInfo;
};
Expand Down
6 changes: 3 additions & 3 deletions app/mocks/handlers/result-handler.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { HttpResponse, http, delay } from 'msw';
import { API_PATH } from '../../business/api-path';
import { mockDatabase } from '../db.mock';
import { ErrorResponseData } from '@/app/utils/http/http-error-handler';
import { Credit, ResultCategoryDetailInfo } from '@/app/business/result/result.query';
import { CreditResponse, ResultCategoryDetailResponse } from '@/app/business/result/result.query';

export const resultHandlers = [
http.get<never, never, ResultCategoryDetailInfo | ErrorResponseData>(
http.get<never, never, ResultCategoryDetailResponse | ErrorResponseData>(
`${API_PATH.resultCategoryDetailInfo}`,
async ({ request }) => {
const accessToken = request.headers.get('Authorization')?.replace('Bearer ', '');
Expand All @@ -23,7 +23,7 @@ export const resultHandlers = [
return HttpResponse.json(data);
},
),
http.get<never, never, Credit[] | ErrorResponseData>(`${API_PATH.credits}`, async ({ request }) => {
http.get<never, never, CreditResponse[] | ErrorResponseData>(`${API_PATH.credits}`, async ({ request }) => {
const accessToken = request.headers.get('Authorization')?.replace('Bearer ', '');
if (accessToken === 'undefined' || !accessToken) {
return HttpResponse.json({ status: 401, message: 'Unauthorized' }, { status: 401 });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { cn } from '@/app/utils/shadcn/utils';
import { useState } from 'react';
import { ResultCategoryDetailLectureToggle } from '../result-category-detail-lecture/result-category-detail-lecture-toggle';
import ResultCagegoryDetailLecture from '../result-category-detail-lecture/result-cagegory-detail-lecture';
import { ResultCategoryDetailInfo } from '@/app/business/result/result.query';
import { ResultCategoryDetailResponse } from '@/app/business/result/result.query';

interface ResultCategoryDetailContentProps {
info: ResultCategoryDetailInfo;
info: ResultCategoryDetailResponse;
}

function ResultCategoryDetailContent({ info }: ResultCategoryDetailContentProps) {
Expand Down

0 comments on commit 511760c

Please sign in to comment.