Phase C+D-1: Cars-Domain auf Rust-Backend umgestellt
Clean-Arch-Schichten für Cars: - lib/domain/entity/car.dart: UUID-id, accountId (Personalnummer), plate, active. Pendant zum Backend-Schema. - lib/domain/repository/cars_repository.dart: Port — listMine, create, update. Keine teamId/personalnummer-Parameter, der Account fließt serverseitig aus dem JWT. - lib/data/mapper/car_mapper.dart: API-DTO (built_value) → Domain. - lib/data/repository/cars_repository_impl.dart: konkrete Impl via generierter CarsApi (dio), mit DioException → CarsRepositoryException- Übersetzung. Feature-Cars-Refactoring: - CarsBloc nimmt jetzt die Domain-Repository-Schnittstelle. Events: CarLoad/CarAdd/CarEdit/CarDeactivate (statt CarDelete). Keine teamId-Parameter mehr. Kein authBloc-Bezug, Session-Expiry läuft über den globalen Provider-Stream. - CarsState sealed mit CarsInitial/Loading/LoadingFailed/Loaded. - Pages: car_management_page, car_management, car_card, car_fail_page, car_selection_page komplett auf die neue Entity und Event-Signaturen. - Alte lib/feature/cars/service/cars_service.dart und lib/feature/cars/repository/cars_repository.dart gelöscht. CarSelectBloc + Storage: - CarSelection.selectedCarId von int? auf String? umgestellt. - CarSelectionRepository persistiert die UUID jetzt als String; defensive Migration für noch vorhandene int-Werte (alte Pre-Migration-Installations) verwirft den Wert leise und erzwingt Neuauswahl. Konsequenz-Cleanup im Tour-Code (Phase-D-Vorbereitung): - Delivery.carId String? statt int?. - Tour.hasUndeliveredLoadedArticles / getFinishedDeliveries auf String carId. - _selectedCarId / int? carId / int selectedCarId in DeliveryOverview, LoadingCustomerPage/OverviewPage, Home, DeliverySelection/SortPage, DeliveryInfo/List, CustomSortDialog, SortableDeliveryList auf String umgestellt. - TourRepository ersetzt int.parse(carId)/int.tryParse-Zuweisungen direkt durch String. - lib/model/car.dart wird zum Re-Export der neuen Domain-Entity, damit Legacy-Imports während Phase-D-Übergang weiter compilieren. DI: - app.dart: CarsBloc bekommt CarsRepositoryImpl(locator<HolzleitnerApi>()) statt der alten CarsRepository(service: CarService()). Build (flutter build apk --debug) durch, flutter analyze ohne errors.
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
class Car {
|
||||
Car({required this.id, required this.plate});
|
||||
|
||||
int id;
|
||||
String plate;
|
||||
}
|
||||
/// Backward-compat-Re-Export: alle Aufrufer, die noch
|
||||
/// `package:hl_lieferservice/model/car.dart` importieren, bekommen
|
||||
/// jetzt die neue Domain-Entity. Mit Phase D wandert dieses File raus,
|
||||
/// sobald die letzten Legacy-Aufrufer (tour_service.dart,
|
||||
/// tour_event.dart) auf die echte Domain-Schicht umgestellt sind.
|
||||
export 'package:hl_lieferservice/domain/entity/car.dart';
|
||||
|
||||
@ -202,7 +202,10 @@ class Delivery implements Comparable<Delivery> {
|
||||
DeliveryState state;
|
||||
String? specialAgreements;
|
||||
PaymentOptions paymentOptions;
|
||||
int? carId;
|
||||
/// UUID des zugewiesenen Fahrzeugs (Backend-Konvention).
|
||||
/// War vor der Backend-Migration `int?` — die Konversion ist Teil
|
||||
/// der Phase-D-Vorbereitung.
|
||||
String? carId;
|
||||
List<Note> notes;
|
||||
List<ImageNote> images;
|
||||
double prepayment;
|
||||
@ -230,7 +233,7 @@ class Delivery implements Comparable<Delivery> {
|
||||
DeliveryState? state,
|
||||
String? specialAgreements,
|
||||
PaymentOptions? paymentOptions,
|
||||
int? carId,
|
||||
String? carId,
|
||||
List<Note>? notes,
|
||||
List<ImageNote>? images,
|
||||
double? prepayment,
|
||||
@ -371,7 +374,10 @@ class Delivery implements Comparable<Delivery> {
|
||||
),
|
||||
paymentAtDelivery: double.tryParse(dto.paymentAtDelivery) ?? 0.0,
|
||||
images: dto.images.map(ImageNote.fromDTO).toList(),
|
||||
carId: int.tryParse(dto.carId),
|
||||
// Legacy: ERPframe-Backend liefert int-Strings; im neuen Backend
|
||||
// sind das UUID-Strings. Beide werden hier transparent
|
||||
// weitergereicht.
|
||||
carId: dto.carId.isEmpty ? null : dto.carId,
|
||||
totalGrossValue: double.parse(
|
||||
dto.totalGrossValue == "" ? "0" : dto.totalGrossValue,
|
||||
),
|
||||
|
||||
@ -52,7 +52,7 @@ class Tour {
|
||||
|
||||
Map<String, List<Delivery>> deliveriesPerCar;
|
||||
|
||||
int getFinishedDeliveries(int carId) {
|
||||
int getFinishedDeliveries(String carId) {
|
||||
return deliveries
|
||||
.where((delivery) => delivery.carId == carId)
|
||||
.where((delivery) => delivery.state == DeliveryState.finished)
|
||||
@ -64,7 +64,7 @@ class Tour {
|
||||
/// that has not been finished yet. Scannable articles count when their
|
||||
/// effective scanned amount (scanned minus removed) is positive; non-scannable
|
||||
/// articles count when their target amount is greater than zero.
|
||||
bool hasUndeliveredLoadedArticles(int carId) {
|
||||
bool hasUndeliveredLoadedArticles(String carId) {
|
||||
return deliveries.any((delivery) {
|
||||
if (delivery.carId != carId) return false;
|
||||
if (delivery.state == DeliveryState.finished) return false;
|
||||
|
||||
Reference in New Issue
Block a user