From 70221815d61f337bf2c39dc1ec09542f433dec1e Mon Sep 17 00:00:00 2001 From: awei Date: Sun, 19 Jul 2026 09:48:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(O5):=20=E8=BB=8A=E8=BC=9B=E5=AF=A9?= =?UTF-8?q?=E6=A0=B8=E2=80=94=E2=80=94=E5=A1=AB/=E6=94=B9=E8=BB=8A?= =?UTF-8?q?=E8=BC=9B=E9=9C=80=20admin=20=E6=A0=B8=E5=87=86=E6=89=8D?= =?UTF-8?q?=E8=83=BD=E6=8E=A5=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit O3 gate(有填車種車牌)升級為 O5 gate(已審核)。司機填/改車輛後進 pending,admin 核准才能接單;退回附原因,司機可重填再送審。 - migration 000022:drivers 加 vehicle_review_status/note+CHECK; 祖父化:既有已填車輛的司機一律 approved,不因導入被鎖出(O5 導入決策) - constants VehicleReview*;model VehicleApproved()(gate 讀它) - gate 兩處(dispatchRound 派單側、AcceptRide 接單側)改用 VehicleApproved; 接單側分「沒填(NoVehicle)」與「待審核(NotApproved)」兩種錯誤,司機知道下一步 - UpdateVehicle 原子地把 review 重置 pending(改車一律重審); UpdateVehicleReview 供審核;SetVehicle 回傳物件同步 pending - admin POST /drivers/:id/vehicle-review(ops 角色)approve/reject; 只有 pending 可審、退回必附原因;admin drivers 列表帶審核欄位 - 司機 GET /driver/vehicle 回應加 review_status/review_note/can_accept - 測試:gate 改為「只派給已審核」+待審核 accept→NotApproved; SetVehicle→pending;admin 審核 approve/reject/需原因/僅pending可審/改車重審 go build/vet 通過;O5 相關整合測試綠;runtime 全鏈路驗過 (填→pending→gate 擋→核准→接單成功;退回+原因;退回無原因 400)。 Co-Authored-By: Claude Fable 5 --- cmd/server/main.go | 1 + .../000022_add_driver_vehicle_review.down.sql | 3 + .../000022_add_driver_vehicle_review.up.sql | 15 +++ internal/constants/vehicle.go | 10 ++ internal/handler/admin.go | 33 +++++++ internal/handler/driver.go | 15 ++- internal/model/models.go | 21 ++++- internal/repository/repository.go | 15 ++- internal/service/admin_operations.go | 26 ++++++ internal/service/admin_operations_test.go | 91 +++++++++++++++++++ internal/service/dispatch.go | 16 ++-- .../service/dispatch_required_vehicle_test.go | 4 + .../service/dispatch_vehicle_gate_test.go | 54 +++++++++-- internal/service/driver_registry.go | 3 + internal/service/driver_vehicle_test.go | 12 ++- internal/service/errors.go | 7 ++ 16 files changed, 300 insertions(+), 26 deletions(-) create mode 100644 db/migrations/000022_add_driver_vehicle_review.down.sql create mode 100644 db/migrations/000022_add_driver_vehicle_review.up.sql diff --git a/cmd/server/main.go b/cmd/server/main.go index 46c9ab4..fc8cb52 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -310,6 +310,7 @@ func main() { ops.Use(middleware.RequireAdminRole(auth.RoleDispatcher)) { ops.PATCH("/drivers/:id/status", adminHandler.PatchDriverStatus) + ops.POST("/drivers/:id/vehicle-review", adminHandler.ReviewDriverVehicle) ops.PUT("/settings/dispatch", adminHandler.PutDispatchSettings) ops.POST("/rides/:id/cancel", adminHandler.CancelRide) } diff --git a/db/migrations/000022_add_driver_vehicle_review.down.sql b/db/migrations/000022_add_driver_vehicle_review.down.sql new file mode 100644 index 0000000..c791498 --- /dev/null +++ b/db/migrations/000022_add_driver_vehicle_review.down.sql @@ -0,0 +1,3 @@ +ALTER TABLE drivers DROP CONSTRAINT IF EXISTS chk_drivers_vehicle_review_status; +ALTER TABLE drivers DROP COLUMN IF EXISTS vehicle_review_note; +ALTER TABLE drivers DROP COLUMN IF EXISTS vehicle_review_status; diff --git a/db/migrations/000022_add_driver_vehicle_review.up.sql b/db/migrations/000022_add_driver_vehicle_review.up.sql new file mode 100644 index 0000000..f361777 --- /dev/null +++ b/db/migrations/000022_add_driver_vehicle_review.up.sql @@ -0,0 +1,15 @@ +-- 車輛審核(O5 定案 2026-07-19):司機填/改車輛後需 admin 核准才能接單。 +-- O3 gate 從「有填車種車牌」升級為「已審核」;App 端多一種「待審核」等待狀態。 +-- 沿用 drivers 既有慣例:TEXT NOT NULL DEFAULT ''。 +ALTER TABLE drivers ADD COLUMN IF NOT EXISTS vehicle_review_status TEXT NOT NULL DEFAULT ''; +ALTER TABLE drivers ADD COLUMN IF NOT EXISTS vehicle_review_note TEXT NOT NULL DEFAULT ''; + +-- 值域最後防線放 DB CHECK:gate 直接讀它,值髒掉會讓不該接單的司機接到單。 +ALTER TABLE drivers DROP CONSTRAINT IF EXISTS chk_drivers_vehicle_review_status; +ALTER TABLE drivers ADD CONSTRAINT chk_drivers_vehicle_review_status + CHECK (vehicle_review_status IN ('', 'pending', 'approved', 'rejected')); + +-- 祖父化:導入審核前既有已填車輛的司機一律視為已核准,不因導入審核而被鎖出 +-- (O5 導入決策 2026-07-19;未填車輛者維持 '',仍走強制設定頁)。 +UPDATE drivers SET vehicle_review_status = 'approved' + WHERE vehicle_type <> '' AND plate_number <> '' AND vehicle_review_status = ''; diff --git a/internal/constants/vehicle.go b/internal/constants/vehicle.go index 4171948..6da0634 100644 --- a/internal/constants/vehicle.go +++ b/internal/constants/vehicle.go @@ -17,6 +17,16 @@ const ( VehicleTypePet = "pet" // 寵物用車(乘客指定此車種時加收清潔費,見 O6/P) ) +// 車輛審核狀態(O5 定案 2026-07-19)。司機填/改車輛後進 Pending,admin 核准才能接單。 +// 值域由 DB CHECK `chk_drivers_vehicle_review_status` 把關(migration 000022)。 +// 導入時既有已填車輛的司機祖父化為 Approved(migration 一次性 UPDATE),不因導入被鎖出。 +const ( + VehicleReviewNone = "" // 未提交(沒填車輛) + VehicleReviewPending = "pending" // 待審核(填了/改了,等 admin) + VehicleReviewApproved = "approved" // 已核准(可接單) + VehicleReviewRejected = "rejected" // 已退回(附原因,可重填) +) + // vehicleTypes 白名單;順序即前端建議的顯示順序。 var vehicleTypes = []string{ VehicleTypeSedan, diff --git a/internal/handler/admin.go b/internal/handler/admin.go index 57c28d9..49b9aaa 100644 --- a/internal/handler/admin.go +++ b/internal/handler/admin.go @@ -343,6 +343,39 @@ func (h *AdminHandler) PatchDriverStatus(c *gin.Context) { c.JSON(http.StatusOK, gin.H{"driver": driver}) } +// ReviewDriverVehicle POST /api/admin/drivers/:id/vehicle-review — 車輛審核(O5)。 +// body: {approve: bool, note?: string}。approve=false 時 note 必填(退回原因)。 +func (h *AdminHandler) ReviewDriverVehicle(c *gin.Context) { + id, err := strconv.ParseInt(c.Param("id"), 10, 64) + if err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "id 格式錯誤"}) + return + } + var req struct { + Approve bool `json:"approve"` + Note string `json:"note"` + } + if err := c.ShouldBindJSON(&req); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "參數錯誤"}) + return + } + driver, err := h.adminOps.ReviewDriverVehicle(id, req.Approve, strings.TrimSpace(req.Note)) + if err != nil { + switch { + case errors.Is(err, service.ErrNotFound): + c.JSON(http.StatusNotFound, gin.H{"error": "找不到司機"}) + case errors.Is(err, service.ErrVehicleNotPending): + c.JSON(http.StatusConflict, gin.H{"error": err.Error()}) + case errors.Is(err, service.ErrRejectNoteRequired): + c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + default: + c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + } + return + } + c.JSON(http.StatusOK, gin.H{"driver": driver}) +} + // GetDispatchSettings GET /api/admin/settings/dispatch func (h *AdminHandler) GetDispatchSettings(c *gin.Context) { c.JSON(http.StatusOK, h.dispatchSettings.JSON()) diff --git a/internal/handler/driver.go b/internal/handler/driver.go index 343a309..cbb4292 100644 --- a/internal/handler/driver.go +++ b/internal/handler/driver.go @@ -68,13 +68,18 @@ func (h *DriverHandler) Me(c *gin.Context) { c.JSON(http.StatusOK, driverPublic(d)) } -// driverVehicle 車輛資訊的回應形狀(O2)。附 `has_vehicle` 讓 App 不必自行判斷 -// 「兩欄皆非空」就知道能不能接單(與 O3 gate 同一條件)。 +// driverVehicle 車輛資訊的回應形狀(O2/O5)。 +// `has_vehicle`=填了沒(App 決定是否顯示強制設定頁); +// `review_status`=審核狀態(App 四態路由:pending 審核中/rejected 已退回+原因); +// `can_accept`=能不能接單(O5 gate =已核准),App 用它就不必自行推導審核邏輯。 func driverVehicle(d *model.Driver) gin.H { return gin.H{ - "vehicle_type": d.VehicleType, - "plate_number": d.PlateNumber, - "has_vehicle": d.HasVehicle(), + "vehicle_type": d.VehicleType, + "plate_number": d.PlateNumber, + "has_vehicle": d.HasVehicle(), + "review_status": d.VehicleReviewStatus, + "review_note": d.VehicleReviewNote, + "can_accept": d.VehicleApproved(), } } diff --git a/internal/model/models.go b/internal/model/models.go index 5418f49..2240927 100644 --- a/internal/model/models.go +++ b/internal/model/models.go @@ -123,17 +123,28 @@ type Driver struct { // 未設定的司機不得被派單/接單(O3),且它是清潔費(O6)與派單車種過濾(P3)的判斷依據。 VehicleType string `gorm:"column:vehicle_type;not null;default:''" json:"vehicle_type"` // PlateNumber 車牌(O1):非空時唯一(partial unique index),'' 為未設定。 - PlateNumber string `gorm:"column:plate_number;not null;default:''" json:"plate_number"` - PasswordHash string `gorm:"column:password_hash;not null;default:''" json:"-"` - CreatedAt time.Time `gorm:"not null"` - UpdatedAt time.Time `gorm:"not null"` + PlateNumber string `gorm:"column:plate_number;not null;default:''" json:"plate_number"` + // VehicleReviewStatus 車輛審核狀態(O5):constants.VehicleReview* 之一。 + // gate 讀它(approved 才能接單);填/改車輛→pending,admin 核准/退回改它。 + VehicleReviewStatus string `gorm:"column:vehicle_review_status;not null;default:''" json:"vehicle_review_status"` + // VehicleReviewNote 退回原因(O5):rejected 時給司機看,其餘為空。 + VehicleReviewNote string `gorm:"column:vehicle_review_note;not null;default:''" json:"vehicle_review_note"` + PasswordHash string `gorm:"column:password_hash;not null;default:''" json:"-"` + CreatedAt time.Time `gorm:"not null"` + UpdatedAt time.Time `gorm:"not null"` } -// HasVehicle 是否已填妥車輛資訊;未填者不得被派單/接單(O3 gate)。 +// HasVehicle 是否已填妥車輛資訊(O2)。是「填了沒」,不是「能不能接單」—— +// 後者要看審核(VehicleApproved)。App 用它決定要不要顯示強制設定頁。 func (d Driver) HasVehicle() bool { return d.VehicleType != "" && d.PlateNumber != "" } +// VehicleApproved 車輛是否已通過審核(O5 gate):唯有已核准才得被派單/接單。 +func (d Driver) VehicleApproved() bool { + return d.VehicleReviewStatus == "approved" +} + func (Driver) TableName() string { return "drivers" } diff --git a/internal/repository/repository.go b/internal/repository/repository.go index 016d431..42699a9 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -219,7 +219,11 @@ func (r *DriverRepository) UpdateVehicle(id int64, vehicleType, plateNumber stri err := r.db.Model(&model.Driver{}).Where("id = ?", id).Updates(map[string]interface{}{ "vehicle_type": vehicleType, "plate_number": plateNumber, - "updated_at": time.Now(), + // O5:填/改車輛一律回 pending 並清掉退回原因——原子地與車輛欄位一起寫, + // 避免「改了車卻還掛著上一次的 approved」讓未審核的新車直接能接單。 + "vehicle_review_status": constants.VehicleReviewPending, + "vehicle_review_note": "", + "updated_at": time.Now(), }).Error if isPlateConflict(err) { return ErrPlateTaken @@ -227,6 +231,15 @@ func (r *DriverRepository) UpdateVehicle(id int64, vehicleType, plateNumber stri return err } +// UpdateVehicleReview 後台審核結果(O5):approve→approved、reject→rejected+原因。 +func (r *DriverRepository) UpdateVehicleReview(id int64, status, note string) error { + return r.db.Model(&model.Driver{}).Where("id = ?", id).Updates(map[string]interface{}{ + "vehicle_review_status": status, + "vehicle_review_note": note, + "updated_at": time.Now(), + }).Error +} + // isPlateConflict 判斷是否為車牌唯一索引衝突。以 PgError 的 code + 約束名判斷, // 不比對錯誤訊息字串(訊息會隨 Postgres 版本/語系變動)。 func isPlateConflict(err error) bool { diff --git a/internal/service/admin_operations.go b/internal/service/admin_operations.go index 2c68d7c..bd00ab7 100644 --- a/internal/service/admin_operations.go +++ b/internal/service/admin_operations.go @@ -59,6 +59,32 @@ func (a *AdminOperations) SetDriverEnabled(ctx context.Context, driverID int64, return d, nil } +// ReviewDriverVehicle 後台審核司機車輛(O5)。approve→approved(清原因); +// reject→rejected+原因。只有「待審核」的司機能審——避免誤審已核准者或沒填車輛者。 +// 退回必須附原因(司機要知道哪裡不對才能修)。 +func (a *AdminOperations) ReviewDriverVehicle(driverID int64, approve bool, note string) (*model.Driver, error) { + d, err := a.drivers.FindByID(driverID) + if err != nil { + return nil, ErrNotFound + } + if d.VehicleReviewStatus != constants.VehicleReviewPending { + return nil, ErrVehicleNotPending + } + status, resultNote := constants.VehicleReviewApproved, "" + if !approve { + if note == "" { + return nil, ErrRejectNoteRequired + } + status, resultNote = constants.VehicleReviewRejected, note + } + if err := a.drivers.UpdateVehicleReview(driverID, status, resultNote); err != nil { + return nil, err + } + d.VehicleReviewStatus = status + d.VehicleReviewNote = resultNote + return d, nil +} + // CancelRideByAdmin 後台強制取消訂單(沿用 cancelActiveRide 核心,已上車不可取消)。 func (a *AdminOperations) CancelRideByAdmin(ctx context.Context, rideID int64) (string, error) { ride, err := a.dispatch.rides.GetByID(rideID) diff --git a/internal/service/admin_operations_test.go b/internal/service/admin_operations_test.go index 7f6b921..8e639e9 100644 --- a/internal/service/admin_operations_test.go +++ b/internal/service/admin_operations_test.go @@ -77,3 +77,94 @@ func TestSetDriverEnabled_載客中不可停用(t *testing.T) { t.Fatalf("載客中停用預期 ErrDriverOnTrip,得到 %v", err) } } + +// TestReviewDriverVehicle O5:admin 車輛審核 approve/reject/退回需原因/僅待審核可審。 +func TestReviewDriverVehicle(t *testing.T) { + db := newServiceTestDB(t) + drivers := repository.NewDriverRepository(db) + rides := repository.NewRideRepository(db) + customers := repository.NewCustomerRepository(db) + redisStore := newServiceTestRedis(t) + settings := NewDispatchSettings(3000, 5, 20, 1, 5) + dispatch := NewDispatchService(drivers, rides, customers, redisStore, lineclient.NewClient(""), nil, settings, nil) + ops := NewAdminOperations(drivers, dispatch, redisStore, settings) + reg := NewDriverRegistry(drivers) + + newPending := func(t *testing.T, lineID, plate string) int64 { + t.Helper() + d, err := drivers.FindOrCreate(lineID, "審核測試司機") + if err != nil { + t.Fatalf("建立司機失敗:%v", err) + } + if _, err := reg.SetVehicle(d.ID, constants.VehicleTypeSedan, plate); err != nil { + t.Fatalf("填車輛失敗:%v", err) + } + return d.ID + } + + t.Run("核准後可接單", func(t *testing.T) { + id := newPending(t, "U_rev_ok", "REV-0001") + got, err := ops.ReviewDriverVehicle(id, true, "") + if err != nil { + t.Fatalf("核准失敗:%v", err) + } + if got.VehicleReviewStatus != constants.VehicleReviewApproved || !got.VehicleApproved() { + t.Fatalf("核准後應 approved,得到 %q", got.VehicleReviewStatus) + } + }) + + t.Run("退回附原因,狀態為 rejected", func(t *testing.T) { + id := newPending(t, "U_rev_rej", "REV-0002") + got, err := ops.ReviewDriverVehicle(id, false, "車牌照片模糊") + if err != nil { + t.Fatalf("退回失敗:%v", err) + } + if got.VehicleReviewStatus != constants.VehicleReviewRejected { + t.Fatalf("退回後應 rejected,得到 %q", got.VehicleReviewStatus) + } + if got.VehicleReviewNote != "車牌照片模糊" { + t.Fatalf("退回原因應保留,得到 %q", got.VehicleReviewNote) + } + if got.VehicleApproved() { + t.Fatal("退回的司機不該能接單") + } + }) + + t.Run("退回未附原因回 ErrRejectNoteRequired", func(t *testing.T) { + id := newPending(t, "U_rev_noreason", "REV-0003") + if _, err := ops.ReviewDriverVehicle(id, false, ""); !errors.Is(err, ErrRejectNoteRequired) { + t.Fatalf("預期 ErrRejectNoteRequired,得到 %v", err) + } + }) + + t.Run("非待審核狀態不可審(已核准者重審回 ErrVehicleNotPending)", func(t *testing.T) { + id := newPending(t, "U_rev_twice", "REV-0004") + if _, err := ops.ReviewDriverVehicle(id, true, ""); err != nil { + t.Fatalf("首次核准失敗:%v", err) + } + if _, err := ops.ReviewDriverVehicle(id, true, ""); !errors.Is(err, ErrVehicleNotPending) { + t.Fatalf("已核准者重審預期 ErrVehicleNotPending,得到 %v", err) + } + }) + + t.Run("改車輛回 pending 後可再審", func(t *testing.T) { + id := newPending(t, "U_rev_rechange", "REV-0005") + if _, err := ops.ReviewDriverVehicle(id, true, ""); err != nil { + t.Fatalf("核准失敗:%v", err) + } + // 改車輛 → 回 pending(O5:任何改動都要重審)。 + if _, err := reg.SetVehicle(id, constants.VehicleTypeSUV, "REV-0006"); err != nil { + t.Fatalf("改車輛失敗:%v", err) + } + d, err := drivers.FindByID(id) + if err != nil { + t.Fatalf("重讀失敗:%v", err) + } + if d.VehicleReviewStatus != constants.VehicleReviewPending { + t.Fatalf("改車輛後應回 pending,得到 %q", d.VehicleReviewStatus) + } + if _, err := ops.ReviewDriverVehicle(id, true, ""); err != nil { + t.Fatalf("重審核准失敗:%v", err) + } + }) +} diff --git a/internal/service/dispatch.go b/internal/service/dispatch.go index 3b6d4f2..7769db9 100644 --- a/internal/service/dispatch.go +++ b/internal/service/dispatch.go @@ -144,8 +144,8 @@ func (s *DispatchService) dispatchRound(rideID int64, attempt int, offered map[i if err != nil || driver.Status != constants.DriverStatusIdle { continue } - // O3 gate:未填車種/車牌者不派單。既有司機一律如此,直到填完(拍板:無寬限期)。 - if !driver.HasVehicle() { + // O5 gate:車輛未通過審核者不派單(O3「有填」升級為「已審核」,拍板:無寬限期)。 + if !driver.VehicleApproved() { continue } // P3:乘客指定車種時只派同車種的司機。**不降級**(P4 拍板)——寵物車/無障礙車是硬需求, @@ -502,12 +502,16 @@ func (s *DispatchService) AcceptRide(ctx context.Context, rideID, driverID int64 s.redis.ReleaseRideLock(ctx, rideID) return "", err } - // O3 gate:未填車輛資訊者不得接單。派單已先過濾(dispatchRound),這裡擋的是 + // O5 gate:車輛未通過審核者不得接單。派單已先過濾(dispatchRound),這裡擋的是 // 直接打 API/LINE 的路徑——只靠 App 端跳轉擋不住。 - // 排在狀態檢查之前:這是接單資格問題,回「非待命狀態」會讓司機不知道要去填車輛。 - if !driver.HasVehicle() { + // 排在狀態檢查之前:這是接單資格問題,回「非待命狀態」會讓司機不知道原因。 + // 分「沒填」與「填了待審核」兩種訊息,司機才知道下一步該做什麼。 + if !driver.VehicleApproved() { s.redis.ReleaseRideLock(ctx, rideID) - return "", ErrDriverNoVehicle + if !driver.HasVehicle() { + return "", ErrDriverNoVehicle + } + return "", ErrDriverNotApproved } if driver.Status != constants.DriverStatusIdle { s.redis.ReleaseRideLock(ctx, rideID) diff --git a/internal/service/dispatch_required_vehicle_test.go b/internal/service/dispatch_required_vehicle_test.go index 110f24c..070a186 100644 --- a/internal/service/dispatch_required_vehicle_test.go +++ b/internal/service/dispatch_required_vehicle_test.go @@ -77,6 +77,10 @@ func newRequiredVehicleFixture(t *testing.T, prefix string, offerTimeoutSec int) if err := drivers.UpdateVehicle(d.ID, spec.vType, spec.plate); err != nil { t.Fatalf("設定車輛失敗:%v", err) } + // O5:填車輛只到 pending,這批測試司機都要核准才進得了派單候選。 + if err := drivers.UpdateVehicleReview(d.ID, constants.VehicleReviewApproved, ""); err != nil { + t.Fatalf("核准車輛失敗:%v", err) + } if err := redisStore.UpdateDriverLocation(ctx, d.ID, 25.031, 121.561); err != nil { t.Fatalf("寫入司機位置失敗:%v", err) } diff --git a/internal/service/dispatch_vehicle_gate_test.go b/internal/service/dispatch_vehicle_gate_test.go index 2dc4f1d..2100c9d 100644 --- a/internal/service/dispatch_vehicle_gate_test.go +++ b/internal/service/dispatch_vehicle_gate_test.go @@ -15,8 +15,9 @@ import ( type gateFixture struct { dispatch *DispatchService publisher *fakePublisher - withID int64 - withoutID int64 + withID int64 // 有車且已審核(可派單/可接單) + withoutID int64 // 沒填車輛 + pendingID int64 // 填了但待審核(O5 gate 擋下) rideID int64 driversRep *repository.DriverRepository ridesRep *repository.RideRepository @@ -41,14 +42,26 @@ func newGateFixture(t *testing.T, prefix string) *gateFixture { if err := drivers.UpdateVehicle(withVehicle.ID, constants.VehicleTypeSedan, "GATE-0001"); err != nil { t.Fatalf("設定車輛資訊失敗:%v", err) } + // O5:填車輛只到 pending,要 admin 核准才能接單——這台代表「已核准」。 + if err := drivers.UpdateVehicleReview(withVehicle.ID, constants.VehicleReviewApproved, ""); err != nil { + t.Fatalf("核准車輛失敗:%v", err) + } // 未填車輛:這正是既有司機在 O1 migration 後的狀態(兩欄皆為 '')。 withoutVehicle, err := drivers.FindOrCreate(prefix+"_without", "無車司機") if err != nil { t.Fatalf("建立司機失敗:%v", err) } + // O5:填了但待審核(UpdateVehicle 後 review_status=pending,未核准)。 + pendingVehicle, err := drivers.FindOrCreate(prefix+"_pending", "待審核司機") + if err != nil { + t.Fatalf("建立司機失敗:%v", err) + } + if err := drivers.UpdateVehicle(pendingVehicle.ID, constants.VehicleTypeSedan, "GATE-PEND"); err != nil { + t.Fatalf("設定車輛資訊失敗:%v", err) + } ctx := context.Background() - for _, id := range []int64{withVehicle.ID, withoutVehicle.ID} { + for _, id := range []int64{withVehicle.ID, withoutVehicle.ID, pendingVehicle.ID} { if err := redisStore.UpdateDriverLocation(ctx, id, 25.031, 121.561); err != nil { t.Fatalf("寫入司機位置失敗:%v", err) } @@ -65,15 +78,16 @@ func newGateFixture(t *testing.T, prefix string) *gateFixture { publisher: fp, withID: withVehicle.ID, withoutID: withoutVehicle.ID, + pendingID: pendingVehicle.ID, rideID: ride.ID, driversRep: drivers, ridesRep: rides, } } -// TestDispatch_未填車輛的司機不被派單 O3 gate 的派單側: -// 未填車種/車牌者不得進入候選(拍板:既有司機一律如此,無寬限期)。 -func TestDispatch_未填車輛的司機不被派單(t *testing.T) { +// TestDispatch_只派給已審核的司機 O5 gate 的派單側: +// 沒填車輛、或填了但待審核者都不得進入候選(只有已核准者被派)。 +func TestDispatch_只派給已審核的司機(t *testing.T) { f := newGateFixture(t, "U_gate_dispatch") if err := f.dispatch.Dispatch(context.Background(), f.rideID); err != nil { @@ -87,10 +101,34 @@ func TestDispatch_未填車輛的司機不被派單(t *testing.T) { } } if len(offeredTo) != 1 { - t.Fatalf("預期只派給 1 位(有車者),實際派給 %v", offeredTo) + t.Fatalf("預期只派給 1 位(已審核者),實際派給 %v", offeredTo) } if offeredTo[0] != f.withID { - t.Fatalf("預期派給有車司機 %d,實際派給 %d", f.withID, offeredTo[0]) + t.Fatalf("預期派給已審核司機 %d,實際派給 %d(未填與待審核都不該被派)", f.withID, offeredTo[0]) + } +} + +// TestAcceptRide_待審核回ErrDriverNotApproved O5 gate 的接單側: +// 填了車輛但尚未核准者接單 → ErrDriverNotApproved(與「沒填」的 NoVehicle 分開)。 +func TestAcceptRide_待審核回ErrDriverNotApproved(t *testing.T) { + f := newGateFixture(t, "U_gate_pending") + ctx := context.Background() + + _, err := f.dispatch.AcceptRide(ctx, f.rideID, f.pendingID, "") + if !errors.Is(err, ErrDriverNotApproved) { + t.Fatalf("預期 ErrDriverNotApproved,得到 %v", err) + } + // 被擋下不留副作用:訂單狀態不變。 + ride, err := f.ridesRep.GetByID(f.rideID) + if err != nil { + t.Fatalf("重讀訂單失敗:%v", err) + } + if ride.Status != constants.RideStatusRequested { + t.Fatalf("被擋下的接單不該改變訂單狀態,得到 %d", ride.Status) + } + // gate 早退仍須釋放搶單鎖——用「已審核司機仍能接」釘住。 + if _, err := f.dispatch.AcceptRide(ctx, f.rideID, f.withID, ""); err != nil { + t.Fatalf("已審核司機應能接單(gate 須釋放搶單鎖):%v", err) } } diff --git a/internal/service/driver_registry.go b/internal/service/driver_registry.go index c07d302..fe8f4f1 100644 --- a/internal/service/driver_registry.go +++ b/internal/service/driver_registry.go @@ -81,6 +81,9 @@ func (s *DriverRegistry) SetVehicle(driverID int64, vehicleType, plateNumber str } d.VehicleType = vehicleType d.PlateNumber = plate + // O5:填/改車輛回 pending 待審核(repo 已原子寫入,這裡同步回傳物件)。 + d.VehicleReviewStatus = constants.VehicleReviewPending + d.VehicleReviewNote = "" return d, nil } diff --git a/internal/service/driver_vehicle_test.go b/internal/service/driver_vehicle_test.go index 994194c..e28195c 100644 --- a/internal/service/driver_vehicle_test.go +++ b/internal/service/driver_vehicle_test.go @@ -41,7 +41,17 @@ func TestDriverSetVehicle(t *testing.T) { t.Fatalf("DB 內車牌應為正規化後的 ABC-1234,得到 %q", reread.PlateNumber) } if !reread.HasVehicle() { - t.Fatal("填妥車輛資訊後 HasVehicle() 應為 true(O3 gate 的條件)") + t.Fatal("填妥車輛資訊後 HasVehicle() 應為 true(O2 的條件)") + } + // O5:填/改車輛後進 pending,還不能接單(要 admin 核准)。 + if got.VehicleReviewStatus != "pending" { + t.Fatalf("設定車輛後應為 pending 待審核,得到 %q", got.VehicleReviewStatus) + } + if reread.VehicleReviewStatus != "pending" { + t.Fatalf("DB 內審核狀態應為 pending,得到 %q", reread.VehicleReviewStatus) + } + if reread.VehicleApproved() { + t.Fatal("待審核的司機 VehicleApproved() 應為 false(O5 gate)") } }) diff --git a/internal/service/errors.go b/internal/service/errors.go index 3a25fbb..4cc39b2 100644 --- a/internal/service/errors.go +++ b/internal/service/errors.go @@ -19,4 +19,11 @@ var ( // ErrDriverNoVehicle O3 gate:未填車輛資訊者不得接單。訊息會原樣回給司機 // (API 走 statusForErr → 409;LINE 走 webhook 的 err.Error() 文字回覆)。 ErrDriverNoVehicle = errors.New("請先填寫車種與車牌才能接單") + // ErrDriverNotApproved O5 gate:填了但尚未通過審核者不得接單。與 NoVehicle 分開, + // 讓司機知道是「等審核」而非「沒填」(App 端正常會走等待畫面,這是直打 API 的防線)。 + ErrDriverNotApproved = errors.New("車輛審核中,通過後才能接單") + // ErrVehicleNotPending O5:只有「待審核」的司機能被審核(避免誤審已核准或沒填車輛者)。 + ErrVehicleNotPending = errors.New("該司機車輛不在待審核狀態") + // ErrRejectNoteRequired O5:退回必須附原因(司機要知道哪裡不對)。 + ErrRejectNoteRequired = errors.New("退回車輛審核必須填寫原因") )