エンドポイントの修正

motok822 · motok822 · commit dfa24c085b29 · 2025-11-08T21:08:48.000+09:00
diff --git a/backend/collectmap/urls.py b/backend/collectmap/urls.py
@@ -18,6 +18,8 @@
 from django.urls import path, include
 from django.http import JsonResponse
 from django.db import connection
+from rest_framework.routers import DefaultRouter
+from paths.views import PathGeometryViewSet
 
 
 def root(request):
@@ -34,12 +36,16 @@ def health_check(request):
     except Exception as e:
         return JsonResponse({"status": "unhealthy", "database": "disconnected", "error": str(e)})
 
+# ルート計算用のルーター
+route_router = DefaultRouter()
+route_router.register(r'', PathGeometryViewSet, basename='route')
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('', root, name='root'),
     path('health', health_check, name='health'),
     path('mountains/', include('mountains.urls')),
     path('paths/', include('paths.urls')),
+    path('route/', include(route_router.urls)),
     path('bear/', include('bear.urls')),
 ]
diff --git a/backend/docs/openapi.yaml b/backend/docs/openapi.yaml
@@ -349,9 +349,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/PathDetail'
           description: ''
-  /paths/route/:
+  /route/:
     get:
-      operationId: paths_route_list
+      operationId: route_list
       description: ダイクストラ法でstartノードからdestノードまでの最短経路のPath一覧を取得
       parameters:
       - in: query
@@ -379,7 +379,7 @@ paths:
         description: 開始ノードのnode_id
         required: true
       tags:
-      - paths
+      - route
       security:
       - cookieAuth: []
       - basicAuth: []
@@ -391,9 +391,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/PaginatedPathList'
           description: ''
-  /paths/route/{id}/:
+  /route/{id}/:
     get:
-      operationId: paths_route_retrieve
+      operationId: route_retrieve
       description: PathGeometry API ViewSet (Read-only) - Dijkstra shortest path
       parameters:
       - in: path
@@ -403,7 +403,7 @@ paths:
         description: A unique integer value identifying this path.
         required: true
       tags:
-      - paths
+      - route
       security:
       - cookieAuth: []
       - basicAuth: []
diff --git a/backend/paths/urls.py b/backend/paths/urls.py
@@ -1,11 +1,12 @@
-from django.urls import path, include
+from django.urls import include, path
 from rest_framework.routers import DefaultRouter
+
 from . import views
 
-router = DefaultRouter()
-router.register(r'', views.PathViewSet, basename='path')
-router.register(r'route', views.PathGeometryViewSet, basename='pathgeometry')
+# PathViewSet用のルーター
+path_router = DefaultRouter()
+path_router.register(r"", views.PathViewSet, basename="path")
 
 urlpatterns = [
-    path('', include(router.urls)),
+    path("", include(path_router.urls)),
 ]
diff --git a/backend/paths/views.py b/backend/paths/views.py
@@ -54,12 +54,16 @@ def list(self, request):
         except ValueError:
             raise ValidationError("start and dest must be integers")
 
+        try:
+            dest_geom = PathGeometry.objects.get(node_id=dest_node_id)
+        except PathGeometry.DoesNotExist:
+            raise NotFound("Destination node not found")
+
         # ノードの存在確認
         try:
             start_geom = PathGeometry.objects.get(node_id=start_node_id)
-            dest_geom = PathGeometry.objects.get(node_id=dest_node_id)
         except PathGeometry.DoesNotExist:
-            raise NotFound("Start or destination node not found")
+            raise NotFound("Start node not found")
 
         # グラフを構築（隣接リスト）
         graph = self._build_graph()
diff --git a/frontend/src/app/api/lib/models/index.ts b/frontend/src/app/api/lib/models/index.ts
@@ -102,6 +102,7 @@ export * from "./pathUpdatedAt";
 export * from "./point";
 export * from "./prefecture";
 export * from "./prefectureBase";
+export * from "./routeListParams";
 export * from "./type";
 export * from "./validationError";
 export * from "./validationErrorLocItem";
