refac: reusing existing stop details api

Author: sameerzohy

3

@@ -0,0 +1,69 @@
+let LogLevel = < TRACE | DEBUG | INFO | WARN | ERROR | OFF >
+
+let logger_cfg = {
+    level = LogLevel.INFO,
+    log_to_file = False
+}
+
+let secrets = ../secrets/gtfs_in_memory_server_rust.example.dhall
+
+in {
+  -- Logger configuration
+  logger_cfg = logger_cfg,
+
+  -- Database configuration
+  database_url = Some ("psql://mtc_root_user:C%40uM7a%242025@13.234.6.205:5432/mtc_master_prod_new"),
+  internal_database_url = Some ("psql://mtc_root_user:C%40uM7a%242025@13.234.6.205:5432/master_mtc_internal"),
+  db_max_connections = 20,
+  db_min_connections = 1,
+  db_acquire_timeout = 5,
+  db_idle_timeout = 600,
+  db_max_lifetime = 3600,
+
+  -- Cache configuration
+  cache_duration = 3600,
+
+  -- Trip filtering configuration
+  ignored_trip_ids = ["t203"] : List Text,
+
+  -- API configuration
+  port = 8000,
+
+  -- GTFS configuration
+  polling_enabled = False,
+  polling_interval = 10,
+  process_batch_size = 100,
+  gc_interval = 300,
+  max_retries = 3,
+  retry_delay = 5,
+  rate_limit_delay = 0.1,
+  cpu_threshold = 80.0,
+  connection_limit = 100,
+  memory_threshold = 1073741824,
+
+  -- HTTP configuration
+  http_pool_idle_timeout = 90,
+  http_tcp_keepalive = 7200,
+  dns_ttl = 300,
+
+  -- OTP configuration
+  otp_instances = {
+    city_based_instances = [
+      { url = "https://api.sandbox.moving.tech/nandi", identifier = "chennai_bus" }
+    ],
+    gtfs_id_based_instances = [] : List { identifier : Text, url : Text },
+    default_instance = { url = "https://api.sandbox.moving.tech/nandi", identifier = "default" }
+  },
+
+  -- Bhubaneswar vehicle cache configuration
+  bhubaneswar_cache_update_interval = 10,
+  phone_number_hash_key = "HASH_KEY",
+
+ enable_schedule_reconciliation=True,
+  -- OSRTC station cache configuration
+  osrtc_base_url = Some "OSRTC_BASE_URL",
+  osrtc_username = secrets.osrtc_username,
+  osrtc_secret_key = secrets.osrtc_secret_key,
+  osrtc_station_refresh_interval_hours = 1,
+  osrtc_feed_key = Some "odisha_osrtc"
+}

src/handlers/routes.rs

@@ -24,7 +24,7 @@ use crate::environment::AppState;
 use crate::graphql::TripQueryParams;
 use crate::models::{
     BusScheduleDetail, BusScheduleDetails, GTFSStop, MemoryUsageStats, MinimalEmployee,
-    NandiRoutesRes, RouteStopMapping, StopClusterResponse, StopCodeFromProviderStopCodeResponse,
+    NandiRoutesRes, RouteStopMapping, StopCodeFromProviderStopCodeResponse, StopDetailResponse,
     TripDetails, VehicleData, VehicleMetadataResponse, VehicleOperationData,
     VehicleServiceTypeResponse,
 };
@@ -206,10 +206,6 @@ pub fn create_routes(cfg: &mut actix_web::web::ServiceConfig) {
                 "/cluster/{gtfs_id}/routes/{src_stop_code}/{dst_stop_code}",
                 actix_web::web::get().to(get_routes_between_clusters_for_stops),
             )
-            .route(
-                "/stop/{gtfs_id}/{stop_code}/cluster",
-                actix_web::web::get().to(get_stop_cluster),
-            )
             .route("/ready", actix_web::web::get().to(readiness_probe))
             .route("/version/{gtfs_id}", actix_web::web::get().to(get_version))
             .route(
@@ -1155,30 +1151,6 @@ pub async fn get_routes_between_clusters_for_stops(
     Ok(HttpResponse::Ok().json(routes))
 }
 
-#[utoipa::path(
-    get,
-    path = "/stop/{gtfs_id}/{stop_code}/cluster",
-    tag = "Cluster",
-    params(
-        ("gtfs_id" = String, Path, description = "GTFS feed identifier"),
-        ("stop_code" = String, Path, description = "Stop code"),
-    ),
-    responses(
-        (status = 200, description = "Cluster id for the stop; cluster_id is null when the stop has no H3 cluster assigned.", body = StopClusterResponse),
-        (status = 404, description = "Unknown gtfs_id or stop_code")
-    )
-)]
-pub async fn get_stop_cluster(
-    app_state: Data<AppState>,
-    path: Path<(String, String)>,
-) -> AppResult<HttpResponse> {
-    let (gtfs_id, stop_code) = path.into_inner();
-    let cluster_id = app_state
-        .gtfs_service
-        .get_stop_cluster_for_stop(&gtfs_id, &stop_code)?;
-    Ok(HttpResponse::Ok().json(StopClusterResponse { cluster_id }))
-}
-
 #[utoipa::path(
     get,
     path = "/routes/{gtfs_id}/fuzzy/{query}",
