From 05751efeeb7789ccbe8d8b605d8e3814b7d240f2 Mon Sep 17 00:00:00 2001 From: awei Date: Wed, 29 Jul 2026 18:21:44 +0800 Subject: [PATCH] =?UTF-8?q?fix(driver):=20=E8=A8=82=E5=96=AE=E8=A2=AB?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=99=82=E8=AA=AA=E6=98=8E=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=AE=93=E8=A1=8C=E7=A8=8B=E5=8D=A1=E7=84=A1?= =?UTF-8?q?=E8=81=B2=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 搭配 dispatch 的修正(乘客取消已接訂單時補推 ride.cancelled 給司機)。 App 端本來就有這則事件的處理,但只是把卡片清掉——司機正開往上車點, 畫面突然少一張卡只會讓他以為 App 壞了。 只在「取消」時說明:完成是他自己按的,不必再講;他自己放棄走的是 ride.redispatched(且後端不推給司機),所以收到 ride.cancelled 一定是別人取消的。 測試:新增 3 案(取消要說明/完成不說/別張單不動)。 Co-Authored-By: Claude Opus 5 --- lib/driver/driver_controller.dart | 8 ++ test/driver_ride_cancelled_notice_test.dart | 99 +++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 test/driver_ride_cancelled_notice_test.dart diff --git a/lib/driver/driver_controller.dart b/lib/driver/driver_controller.dart index f85be42..6f65c64 100644 --- a/lib/driver/driver_controller.dart +++ b/lib/driver/driver_controller.dart @@ -902,6 +902,14 @@ class DriverController extends ChangeNotifier { if (event.rideId != null && (_activeRide?.rideId == event.rideId || _pendingOffer?.rideId == event.rideId)) { + // 取消的行程卡**不能無聲消失**:司機正開往上車點,畫面突然少一張卡 + // 只會讓他以為 App 壞了。這則事件只有「別人取消」才會送到司機這邊 + // (他自己放棄走的是 ride.redispatched,且不推給司機),所以說得出原因。 + // 完成不必說——那是他自己按的。 + if (event.type == FleetEventTypes.rideCancelled && + _activeRide?.rideId == event.rideId) { + _setError('這筆訂單已被取消,不用再前往上車點'); + } if (_activeRide?.rideId == event.rideId) _activeRide = null; if (_pendingOffer?.rideId == event.rideId) _pendingOffer = null; notifyListeners(); diff --git a/test/driver_ride_cancelled_notice_test.dart b/test/driver_ride_cancelled_notice_test.dart new file mode 100644 index 0000000..84c8370 --- /dev/null +++ b/test/driver_ride_cancelled_notice_test.dart @@ -0,0 +1,99 @@ +import 'package:dio/dio.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:line_fleet_app/core/api/fleet_api_client.dart'; +import 'package:line_fleet_app/core/config/app_config.dart'; +import 'package:line_fleet_app/core/models/models.dart'; +import 'package:line_fleet_app/core/storage/token_storage.dart'; +import 'package:line_fleet_app/core/ws/fleet_ws_client.dart'; +import 'package:line_fleet_app/driver/driver_controller.dart'; + +/// 乘客(或客服)取消已接的訂單時,司機端的行程卡要消失**並說明原因**。 +/// +/// 後端先前只推 LINE,App 司機一則事件都收不到(dispatch 的 `cancelActiveRide` +/// 只有 `line.PushText`)——司機端**沒有輪詢**,行程卡會一直留著, +/// 他會開去接一個已經取消的乘客。後端補推 `ride.cancelled` 給司機後, +/// App 這側要把「卡片消失」講清楚,否則畫面突然少一張卡只會讓他以為 App 壞了。 +void main() { + group('司機端收到 ride.cancelled', () { + test('進行中的行程被取消 → 收掉行程卡並說明原因', () async { + final api = _Api()..restoreRide = _ride(11); + final ctrl = await _loggedIn(api); + addTearDown(ctrl.dispose); + expect(ctrl.activeRide?.rideId, 11, reason: '前置:手上有一張已接的單'); + + ctrl.handleWsEventForTest( + FleetWsEvent(type: FleetEventTypes.rideCancelled, rideId: 11), + ); + + expect(ctrl.activeRide, isNull); + expect(ctrl.error, '這筆訂單已被取消,不用再前往上車點'); + }); + + test('完成不報訊息——那是司機自己按的', () async { + final api = _Api()..restoreRide = _ride(12); + final ctrl = await _loggedIn(api); + addTearDown(ctrl.dispose); + + ctrl.handleWsEventForTest( + FleetWsEvent(type: FleetEventTypes.rideCompleted, rideId: 12), + ); + + expect(ctrl.activeRide, isNull); + expect(ctrl.error, isNull); + }); + + test('別張單的取消不動自己的行程卡', () async { + final api = _Api()..restoreRide = _ride(13); + final ctrl = await _loggedIn(api); + addTearDown(ctrl.dispose); + + ctrl.handleWsEventForTest( + FleetWsEvent(type: FleetEventTypes.rideCancelled, rideId: 99), + ); + + expect(ctrl.activeRide?.rideId, 13); + expect(ctrl.error, isNull); + }); + }); +} + +Future _loggedIn(_Api api) async { + final ctrl = DriverController( + storage: MemoryDriverAuthStore() + ..save(const AuthSession(driverId: 7, token: 'tok')), + api: api, + wsFactory: FleetWsClient.silent, + ); + await ctrl.init(); + return ctrl; +} + +ActiveRide _ride(int id) => ActiveRide( + rideId: id, + address: '台北101', + phase: DriverRidePhase.enRouteToPickup, + ); + +class _Api extends FleetApiClient { + _Api() : super(dio: Dio(BaseOptions(baseUrl: 'http://test.invalid/api'))); + + ActiveRide? restoreRide; + + @override + void setToken(String? token) {} + + @override + Future activeRide() async => restoreRide; + + @override + Future> fetchLostItems() async => const []; + + @override + Future fetchVehicle() async => const DriverVehicle( + vehicleType: 'sedan', + plateNumber: 'ABC-1234', + hasVehicle: true, + reviewStatus: VehicleReviewStatus.approved, + canAccept: true, + ); +}