[Refactor] #100 - Refactoring snake_case to camelCase

src/apis/domains/booth/_interfaces.ts

@@ -1,33 +1,60 @@
+import { Booth, BoothsElement } from "@interfaces/booth";
 import { BoothStatus, WaitingStatus } from "@linenow-types/status";
 
-export interface Image {
+interface Image {
   image: string;
 }
 
-// Booth 인터페이스 정의
-export interface Booth {
+interface Menu {
+  name: string;
+  price: string;
+}
+
+export interface GetBoothResponse {
   id: number;
-  name?: string;
-  description?: string;
-  location?: string;
-  caution?: string;
+  name: string;
+  description: string;
+  location: string;
+  caution: string;
+
   is_operated: BoothStatus;
-  images?: Image[];
-  menu?: { name: string; price: number }[];
+  images: Image[];
+  menu: Menu[];
+
   open_time: string;
-  close_time?: string;
-  waiting_count?: number;
-  is_waiting?: boolean;
-  waiting_status?: WaitingStatus;
+  close_time: string;
+
+  waiting_count: number;
+  total_waiting_teams: number;
+  waiting_teams_ahead: number;
+
+  is_waiting: boolean;
   waiting_id?: number;
-  total_waiting_teams?: number;
-  waiting_teams_ahead?: number;
+  waiting_status: WaitingStatus;
 }
 
-// GetBoothResponse 함수 정의
-export const GetBoothResponse = (response: Booth): Booth => {
+export interface GetBoothsResponse
+  extends Array<{
+    id: number;
+    name: string;
+    description: string;
+    location: string;
+
+    is_operated: BoothStatus;
+    thumbnail: string;
+
+    waiting_count: number;
+    total_waiting_teams: number;
+
+    is_waiting: boolean;
+    waiting_status: WaitingStatus | null;
+  }> {}
+
+export const transformGetBoothResponse = (
+  response: GetBoothResponse
+): Booth => {
   return {
-    id: response.id,
+    boothID: response.id,
     name: response.name,
     description: response.description,
     location: response.location,
@@ -38,14 +65,31 @@ export const GetBoothResponse = (response: Booth): Booth => {
         name: item.name,
         price: item.price,
       })) || [],
-    open_time: response.open_time,
-    close_time: response.close_time,
-    waiting_count: response.waiting_count,
-    is_waiting: response.is_waiting,
-    waiting_status: response.waiting_status,
-    is_operated: response.is_operated,
-    waiting_id: response.waiting_id,
-    total_waiting_teams: response.total_waiting_teams,
-    waiting_teams_ahead: response.waiting_teams_ahead,
+    openTime: response.open_time,
+    closeTime: response.close_time,
+    waitingCount: response.waiting_count,
+    isWaiting: response.is_waiting,
+    waitingStatus: response.waiting_status,
+    isOperated: response.is_operated,
+    waitingID: response.waiting_id,
+    totalWaitingTeams: response.total_waiting_teams,
+    waitingTeamsAhead: response.waiting_teams_ahead,
   };
 };
+
+export const transformgetBoothsResponse = (
+  response: GetBoothsResponse
+): BoothsElement[] => {
+  return response.map((item) => ({
+    boothID: item.id,
+    name: item.name,
+    thumbnail: item.thumbnail,
+    description: item.description,
+    location: item.location,
+    isOperated: item.is_operated,
+    waitingCount: item.waiting_count,
+    totalWaitingTeams: item.total_waiting_teams,
+    isWaiting: item.is_waiting,
+    waitingStatus: item.waiting_status,
+  }));
+};

src/apis/domains/booth/apis.ts

@@ -1,14 +1,41 @@
+// api method
 import { getResponse } from "@apis/instance";
-import { Booth, GetBoothResponse } from "./_interfaces";
 
+// types
+import { Booth, BoothsElement } from "@interfaces/booth";
+import {
+  GetBoothResponse,
+  GetBoothsResponse,
+  transformGetBoothResponse,
+  transformgetBoothsResponse,
+} from "./_interfaces";
+
+// get booth : - 부스 상세
 export interface GetBoothRequest {
-  boothId: number;
+  boothID: number;
 }
 
 export const getBooth = async ({
-  boothId,
+  ...props
 }: GetBoothRequest): Promise<Booth | null> => {
-  const response = await getResponse<Booth>(`/api/v1/booths/${boothId}`);
+  const response = await getResponse<GetBoothResponse>(
+    `/api/v1/booths/${props.boothID}`
+  );
+
+  return response ? transformGetBoothResponse(response) : null;
+};
+
+// get booths : - 부스 리스트
+export interface GetBoothsRequest {
+  ordering: string;
+}
+
+export const getBoothList = async ({
+  ...props
+}: GetBoothsRequest): Promise<BoothsElement[]> => {
+  const response = await getResponse<GetBoothsResponse>(
+    `/api/v1/booths?ordering=${props.ordering}`
+  );
 
-  return response ? GetBoothResponse(response) : null;
+  return response ? transformgetBoothsResponse(response) : [];
 };

src/apis/domains/booth/queries.ts

@@ -1,3 +1,4 @@
 export const BOOTH_QUERY_KEY = {
   BOOTH: "booth",
+  BOOTHS: "booths",
 };

src/apis/domains/waiting/_interfaces.ts

@@ -1,4 +1,4 @@
-import { postResponse } from "@apis/instance";
+import { postResponseNew } from "@apis/instance";
 import { Waiting } from "@interfaces/waiting";
 import { WaitingStatus } from "@linenow-types/status";
 
@@ -13,6 +13,7 @@ export interface GetWaitingResponse {
   // confirmed_at?: string;
   // canceled_at?: string;
   waiting_teams_ahead: number;
+  total_waiting_teams: number;
   confirm_due_time: string;
   arrival_due_time: string;
 }
@@ -34,8 +35,9 @@ export const transformGetWaitingResponse = (
     waitingID: response.id,
     waitingStatus: response.waiting_status,
     waitingTeamsAhead: response.waiting_teams_ahead,
+    totalWaitingTeams: response.total_waiting_teams,
 
-    party_size: response.party_size,
+    partySize: response.party_size,
 
     confirmDueTime: response.confirm_due_time,
     arrivalarrivalDueTime: response.arrival_due_time,
@@ -63,25 +65,32 @@ export const transformGetWaitingsResponse = (
 
 // 대기 줄서기 등록 요청 인터페이스
 export interface RegisterWaitingRequest {
-  boothId: number;
+  boothID: number;
+  partySize: number;
+}
+
+interface PostWaitingRegisterBody {
   party_size: number;
 }
 
-export interface PostWaitingRegisterProps extends Waiting {
-  id?: number;
+export interface PostWaitingRegisterResponse {
+  id: number;
 }
+
 // 대기 줄서기 등록 함수
 export const postWaitingRegister = async ({
-  boothId,
-  party_size,
-}: RegisterWaitingRequest): Promise<PostWaitingRegisterProps | null> => {
-  const response = await postResponse<PostWaitingRegisterProps>(
-    `api/v1/waitings/${boothId}/register`,
-    { party_size }
-  );
+  ...props
+}: RegisterWaitingRequest): Promise<PostWaitingRegisterResponse | null> => {
+  const response = await postResponseNew<
+    PostWaitingRegisterBody,
+    PostWaitingRegisterResponse
+  >(`api/v1/waitings/${props.boothID}/register`, {
+    party_size: props.partySize,
+  });
 
   if (response) {
     return response;
+  } else {
+    throw new Error("post error");
   }
-  return null;
 };