Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions internal/events/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ const (
// TypeRideStopUpdated 司機標記到達/跳過某一站(N7)。payload 帶**整趟 stops**,
// 收到整批覆蓋即可,不必自己套用差異——乘客端據此顯示「走到第幾站」。
TypeRideStopUpdated = "ride.stop_updated"

// TypeRideTaken 這單已被別人接走——**只送給本輪收過 offer 但沒接到的司機**。
// 他們的手機上留著一張全螢幕接單卡,先前沒有任何事件收得掉它:
// ride.accepted 只送給接到的那位,逾時取消也只通知乘客。
// 不能用 ride.cancelled 代替——訂單並沒有取消,只是不是他的了。
TypeRideTaken = "ride.taken"
)

// 審計 actor_role
Expand Down
35 changes: 35 additions & 0 deletions internal/redis/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,41 @@ func (s *Store) ClearRejected(ctx context.Context, rideID int64) {
s.client.Del(ctx, fmt.Sprintf("ride:%d:rejected", rideID))
}

// OfferRideDriver 記錄「本單已推給這位司機」。
//
// 一輪派單會**同時**推給半徑內每一位符合條件的司機,只有一位搶得到;
// 其餘的人手機上留著一張全螢幕接單卡,而後端先前**沒有任何方式**通知他們這單沒了
// (`offered` 只是 dispatchRound 遞迴中的記憶體 map,接單/取消流程都拿不到)。
// 這個集合讓「已被接走/已取消」時能把那些卡片收掉。
func (s *Store) OfferRideDriver(ctx context.Context, rideID, driverID int64) error {
key := fmt.Sprintf("ride:%d:offered", rideID)
if err := s.client.SAdd(ctx, key, driverID).Err(); err != nil {
return err
}
// 與拒接集合同一個 TTL:派單輪次全部走完也遠短於 30 分鐘,過期即自然清掉。
return s.client.Expire(ctx, key, 30*time.Minute).Err()
}

// OfferedDrivers 取得本單收過派單邀請的司機集合。
func (s *Store) OfferedDrivers(ctx context.Context, rideID int64) []int64 {
vals, err := s.client.SMembers(ctx, fmt.Sprintf("ride:%d:offered", rideID)).Result()
if err != nil {
return nil
}
ids := make([]int64, 0, len(vals))
for _, v := range vals {
if id, e := strconv.ParseInt(v, 10, 64); e == nil {
ids = append(ids, id)
}
}
return ids
}

// ClearOffered 清掉本單的已派送集合(接單/取消後)。
func (s *Store) ClearOffered(ctx context.Context, rideID int64) {
s.client.Del(ctx, fmt.Sprintf("ride:%d:offered", rideID))
}

// GetDriverLocation 取得司機最新位置
func (s *Store) GetDriverLocation(ctx context.Context, driverID int64) (lat, lng float64, ok bool) {
idStr := strconv.FormatInt(driverID, 10)
Expand Down
34 changes: 34 additions & 0 deletions internal/service/dispatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,39 @@ func (s *DispatchService) pushOffer(ctx context.Context, driver *model.Driver, r
rideOfferPushData(ride, ride.PickupAddress, etaSec, distM),
)
}
// 記錄「這單推給過他」——接單/取消時要靠它把沒搶到的人手機上的接單卡收掉。
// 失敗只記 log:漏記一位的後果是他的卡片留著(=修正前的行為),不該擋住派單。
if err := s.redis.OfferRideDriver(ctx, ride.ID, driver.ID); err != nil {
log.Error().Err(err).Int64("ride_id", ride.ID).Int64("driver_id", driver.ID).
Msg("記錄派單對象失敗(接單後將無法收掉他的接單卡)")
}
s.publish(events.Recipient{Role: events.RoleDriver, ID: driver.ID}, events.Event{
Type: events.TypeRideAssigned,
RideID: ride.ID,
Payload: rideAssignedPayload(ride, ride.PickupAddress, etaSec, distM, s.rideStops(ride.ID)),
})
}

