バス経路に時刻表ベースのstop_conditionフィルタリングを追加 #1383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

TinyKitten wants to merge 15 commits into dev from claude/add-bus-timetable-filtering-BxpAf

data/create_table.sql

-Original file line number
+Diff line change
@@ Expand Up / @@ -605,6 +605,22 @@ END $$; @@
     CREATE INDEX IF NOT EXISTS idx_stations_transport_type ON public.stations USING btree (transport_type);
     CREATE INDEX IF NOT EXISTS idx_lines_transport_type ON public.lines USING btree (transport_type);
+    --
+    -- Add gtfs_stop_id to stations table for bus timetable filtering
+    --
+    DO $$
+    BEGIN
+        IF NOT EXISTS (
+            SELECT 1 FROM information_schema.columns
+            WHERE table_name = 'stations' AND column_name = 'gtfs_stop_id'
+        ) THEN
+            ALTER TABLE public.stations ADD COLUMN gtfs_stop_id TEXT;
+        END IF;
+    END $$;
+    CREATE INDEX IF NOT EXISTS idx_stations_gtfs_stop_id ON public.stations USING btree (gtfs_stop_id);
     -- ============================================================
     -- GTFS Tables
     -- ============================================================
@@ Expand Down @@

stationapi/src/domain/repository/station_repository.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,21 @@ pub trait StationRepository: Send + Sync + 'static { @@
             to_station_id: u32,
             via_line_id: Option<u32>,
         ) -> Result<Vec<Station>, DomainError>;
+        /// Get bus stops that have active service around the current JST time.
+        /// Returns a set of station_cd values for bus stops that have scheduled departures
+        /// within a time window around the specified time.
+        ///
+        /// # Arguments
+        /// * `station_cds` - List of station_cd values to check
+        /// * `current_time_jst` - Current time in JST (HH:MM:SS format)
+        /// * `current_date_jst` - Current date in JST (YYYYMMDD format)
+        async fn get_active_bus_stop_station_cds(
+            &self,
+            station_cds: &[i32],
+            current_time_jst: &str,
+            current_date_jst: &str,
+        ) -> Result<std::collections::HashSet<i32>, DomainError>;
     }
     #[cfg(test)]
@@ Expand Down Expand Up / @@ -72,6 +87,14 @@ mod tests { @@
                 stations.insert(3, station3);
                 stations.insert(4, station4);
+                // Add bus stops for testing
+                let bus_stop1 =
+                    create_test_bus_stop(100, "新宿駅前バス停", 2001, 35.690500, 139.700100);
+                let bus_stop2 =
+                    create_test_bus_stop(101, "渋谷駅前バス停", 2001, 35.659200, 139.700200);
+                stations.insert(100, bus_stop1);
+                stations.insert(101, bus_stop2);
                 Self { stations }
             }
         }
@@ Expand Down Expand Up / @@ -241,6 +264,25 @@ mod tests { @@
                 Ok(result)
             }
+            async fn get_active_bus_stop_station_cds(
+                &self,
+                station_cds: &[i32],
+                _current_time_jst: &str,
+                _current_date_jst: &str,
+            ) -> Result<std::collections::HashSet<i32>, DomainError> {
+                // Mock implementation: returns all bus stops as active
+                let result: std::collections::HashSet<i32> = self
+                    .stations
+                    .values()
+                    .filter(|s| {
+                        station_cds.contains(&s.station_cd)
+                            && s.transport_type == crate::domain::entity::gtfs::TransportType::Bus
+                    })
+                    .map(|s| s.station_cd)
+                    .collect();
+                Ok(result)
+            }
         }
         // テスト用のStation作成ヘルパー関数
@@ Expand Down Expand Up / @@ -320,6 +362,83 @@ mod tests { @@
             )
         }
