Merge branch 'develop' into feature/#123

Kernel360 · Aug 29, 2024 · fd0dabb · fd0dabb
2 parents fe0c8bd + 8a0f8c5
commit fd0dabb
Show file tree

Hide file tree

Showing 15 changed files with 1,187 additions and 108 deletions.
diff --git a/client/api/v1.d.ts b/client/api/v1.d.ts
@@ -180,6 +180,22 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/api/bus/stat/process/all": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        post: operations["process"];
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/api/bus-review": {
         parameters: {
             query?: never;
@@ -368,6 +384,22 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/api/bus/statics/now": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get: operations["getStatics"];
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/api/bus/route": {
         parameters: {
             query?: never;
@@ -495,6 +527,9 @@ export interface components {
         UserUpdateReqDto: {
             nickname: string;
         };
+        ErrorRespDto: {
+            message: string;
+        };
         /** @description 유저 정보 응답 DTO */
         UserRespDto: {
             /** Format: int64 */
@@ -504,9 +539,6 @@ export interface components {
             nickname: string;
             oauthProvider: string;
         };
-        ErrorRespDto: {
-            message: string;
-        };
         SubwayReviewReqDto: {
             /** Format: int64 */
             stationId: number;
@@ -660,6 +692,38 @@ export interface components {
             /** Format: date-time */
             createdAt: string;
         };
+        BusRemainSeatDto: {
+            /** @enum {string} */
+            plateType: "UNKNOWN" | "SMALL" | "MEDIUM" | "LARGE" | "DOUBLE_DECKER";
+            plateNo: string;
+            /** Format: date-time */
+            standardTime: string;
+            remainSeatList: components["schemas"]["SeatInfo"][];
+        };
+        BusStaticsDto: {
+            /** Format: date-time */
+            requestTime: string;
+            /** Format: int64 */
+            routeId: number;
+            routeName: string;
+            /** Format: int32 */
+            stationNum: number;
+            /** Format: int32 */
+            busNum: number;
+            stationList: components["schemas"]["StationInfo"][];
+            data: components["schemas"]["BusRemainSeatDto"][];
+        };
+        SeatInfo: {
+            /** Format: date-time */
+            arrivedTime: string;
+            /** Format: int32 */
+            remainSeat: number;
+        };
+        StationInfo: {
+            /** Format: int64 */
+            stationId: number;
+            stationName: string;
+        };
         BusRouteRespDto: {
             /** Format: int64 */
             routeId: number;
@@ -712,6 +776,7 @@ export interface components {
             routeName: string;
             routeStation: components["schemas"]["BusRouteStationRespDto"];
             arrivalInfo?: components["schemas"]["BusArrivalRespDto"];
+            statics?: components["schemas"]["BusStaticsDto"];
         };
     };
     responses: never;
@@ -1332,6 +1397,26 @@ export interface operations {
             };
         };
     };
+    process: {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description OK */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "*/*": string;
+                };
+            };
+        };
+    };
     getBusReviewList: {
         parameters: {
             query: {
@@ -1706,6 +1791,31 @@ export interface operations {
             };
         };
     };
+    getStatics: {
+        parameters: {
+            query: {
+                routeStationId: number;
+                stationNum?: number;
+                timeRange?: number;
+                week?: number;
+            };
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description OK */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "*/*": components["schemas"]["BusStaticsDto"];
+                };
+            };
+        };
+    };
     getRoutes: {
         parameters: {
             query?: {

diff --git a/client/app/bookmark/components/BookmarkRoutes.tsx b/client/app/bookmark/components/BookmarkRoutes.tsx
@@ -1,6 +1,6 @@
 import { components } from "@/api/v1"
 
-import BusLiveInfoCard from "@/app/bookmark/components/BusLiveInfoCard"
+import BusLiveInfoCard from "@/components/bus/BusLiveInfoCard"
 
 type BookmarkDetailResp = components["schemas"]["BookmarkDetailRespDto"]
 

diff --git a/client/app/bookmark/components/BusLiveInfoCard.tsx b/client/app/bookmark/components/BusLiveInfoCard.tsx
diff --git a/client/app/bookmark/components/EditBookmark.tsx b/client/app/bookmark/components/EditBookmark.tsx
@@ -4,10 +4,10 @@ import { components } from "@/api/v1"
 
 import { Badge } from "@/components/ui/badge"
 import { Button } from "@/components/ui/button"
+import SearchBusRoute from "@/components/bus/SearchBusRoute"
+import SelectRouteStation from "@/components/bus/SelectRouteStation"
 import BusEditCard from "@/app/bookmark/components/BusEditCard"
 import RouteStationCard from "@/app/bookmark/components/RouteStationCard"
-import SearchBusRoute from "@/app/bookmark/components/SearchBusRoute"
-import SelectRouteStation from "@/app/bookmark/components/SelectRouteStation"
 
 type BookmarkResp = components["schemas"]["BookmarkRespDto"]
 type BookmarkDetailResp = components["schemas"]["BookmarkDetailRespDto"]

diff --git a/client/app/page.tsx b/client/app/page.tsx
@@ -3,9 +3,9 @@
 import { useState } from "react"
 import { components } from "@/api/v1"
 
-import BusLiveInfoCard from "@/app/bookmark/components/BusLiveInfoCard"
-import SearchBusRoute from "@/app/bookmark/components/SearchBusRoute"
-import SelectRouteStation from "@/app/bookmark/components/SelectRouteStation"
+import BusLiveInfoCard from "@/components/bus/BusLiveInfoCard"
+import SearchBusRoute from "@/components/bus/SearchBusRoute"
+import SelectRouteStation from "@/components/bus/SelectRouteStation"
 
 type BusRoute = components["schemas"]["BusRouteRespDto"]
 type BusRouteStation = components["schemas"]["BusRouteStationRespDto"]

diff --git a/...t/app/bookmark/components/ArrivalInfo.tsx → client/components/bus/ArrivalInfo.tsx b/...t/app/bookmark/components/ArrivalInfo.tsx → client/components/bus/ArrivalInfo.tsx