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.
95 lines
2.9 KiB
Dart
95 lines
2.9 KiB
Dart
import 'package:flutter/cupertino.dart';
|
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
|
import 'package:hl_lieferservice/feature/car_selection/repository/car_selection_repository.dart';
|
|
import 'package:hl_lieferservice/feature/cars/model/selection.dart';
|
|
import 'package:hl_lieferservice/model/car.dart';
|
|
|
|
import 'events.dart';
|
|
import 'state.dart';
|
|
|
|
class CarSelectBloc extends Bloc<CarSelectEvent, CarSelectState> {
|
|
final CarSelectionRepository repository;
|
|
|
|
CarSelectBloc({required this.repository}) : super(CarSelectInitial()) {
|
|
on<CarSelectLoad>(_load);
|
|
on<CarSelectConfirm>(_confirm);
|
|
on<CarSelectChange>(_change);
|
|
on<CarSelectCancel>(_cancel);
|
|
}
|
|
|
|
Future<void> _load(
|
|
CarSelectLoad event,
|
|
Emitter<CarSelectState> emit,
|
|
) async {
|
|
try {
|
|
emit(CarSelectLoading());
|
|
|
|
final CarSelection? stored = await repository.getSelection(event.userId);
|
|
final today = DateTime.now();
|
|
|
|
final bool validForToday =
|
|
stored != null &&
|
|
stored.selectedCarId != null &&
|
|
stored.selectedCarPlate != null &&
|
|
stored.date.year == today.year &&
|
|
stored.date.month == today.month &&
|
|
stored.date.day == today.day;
|
|
|
|
if (validForToday) {
|
|
emit(
|
|
CarSelectComplete(
|
|
selectedCar: Car(
|
|
id: stored.selectedCarId!,
|
|
// accountId/active fließen aus der lokalen Selection
|
|
// nicht durch — wir persistieren nur (id, plate) als
|
|
// UI-Pointer. Die Tour-Logik holt die vollständigen
|
|
// Car-Felder weiterhin aus dem CarsBloc-Listing.
|
|
accountId: 0,
|
|
plate: stored.selectedCarPlate!,
|
|
active: true,
|
|
),
|
|
),
|
|
);
|
|
} else {
|
|
emit(CarSelectRequired());
|
|
}
|
|
} catch (e, st) {
|
|
debugPrint('CarSelectBloc._load failed: $e');
|
|
debugPrint('Stacktrace: $st');
|
|
emit(CarSelectFailed());
|
|
}
|
|
}
|
|
|
|
void _change(CarSelectChange event, Emitter<CarSelectState> emit) {
|
|
final previousCar =
|
|
state is CarSelectComplete ? (state as CarSelectComplete).selectedCar : null;
|
|
emit(CarSelectRequired(previousCar: previousCar));
|
|
}
|
|
|
|
void _cancel(CarSelectCancel event, Emitter<CarSelectState> emit) {
|
|
// Restore without touching SharedPreferences — no tour reload needed.
|
|
emit(CarSelectComplete(selectedCar: event.car));
|
|
}
|
|
|
|
Future<void> _confirm(
|
|
CarSelectConfirm event,
|
|
Emitter<CarSelectState> emit,
|
|
) async {
|
|
try {
|
|
final today = DateTime.now();
|
|
await repository.saveSelection(
|
|
event.userId,
|
|
CarSelection(
|
|
date: today,
|
|
selectedCarId: event.car.id,
|
|
selectedCarPlate: event.car.plate,
|
|
),
|
|
);
|
|
emit(CarSelectComplete(selectedCar: event.car));
|
|
} catch (e, st) {
|
|
debugPrint('CarSelectBloc._confirm failed: $e');
|
|
debugPrint('Stacktrace: $st');
|
|
emit(CarSelectFailed());
|
|
}
|
|
}
|
|
} |