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
9 changes: 9 additions & 0 deletions internal/service/tracking.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,15 @@ func (s *TrackingService) PickUp(ctx context.Context, rideID, driverID int64) (*
Type: events.TypeRidePickedUp,
RideID: rideID,
})
// 也推給司機——**多裝置/跨管道**:這個標記可能來自他的第二台裝置或 LINE。
// 沒有這則事件,另一台會停在「前往上車點」階段、按鈕還是「乘客已上車」,
// 按下去只會被後端拒絕(狀態已是 PickedUp),而「放棄此單」這時也已不可用。
// 動作來源那台會多收到一則自己造成的事件(它已經自己切好階段了)——
// 一次無害的重複,遠比兩台顯示不同階段便宜。與 ride.stop_updated(#53)同一原則。
s.publish(events.Recipient{Role: events.RoleDriver, ID: driverID}, events.Event{
Type: events.TypeRidePickedUp,
RideID: rideID,
})
customerLineID, _ := s.rides.GetCustomerLineUserID(rideID)
if customerLineID != "" {
_ = s.line.PushText(ctx, customerLineID, "行程開始,祝您旅途愉快")
Expand Down
55 changes: 53 additions & 2 deletions internal/service/tracking_pickup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,23 @@ import (
"time"

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

// pickUpFixture 建好「已接單」的訂單,回傳 tracking 服務、訂單與司機 id。
func pickUpFixture(t *testing.T, dropoff *model.GeoPoint, dropoffAddress string) (*TrackingService, int64, int64) {
t.Helper()
svc, rideID, driverID, _ := pickUpFixtureWithPublisher(t, dropoff, dropoffAddress)
return svc, rideID, driverID
}

// pickUpFixtureWithPublisher 同上,但額外回傳注入的 fakePublisher 供事件斷言。
func pickUpFixtureWithPublisher(
t *testing.T, dropoff *model.GeoPoint, dropoffAddress string,
) (*TrackingService, int64, int64, *fakePublisher) {
t.Helper()
db := newServiceTestDB(t)
redis := newServiceTestRedis(t)
Expand Down Expand Up @@ -57,11 +67,12 @@ func pickUpFixture(t *testing.T, dropoff *model.GeoPoint, dropoffAddress string)
t.Fatalf("接單失敗:%v", err)
}

fp := &fakePublisher{}
svc := NewTrackingService(
drivers, rides, tracks, redis, lineclient.NewClient(""),
nil, 0, 0, nil,
nil, 0, 0, fp,
)
return svc, ride.ID, driver.ID
return svc, ride.ID, driver.ID, fp
}

func TestPickUp_回傳目的地座標(t *testing.T) {
Expand Down Expand Up @@ -107,3 +118,43 @@ func TestPickUp_非該訂單司機被拒(t *testing.T) {
t.Fatalf("預期 ErrForbidden,得到 %v", err)
}
}

// TestPickUp_也推給司機 「乘客已上車」的事件先前只推乘客。
//
// 多裝置/跨管道下這會讓司機的另一台裝置停在「前往上車點」階段——按鈕還是
// 「乘客已上車」,按下去只會被後端拒絕(狀態已是 PickedUp),「放棄此單」這時也已不可用。
// App 端本來就有 ride.picked_up 的處理(切到 onTrip 階段),缺的一直是這則事件。
// 與 ride.stop_updated(#53)同一原則。
func TestPickUp_也推給司機(t *testing.T) {
svc, rideID, driverID, fp := pickUpFixtureWithPublisher(t, nil, "")

if _, err := svc.PickUp(context.Background(), rideID, driverID); err != nil {
t.Fatalf("上車標記應成功:%v", err)
}

var toCustomer, toDriver *events.Event
for i := range fp.recv {
r := fp.recv[i]
if r.Ev.Type != events.TypeRidePickedUp {
continue
}
switch r.Rec.Role {
case events.RoleCustomer:
toCustomer = &fp.recv[i].Ev
case events.RoleDriver:
if r.Rec.ID == driverID {
toDriver = &fp.recv[i].Ev
}
}
}
if toCustomer == nil {
t.Fatalf("乘客沒收到 %s;實際發佈:%+v", events.TypeRidePickedUp, fp.recv)
}
if toDriver == nil {
t.Fatalf("**司機**沒收到 %s——他的另一台裝置會停在前往上車點階段;實際發佈:%+v",
events.TypeRidePickedUp, fp.recv)
}
if toDriver.RideID != rideID {
t.Fatalf("司機收到的事件 ride_id 應為 %d,得到 %d", rideID, toDriver.RideID)
}
}
Loading