diff --git a/frontend/src/app/api/lib/models/routeListParams.ts b/frontend/src/app/api/lib/models/routeListParams.ts
@@ -0,0 +1,26 @@
+/**
+ * Generated by orval v7.13.2 🍺
+ * Do not edit manually.
+ * Collect Map API
+ * Django backend for Collect Map API - Mountain and Path data management
+ * OpenAPI spec version: 1.0.0
+ */
+
+export type RouteListParams = {
+  /**
+   * 終了ノードのnode_id
+   */
+  dest: number;
+  /**
+   * Number of results to return per page.
+   */
+  limit?: number;
+  /**
+   * The initial index from which to return the results.
+   */
+  offset?: number;
+  /**
+   * 開始ノードのnode_id
+   */
+  start: number;
+};
diff --git a/frontend/src/app/api/lib/paths/paths.ts b/frontend/src/app/api/lib/paths/paths.ts
@@ -9,10 +9,8 @@
 import { customFetch } from ".././custom-fetch";
 import type {
   PaginatedPathList,
-  Path,
   PathDetail,
   PathsListParams,
-  PathsRouteListParams,
 } from ".././models";
 
 /**
@@ -82,72 +80,3 @@ export const pathsRetrieve = async (
     method: "GET",
   });
 };
-
-/**
- * ダイクストラ法でstartノードからdestノードまでの最短経路のPath一覧を取得
- */
-export type pathsRouteListResponse200 = {
-  data: PaginatedPathList;
-  status: 200;
-};
-
-export type pathsRouteListResponseSuccess = pathsRouteListResponse200 & {
-  headers: Headers;
-};
-
-export type pathsRouteListResponse = pathsRouteListResponseSuccess;
-
-export const getPathsRouteListUrl = (params: PathsRouteListParams) => {
-  const normalizedParams = new URLSearchParams();
-
-  Object.entries(params || {}).forEach(([key, value]) => {
-    if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
-    }
-  });
-
-  const stringifiedParams = normalizedParams.toString();
-
-  return stringifiedParams.length > 0
-    ? `/paths/route/?${stringifiedParams}`
-    : `/paths/route/`;
-};
-
-export const pathsRouteList = async (
-  params: PathsRouteListParams,
-  options?: RequestInit,
-): Promise<pathsRouteListResponse> => {
-  return customFetch<pathsRouteListResponse>(getPathsRouteListUrl(params), {
-    ...options,
-    method: "GET",
-  });
-};
-
-/**
- * PathGeometry API ViewSet (Read-only) - Dijkstra shortest path
- */
-export type pathsRouteRetrieveResponse200 = {
-  data: Path;
-  status: 200;
-};
-
-export type pathsRouteRetrieveResponseSuccess =
-  pathsRouteRetrieveResponse200 & {
-    headers: Headers;
-  };
-
-export type pathsRouteRetrieveResponse = pathsRouteRetrieveResponseSuccess;
-
-export const getPathsRouteRetrieveUrl = (id: number) => {
-  return `/paths/route/${id}/`;
-};
-
-export const pathsRouteRetrieve = async (
-  id: number,
-  options?: RequestInit,
-): Promise<pathsRouteRetrieveResponse> => {
-  return customFetch<pathsRouteRetrieveResponse>(getPathsRouteRetrieveUrl(id), {
-    ...options,
-    method: "GET",
-  });
-};
diff --git a/frontend/src/app/api/lib/route/route.ts b/frontend/src/app/api/lib/route/route.ts
@@ -0,0 +1,78 @@
+/**
+ * Generated by orval v7.13.2 🍺
+ * Do not edit manually.
+ * Collect Map API
+ * Django backend for Collect Map API - Mountain and Path data management
+ * OpenAPI spec version: 1.0.0
+ */
+
+import { customFetch } from ".././custom-fetch";
+import type { PaginatedPathList, Path, RouteListParams } from ".././models";
+
+/**
+ * ダイクストラ法でstartノードからdestノードまでの最短経路のPath一覧を取得
+ */
+export type routeListResponse200 = {
+  data: PaginatedPathList;
+  status: 200;
+};
+
+export type routeListResponseSuccess = routeListResponse200 & {
+  headers: Headers;
+};
+
+export type routeListResponse = routeListResponseSuccess;
+
+export const getRouteListUrl = (params: RouteListParams) => {
+  const normalizedParams = new URLSearchParams();
+
+  Object.entries(params || {}).forEach(([key, value]) => {
+    if (value !== undefined) {
+      normalizedParams.append(key, value === null ? "null" : value.toString());
+    }
+  });
+
+  const stringifiedParams = normalizedParams.toString();
+
+  return stringifiedParams.length > 0
+    ? `/route/?${stringifiedParams}`
+    : `/route/`;
+};
+
+export const routeList = async (
+  params: RouteListParams,
+  options?: RequestInit,
+): Promise<routeListResponse> => {
+  return customFetch<routeListResponse>(getRouteListUrl(params), {
+    ...options,
+    method: "GET",
+  });
+};
+
+/**
+ * PathGeometry API ViewSet (Read-only) - Dijkstra shortest path
+ */
+export type routeRetrieveResponse200 = {
+  data: Path;
+  status: 200;
+};
+
+export type routeRetrieveResponseSuccess = routeRetrieveResponse200 & {
+  headers: Headers;
+};
+
+export type routeRetrieveResponse = routeRetrieveResponseSuccess;
+
+export const getRouteRetrieveUrl = (id: number) => {
+  return `/route/${id}/`;
+};
+
+export const routeRetrieve = async (
+  id: number,
+  options?: RequestInit,
+): Promise<routeRetrieveResponse> => {
+  return customFetch<routeRetrieveResponse>(getRouteRetrieveUrl(id), {
+    ...options,
+    method: "GET",
+  });
+};