// notifyOfferedDrivers 通知「收過本單 offer」的司機,並清掉該集合。
//
// exceptID 為 0 時通知全部(取消情境);否則跳過該司機(接單者自己已經收到 ride.accepted)。
// 沒有這一步,沒搶到的司機手機上那張全螢幕接單卡**沒有任何東西收得掉**——
// 他要自己按下去、拿到「手慢了,這單已被其他司機接走」才會消失。
func (s *DispatchService) notifyOfferedDrivers(
ctx context.Context, rideID int64, eventType string, exceptID int64,
) {
for _, id := range s.redis.OfferedDrivers(ctx, rideID) {
if id == exceptID {
continue
}
s.publish(events.Recipient{Role: events.RoleDriver, ID: id}, events.Event{
Type: eventType,
RideID: rideID,
})
}
s.redis.ClearOffered(ctx, rideID)
}

// giveUpIfUnaccepted 逾時仍無人接單 → 取消訂單並通知客戶(避免永久停在 ASSIGNED)
func (s *DispatchService) giveUpIfUnaccepted(rideID int64) {
ctx := context.Background()
Expand All @@ -330,6 +356,8 @@ func (s *DispatchService) giveUpIfUnaccepted(rideID int64) {
s.audit.record(rideID, statusPtr(from), constants.RideStatusCancelled,
events.TypeRideCancelled, events.ActorSystem, nil, "dispatch_timeout")
s.redis.ClearRejected(ctx, rideID)
// 逾時取消先前**只通知乘客**,收過 offer 的司機卡片一樣留著(T3)。
s.notifyOfferedDrivers(ctx, rideID, events.TypeRideCancelled, 0)
log.Warn().Int64("ride_id", rideID).Msg("逾時無人接單,訂單自動取消")

reason, text, payload := giveUpCancelInfo(ride)
Expand Down Expand Up @@ -418,6 +446,9 @@ func (s *DispatchService) cancelActiveRide(
s.audit.record(ride.ID, statusPtr(from), constants.RideStatusCancelled,
events.TypeRideCancelled, actorRole, actorID, note)
s.releaseAndReset(ctx, ride.ID, ride.DriverID)
// 還沒有人接單就被取消時(status=Assigned),收過 offer 的司機全都留著卡片;
// 已接單的情境下這個集合通常已在接單時清空,這裡再呼叫一次是冪等的。
s.notifyOfferedDrivers(ctx, ride.ID, events.TypeRideCancelled, 0)
log.Info().Int64("ride_id", ride.ID).Str("actor", actorRole).Msg("訂單已取消")
s.publish(events.Recipient{Role: events.RoleCustomer, ID: ride.CustomerID}, events.Event{
Type: events.TypeRideCancelled,
Expand Down Expand Up @@ -574,6 +605,9 @@ func (s *DispatchService) AcceptRide(ctx context.Context, rideID, driverID int64
RideID: rideID,
Payload: rideAcceptedCustomerPayload(driver, etaSec),
})
// 沒搶到的司機:把他們的接單卡收掉(T2)。必須在接單者的 ride.accepted 之外另送,
// 因為 ride.accepted 的收件人是「接到的那位」。
s.notifyOfferedDrivers(ctx, rideID, events.TypeRideTaken, driverID)
s.publish(events.Recipient{Role: events.RoleDriver, ID: driverID}, events.Event{
Type: events.TypeRideAccepted,
RideID: rideID,
Expand Down
125 changes: 125 additions & 0 deletions internal/service/dispatch_offer_taken_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
package service

import (
"context"
"testing"

"line-fleet-dispatch/internal/constants"
"line-fleet-dispatch/internal/events"
lineclient "line-fleet-dispatch/internal/line"
"line-fleet-dispatch/internal/repository"
)

// 同一張單會**同時**推給半徑內每一位待命司機,只有一位搶得到。
// 先前沒搶到的人手機上留著一張全螢幕接單卡,而**沒有任何事件收得掉它**——
// ride.accepted 只送給接到的那位,逾時取消也只通知乘客。
// 他得自己按下去、拿到「手慢了,這單已被其他司機接走」才會消失。
//
// 這組測試釘住補送的兩則:接單 → ride.taken 給沒接到的人;取消 → ride.cancelled 給所有人。

func TestAcceptRide_通知沒搶到的司機(t *testing.T) {
db := newServiceTestDB(t)
redisStore := newServiceTestRedis(t)
customers := repository.NewCustomerRepository(db)
drivers := repository.NewDriverRepository(db)
rides := repository.NewRideRepository(db)
fp := &fakePublisher{}
dispatch := NewDispatchService(drivers, rides, customers, redisStore,
lineclient.NewClient(""), NewETAService(nil), NewDispatchSettings(3000, 5, 20, 1, 5), fp)

cust, err := customers.FindOrCreateByLineUserID("U_taken_cust", "乘客")
if err != nil {
t.Fatalf("建立乘客失敗:%v", err)
}
winner, err := drivers.FindOrCreate("U_taken_win", "搶到的司機")
if err != nil {
t.Fatalf("建立司機失敗:%v", err)
}
loser, err := drivers.FindOrCreate("U_taken_lose", "沒搶到的司機")
if err != nil {
t.Fatalf("建立司機失敗:%v", err)
}
if err := drivers.UpdateStatus(winner.ID, constants.DriverStatusIdle); err != nil {
t.Fatalf("設定司機狀態失敗:%v", err)
}
// O5 gate:沒有已核准的車輛就接不了單。
if err := drivers.UpdateVehicle(winner.ID, constants.VehicleTypeSedan, "TAKEN-01"); err != nil {
t.Fatalf("設定車輛失敗:%v", err)
}
if err := drivers.UpdateVehicleReview(winner.ID, constants.VehicleReviewApproved, ""); err != nil {
t.Fatalf("核准車輛失敗:%v", err)
}
ride := newTestRide(t, rides, cust.ID, constants.RideStatusAssigned)

ctx := context.Background()
// 模擬本輪派單:兩位都收到了 offer
for _, id := range []int64{winner.ID, loser.ID} {
if err := redisStore.OfferRideDriver(ctx, ride.ID, id); err != nil {
t.Fatalf("記錄派單對象失敗:%v", err)
}
}

if _, err := dispatch.AcceptRide(ctx, ride.ID, winner.ID, ""); err != nil {
t.Fatalf("接單應成功:%v", err)
}

var takenTo []int64
for _, r := range fp.recv {
if r.Ev.Type == events.TypeRideTaken && r.Rec.Role == events.RoleDriver {
takenTo = append(takenTo, r.Rec.ID)
}
}
if len(takenTo) != 1 || takenTo[0] != loser.ID {
t.Fatalf("ride.taken 應只送給沒搶到的司機 %d,實際送給 %v(全部事件:%+v)",
loser.ID, takenTo, fp.recv)
}
// 接到的那位收的是 ride.accepted,不該再收一則「被別人接走」
for _, r := range fp.recv {
if r.Ev.Type == events.TypeRideTaken && r.Rec.ID == winner.ID {
t.Fatalf("接到單的司機不該收到 ride.taken:%+v", r)
}
}
// 集合用過即清,重派時不會誤發給舊名單
if left := redisStore.OfferedDrivers(ctx, ride.ID); len(left) != 0 {
t.Fatalf("接單後 offered 集合應清空,仍有 %v", left)
}
}

func TestGiveUp逾時取消_通知收過offer的司機(t *testing.T) {
db := newServiceTestDB(t)
redisStore := newServiceTestRedis(t)
customers := repository.NewCustomerRepository(db)
drivers := repository.NewDriverRepository(db)
rides := repository.NewRideRepository(db)
fp := &fakePublisher{}
dispatch := NewDispatchService(drivers, rides, customers, redisStore,
lineclient.NewClient(""), NewETAService(nil), NewDispatchSettings(3000, 5, 20, 1, 5), fp)

cust, err := customers.FindOrCreateByLineUserID("U_giveup_cust", "乘客")
if err != nil {
t.Fatalf("建立乘客失敗:%v", err)
}
drv, err := drivers.FindOrCreate("U_giveup_drv", "收到邀請的司機")
if err != nil {
t.Fatalf("建立司機失敗:%v", err)
}
ride := newTestRide(t, rides, cust.ID, constants.RideStatusAssigned)

ctx := context.Background()
if err := redisStore.OfferRideDriver(ctx, ride.ID, drv.ID); err != nil {
t.Fatalf("記錄派單對象失敗:%v", err)
}

dispatch.giveUpIfUnaccepted(ride.ID)

var gotDriver bool
for _, r := range fp.recv {
if r.Ev.Type == events.TypeRideCancelled && r.Rec.Role == events.RoleDriver && r.Rec.ID == drv.ID {
gotDriver = true
}
}
if !gotDriver {
t.Fatalf("逾時取消時收過 offer 的司機也要收到 %s,否則接單卡留著;實際:%+v",
events.TypeRideCancelled, fp.recv)
}
}
Loading