support English

This commit is contained in:
Bkk1234 committed 2026-10-23 17:43:11 +07:00
1 parent 138a3d15d8
commit b8ed110459
36 files changed
+523 -118

No files matched your search

+2
View File
@@ -5,10 +5,12 @@ use sqlx::types::Json as SqlxJson;
pub struct RouteDetail {
pub route_id: String,
pub name_th: String,
pub name_en: Option<String>,
pub vehicle_type: String,
pub route_group_id: i16,
pub route_group_code: String,
pub route_group_label_th: String,
pub route_group_label_en: Option<String>,
pub contact: SqlxJson<serde_json::Value>,
pub metadata: SqlxJson<serde_json::Value>,
pub province_ids: Vec<i16>,
+2
View File
@@ -5,10 +5,12 @@ pub async fn fetch(pool: &PgPool, route_id: &str) -> Result<Option<RouteDetail>,
let sql = r#"
SELECT r.route_id,
r.name_th,
r.name_en,
r.vehicle_type::text AS vehicle_type,
r.route_group_id,
g.code AS route_group_code,
g.label_th AS route_group_label_th,
g.label_en AS route_group_label_en,
r.contact,
r.metadata,
COALESCE(ARRAY(SELECT province_id FROM route_provinces rp WHERE rp.route_id = r.route_id ORDER BY province_id), '{}') AS province_ids,
+3
View File
@@ -6,8 +6,11 @@ pub struct StopDetail {
pub id: i32,
pub code: String,
pub name_th: String,
pub name_en: Option<String>,
pub city_th: Option<String>,
pub city_en: Option<String>,
pub province_th: Option<String>,
pub province_en: Option<String>,
pub station_type: String,
pub attributes: SqlxJson<serde_json::Value>,
pub metadata: SqlxJson<serde_json::Value>,
+5 -2
View File
@@ -3,7 +3,8 @@ use sqlx::PgPool;
pub async fn fetch(pool: &PgPool, code: &str) -> Result<Option<StopDetail>, sqlx::Error> {
let sql = r#"
SELECT s.id, s.code, s.name_th, s.city_th, s.province_th,
SELECT s.id, s.code, s.name_th, s.name_en, s.city_th, s.city_en,
s.province_th, s.province_en,
s.station_type::text AS station_type,
s.attributes, s.metadata,
COALESCE((
@@ -18,9 +19,11 @@ pub async fn fetch(pool: &PgPool, code: &str) -> Result<Option<StopDetail>, sqlx
SELECT jsonb_agg(jsonb_build_object(
'route_id', r.route_id,
'name_th', r.name_th,
'name_en', r.name_en,
'vehicle_type', r.vehicle_type::text,
'route_group_code', g.code,
'route_group_label_th', g.label_th
'route_group_label_th', g.label_th,
'route_group_label_en', g.label_en
) ORDER BY rs.stop_sequence, r.route_id)
FROM route_stops rs
JOIN routes r ON r.route_id = rs.route_id
+1
View File
@@ -4,4 +4,5 @@ use serde::Serialize;
pub struct ProvinceRow {
pub id: i16,
pub name_th: String,
pub name_en: Option<String>,
}
+1 -1
View File
@@ -3,7 +3,7 @@ use sqlx::PgPool;
pub async fn list(pool: &PgPool) -> Result<Vec<ProvinceRow>, sqlx::Error> {
sqlx::query_as::<_, ProvinceRow>(
"SELECT id, name_th FROM provinces ORDER BY id",
"SELECT id, name_th, name_en FROM provinces ORDER BY id",
)
.fetch_all(pool)
.await
+1
View File
@@ -5,6 +5,7 @@ pub struct RouteGroupRow {
pub id: i16,
pub code: String,
pub label_th: String,
pub label_en: Option<String>,
pub display_order: i16,
pub is_active: bool,
}
+2 -2
View File
@@ -3,8 +3,8 @@ use sqlx::PgPool;
pub async fn list(pool: &PgPool) -> Result<Vec<RouteGroupRow>, sqlx::Error> {
sqlx::query_as::<_, RouteGroupRow>(
"SELECT id, code, label_th, display_order, is_active \
FROM route_groups WHERE is_active ORDER BY display_order, id",
"SELECT id, code, label_th, label_en, display_order, is_active \
FROM route_groups WHERE is_active ORDER BY display_order, id"
)
.fetch_all(pool)
.await
+3
View File
@@ -7,8 +7,11 @@ pub struct RouteStopRow {
pub station_id: i32,
pub code: String,
pub name_th: String,
pub name_en: Option<String>,
pub city_th: Option<String>,
pub city_en: Option<String>,
pub province_th: Option<String>,
pub province_en: Option<String>,
pub station_type: String,
pub attributes: SqlxJson<serde_json::Value>,
}
+3
View File
@@ -7,8 +7,11 @@ pub async fn list(pool: &PgPool, route_id: &str) -> Result<Vec<RouteStopRow>, sq
s.id AS station_id,
s.code,
s.name_th,
s.name_en,
s.city_th,
s.city_en,
s.province_th,
s.province_en,
s.station_type::text AS station_type,
s.attributes
FROM route_stops rs
+2
View File
@@ -11,10 +11,12 @@ pub struct ListRoutesQuery {
pub struct RouteListRow {
pub route_id: String,
pub name_th: String,
pub name_en: Option<String>,
pub vehicle_type: String,
pub route_group_id: i16,
pub route_group_code: String,
pub route_group_label_th: String,
pub route_group_label_en: Option<String>,
pub contact: SqlxJson<serde_json::Value>,
pub metadata: SqlxJson<serde_json::Value>,
pub province_ids: Vec<i16>,
+2
View File
@@ -5,10 +5,12 @@ pub async fn list(pool: &PgPool, q: &ListRoutesQuery) -> Result<Vec<RouteListRow
let sql = r#"
SELECT r.route_id,
r.name_th,
r.name_en,
r.vehicle_type::text AS vehicle_type,
r.route_group_id,
g.code AS route_group_code,
g.label_th AS route_group_label_th,
g.label_en AS route_group_label_en,
r.contact,
r.metadata,
COALESCE(ARRAY(SELECT province_id FROM route_provinces rp WHERE rp.route_id = r.route_id ORDER BY province_id), '{}') AS province_ids,
+1
View File
@@ -15,6 +15,7 @@ pub struct ScheduleRow {
pub station_id: i32,
pub station_code: String,
pub station_name_th: String,
pub station_name_en: Option<String>,
pub direction_note: Option<String>,
pub departure_times: Vec<String>,
pub variants: SqlxJson<serde_json::Value>,
+1
View File
@@ -8,6 +8,7 @@ pub async fn list(pool: &PgPool, q: &ListSchedulesQuery) -> Result<Vec<ScheduleR
sc.station_id,
s.code AS station_code,
s.name_th AS station_name_th,
s.name_en AS station_name_en,
sc.direction_note,
ARRAY(SELECT to_char(t, 'HH24:MI') FROM unnest(sc.departure_times) AS t) AS departure_times,
sc.variants,
+12
View File
@@ -0,0 +1,12 @@
use serde::Serialize;
use sqlx::types::Json as SqlxJson;
#[derive(Debug, Serialize, sqlx::FromRow)]
pub struct SponsorRow {
pub slug: String,
pub name_th: String,
pub name_en: Option<String>,
pub website_url: Option<String>,
pub display_order: i16,
pub meta: SqlxJson<serde_json::Value>,
}
+13
View File
@@ -0,0 +1,13 @@
use super::service;
use crate::error::AppResult;
use crate::state::AppState;
use axum::{extract::State, routing::get, Json, Router};
pub fn route() -> Router<AppState> {
Router::new().route("/api/sponsors", get(handler))
}
async fn handler(State(state): State<AppState>) -> AppResult<Json<serde_json::Value>> {
let rows = service::handle(&state).await?;
Ok(Json(serde_json::json!({ "items": rows })))
}
+6
View File
@@ -0,0 +1,6 @@
pub mod dto;
pub mod handler;
pub mod repo;
pub mod service;
pub use handler::route;
+11
View File
@@ -0,0 +1,11 @@
use super::dto::SponsorRow;
use sqlx::PgPool;
pub async fn list(pool: &PgPool) -> Result<Vec<SponsorRow>, sqlx::Error> {
sqlx::query_as::<_, SponsorRow>(
"SELECT slug, name_th, name_en, website_url, display_order, meta \
FROM sponsors WHERE is_active ORDER BY display_order, slug",
)
.fetch_all(pool)
.await
}
+7
View File
@@ -0,0 +1,7 @@
use super::{dto::SponsorRow, repo};
use crate::error::AppResult;
use crate::state::AppState;
pub async fn handle(state: &AppState) -> AppResult<Vec<SponsorRow>> {
Ok(repo::list(&state.db).await?)
}
+3
View File
@@ -13,8 +13,11 @@ pub struct StopRow {
pub id: i32,
pub code: String,
pub name_th: String,
pub name_en: Option<String>,
pub city_th: Option<String>,
pub city_en: Option<String>,
pub province_th: Option<String>,
pub province_en: Option<String>,
pub station_type: String,
pub attributes: SqlxJson<serde_json::Value>,
pub images: SqlxJson<serde_json::Value>,
+2 -1
View File
@@ -4,7 +4,8 @@ use sqlx::PgPool;
pub async fn list(pool: &PgPool, q: &ListStopsQuery) -> Result<Vec<StopRow>, sqlx::Error> {
let (min_lng, min_lat, max_lng, max_lat) = parse_bbox(q.bbox.as_deref());
let sql = r#"
SELECT s.id, s.code, s.name_th, s.city_th, s.province_th,
SELECT s.id, s.code, s.name_th, s.name_en, s.city_th, s.city_en,
s.province_th, s.province_en,
s.station_type::text AS station_type, s.attributes,
COALESCE((
SELECT jsonb_agg(jsonb_build_object(
+2
View File
@@ -9,6 +9,7 @@ pub mod list_route_stops;
pub mod list_stops;
pub mod get_stop;
pub mod list_schedules;
pub mod list_sponsors;
pub mod upload_image;
pub mod list_images;
pub mod delete_image;
@@ -27,6 +28,7 @@ pub fn router() -> Router<AppState> {
.merge(list_stops::route())
.merge(get_stop::route())
.merge(list_schedules::route())
.merge(list_sponsors::route())
.merge(upload_image::route())
.merge(list_images::route())
.merge(delete_image::route())