@@ -1293,7 +1265,7 @@ pub fn merge_stop_and_mapping(
         ("gtfs_id" = String, Path, description = "GTFS feed identifier"),
         ("stop_code" = String, Path, description = "Stop code"),
     ),
-    responses((status = 200, description = "Stop details", body = RouteStopMapping))
+    responses((status = 200, description = "Stop details", body = StopDetailResponse))
 )]
 pub async fn get_stop(
     app_state: Data<AppState>,
@@ -1309,14 +1281,21 @@ pub async fn get_stop(
             .get_station_by_id(&stop_code)
             .await
             .ok_or_else(|| AppError::NotFound(format!("OSRTC station not found: {stop_code}")))?;
-        return Ok(HttpResponse::Ok().json(osrtc_station_to_route_stop_mapping(&station)));
+        return Ok(HttpResponse::Ok().json(StopDetailResponse {
+            mapping: osrtc_station_to_route_stop_mapping(&station),
+            cluster_id: None,
+        }));
     }
     let (stop, maybe_mapping) = app_state
         .gtfs_service
         .get_stop(&gtfs_id, &stop_code)
         .await?;
-    let merged_stop = merge_stop_and_mapping(stop, maybe_mapping);
-    Ok(HttpResponse::Ok().json(merged_stop))
+    let cluster_id = stop.cluster_id.clone();
+    let mapping = merge_stop_and_mapping(stop, maybe_mapping);
+    Ok(HttpResponse::Ok().json(StopDetailResponse {
+        mapping,
+        cluster_id,
+    }))
 }
 
 #[utoipa::path(

src/models.rs

@@ -459,7 +459,10 @@ pub struct GTFSStop {
 }
 
 #[derive(Debug, Clone, Serialize, ToSchema)]
-pub struct StopClusterResponse {
+pub struct StopDetailResponse {
+    #[serde(flatten)]
+    pub mapping: RouteStopMapping,
+    #[serde(rename = "clusterId", skip_serializing_if = "Option::is_none")]
     pub cluster_id: Option<String>,
 }
 

src/services/gtfs_service.rs

@@ -1637,29 +1637,6 @@ impl GTFSService {
         Ok(out)
     }
 
-    pub fn get_stop_cluster_for_stop(
-        &self,
-        gtfs_id: &str,
-        stop_code: &str,
-    ) -> AppResult<Option<String>> {
-        let data = self.data.load_full();
-        let gtfs_id = clean_identifier(gtfs_id);
-        let stop_code = clean_identifier(stop_code);
-
-        let stops_data = data.stops_by_gtfs.get(&gtfs_id).ok_or_else(|| {
-            AppError::NotFound(format!("Stops data not found for gtfs_id: {}", gtfs_id))
-        })?;
-
-        let stop = stops_data.stops.get(&stop_code).ok_or_else(|| {
-            AppError::NotFound(format!(
-                "Stop not found for stop_code: {} under gtfs_id: {}",
-                stop_code, gtfs_id
-            ))
-        })?;
-
-        Ok(stop.cluster_id.clone())
-    }
-
     pub fn get_routes_between_clusters_for_stops(
         &self,
         gtfs_id: &str,

src/swagger.rs

@@ -50,7 +50,6 @@ use crate::services::operator::QueryBody;
         routes::get_all_route_stop_mappings_by_stop_codes,
         routes::get_cluster_destinations,
         routes::get_routes_between_clusters_for_stops,
-        routes::get_stop_cluster,
         routes::get_all_vehicles_by_ids,
         routes::get_routes_by_ids,
         // Trip
@@ -118,7 +117,7 @@ use crate::services::operator::QueryBody;
         models::BusScheduleDetail,
         models::BusStopETA,
         models::StopCodeFromProviderStopCodeResponse,
-        models::StopClusterResponse,
+        models::StopDetailResponse,
         models::MemoryUsageStats,
         models::TripDetails,
         models::TripStopDetail,