+        // テスト用のバス停作成ヘルパー関数
+        fn create_test_bus_stop(
+            station_cd: i32,
+            station_name: &str,
+            line_cd: i32,
+            lat: f64,
+            lon: f64,
+        ) -> Station {
+            Station::new(
+                station_cd,
+                station_cd, // station_g_cd
+                station_name.to_string(),
+                format!("{station_name}_k"),
+                Some(format!("{station_name}_r")),
+                Some(format!("{station_name}_zh")),
+                Some(format!("{station_name}_ko")),
+                vec![],
+                None,
+                None,
+                None,
+                None,
+                None,
+                line_cd,
+                None,
+                vec![],
+, // 東京都
+                "100-0000".to_string(),
+                "東京都".to_string(),
+                lon,
+                lat,
+                "20000101".to_string(),
+                "99991231".to_string(),
+,
+,
+                StopCondition::All,
+                None,
+                false,
+                None,
+                Some(1),
+                Some("都営バス".to_string()),
+                Some("とえいばす".to_string()),
+                Some("Toei Bus".to_string()),
+                Some("Toei Bus".to_string()),
+                Some("都营巴士".to_string()),
+                Some("도에이 버스".to_string()),
+                Some("#009944".to_string()),
+                Some(99), // OtherLineType for bus
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                Some(1000),
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None, // kind
+                TransportType::Bus,
+            )
+        }
         #[tokio::test]
         async fn test_find_by_id_existing() {
             let repo = MockStationRepository::new();
@@ Expand Down Expand Up / @@ -408,7 +527,7 @@ mod tests { @@
         async fn test_get_by_line_group_id() {
             let repo = MockStationRepository::new();
             let result = repo.get_by_line_group_id(1000).await.unwrap();
-            assert_eq!(result.len(), 4); // すべての駅がline_group_cd = 1000に設定されている
+            assert_eq!(result.len(), 6); // すべての駅・バス停がline_group_cd = 1000に設定されている
         }
         #[tokio::test]
@@ Expand Down Expand Up / @@ -452,4 +571,70 @@ mod tests { @@
             let result = repo.get_route_stops(1, 2, Some(1001)).await.unwrap();
             assert!(result.is_empty());
         }
+        #[tokio::test]
+        async fn test_get_active_bus_stop_station_cds_returns_bus_stops() {
+            let repo = MockStationRepository::new();
+            // Query for bus stops (100 and 101 are bus stops)
+            let result = repo
+                .get_active_bus_stop_station_cds(&[100, 101], "12:00:00", "20250117")
+                .await
+                .unwrap();
+            // Mock implementation returns all bus stops as active
+            assert!(result.contains(&100));
+            assert!(result.contains(&101));
+        }
+        #[tokio::test]
+        async fn test_get_active_bus_stop_station_cds_excludes_rail_stations() {
+            let repo = MockStationRepository::new();
+            // Query for rail stations (1, 2 are rail stations)
+            let result = repo
+                .get_active_bus_stop_station_cds(&[1, 2], "12:00:00", "20250117")
+                .await
+                .unwrap();
+            // Rail stations should not be returned
+            assert!(result.is_empty());
+        }
+        #[tokio::test]
+        async fn test_get_active_bus_stop_station_cds_mixed_input() {
+            let repo = MockStationRepository::new();
+            // Query for both rail and bus stations
+            let result = repo
+                .get_active_bus_stop_station_cds(&[1, 100, 2, 101], "12:00:00", "20250117")
+                .await
+                .unwrap();
+            // Only bus stops should be returned
+            assert_eq!(result.len(), 2);
+            assert!(result.contains(&100));
+            assert!(result.contains(&101));
+            assert!(!result.contains(&1));
+            assert!(!result.contains(&2));
+        }
+        #[tokio::test]
+        async fn test_get_active_bus_stop_station_cds_empty_input() {
+            let repo = MockStationRepository::new();
+            let result = repo
+                .get_active_bus_stop_station_cds(&[], "12:00:00", "20250117")
+                .await
+                .unwrap();
+            assert!(result.is_empty());
+        }
+        #[tokio::test]
+        async fn test_find_by_id_bus_stop() {
+            let repo = MockStationRepository::new();
+            let result = repo.find_by_id(100).await.unwrap();
+            assert!(result.is_some());
+            let station = result.unwrap();
+            assert_eq!(station.station_cd, 100);
+            assert_eq!(station.station_name, "新宿駅前バス停");
+            assert_eq!(station.transport_type, TransportType::Bus);
+        }
     }

stationapi/src/import.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -1906,10 +1906,10 @@ async fn integrate_gtfs_stops_to_stations( @@
                         station_cd, station_g_cd, station_name, station_name_k,
                         station_name_r, station_name_zh, station_name_ko,
                         line_cd, pref_cd, post, address, lon, lat,
-                        open_ymd, close_ymd, e_status, e_sort, transport_type
+                        open_ymd, close_ymd, e_status, e_sort, transport_type, gtfs_stop_id
                     ) VALUES (
                         $1, $2, $3, $4, $5, $6, $7, $8, 13, '', '', $9, $10,
-                        '', '', 0, $11, 1
+                        '', '', 0, $11, 1, $12
                     )
                     ON CONFLICT (station_cd) DO NOTHING"#,
                 )
@@ Expand All / @@ -1929,6 +1929,7 @@ async fn integrate_gtfs_stops_to_stations( @@
                 .bind(stop.stop_lon)
                 .bind(stop.stop_lat)
                 .bind(stop_sequence)
+                .bind(&stop.stop_id)
                 .execute(&mut *conn)
                 .await?;
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

バス経路に時刻表ベースのstop_conditionフィルタリングを追加 #1383

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!