From 2231a559fc099c7e794671247e367c7a881b63de Mon Sep 17 00:00:00 2001 From: awei Date: Thu, 30 Jul 2026 01:10:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(dispatch):=20=E5=8D=94=E5=B0=8B?= =?UTF-8?q?=E5=96=AE=E6=AF=8F=E4=B8=80=E6=AD=A5=E4=B9=9F=E6=8E=A8=E6=92=AD?= =?UTF-8?q?=E2=80=94=E2=80=94=E6=8E=A8=E7=B5=A6=E5=B0=8D=E6=96=B9=EF=BC=8C?= =?UTF-8?q?=E6=A8=99=E9=A1=8C=E8=AC=9B=E3=80=8C=E6=8E=A5=E4=B8=8B=E4=BE=86?= =?UTF-8?q?=E8=A6=81=E5=81=9A=E4=BB=80=E9=BA=BC=E3=80=8D=EF=BC=88U3?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 協尋的節奏是小時級(司機要回車上翻、乘客要等),雙方幾乎都不在 App 前景。 先前每一步都只走 WS,整條流程等於要靠當事人自己想起來去開 App 看: 建了單司機不知道、找到了乘客不知道、付了款司機不知道。 - LostItemService 加 SetAppNotifier;建單推司機,之後每一次狀態轉換推給對方 (司機標記尋獲/歸還 → 推乘客;乘客付款/取消 → 推司機)。動作發起者自己剛按完, 系統匣再跳一則只是噪音。 - 標題講的是「收訊者接下來要做什麼」而非內部狀態名:found 對乘客是 「司機找到你的遺失物了」(=該付處理費了);closed 對乘客是「協尋已結案」、 對司機是「乘客取消了協尋」——同一個狀態對兩邊的意思不一樣。 - data 只帶 type+ride_id,物品描述放通知本文並以 rune 截斷;App 醒來後重讀協尋清單。 驗收:go test ./internal/service -run 'TestLostItem' 通過(真 PostGIS+Redis), 整合測試走完 open→found→paid→returned 四步逐一驗到收訊者與標題。 反向確認:把 pushLostItem 改成永遠早退 → FAIL(建單得到 0 則)。 Co-Authored-By: Claude Opus 5 --- cmd/server/main.go | 2 + docs/TODO.md | 24 ++++ internal/service/lost_item.go | 64 ++++++++++ internal/service/lost_item_push_test.go | 161 ++++++++++++++++++++++++ 4 files changed, 251 insertions(+) create mode 100644 internal/service/lost_item_push_test.go diff --git a/cmd/server/main.go b/cmd/server/main.go index f7599b0..29758af 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -175,6 +175,8 @@ func main() { // 要等他自己再打開 App 才看得到。 chatService.SetAppNotifier(appNotify) lostItemService := service.NewLostItemService(rideRepo, lostItemRepo, feeSettings, hub) + // 協尋推播:這條流程是小時級的,雙方幾乎都不在 App 前景,只靠 WS 等於沒有通知。 + lostItemService.SetAppNotifier(appNotify) if cfg.AppEnv == "production" { gin.SetMode(gin.ReleaseMode) diff --git a/docs/TODO.md b/docs/TODO.md index 53fcd47..912115c 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -1124,6 +1124,30 @@ admin 取消各驗到一則推播,乘客自己取消驗到**沒有**推播。 (推播 data 沒有訊息本體,餵給 `RideMessage.fromJson` 只會解析失敗被丟掉; 內容等聊天室自己以 REST 補齊)。 +### U3. 協尋單每一步也推播(2026-07-30) + +> 協尋的節奏是**小時級**(司機要回車上翻、乘客要等),雙方幾乎都不在 App 前景。 +> 先前每一步都只走 WS,整條流程等於要靠當事人自己想起來去開 App 看—— +> **建了單司機不知道、找到了乘客不知道、付了款司機不知道**。 + +- [x] `LostItemService` 加 `SetAppNotifier`;建單推司機,之後**每一次狀態轉換推給對方** + (司機標記尋獲/歸還 → 推乘客;乘客付款/取消 → 推司機)。 + 動作發起者自己剛按完,系統匣再跳一則只是噪音。 +- [x] **標題講的是「收訊者接下來要做什麼」**,不是內部狀態名: + `found` 對乘客是「司機找到你的遺失物了」(=該付處理費了)、 + `closed` 對乘客是「協尋已結案」但對司機是「乘客取消了協尋」—— + 同一個狀態對兩邊的意思不一樣,共用一句文案會有一邊看不懂。 +- [x] data 只帶 `type`+`ride_id`,內容(物品描述)放通知本文並以 rune 截斷; + App 醒來後重讀協尋清單(狀態可能又變過了)。 + +**驗收(2026-07-30 實跑)**:`go test ./internal/service -run 'TestLostItem'` —— +整合測試走完 open→found→paid→returned 四步,逐步驗到「推給對方」的標題與 data type; +`TestLostItemPushTitle` 釘住五種標題(含 closed 的兩種說法); +未注入 notifier 仍可建單。 + +**App 端同批**:`lost_item.created`/`lost_item.updated` 進兩端白名單,收到後**只重讀協尋清單** +(推播 data 沒有協尋單本體;乘客端也不走「重讀行程」那條——協尋單變了不代表行程變了)。 + --- ## 下次任務 diff --git a/internal/service/lost_item.go b/internal/service/lost_item.go index abc7ab6..bad97f6 100644 --- a/internal/service/lost_item.go +++ b/internal/service/lost_item.go @@ -1,7 +1,9 @@ package service import ( + "context" "errors" + "strconv" "strings" "time" "unicode/utf8" @@ -9,6 +11,7 @@ import ( "line-fleet-dispatch/internal/constants" "line-fleet-dispatch/internal/events" "line-fleet-dispatch/internal/model" + "line-fleet-dispatch/internal/notify" "line-fleet-dispatch/internal/repository" ) @@ -30,6 +33,15 @@ type LostItemService struct { items *repository.LostItemRepository fees *FeeSettings publisher events.Publisher + appNotify *notify.Dispatcher +} + +// SetAppNotifier 注入 App 推播;可選。 +// +// 協尋的節奏是**小時級**(司機要回車上翻、乘客要等),雙方幾乎都不在 App 前景—— +// 沒有推播的話,每一步都要靠當事人自己想起來去開 App 看,整條流程就停在那裡。 +func (s *LostItemService) SetAppNotifier(d *notify.Dispatcher) { + s.appNotify = d } func NewLostItemService(rides *repository.RideRepository, items *repository.LostItemRepository, fees *FeeSettings, publisher events.Publisher) *LostItemService { @@ -81,6 +93,8 @@ func (s *LostItemService) CreateByCustomer(customerID, rideID int64, description return nil, err } s.publishItem(item, events.TypeLostItemCreated) + // 建單的是乘客,所以推給司機。 + s.pushLostItem(item, events.TypeLostItemCreated, events.RoleDriver, "乘客回報遺失物", item.Description) return item, nil } @@ -166,9 +180,59 @@ func (s *LostItemService) transition(role string, subjectID, itemID int64, from return nil, err } s.publishItem(item, events.TypeLostItemUpdated) + // 推給**對方**:司機標記尋獲/歸還時推乘客,乘客付款/取消時推司機。 + // 動作發起者自己剛按完,系統匣再跳一則只是噪音。 + if role == events.RoleDriver { + s.pushLostItem(item, events.TypeLostItemUpdated, events.RoleCustomer, + lostItemPushTitle(events.RoleCustomer, to), item.Description) + } else { + s.pushLostItem(item, events.TypeLostItemUpdated, events.RoleDriver, + lostItemPushTitle(events.RoleDriver, to), item.Description) + } return item, nil } +// lostItemPushTitle 依「推給誰」與「轉成什麼狀態」給標題。 +// +// 標題要講**收訊者接下來要做什麼**——「已尋獲」對乘客的意思是「該付處理費了」。 +func lostItemPushTitle(recipientRole, status string) string { + switch status { + case constants.LostItemStatusFound: + return "司機找到你的遺失物了" + case constants.LostItemStatusPaid: + return "乘客已支付處理費" + case constants.LostItemStatusReturned: + return "遺失物已歸還" + case constants.LostItemStatusClosed: + if recipientRole == events.RoleCustomer { + return "協尋已結案" + } + return "乘客取消了協尋" + default: + return "協尋單有更新" + } +} + +// pushLostItem 推一則協尋通知給指定角色。 +// +// data 只帶 type 與 ride_id:App 醒來後重讀協尋清單(狀態可能又變過了), +// 與行程狀態推播同一條原則。用 context.Background()——推播是回應之後的背景動作。 +func (s *LostItemService) pushLostItem(item *model.LostItemRequest, eventType, recipientRole, title, body string) { + if s.appNotify == nil { + return + } + ctx := context.Background() + data := map[string]string{ + "type": eventType, + "ride_id": strconv.FormatInt(item.RideID, 10), + } + if recipientRole == events.RoleDriver { + s.appNotify.NotifyDriverRideUpdate(ctx, item.DriverID, item.RideID, title, previewText(body), data) + return + } + s.appNotify.NotifyCustomerRideUpdate(ctx, item.CustomerID, item.RideID, title, previewText(body), data) +} + // publishItem 推播協尋單事件給行程雙方。 func (s *LostItemService) publishItem(item *model.LostItemRequest, eventType string) { if s.publisher == nil { diff --git a/internal/service/lost_item_push_test.go b/internal/service/lost_item_push_test.go new file mode 100644 index 0000000..4db6375 --- /dev/null +++ b/internal/service/lost_item_push_test.go @@ -0,0 +1,161 @@ +package service + +import ( + "testing" + + "gorm.io/gorm" + + "line-fleet-dispatch/internal/constants" + "line-fleet-dispatch/internal/events" + "line-fleet-dispatch/internal/repository" +) + +// 協尋的節奏是小時級(司機要回車上翻、乘客要等),雙方幾乎都不在 App 前景—— +// 先前每一步都只走 WS,等於整條流程要靠當事人自己想起來去開 App 看。 +// +// 這組測試釘住「每一步推給對方、不推給動作發起者」。 + +func TestLostItem_每一步推給對方(t *testing.T) { + db := newServiceTestDB(t) + customers := repository.NewCustomerRepository(db) + drivers := repository.NewDriverRepository(db) + rides := repository.NewRideRepository(db) + items := repository.NewLostItemRepository(db) + + cust, err := customers.FindOrCreateByLineUserID("U_lostpush_cust", "乘客") + if err != nil { + t.Fatalf("建立乘客失敗:%v", err) + } + driver, err := drivers.FindOrCreate("U_lostpush_driver", "司機") + if err != nil { + t.Fatalf("建立司機失敗:%v", err) + } + ride := newTestRide(t, rides, cust.ID, constants.RideStatusRequested) + if err := rides.AcceptRide(ride.ID, driver.ID, 300); err != nil { + t.Fatalf("指派司機失敗:%v", err) + } + if err := rides.MarkPickedUp(ride.ID); err != nil { + t.Fatalf("上車失敗:%v", err) + } + fare, comm, net := int64(10000), int64(1500), int64(8500) + if err := rides.CompleteRide(ride.ID, 3000, &fare, &comm, &net, nil); err != nil { + t.Fatalf("完成行程失敗:%v", err) + } + + svc := NewLostItemService(rides, items, newTestFees(t, db), &fakePublisher{}) + n, pusher := newFakeNotifier() + svc.SetAppNotifier(n) + + // 1) 乘客建單 → 推司機 + item, err := svc.CreateByCustomer(cust.ID, ride.ID, "黑色錢包") + if err != nil { + t.Fatalf("建立協尋單失敗:%v", err) + } + pushes := pusher.customerPushes() + if len(pushes) != 1 { + t.Fatalf("建單應推一則給司機,得到 %d:%v", len(pushes), pushes) + } + if pushes[0].data["type"] != events.TypeLostItemCreated { + t.Errorf("data.type=%q,預期 lost_item.created", pushes[0].data["type"]) + } + if pushes[0].title != "乘客回報遺失物" { + t.Errorf("title=%q", pushes[0].title) + } + + // 2) 司機標記尋獲 → 推乘客,標題要講「乘客接下來要做什麼」 + if _, err := svc.MarkFound(driver.ID, item.ID); err != nil { + t.Fatalf("標記尋獲失敗:%v", err) + } + pushes = pusher.customerPushes() + if len(pushes) != 2 { + t.Fatalf("尋獲後應累計 2 則,得到 %d", len(pushes)) + } + if pushes[1].title != "司機找到你的遺失物了" { + t.Errorf("title=%q", pushes[1].title) + } + if pushes[1].data["type"] != events.TypeLostItemUpdated { + t.Errorf("data.type=%q,預期 lost_item.updated", pushes[1].data["type"]) + } + + // 3) 乘客付款 → 推司機 + if _, err := svc.Pay(cust.ID, item.ID); err != nil { + t.Fatalf("支付處理費失敗:%v", err) + } + pushes = pusher.customerPushes() + if len(pushes) != 3 || pushes[2].title != "乘客已支付處理費" { + t.Fatalf("付款後的推播不對:%v", pushes) + } + + // 4) 司機歸還 → 推乘客 + if _, err := svc.MarkReturned(driver.ID, item.ID); err != nil { + t.Fatalf("標記歸還失敗:%v", err) + } + pushes = pusher.customerPushes() + if len(pushes) != 4 || pushes[3].title != "遺失物已歸還" { + t.Fatalf("歸還後的推播不對:%v", pushes) + } +} + +// 標題要講「收訊者接下來要做什麼」——同一個 closed 對兩邊的意思不一樣。 +func TestLostItemPushTitle(t *testing.T) { + cases := []struct { + recipient string + status string + want string + }{ + {events.RoleCustomer, constants.LostItemStatusFound, "司機找到你的遺失物了"}, + {events.RoleDriver, constants.LostItemStatusPaid, "乘客已支付處理費"}, + {events.RoleCustomer, constants.LostItemStatusReturned, "遺失物已歸還"}, + {events.RoleCustomer, constants.LostItemStatusClosed, "協尋已結案"}, + {events.RoleDriver, constants.LostItemStatusClosed, "乘客取消了協尋"}, + } + for _, c := range cases { + if got := lostItemPushTitle(c.recipient, c.status); got != c.want { + t.Errorf("lostItemPushTitle(%q, %q)=%q,預期 %q", c.recipient, c.status, got, c.want) + } + } +} + +// 未注入 notifier(既有測試與舊部署)照常運作。 +func TestLostItem_未注入notifier仍可建單(t *testing.T) { + db := newServiceTestDB(t) + customers := repository.NewCustomerRepository(db) + drivers := repository.NewDriverRepository(db) + rides := repository.NewRideRepository(db) + items := repository.NewLostItemRepository(db) + + cust, err := customers.FindOrCreateByLineUserID("U_lostpush_nonotify", "乘客") + if err != nil { + t.Fatalf("建立乘客失敗:%v", err) + } + driver, err := drivers.FindOrCreate("U_lostpush_nonotify_d", "司機") + if err != nil { + t.Fatalf("建立司機失敗:%v", err) + } + ride := newTestRide(t, rides, cust.ID, constants.RideStatusRequested) + if err := rides.AcceptRide(ride.ID, driver.ID, 300); err != nil { + t.Fatalf("指派司機失敗:%v", err) + } + if err := rides.MarkPickedUp(ride.ID); err != nil { + t.Fatalf("上車失敗:%v", err) + } + fare, comm, net := int64(10000), int64(1500), int64(8500) + if err := rides.CompleteRide(ride.ID, 3000, &fare, &comm, &net, nil); err != nil { + t.Fatalf("完成行程失敗:%v", err) + } + + svc := NewLostItemService(rides, items, newTestFees(t, db), &fakePublisher{}) + if _, err := svc.CreateByCustomer(cust.ID, ride.ID, "雨傘"); err != nil { + t.Fatalf("沒有推播也要能建單:%v", err) + } +} + +// newTestFees 載入費率設定(migration 已填預設值)。 +func newTestFees(t *testing.T, db *gorm.DB) *FeeSettings { + t.Helper() + fees, err := NewFeeSettings(repository.NewFeeSettingsRepository(db)) + if err != nil { + t.Fatalf("載入費率設定失敗:%v", err) + } + return fees +} From b7ba17cb5e5600cb48bf24f93366087bf447ffa1 Mon Sep 17 00:00:00 2001 From: awei Date: Thu, 30 Jul 2026 01:19:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?docs(dispatch):=20=E6=8E=A8=E6=92=AD?= =?UTF-8?q?=E9=8F=88=E8=B7=AF=E7=9A=84=E5=AF=A6=E8=B7=91=E8=AD=89=E6=93=9A?= =?UTF-8?q?=EF=BC=88U4=EF=BC=89=EF=BC=8B=E5=85=A9=E6=94=AF=E9=A9=97?= =?UTF-8?q?=E8=AD=89=E8=85=B3=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit U/U2/U3 先前的證據都只到 service 層。這批用本機 postgis+redis 容器+go run 起真後端 (FCM_CREDENTIALS_FILE 留空 → LogPusher stub),以 curl 走完整條 HTTP 路徑, 從 log 的 token 前綴判定「推給誰、推了什麼」:10 則推播收件人全部正確, 另跑一輪取消路徑——乘客自己取消完全沒有推播(負向斷言成立)、admin 取消推 ride.cancelled、 司機放棄推 ride.redispatched。 scripts/push_e2e.sh、scripts/push_cancel_e2e.sh 連同踩到的四個坑一起收進 repo (registry 拉不到只能改跑本機 server、車牌長度上限、vehicle-review 參數是 approve、 建單回的是 ride_id)。 Co-Authored-By: Claude Opus 5 --- docs/TODO.md | 41 ++++++++++++++ scripts/push_cancel_e2e.sh | 63 ++++++++++++++++++++++ scripts/push_e2e.sh | 108 +++++++++++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+) create mode 100755 scripts/push_cancel_e2e.sh create mode 100755 scripts/push_e2e.sh diff --git a/docs/TODO.md b/docs/TODO.md index 912115c..688f2be 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -1148,6 +1148,47 @@ admin 取消各驗到一則推播,乘客自己取消驗到**沒有**推播。 **App 端同批**:`lost_item.created`/`lost_item.updated` 進兩端白名單,收到後**只重讀協尋清單** (推播 data 沒有協尋單本體;乘客端也不走「重讀行程」那條——協尋單變了不代表行程變了)。 +### U4. 整條推播鏈路的實跑驗證(2026-07-30,**不需 Firebase 憑證**) + +> U/U2/U3 的證據原本都只到 service 層(單元+整合測試)。這一節補的是 +> **整條 HTTP 路徑真的會呼叫送出**——沒有憑證時走 `LogPusher` stub, +> log 會印出收件裝置的 token 前綴、標題與 data,足以判定「推給誰、推了什麼」。 + +**做法**(本機起 postgis+redis 容器、`go run ./cmd/server`; +`FCM_CREDENTIALS_FILE` 留空 → log 出現「未設定 FCM_CREDENTIALS_FILE,App 推播使用 stub」): +註冊司機/乘客各自的 device token(`DRIVER-FCM-TOKEN`/`CUSTOMER-FCM-TOKEN` +——**token 前綴就是判斷推給誰的依據**),然後用 curl 走完整條鏈路。 + +**實測結果(2026-07-30,10 則推播,收件人全部正確)**: + +| 動作 | 推播 data.type | 標題 | 收件裝置 | +|---|---|---|---| +| 派單 | `ride.assigned` | 新派單 #2 | `DRIVER-F…` | +| 司機接單 | `ride.accepted` | 司機已接單 | `CUSTOMER…` | +| 進上車圍籬 | `driver.arrived` | 司機已抵達 | `CUSTOMER…` | +| 乘客發話 | `chat.message` | 乘客傳來訊息 | `DRIVER-F…` | +| 司機發話 | `chat.message` | 司機傳來訊息 | `CUSTOMER…` | +| 完成行程 | `ride.completed` | 行程已完成 | `CUSTOMER…` | +| 乘客建協尋單 | `lost_item.created` | 乘客回報遺失物 | `DRIVER-F…` | +| 司機標記尋獲 | `lost_item.updated` | 司機找到你的遺失物了 | `CUSTOMER…` | +| 乘客付處理費 | `lost_item.updated` | 乘客已支付處理費 | `DRIVER-F…` | +| 司機標記歸還 | `lost_item.updated` | 遺失物已歸還 | `CUSTOMER…` | + +**取消那三條另跑一輪**(同日): +- **乘客自己取消 → 完全沒有推播**(只有先前那則派單邀請)——負向斷言成立。 +- **admin 取消 → `ride.cancelled`「行程已取消」給乘客**。 +- **司機接單後放棄 → `ride.accepted` 後緊接 `ride.redispatched`「正在重新為您派車」給乘客**。 + +**踩到的坑(留給下次跑的人)**: +1. **本機 Docker 拉不到 registry**(`load metadata for docker.io/library/golang:1.25-alpine` 會卡死), + 所以 `docker compose up --build` 起不來。**改用 `docker compose up -d postgis redis` + +本機 `go run ./cmd/server`**(DB_HOST=localhost DB_PORT=5433)——postgis/redis 映像本機已有。 +2. `PUT /api/driver/vehicle` 的車牌有**長度上限**,拿 epoch 當後綴會被 400「車牌格式錯誤」擋下。 +3. `POST /api/admin/drivers/:id/vehicle-review` 的參數是 **`{"approve":true}`**,不是 `{"status":"approved"}`。 +4. `POST /api/rides` 回的是 **`ride_id`** 不是 `id`。 + +**仍未做**:真 Firebase 憑證下的端到端(手機真的響),那是 A2 的同一個卡點。 + --- ## 下次任務 diff --git a/scripts/push_cancel_e2e.sh b/scripts/push_cancel_e2e.sh new file mode 100755 index 0000000..d6ea4c9 --- /dev/null +++ b/scripts/push_cancel_e2e.sh @@ -0,0 +1,63 @@ +#!/bin/sh +# 取消/重新派車那三條路徑的實跑驗證(承 push_e2e.sh): +# 1. 乘客自己取消 → **不該有推播**(他就在前景,剛按完) +# 2. admin 取消 → 應推 ride.cancelled 給乘客 +# 3. 司機放棄 → 應推 ride.redispatched 給乘客 +set -e +API="${API_URL:-http://localhost:8080}" +SUFFIX="${SUFFIX:-$(date +%s)}" +PLATE="PC-$(echo "$SUFFIX" | tail -c 5)" + +fail() { echo "✗ $1"; exit 1; } +jsonval() { grep -o "\"$2\":[^,}]*" | head -1 | cut -d: -f2- | tr -d '" '; } + +# --- 準備司機(已核准車輛、上線)與乘客 --- +curl -sf -X POST "$API/api/driver/register" -H 'Content-Type: application/json' \ + -d "{\"line_user_id\":\"cx-d-$SUFFIX\",\"name\":\"取消測試司機\",\"password\":\"pw123456\"}" >/dev/null +DLOGIN=$(curl -sf -X POST "$API/api/driver/login" -H 'Content-Type: application/json' \ + -d "{\"line_user_id\":\"cx-d-$SUFFIX\",\"password\":\"pw123456\"}") +DTOKEN=$(echo "$DLOGIN" | jsonval x token); DID=$(echo "$DLOGIN" | jsonval x driver_id) +curl -sf -X POST "$API/api/driver/device-token" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $DTOKEN" -d '{"platform":"fcm","token":"DRIVER-FCM-TOKEN"}' >/dev/null +curl -sf -X PUT "$API/api/driver/vehicle" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $DTOKEN" -d "{\"vehicle_type\":\"sedan\",\"plate_number\":\"$PLATE\"}" >/dev/null +ATOKEN=$(curl -sf -X POST "$API/api/admin/login" -H 'Content-Type: application/json' \ + -d '{"username":"admin","password":"admin"}' | jsonval x token) +curl -sf -X POST "$API/api/admin/drivers/$DID/vehicle-review" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $ATOKEN" -d '{"approve":true}' >/dev/null +curl -sf -X POST "$API/api/driver/online" -H "Authorization: Bearer $DTOKEN" >/dev/null +curl -sf -X POST "$API/api/driver/location" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $DTOKEN" -d '{"lat":25.0330,"lng":121.5650}' >/dev/null + +curl -sf -X POST "$API/api/customer/register" -H 'Content-Type: application/json' \ + -d "{\"line_user_id\":\"cx-c-$SUFFIX\",\"name\":\"取消測試乘客\",\"password\":\"pw123456\"}" >/dev/null +CTOKEN=$(curl -sf -X POST "$API/api/customer/login" -H 'Content-Type: application/json' \ + -d "{\"line_user_id\":\"cx-c-$SUFFIX\",\"password\":\"pw123456\"}" | jsonval x token) +curl -sf -X POST "$API/api/customer/device-token" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $CTOKEN" -d '{"platform":"fcm","token":"CUSTOMER-FCM-TOKEN"}' >/dev/null + +newride() { + curl -sf -X POST "$API/api/rides" -H 'Content-Type: application/json' -H "Authorization: Bearer $CTOKEN" \ + -d '{"pickup_lat":25.0335,"pickup_lng":121.5655,"pickup_address":"台北101","dropoff_lat":25.0478,"dropoff_lng":121.5170,"dropoff_address":"台北車站"}' \ + | jsonval x ride_id +} + +echo "== 1) 乘客自己取消(預期:沒有推播)==" +R1=$(newride); sleep 2 +curl -sf -X POST "$API/api/rides/$R1/cancel-by-customer" -H "Authorization: Bearer $CTOKEN" >/dev/null +echo "ride_id=$R1 已由乘客取消" + +echo "== 2) admin 取消(預期:推 ride.cancelled 給乘客)==" +R2=$(newride); sleep 2 +curl -sf -X POST "$API/api/admin/rides/$R2/cancel" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $ATOKEN" -d '{"note":"客服取消"}' >/dev/null +echo "ride_id=$R2 已由 admin 取消" + +echo "== 3) 司機接單後放棄(預期:推 ride.redispatched 給乘客)==" +R3=$(newride); sleep 2 +curl -sf -X POST "$API/api/rides/$R3/accept" -H "Authorization: Bearer $DTOKEN" >/dev/null +curl -sf -X POST "$API/api/rides/$R3/cancel" -H "Authorization: Bearer $DTOKEN" >/dev/null +echo "ride_id=$R3 已由司機放棄" + +echo +echo "✓ 三種取消路徑跑完:R1=$R1(乘客自撤)R2=$R2(admin)R3=$R3(司機放棄)" diff --git a/scripts/push_e2e.sh b/scripts/push_e2e.sh new file mode 100755 index 0000000..861eed3 --- /dev/null +++ b/scripts/push_e2e.sh @@ -0,0 +1,108 @@ +#!/bin/sh +# 推播送出路徑的 docker 實跑驗證(U/U2/U3)。 +# +# 沒有 Firebase 憑證時後端走 LogPusher stub,log 會印出「App 推播(stub)」與 data—— +# 這足以證明**送出路徑真的被呼叫**(單元測試證明的是 service 層,這裡證明整條 HTTP 路徑)。 +# +# 怎麼起後端(本機 Docker 拉不到 registry 時 `docker compose up --build` 會卡在 +# load metadata for golang:1.25-alpine,改用這條): +# docker compose up -d postgis redis +# DB_HOST=localhost DB_PORT=5433 DB_NAME=fleet DB_USER=fleet DB_PASSWORD=change_me \ +# REDIS_ADDR=localhost:6379 ADMIN_SEED_USERNAME=admin ADMIN_SEED_PASSWORD=admin \ +# go run ./cmd/server > /tmp/push_server.log 2>&1 & +# 跑完看證據: +# grep 'App 推播(stub)' /tmp/push_server.log +set -e +API="${API_URL:-http://localhost:8080}" +SUFFIX="${SUFFIX:-$(date +%s)}" +PLATE="PS-$(echo "$SUFFIX" | tail -c 5)" # 車牌有長度上限(寬鬆驗證但 <=10) + +fail() { echo "✗ $1"; exit 1; } +jsonval() { grep -o "\"$2\":[^,}]*" | head -1 | cut -d: -f2- | tr -d '" '; } + +echo "== healthz ==" +curl -sf "$API/healthz" >/dev/null || fail "healthz 未就緒" + +echo "== 司機註冊/登入 ==" +curl -sf -X POST "$API/api/driver/register" -H 'Content-Type: application/json' \ + -d "{\"line_user_id\":\"push-d-$SUFFIX\",\"name\":\"推播司機\",\"password\":\"pw123456\"}" >/dev/null +DLOGIN=$(curl -sf -X POST "$API/api/driver/login" -H 'Content-Type: application/json' \ + -d "{\"line_user_id\":\"push-d-$SUFFIX\",\"password\":\"pw123456\"}") +DTOKEN=$(echo "$DLOGIN" | jsonval x token) +DID=$(echo "$DLOGIN" | jsonval x driver_id) +[ -n "$DTOKEN" ] || fail "司機登入失敗: $DLOGIN" +echo "driver_id=$DID" + +echo "== 司機註冊裝置 token ==" +curl -sf -X POST "$API/api/driver/device-token" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $DTOKEN" -d '{"platform":"fcm","token":"DRIVER-FCM-TOKEN"}' >/dev/null + +echo "== 司機填車輛 → admin 核准(O5 gate)==" +curl -sf -X PUT "$API/api/driver/vehicle" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $DTOKEN" -d "{\"vehicle_type\":\"sedan\",\"plate_number\":\"$PLATE\"}" >/dev/null +ALOGIN=$(curl -sf -X POST "$API/api/admin/login" -H 'Content-Type: application/json' \ + -d '{"username":"admin","password":"admin"}') +ATOKEN=$(echo "$ALOGIN" | jsonval x token) +[ -n "$ATOKEN" ] || fail "admin 登入失敗: $ALOGIN" +REVIEW=$(curl -s -w '\n%{http_code}' -X POST "$API/api/admin/drivers/$DID/vehicle-review" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $ATOKEN" -d '{"approve":true}') +echo " vehicle-review: $(echo "$REVIEW" | tail -1)" + +echo "== 司機上線+回報位置 ==" +ONLINE=$(curl -s -w '\n%{http_code}' -X POST "$API/api/driver/online" -H "Authorization: Bearer $DTOKEN") +echo " online: $(echo "$ONLINE" | tail -1) $(echo "$ONLINE" | head -1 | head -c 120)" +curl -sf -X POST "$API/api/driver/location" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $DTOKEN" -d '{"lat":25.0330,"lng":121.5650}' >/dev/null + +echo "== 乘客註冊/登入+裝置 token ==" +curl -sf -X POST "$API/api/customer/register" -H 'Content-Type: application/json' \ + -d "{\"line_user_id\":\"push-c-$SUFFIX\",\"name\":\"推播乘客\",\"password\":\"pw123456\"}" >/dev/null +CLOGIN=$(curl -sf -X POST "$API/api/customer/login" -H 'Content-Type: application/json' \ + -d "{\"line_user_id\":\"push-c-$SUFFIX\",\"password\":\"pw123456\"}") +CTOKEN=$(echo "$CLOGIN" | jsonval x token) +[ -n "$CTOKEN" ] || fail "乘客登入失敗: $CLOGIN" +curl -sf -X POST "$API/api/customer/device-token" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $CTOKEN" -d '{"platform":"fcm","token":"CUSTOMER-FCM-TOKEN"}' >/dev/null + +echo "== 乘客叫車 ==" +RIDE=$(curl -sf -X POST "$API/api/rides" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $CTOKEN" \ + -d '{"pickup_lat":25.0335,"pickup_lng":121.5655,"pickup_address":"台北101","dropoff_lat":25.0478,"dropoff_lng":121.5170,"dropoff_address":"台北車站"}') +RID=$(echo "$RIDE" | jsonval x ride_id) +[ -n "$RID" ] || fail "建單失敗: $RIDE" +echo "ride_id=$RID" +sleep 3 + +echo "== 司機接單(→ 應推 ride.accepted 給乘客)==" +ACC=$(curl -s -w '\n%{http_code}' -X POST "$API/api/rides/$RID/accept" -H "Authorization: Bearer $DTOKEN") +echo " accept: $(echo "$ACC" | tail -1) $(echo "$ACC" | head -1 | head -c 160)" + +echo "== 司機開到上車點(→ 圍籬 driver.arrived 推乘客)==" +curl -sf -X POST "$API/api/driver/location" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $DTOKEN" -d '{"lat":25.0335,"lng":121.5655}' >/dev/null +sleep 1 + +echo "== 對話:乘客 → 司機、司機 → 乘客(→ 各推對方一則)==" +curl -sf -X POST "$API/api/rides/$RID/messages" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $CTOKEN" -d '{"body":"我在門口"}' >/dev/null +curl -sf -X POST "$API/api/rides/$RID/messages" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $DTOKEN" -d '{"body":"我到了"}' >/dev/null + +echo "== 上車 → 完成(→ ride.completed 推乘客)==" +curl -sf -X POST "$API/api/rides/$RID/pickup" -H "Authorization: Bearer $DTOKEN" >/dev/null +curl -sf -X POST "$API/api/driver/location" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $DTOKEN" -d '{"lat":25.0478,"lng":121.5170}' >/dev/null +curl -sf -X POST "$API/api/rides/$RID/complete" -H "Authorization: Bearer $DTOKEN" >/dev/null + +echo "== 遺失物:建單 → 尋獲 → 付款 → 歸還(→ 每步推對方)==" +ITEM=$(curl -sf -X POST "$API/api/rides/$RID/lost-items" -H 'Content-Type: application/json' \ + -H "Authorization: Bearer $CTOKEN" -d '{"description":"黑色錢包"}') +IID=$(echo "$ITEM" | jsonval x id) +[ -n "$IID" ] || fail "建立協尋單失敗: $ITEM" +curl -sf -X POST "$API/api/lost-items/$IID/found" -H "Authorization: Bearer $DTOKEN" >/dev/null +curl -sf -X POST "$API/api/lost-items/$IID/pay" -H "Authorization: Bearer $CTOKEN" >/dev/null +curl -sf -X POST "$API/api/lost-items/$IID/return" -H "Authorization: Bearer $DTOKEN" >/dev/null + +echo +echo "✓ 流程跑完。ride_id=$RID lost_item_id=$IID" +echo "接著用:docker compose logs app | grep 'App 推播(stub)' 看送出路徑是否真的被呼叫"