diff --git a/assets/images/flower_logo.png b/assets/images/flower_logo.png new file mode 100644 index 0000000..52e92c5 Binary files /dev/null and b/assets/images/flower_logo.png differ diff --git a/assets/images/whatsapp.png b/assets/images/whatsapp.png new file mode 100644 index 0000000..a45d019 Binary files /dev/null and b/assets/images/whatsapp.png differ diff --git a/assets/translations/ar.json b/assets/translations/ar.json index d9cc878..2f3df98 100644 --- a/assets/translations/ar.json +++ b/assets/translations/ar.json @@ -179,17 +179,15 @@ "failed_to_save_address": "فشل حفظ العنوان", "addNewAddress": "إضافة عنوان جديد", "savedAddress": "تم حفظ العنوان", - "recipient_phone": "Recipient phone", - "english": "English", - "sortBy": "Sort By", - "lowestPrice": "Lowest Price", - "highestPrice": "Highest Price", - "newest": "Newest", - "oldest": "Oldest", - "discount": "Discounts", - "filter": "Filter", - "active": "Active", - "completed": "Completed", + "sortBy": "ترتيب حسب", + "lowestPrice": "أدنى سعر", + "highestPrice": "أعلى سعر", + "newest": "الأحدث", + "oldest": "الأقدم", + "discount": "الخصومات", + "filter": "فلتر", + "active": "نشط", + "completed": "مكتمل", "no_orders_found": "لا توجد طلبات", "track_order": "تتبع الطلب", "order_number": "رقم الطلب#", @@ -241,11 +239,25 @@ "editDriverProfile": "تعديل الملف الشخصي", "editVehicle": "تعديل المركبة", "cannotBeSame": "كلمة المرور الجديدة لا يجب أن تطابق الحالية", - "driverOrderTitle": "طلب زهور", + "orderDetails": "بيانات الطلب", + "status": "الحالة", + "orderId": "رقم الطلب : ", "pickupAddress": "عنوان الاستلام", + "floweryStore": "متجر فلوري", + "userAddress": "عنوان المستخدم", + "arrivedAtPickupPoint": "وصلت الى نقطة الالتقاء", + "startDelivery": "بدء التوصيل", + "arriverAtDestination": "وصلت إلى نقطة التسليم", + "confirmDelivery": "تأكيد التسليم", + "deliveryConfirmed": "تم تأكيد التسليم", + "orderCompleted": "تم إكمال الطلب", + "accepted": "مقبول", + "pickedUp": "تم الاستلام", + "outForDelivery": "في الطريق للتسليم", + "arrived": "وصلت", + "driverOrderTitle": "طلب زهور", "unknownStore": "متجر غير معروف", "noAddress": "لا يوجد عنوان", - "userAddress": "عنوان المستخدم", "accept": "قبول", "reject": "رفض", "noPendingOrders": "لا توجد طلبات معلقة", diff --git a/assets/translations/en.json b/assets/translations/en.json index 14068c5..13bc5ba 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -182,7 +182,6 @@ "addNewAddress": "Add New Address", "savedAddress": "Saved Address", "recipient_phone": "Recipient phone", - "english": "English", "sortBy": "Sort By", "lowestPrice": "Lowest Price", "highestPrice": "Highest Price", @@ -243,11 +242,25 @@ "editDriverProfile": "Edit Driver Profile", "editVehicle": "Edit Vehicle", "cannotBeSame": "New password cann't be same", - "driverOrderTitle": "Flower order", + "orderDetails": "Order details", + "status": "Status : ", + "orderId": "Order ID : # ", "pickupAddress": "Pickup address", + "floweryStore": "Flowery Store", + "userAddress": "User address", + "arrivedAtPickupPoint": "Arrived at pickup point", + "startDelivery": "Start delivery", + "arriverAtDestination": "Arrived at destination", + "confirmDelivery": "Confirm delivery", + "deliveryConfirmed": "Delivery confirmed", + "orderCompleted": "Order completed", + "accepted": "Accepted", + "pickedUp": "Picked up", + "outForDelivery": "Out for delivery", + "arrived": "Arrived", + "driverOrderTitle": "Flower order", "unknownStore": "Unknown Store", "noAddress": "No address", - "userAddress": "User address", "accept": "Accept", "reject": "Reject", "noPendingOrders": "No pending orders", diff --git a/lib/app/config/di/di.config.dart b/lib/app/config/di/di.config.dart index 7d56c72..cc849cb 100644 --- a/lib/app/config/di/di.config.dart +++ b/lib/app/config/di/di.config.dart @@ -53,6 +53,18 @@ import '../../../features/auth/presentation/reset_password/manager/reset_passwor as _i378; import '../../../features/auth/presentation/verify_reset/manger/cubit/verify_reset_cubit.dart' as _i466; +import '../../../features/driver_orders_details/api/datasource/order_details_remote_datasource_impl.dart' + as _i860; +import '../../../features/driver_orders_details/data/datasource/order_details_remote_datasource.dart' + as _i114; +import '../../../features/driver_orders_details/data/repos/order_details_repo_impl.dart' + as _i55; +import '../../../features/driver_orders_details/domain/repos/order_details_repo.dart' + as _i313; +import '../../../features/driver_orders_details/domain/usecases/get_order_details_usecase.dart' + as _i1045; +import '../../../features/driver_orders_details/presentation/manager/order_details_cubit.dart' + as _i375; import '../../../features/home/api/driverOrderDataS_imp.dart' as _i495; import '../../../features/home/data/datascourse/driverOrderDatascource.dart' as _i743; @@ -96,6 +108,7 @@ import '../../../features/profile/presentation/managers/profile_cubit.dart' as _i603; import '../../core/api_manger/api_client.dart' as _i890; import '../auth_storage/auth_storage.dart' as _i603; +import '../network/firebase_module.dart' as _i383; import '../network/network_module.dart' as _i200; extension GetItInjectableX on _i174.GetIt { @@ -105,9 +118,11 @@ extension GetItInjectableX on _i174.GetIt { _i526.EnvironmentFilter? environmentFilter, }) { final gh = _i526.GetItHelper(this, environment, environmentFilter); + final firebaseModule = _$FirebaseModule(); final networkModule = _$NetworkModule(); gh.factory<_i959.AppSectionCubit>(() => _i959.AppSectionCubit()); gh.lazySingleton<_i603.AuthStorage>(() => _i603.AuthStorage()); + gh.lazySingleton<_i974.FirebaseFirestore>(() => firebaseModule.firestore); gh.lazySingleton<_i783.CountryLocalDataSource>( () => _i783.CountryLocalDataSourceImpl(), ); @@ -131,18 +146,29 @@ extension GetItInjectableX on _i174.GetIt { gh.lazySingleton<_i697.ProfileLocalDataSource>( () => _i495.ProfileLocalDataSourceImpl(gh<_i603.AuthStorage>()), ); + gh.factory<_i114.OrderDetailsRemoteDatasource>( + () => _i860.OrderDetailsRemoteDatasourceImpl( + firestore: gh<_i974.FirebaseFirestore>(), + ), + ); gh.lazySingleton<_i890.ApiClient>( () => networkModule.authApiClient(gh<_i361.Dio>()), ); gh.factory<_i466.MyOrdersRemoteDataSource>( () => _i583.MyOrdersRemoteDataSourceImp(gh<_i890.ApiClient>()), ); + gh.factory<_i313.OrderDetailsRepo>( + () => _i55.OrderDetailsRepoImpl(gh<_i114.OrderDetailsRemoteDatasource>()), + ); gh.factory<_i919.MyOrdersRepo>( () => _i754.MyOrdersRepoImpl(gh<_i466.MyOrdersRemoteDataSource>()), ); gh.factory<_i335.GetOrderUseCase>( () => _i335.GetOrderUseCase(gh<_i919.MyOrdersRepo>()), ); + gh.factory<_i1045.GetOrderDetailsUsecase>( + () => _i1045.GetOrderDetailsUsecase(repo: gh<_i313.OrderDetailsRepo>()), + ); gh.factory<_i743.DriverOrderDataSource>( () => _i495.DriverOrderDataSourceImpl(gh<_i890.ApiClient>()), ); @@ -155,6 +181,9 @@ extension GetItInjectableX on _i174.GetIt { gh.factory<_i712.AuthRepo>( () => _i566.AuthRepoImpl(gh<_i708.AuthRemoteDataSource>()), ); + gh.factory<_i375.OrderDetailsCubit>( + () => _i375.OrderDetailsCubit(gh<_i1045.GetOrderDetailsUsecase>()), + ); gh.factory<_i991.ChangePasswordUsecase>( () => _i991.ChangePasswordUsecase(gh<_i712.AuthRepo>()), ); @@ -267,4 +296,6 @@ extension GetItInjectableX on _i174.GetIt { } } +class _$FirebaseModule extends _i383.FirebaseModule {} + class _$NetworkModule extends _i200.NetworkModule {} diff --git a/lib/app/config/network/firebase_module.dart b/lib/app/config/network/firebase_module.dart new file mode 100644 index 0000000..e7ebf30 --- /dev/null +++ b/lib/app/config/network/firebase_module.dart @@ -0,0 +1,8 @@ +import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:injectable/injectable.dart'; + +@module +abstract class FirebaseModule { + @lazySingleton + FirebaseFirestore get firestore => FirebaseFirestore.instance; +} diff --git a/lib/app/core/router/app_router.dart b/lib/app/core/router/app_router.dart index 07c87af..4f7f329 100644 --- a/lib/app/core/router/app_router.dart +++ b/lib/app/core/router/app_router.dart @@ -1,18 +1,16 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; -import 'package:tracking_app/app/config/auth_storage/auth_storage.dart'; import 'package:tracking_app/app/config/di/di.dart'; import 'package:tracking_app/app/core/router/route_names.dart'; -import 'package:tracking_app/features/auth/presentation/logout/manager/logout_cubit.dart'; import 'package:tracking_app/features/Onboarding/presentation/pages/onboardingScreen.dart'; import 'package:tracking_app/features/app_sections/presentation/pages/app_sections.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/pages/drivers_orders_details_page.dart'; import 'package:tracking_app/features/profile/data/models/driver_model.dart'; import 'package:tracking_app/features/profile/presentation/pages/edit_driver_profile_page.dart'; import 'package:tracking_app/features/profile/presentation/pages/edit_vehicle_page.dart'; import 'package:tracking_app/features/profile/presentation/pages/profile_page.dart'; import 'package:tracking_app/features/my_orders/domain/models/order_entity.dart'; import 'package:tracking_app/features/my_orders/presentation/pages/order_details_page.dart'; -import '../../config/di/di.dart'; import 'package:tracking_app/features/auth/presentation/apply/view/apply_view.dart'; import 'package:tracking_app/features/auth/presentation/forget_pass/manager/cubit/forget_pass_cubit.dart'; import 'package:tracking_app/features/auth/presentation/forget_pass/pages/forget_pass_page.dart'; @@ -99,6 +97,12 @@ final GoRouter appRouter = GoRouter( return EditVehiclePage(driver: driver); }, ), + + GoRoute( + path: RouteNames.ordersDetailsPage, + builder: (context, state) => DriversOrdersDetailsPage(), + ), + GoRoute( path: RouteNames.orderDetails, builder: (context, state) { diff --git a/lib/app/core/router/route_names.dart b/lib/app/core/router/route_names.dart index eef426a..c435505 100644 --- a/lib/app/core/router/route_names.dart +++ b/lib/app/core/router/route_names.dart @@ -13,6 +13,7 @@ abstract class RouteNames { static const editDriverProfile = "/editDriverProfile"; static const editVehicle = "/editVehicle"; static const getProfle = "/profile-data"; + static const ordersDetailsPage = "/ordersDetails"; static const myOrders = "/myOrders"; static const orderDetails = "/orderDetails"; } diff --git a/lib/app/core/ui_helper/color/colors.dart b/lib/app/core/ui_helper/color/colors.dart index 394c8a3..bcdc243 100644 --- a/lib/app/core/ui_helper/color/colors.dart +++ b/lib/app/core/ui_helper/color/colors.dart @@ -17,4 +17,5 @@ abstract final class AppColors { static const Color white = Color(0xFFFFFFFF); static const Color purple = Color(0xFF441AB0); static const Color white70 = Color(0xFFA6A6A6); + static const Color lightPink = Color(0xFFF9ECF0); } diff --git a/lib/app/core/values/paths.dart b/lib/app/core/values/paths.dart index d1ceac7..26ff989 100644 --- a/lib/app/core/values/paths.dart +++ b/lib/app/core/values/paths.dart @@ -4,4 +4,7 @@ class AppPaths { static const String aboutUs = 'about_app'; static const String terms = 'terms_and_conditions'; static const String onboardingImage = 'assets/images/Clip path group.png'; + static const String whatsappImage = 'assets/images/whatsapp.png'; + static const String flowerLogo = 'assets/images/flower_logo.png'; + static const String mediaUrl = 'https://flower.elevateegy.com/uploads/'; } diff --git a/lib/features/driver_orders_details/api/datasource/order_details_remote_datasource_impl.dart b/lib/features/driver_orders_details/api/datasource/order_details_remote_datasource_impl.dart new file mode 100644 index 0000000..86362e1 --- /dev/null +++ b/lib/features/driver_orders_details/api/datasource/order_details_remote_datasource_impl.dart @@ -0,0 +1,34 @@ +import 'package:injectable/injectable.dart'; +import 'package:tracking_app/app/core/network/api_result.dart'; +import 'package:tracking_app/features/driver_orders_details/data/datasource/order_details_remote_datasource.dart'; +import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:tracking_app/features/driver_orders_details/data/models/orders_dto.dart'; + +@Injectable(as: OrderDetailsRemoteDatasource) +class OrderDetailsRemoteDatasourceImpl implements OrderDetailsRemoteDatasource { + final FirebaseFirestore _firestore; + OrderDetailsRemoteDatasourceImpl({required FirebaseFirestore firestore}) + : _firestore = firestore; + + @override + ApiResult> getOrderStream(String orderId) { + try { + final stream = _firestore + .collection('orders') + .doc(orderId) + .snapshots() + .map((snapshot) { + if (!snapshot.exists || snapshot.data() == null) { + throw Exception("Document does not exist!"); + } + return OrderDto.fromJson( + snapshot.data() as Map, + snapshot.id, + ); + }); + return SuccessApiResult>(data: stream); + } catch (e) { + return ErrorApiResult>(error: e.toString()); + } + } +} diff --git a/lib/features/driver_orders_details/data/datasource/order_details_remote_datasource.dart b/lib/features/driver_orders_details/data/datasource/order_details_remote_datasource.dart new file mode 100644 index 0000000..49bbd41 --- /dev/null +++ b/lib/features/driver_orders_details/data/datasource/order_details_remote_datasource.dart @@ -0,0 +1,6 @@ +import 'package:tracking_app/app/core/network/api_result.dart'; +import 'package:tracking_app/features/driver_orders_details/data/models/orders_dto.dart'; + +abstract class OrderDetailsRemoteDatasource { + ApiResult> getOrderStream(String orderId); +} diff --git a/lib/features/driver_orders_details/data/mapper/order_dto_mapper.dart b/lib/features/driver_orders_details/data/mapper/order_dto_mapper.dart new file mode 100644 index 0000000..ab50afe --- /dev/null +++ b/lib/features/driver_orders_details/data/mapper/order_dto_mapper.dart @@ -0,0 +1,51 @@ +import 'package:tracking_app/features/driver_orders_details/data/models/orders_dto.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; + +extension OrderDtoMapper on OrderDto { + OrderModel toOrderModel() { + return OrderModel( + driverId: driverId, + orderId: orderId, + userAddress: userAddress.toUserAddressModel(), + userId: userId, + orderDetails: orderDetails.toOrderDetailsModel(), + ); + } +} + +extension OrderDetailsDtoMapper on OrderDetailsDto { + OrderDetailsModel toOrderDetailsModel() { + return OrderDetailsModel( + items: items.map((i) => i.toOrderItemModel()).toList(), + status: status, + totalPrice: totalPrice, + pickupAddress: pickupAddress.toPickedAddressModel(), + orderId: orderId, + userAddress: userAddress, + ); + } +} + +extension OrderItemDtoMapper on OrderItemDto { + OrderItemModel toOrderItemModel() { + return OrderItemModel( + productId: productId, + title: title, + image: image, + quantity: quantity, + price: price, + ); + } +} + +extension PickedAddressDtoMapper on PickedAddressDto { + PickedAddressModel toPickedAddressModel() { + return PickedAddressModel(name: name, address: address); + } +} + +extension UserAddressDtoMapper on UserAddressDto { + UserAddressModel toUserAddressModel() { + return UserAddressModel(name: name, address: address, userId: userId); + } +} diff --git a/lib/features/driver_orders_details/data/models/orders_dto.dart b/lib/features/driver_orders_details/data/models/orders_dto.dart new file mode 100644 index 0000000..0b14faf --- /dev/null +++ b/lib/features/driver_orders_details/data/models/orders_dto.dart @@ -0,0 +1,154 @@ +class OrderDto { + final String orderId; + final String driverId; + final String userId; + final OrderDetailsDto orderDetails; + final UserAddressDto userAddress; + + OrderDto({ + required this.orderId, + required this.driverId, + required this.userId, + required this.orderDetails, + required this.userAddress, + }); + + factory OrderDto.fromJson(Map json, String id) { + return OrderDto( + orderId: id, + driverId: json['driver_id'] ?? '', + userId: json['user_id'] ?? '', + orderDetails: OrderDetailsDto.fromJson(json['oder_dt'] ?? {}), + userAddress: UserAddressDto.fromJson(json['userAddress'] ?? {}), + ); + } + + Map toJson() { + return { + 'driver_id': driverId, + 'user_id': userId, + 'oder_dt': (orderDetails).toJson(), + 'userAddress': (userAddress).toJson(), + }; + } +} + +class OrderDetailsDto { + final List items; + final String status; + final double totalPrice; + final PickedAddressDto pickupAddress; + final String orderId; + final String userAddress; + + OrderDetailsDto({ + required this.items, + required this.status, + required this.totalPrice, + required this.pickupAddress, + required this.orderId, + required this.userAddress, + }); + + factory OrderDetailsDto.fromJson(Map json) { + return OrderDetailsDto( + status: json['status'] ?? '', + totalPrice: (json['totalPrice'] ?? 0).toDouble(), + pickupAddress: PickedAddressDto.fromJson(json['pickupAddress'] ?? {}), + items: (json['items'] as List? ?? []) + .map((i) => OrderItemDto.fromJson(i)) + .toList(), + orderId: json['orderId'] ?? '', + userAddress: json['userAddress'] ?? '', + ); + } + + Map toJson() { + return { + 'status': status, + 'totalPrice': totalPrice, + 'pickupAddress': (pickupAddress).toJson(), + 'items': items.map((i) => (i).toJson()).toList(), + 'orderId': orderId, + 'userAddress': userAddress, + }; + } +} + +class OrderItemDto { + final String productId; + final String title; + final String image; + final int quantity; + final double price; + + OrderItemDto({ + required this.productId, + required this.title, + required this.image, + required this.quantity, + required this.price, + }); + + factory OrderItemDto.fromJson(Map json) { + return OrderItemDto( + productId: json['productId'] ?? '', + title: json['title'] ?? '', + image: json['image'] ?? '', + quantity: json['quantity'] ?? 0, + price: (json['price'] ?? 0).toDouble(), + ); + } + + Map toJson() { + return { + 'productId': productId, + 'title': title, + 'image': image, + 'quantity': quantity, + 'price': price, + }; + } +} + +class PickedAddressDto { + final String name; + final String address; + + PickedAddressDto({required this.name, required this.address}); + + factory PickedAddressDto.fromJson(Map json) { + return PickedAddressDto( + name: json['name'] ?? '', + address: json['address'] ?? '', + ); + } + + Map toJson() { + return {'name': name, 'address': address}; + } +} + +class UserAddressDto { + final String name; + final String address; + final String userId; + + UserAddressDto({ + required this.name, + required this.address, + required this.userId, + }); + + factory UserAddressDto.fromJson(Map json) { + return UserAddressDto( + name: json['name'] ?? '', + address: json['adress'] ?? '', + userId: json['user_id'] ?? '', + ); + } + + Map toJson() { + return {'name': name, 'adress': address, 'user_id': userId}; + } +} diff --git a/lib/features/driver_orders_details/data/repos/order_details_repo_impl.dart b/lib/features/driver_orders_details/data/repos/order_details_repo_impl.dart new file mode 100644 index 0000000..37251f2 --- /dev/null +++ b/lib/features/driver_orders_details/data/repos/order_details_repo_impl.dart @@ -0,0 +1,27 @@ +import 'package:injectable/injectable.dart'; +import 'package:tracking_app/app/core/network/api_result.dart'; +import 'package:tracking_app/features/driver_orders_details/data/datasource/order_details_remote_datasource.dart'; +import 'package:tracking_app/features/driver_orders_details/data/mapper/order_dto_mapper.dart'; +import 'package:tracking_app/features/driver_orders_details/data/models/orders_dto.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/repos/order_details_repo.dart'; + +@Injectable(as: OrderDetailsRepo) +class OrderDetailsRepoImpl implements OrderDetailsRepo { + final OrderDetailsRemoteDatasource _remoteDataSource; + OrderDetailsRepoImpl(this._remoteDataSource); + + @override + ApiResult> getOrderDetails(String orderId) { + final result = _remoteDataSource.getOrderStream(orderId); + + switch (result) { + case SuccessApiResult>(): + return SuccessApiResult>( + data: result.data.map((dto) => dto.toOrderModel()), + ); + case ErrorApiResult>(): + return ErrorApiResult>(error: result.error); + } + } +} diff --git a/lib/features/driver_orders_details/domain/models/orders_model.dart b/lib/features/driver_orders_details/domain/models/orders_model.dart new file mode 100644 index 0000000..9e96435 --- /dev/null +++ b/lib/features/driver_orders_details/domain/models/orders_model.dart @@ -0,0 +1,68 @@ +class OrderModel { + final String orderId; + final String driverId; + final String userId; + final OrderDetailsModel orderDetails; + final UserAddressModel userAddress; + + OrderModel({ + required this.orderId, + required this.driverId, + required this.userId, + required this.orderDetails, + required this.userAddress, + }); +} + +class OrderDetailsModel { + final List items; + final String status; + final double totalPrice; + final PickedAddressModel pickupAddress; + final String orderId; + final String userAddress; + + OrderDetailsModel({ + required this.items, + required this.status, + required this.totalPrice, + required this.pickupAddress, + required this.orderId, + required this.userAddress, + }); +} + +class OrderItemModel { + final String productId; + final String title; + final String image; + final int quantity; + final double price; + + OrderItemModel({ + required this.productId, + required this.title, + required this.image, + required this.quantity, + required this.price, + }); +} + +class PickedAddressModel { + final String name; + final String address; + + PickedAddressModel({required this.name, required this.address}); +} + +class UserAddressModel { + final String userId; + final String name; + final String address; + + UserAddressModel({ + required this.name, + required this.address, + required this.userId, + }); +} diff --git a/lib/features/driver_orders_details/domain/repos/order_details_repo.dart b/lib/features/driver_orders_details/domain/repos/order_details_repo.dart new file mode 100644 index 0000000..942beaa --- /dev/null +++ b/lib/features/driver_orders_details/domain/repos/order_details_repo.dart @@ -0,0 +1,6 @@ +import 'package:tracking_app/app/core/network/api_result.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; + +abstract class OrderDetailsRepo { + ApiResult> getOrderDetails(String orderId); +} diff --git a/lib/features/driver_orders_details/domain/usecases/get_order_details_usecase.dart b/lib/features/driver_orders_details/domain/usecases/get_order_details_usecase.dart new file mode 100644 index 0000000..e3253c1 --- /dev/null +++ b/lib/features/driver_orders_details/domain/usecases/get_order_details_usecase.dart @@ -0,0 +1,13 @@ +import 'package:injectable/injectable.dart'; +import 'package:tracking_app/app/core/network/api_result.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/repos/order_details_repo.dart'; + +@injectable +class GetOrderDetailsUsecase { + OrderDetailsRepo _repo; + GetOrderDetailsUsecase({required OrderDetailsRepo repo}) : _repo = repo; + + ApiResult> call(String orderId) => + _repo.getOrderDetails(orderId); +} diff --git a/lib/features/driver_orders_details/presentation/manager/order_details_cubit.dart b/lib/features/driver_orders_details/presentation/manager/order_details_cubit.dart new file mode 100644 index 0000000..224458f --- /dev/null +++ b/lib/features/driver_orders_details/presentation/manager/order_details_cubit.dart @@ -0,0 +1,58 @@ +import 'dart:async'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:injectable/injectable.dart'; +import 'package:tracking_app/app/config/auth_storage/auth_storage.dart'; +import 'package:tracking_app/app/config/base_state/base_state.dart'; +import 'package:tracking_app/app/config/di/di.dart'; +import 'package:tracking_app/app/core/network/api_result.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; +import '../../domain/usecases/get_order_details_usecase.dart'; +import 'order_details_states.dart'; + +@injectable +class OrderDetailsCubit extends Cubit { + final GetOrderDetailsUsecase _getOrderDetailsUsecase; + StreamSubscription? _subscription; + final _authStorage = getIt(); + + OrderDetailsCubit(this._getOrderDetailsUsecase) : super(OrderDetailsStates()); + + void getOrderDetails() async { + emit(state.copyWith(data: Resource.loading())); + _subscription?.cancel(); + + try { + final orderId = await _authStorage.getOrderId(); + if (orderId == null || orderId.isEmpty) { + emit(state.copyWith(data: Resource.error('Order ID not found'))); + return; + } + final result = _getOrderDetailsUsecase.call(orderId); + + if (result is SuccessApiResult>) { + _subscription = result.data.listen( + (order) { + emit(state.copyWith(data: Resource.success(order))); + }, + onError: (error) { + emit(state.copyWith(data: Resource.error(error.toString()))); + }, + ); + } else if (result is ErrorApiResult>) { + emit(state.copyWith(data: Resource.error(result.error))); + } + } catch (e) { + emit( + state.copyWith( + data: Resource.error("Error retrieving order details: $e"), + ), + ); + } + } + + @override + Future close() { + _subscription?.cancel(); + return super.close(); + } +} diff --git a/lib/features/driver_orders_details/presentation/manager/order_details_states.dart b/lib/features/driver_orders_details/presentation/manager/order_details_states.dart new file mode 100644 index 0000000..267a1ca --- /dev/null +++ b/lib/features/driver_orders_details/presentation/manager/order_details_states.dart @@ -0,0 +1,11 @@ +import 'package:tracking_app/app/config/base_state/base_state.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; + +class OrderDetailsStates { + final Resource? data; + const OrderDetailsStates({this.data}); + + OrderDetailsStates copyWith({Resource? data}) { + return OrderDetailsStates(data: data ?? this.data); + } +} diff --git a/lib/features/driver_orders_details/presentation/pages/drivers_orders_details_page.dart b/lib/features/driver_orders_details/presentation/pages/drivers_orders_details_page.dart new file mode 100644 index 0000000..aa8ba57 --- /dev/null +++ b/lib/features/driver_orders_details/presentation/pages/drivers_orders_details_page.dart @@ -0,0 +1,165 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; +import 'package:tracking_app/app/config/base_state/base_state.dart'; +import 'package:tracking_app/app/config/di/di.dart'; +import 'package:tracking_app/app/core/ui_helper/color/colors.dart'; +import 'package:tracking_app/app/core/values/paths.dart'; +import 'package:tracking_app/app/core/widgets/custom_button.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/manager/order_details_cubit.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/manager/order_details_states.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/widgets/address_card.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/widgets/bottom_row_section.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/widgets/order_item.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/widgets/order_status.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/widgets/section_title.dart'; +import 'package:tracking_app/generated/locale_keys.g.dart'; + +class DriversOrdersDetailsPage extends StatelessWidget { + const DriversOrdersDetailsPage({super.key}); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + leading: IconButton( + icon: const Icon(Icons.arrow_back_ios, color: AppColors.blackColor), + onPressed: () => context.pop(), + ), + title: Text( + LocaleKeys.orderDetails.tr(), + style: Theme.of(context).textTheme.bodyMedium!.copyWith( + fontSize: 20, + color: AppColors.blackColor, + ), + ), + ), + body: BlocProvider( + create: (context) => getIt()..getOrderDetails(), + child: BlocBuilder( + builder: (context, state) { + if (state.data?.status == Status.loading) { + return const Center(child: CircularProgressIndicator()); + } else if (state.data?.status == Status.error) { + return Center(child: Text(state.data!.error.toString())); + } else if (state.data?.status == Status.success) { + final order = state.data!.data; + final status = OrderStatus.fromString(order?.orderDetails.status); + + int currentStep = status.step; + return SingleChildScrollView( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: List.generate(5, (index) { + return Expanded( + child: Container( + height: 4, + margin: const EdgeInsets.symmetric(horizontal: 2), + decoration: BoxDecoration( + color: index < currentStep + ? AppColors.green + : AppColors.lightGrey, + borderRadius: BorderRadius.circular(2), + ), + ), + ); + }), + ), + const SizedBox(height: 20), + + Container( + width: double.infinity, + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: AppColors.lightPink, + borderRadius: BorderRadius.circular(12), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + '${LocaleKeys.status.tr()}${order?.orderDetails.status}', + style: TextStyle( + color: AppColors.green, + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), + const SizedBox(height: 4), + Text( + '${LocaleKeys.orderId.tr()}${order?.orderId}', + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 16, + ), + ), + const SizedBox(height: 4), + Text( + 'Wed, 03 Sep 2024, 11:00 AM', + style: TextStyle( + color: AppColors.grey, + fontSize: 14, + ), + ), + ], + ), + ), + const SizedBox(height: 24), + + SectionTitle(title: LocaleKeys.pickupAddress.tr()), + AddressCard( + title: order?.orderDetails.pickupAddress.name ?? '', + address: order?.orderDetails.pickupAddress.address ?? '', + imagePath: AppPaths.flowerLogo, + ), + const SizedBox(height: 16), + SectionTitle(title: LocaleKeys.userAddress.tr()), + + AddressCard( + title: order?.userAddress.name ?? '', + address: order?.userAddress.address ?? '', + imagePath: AppPaths.flowerLogo, + ), + const SizedBox(height: 24), + + SectionTitle(title: LocaleKeys.orderDetails.tr()), + OrderItems(), + const SizedBox(height: 16), + + BottomRowSection( + label: LocaleKeys.total.tr(), + value: + '${LocaleKeys.egp.tr()} ${order?.orderDetails.totalPrice.toStringAsFixed(2)}', + ), + BottomRowSection( + label: LocaleKeys.payment_method.tr(), + value: LocaleKeys.cash_on_delivery.tr(), + ), + + const SizedBox(height: 32), + + SizedBox( + width: double.infinity, + height: 55, + child: CustomButton( + isEnabled: true, + onPressed: () {}, + isLoading: false, + text: status.buttonTextKey.tr(), + ), + ), + ], + ), + ); + } + return const SizedBox.shrink(); + }, + ), + ), + ); + } +} diff --git a/lib/features/driver_orders_details/presentation/widgets/address_card.dart b/lib/features/driver_orders_details/presentation/widgets/address_card.dart new file mode 100644 index 0000000..6b211c2 --- /dev/null +++ b/lib/features/driver_orders_details/presentation/widgets/address_card.dart @@ -0,0 +1,78 @@ +import 'package:flutter/material.dart'; +import 'package:tracking_app/app/core/ui_helper/color/colors.dart'; +import 'package:tracking_app/app/core/values/paths.dart'; + +class AddressCard extends StatelessWidget { + final String title; + final String address; + final String imagePath; + + const AddressCard({ + super.key, + required this.title, + required this.address, + required this.imagePath, + }); + + @override + Widget build(BuildContext context) { + return Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + border: Border.all(color: AppColors.lightGrey), + borderRadius: BorderRadius.circular(12), + ), + child: Row( + children: [ + CircleAvatar(backgroundImage: AssetImage(imagePath), radius: 25), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + title, + style: Theme.of( + context, + ).textTheme.labelSmall!.copyWith(fontWeight: FontWeight.w400), + ), + Row( + children: [ + Icon( + Icons.location_on_outlined, + size: 16, + color: AppColors.blackColor, + ), + Flexible( + child: Text( + address, + overflow: TextOverflow.ellipsis, + maxLines: 1, + style: Theme.of(context).textTheme.labelSmall!.copyWith( + fontWeight: FontWeight.w400, + color: AppColors.blackColor, + ), + ), + ), + ], + ), + ], + ), + ), + IconButton( + onPressed: () {}, + icon: Icon(Icons.phone_outlined, color: AppColors.pink, size: 20), + ), + + IconButton( + onPressed: () {}, + icon: ImageIcon( + AssetImage(AppPaths.whatsappImage), + color: AppColors.pink, + ), + ), + ], + ), + ); + } +} diff --git a/lib/features/driver_orders_details/presentation/widgets/bottom_row_section.dart b/lib/features/driver_orders_details/presentation/widgets/bottom_row_section.dart new file mode 100644 index 0000000..481983d --- /dev/null +++ b/lib/features/driver_orders_details/presentation/widgets/bottom_row_section.dart @@ -0,0 +1,41 @@ +import 'package:flutter/material.dart'; +import 'package:tracking_app/app/core/ui_helper/color/colors.dart'; + +class BottomRowSection extends StatelessWidget { + final String label; + final String value; + const BottomRowSection({super.key, required this.label, required this.value}); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 8), + child: Container( + margin: const EdgeInsets.only(bottom: 8), + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + border: Border.all(color: AppColors.lightGrey), + borderRadius: BorderRadius.circular(12), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + label, + style: Theme.of(context).textTheme.labelMedium!.copyWith( + fontWeight: FontWeight.w500, + fontSize: 16, + ), + ), + Text( + value, + style: Theme.of( + context, + ).textTheme.labelSmall!.copyWith(fontWeight: FontWeight.w500), + ), + ], + ), + ), + ); + } +} diff --git a/lib/features/driver_orders_details/presentation/widgets/order_item.dart b/lib/features/driver_orders_details/presentation/widgets/order_item.dart new file mode 100644 index 0000000..1d6cebc --- /dev/null +++ b/lib/features/driver_orders_details/presentation/widgets/order_item.dart @@ -0,0 +1,85 @@ +import 'package:cached_network_image/cached_network_image.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:shimmer/shimmer.dart'; +import 'package:tracking_app/app/core/ui_helper/color/colors.dart'; +import 'package:tracking_app/app/core/values/paths.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/manager/order_details_cubit.dart'; + +class OrderItems extends StatelessWidget { + const OrderItems({super.key}); + + @override + Widget build(BuildContext context) { + final order = BlocProvider.of(context).state.data!.data; + return ListView.builder( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + itemCount: order?.orderDetails.items.length, + itemBuilder: (context, index) { + return Container( + margin: const EdgeInsets.only(bottom: 8), + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + border: Border.all(color: AppColors.lightGrey), + borderRadius: BorderRadius.circular(12), + ), + child: Row( + children: [ + ClipRRect( + borderRadius: BorderRadius.circular(50), + child: CachedNetworkImage( + imageUrl: + "${AppPaths.mediaUrl}${order!.orderDetails.items[index].image}", + placeholder: (context, url) => Shimmer( + gradient: LinearGradient( + colors: [ + AppColors.lightGrey, + AppColors.white, + AppColors.lightGrey, + ], + ), + child: const CircularProgressIndicator(), + ), + errorWidget: (context, url, error) => Icon(Icons.error), + width: 55, + height: 55, + fit: BoxFit.cover, + ), + ), + const SizedBox(width: 12), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + order.orderDetails.items[index].title, + overflow: TextOverflow.ellipsis, + style: Theme.of(context).textTheme.labelSmall!.copyWith( + fontWeight: FontWeight.w400, + ), + ), + Text( + 'EGP ${order.orderDetails.items[index].price.toStringAsFixed(2)}', + style: Theme.of(context).textTheme.labelSmall!.copyWith( + fontWeight: FontWeight.w500, + color: AppColors.blackColor, + ), + ), + ], + ), + ), + Text( + 'X${order.orderDetails.items[index].quantity}', + style: Theme.of(context).textTheme.labelSmall!.copyWith( + fontWeight: FontWeight.w500, + color: AppColors.pink, + ), + ), + ], + ), + ); + }, + ); + } +} diff --git a/lib/features/driver_orders_details/presentation/widgets/order_status.dart b/lib/features/driver_orders_details/presentation/widgets/order_status.dart new file mode 100644 index 0000000..4c88788 --- /dev/null +++ b/lib/features/driver_orders_details/presentation/widgets/order_status.dart @@ -0,0 +1,83 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/foundation.dart'; +import 'package:tracking_app/generated/locale_keys.g.dart'; + +enum OrderStatus { + accepted, + pickup, + outForDelivery, + arrived, + delivered, + unknown; + + static OrderStatus fromString(String? status) { + switch (status?.toLowerCase()) { + case 'accepted': + return OrderStatus.accepted; + case 'pickup': + return OrderStatus.pickup; + case 'out_for_delivery': + return OrderStatus.outForDelivery; + case 'arrived': + return OrderStatus.arrived; + case 'delivered': + return OrderStatus.delivered; + default: + debugPrint('Unknown order status: $status'); + return OrderStatus.unknown; + } + } +} + +extension OrderStatusX on OrderStatus { + int get step { + switch (this) { + case OrderStatus.accepted: + return 1; + case OrderStatus.pickup: + return 2; + case OrderStatus.outForDelivery: + return 3; + case OrderStatus.arrived: + return 4; + case OrderStatus.delivered: + return 5; + case OrderStatus.unknown: + return 1; + } + } + + String get buttonTextKey { + switch (this) { + case OrderStatus.accepted: + return LocaleKeys.arrivedAtPickupPoint.tr(); + case OrderStatus.pickup: + return LocaleKeys.startDelivery.tr(); + case OrderStatus.outForDelivery: + return LocaleKeys.arriverAtDestination.tr(); + case OrderStatus.arrived: + return LocaleKeys.confirmDelivery.tr(); + case OrderStatus.delivered: + return LocaleKeys.orderCompleted.tr(); + case OrderStatus.unknown: + return LocaleKeys.arrivedAtPickupPoint; + } + } + + String get statusTextKey { + switch (this) { + case OrderStatus.accepted: + return LocaleKeys.accepted.tr(); + case OrderStatus.pickup: + return LocaleKeys.pickedUp.tr(); + case OrderStatus.outForDelivery: + return LocaleKeys.outForDelivery.tr(); + case OrderStatus.arrived: + return LocaleKeys.arrived.tr(); + case OrderStatus.delivered: + return LocaleKeys.delivered.tr(); + case OrderStatus.unknown: + return ''; + } + } +} diff --git a/lib/features/driver_orders_details/presentation/widgets/section_title.dart b/lib/features/driver_orders_details/presentation/widgets/section_title.dart new file mode 100644 index 0000000..8055f29 --- /dev/null +++ b/lib/features/driver_orders_details/presentation/widgets/section_title.dart @@ -0,0 +1,20 @@ +import 'package:flutter/material.dart'; +import 'package:tracking_app/app/core/ui_helper/color/colors.dart'; + +class SectionTitle extends StatelessWidget { + final String title; + const SectionTitle({super.key, required this.title}); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.only(bottom: 12), + child: Text( + title, + style: Theme.of( + context, + ).textTheme.bodyMedium!.copyWith(color: AppColors.blackColor), + ), + ); + } +} diff --git a/lib/features/home/presentation/widgets/driverScreenBody.dart b/lib/features/home/presentation/widgets/driverScreenBody.dart index 9f97a0b..1bfefb6 100644 --- a/lib/features/home/presentation/widgets/driverScreenBody.dart +++ b/lib/features/home/presentation/widgets/driverScreenBody.dart @@ -1,7 +1,11 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:go_router/go_router.dart'; +import 'package:tracking_app/app/config/auth_storage/auth_storage.dart'; import 'package:tracking_app/app/config/base_state/base_state.dart'; +import 'package:tracking_app/app/config/di/di.dart'; +import 'package:tracking_app/app/core/router/route_names.dart'; import 'package:tracking_app/features/home/presentation/manger/driverorderCubit.dart'; import 'package:tracking_app/features/home/presentation/manger/driverorderIntent.dart'; import 'package:tracking_app/features/home/presentation/manger/driverorderStates.dart'; @@ -49,10 +53,14 @@ class _DriverOrderBodyState extends State { itemBuilder: (context, index) { return DriverOrderItem( order: orders[index], - onAccept: () { + onAccept: () async { + final order = orders[index]; + await getIt().saveOrderId(order.id.toString()); + debugPrint('<<<< Saved Order ID: ${order.id}'); context.read().onIntent( AcceptOrder(orders[index]), ); + context.push(RouteNames.ordersDetailsPage); }, onReject: () { context.read().onIntent( diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index bc697fc..8716e79 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -246,11 +246,25 @@ abstract class LocaleKeys { static const editDriverProfile = 'editDriverProfile'; static const editVehicle = 'editVehicle'; static const cannotBeSame = 'cannotBeSame'; - static const driverOrderTitle = 'driverOrderTitle'; + static const orderDetails = 'orderDetails'; + static const status = 'status'; + static const orderId = 'orderId'; static const pickupAddress = 'pickupAddress'; + static const floweryStore = 'floweryStore'; + static const userAddress = 'userAddress'; + static const arrivedAtPickupPoint = 'arrivedAtPickupPoint'; + static const startDelivery = 'startDelivery'; + static const arriverAtDestination = 'arriverAtDestination'; + static const confirmDelivery = 'confirmDelivery'; + static const deliveryConfirmed = 'deliveryConfirmed'; + static const orderCompleted = 'orderCompleted'; + static const accepted = 'accepted'; + static const pickedUp = 'pickedUp'; + static const outForDelivery = 'outForDelivery'; + static const arrived = 'arrived'; + static const driverOrderTitle = 'driverOrderTitle'; static const unknownStore = 'unknownStore'; static const noAddress = 'noAddress'; - static const userAddress = 'userAddress'; static const accept = 'accept'; static const reject = 'reject'; static const noPendingOrders = 'noPendingOrders'; diff --git a/pubspec.lock b/pubspec.lock index dd63c41..1b39f8d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -25,6 +25,14 @@ packages: url: "https://pub.dev" source: hosted version: "7.7.1" + ansicolor: + dependency: transitive + description: + name: ansicolor + sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f" + url: "https://pub.dev" + source: hosted + version: "2.0.3" archive: dependency: transitive description: @@ -133,10 +141,34 @@ packages: dependency: transitive description: name: built_value - sha256: "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9" + sha256: "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8" + url: "https://pub.dev" + source: hosted + version: "8.12.3" + cached_network_image: + dependency: "direct main" + description: + name: cached_network_image + sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916" url: "https://pub.dev" source: hosted - version: "8.12.4" + version: "3.4.1" + cached_network_image_platform_interface: + dependency: transitive + description: + name: cached_network_image_platform_interface + sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829" + url: "https://pub.dev" + source: hosted + version: "4.1.1" + cached_network_image_web: + dependency: transitive + description: + name: cached_network_image_web + sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062" + url: "https://pub.dev" + source: hosted + version: "1.3.1" characters: dependency: transitive description: @@ -462,6 +494,14 @@ packages: url: "https://pub.dev" source: hosted version: "9.1.1" + flutter_cache_manager: + dependency: transitive + description: + name: flutter_cache_manager + sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" + url: "https://pub.dev" + source: hosted + version: "3.4.1" flutter_lints: dependency: "direct dev" description: @@ -549,22 +589,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.0" + geoclue: + dependency: transitive + description: + name: geoclue + sha256: c2a998c77474fc57aa00c6baa2928e58f4b267649057a1c76738656e9dbd2a7f + url: "https://pub.dev" + source: hosted + version: "0.1.1" geolocator: dependency: "direct main" description: name: geolocator - sha256: f4efb8d3c4cdcad2e226af9661eb1a0dd38c71a9494b22526f9da80ab79520e5 + sha256: "79939537046c9025be47ec645f35c8090ecadb6fe98eba146a0d25e8c1357516" url: "https://pub.dev" source: hosted - version: "10.1.1" + version: "14.0.2" geolocator_android: dependency: transitive description: name: geolocator_android - sha256: fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d + sha256: "179c3cb66dfa674fc9ccbf2be872a02658724d1c067634e2c427cf6df7df901a" url: "https://pub.dev" source: hosted - version: "4.6.2" + version: "5.0.2" geolocator_apple: dependency: transitive description: @@ -573,6 +621,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.13" + geolocator_linux: + dependency: transitive + description: + name: geolocator_linux + sha256: d64112a205931926f4363bb6bd48f14cb38e7326833041d170615586cd143797 + url: "https://pub.dev" + source: hosted + version: "0.2.4" geolocator_platform_interface: dependency: transitive description: @@ -585,10 +641,10 @@ packages: dependency: transitive description: name: geolocator_web - sha256: "102e7da05b48ca6bf0a5bda0010f886b171d1a08059f01bfe02addd0175ebece" + sha256: b1ae9bdfd90f861fde8fd4f209c37b953d65e92823cb73c7dee1fa021b06f172 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "4.1.3" geolocator_windows: dependency: transitive description: @@ -617,10 +673,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: b465e99ce64ba75e61c8c0ce3d87b66d8ac07f0b35d0a7e0263fcfc10f99e836 + sha256: "7974313e217a7771557add6ff2238acb63f635317c35fa590d348fb238f00896" url: "https://pub.dev" source: hosted - version: "13.2.5" + version: "17.1.0" google_maps: dependency: transitive description: @@ -677,6 +733,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.2" + gsettings: + dependency: transitive + description: + name: gsettings + sha256: "1b0ce661f5436d2db1e51f3c4295a49849f03d304003a7ba177d01e3a858249c" + url: "https://pub.dev" + source: hosted + version: "0.2.8" + hotreloader: + dependency: transitive + description: + name: hotreloader + sha256: bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b + url: "https://pub.dev" + source: hosted + version: "4.3.0" html: dependency: transitive description: @@ -777,10 +849,10 @@ packages: dependency: "direct main" description: name: injectable - sha256: "32e9bac6fe9c84339c5add60478d27a01e363ce1ad5c22ca7e525c6b28a7559c" + sha256: "32b36a9d87f18662bee0b1951b81f47a01f2bf28cd6ea94f60bc5453c7bf598c" url: "https://pub.dev" source: hosted - version: "2.7.0" + version: "2.7.1+4" injectable_generator: dependency: "direct dev" description: @@ -853,6 +925,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + lean_builder: + dependency: transitive + description: + name: lean_builder + sha256: ef5cd5f907157eb7aa87d1704504b5a6386d2cbff88a3c2b3344477bab323ee9 + url: "https://pub.dev" + source: hosted + version: "0.1.2" lints: dependency: transitive description: @@ -949,6 +1029,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.2" + octo_image: + dependency: transitive + description: + name: octo_image + sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" package_config: dependency: transitive description: @@ -957,6 +1045,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.2.0" + package_info_plus: + dependency: transitive + description: + name: package_info_plus + sha256: f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d + url: "https://pub.dev" + source: hosted + version: "9.0.0" + package_info_plus_platform_interface: + dependency: transitive + description: + name: package_info_plus_platform_interface + sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086" + url: "https://pub.dev" + source: hosted + version: "3.2.1" path: dependency: transitive description: @@ -973,6 +1077,30 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + path_provider: + dependency: transitive + description: + name: path_provider + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" + url: "https://pub.dev" + source: hosted + version: "2.1.5" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e + url: "https://pub.dev" + source: hosted + version: "2.2.22" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4" + url: "https://pub.dev" + source: hosted + version: "2.5.1" path_provider_linux: dependency: transitive description: @@ -1049,10 +1177,10 @@ packages: dependency: transitive description: name: protobuf - sha256: de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e + sha256: "2fcc8a202ca7ec17dab7c97d6b6d91cf03aa07fe6f65f8afbb6dfa52cc5bd902" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "5.1.0" provider: dependency: "direct main" description: @@ -1097,10 +1225,18 @@ packages: dependency: "direct dev" description: name: retrofit_generator - sha256: c72bb844c0603df3459611f4315ec021726b27c9daa0633e649115862c3ea9ac + sha256: "7ec323f3329ad2ca0bcdc96fe02ec7f2486ecfac6cd2d035b03c398ef6f42308" url: "https://pub.dev" source: hosted - version: "10.0.2" + version: "10.2.0" + rxdart: + dependency: transitive + description: + name: rxdart + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" + url: "https://pub.dev" + source: hosted + version: "0.28.0" sanitize_html: dependency: transitive description: @@ -1258,6 +1394,46 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.2" + sqflite: + dependency: transitive + description: + name: sqflite + sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03 + url: "https://pub.dev" + source: hosted + version: "2.4.2" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88 + url: "https://pub.dev" + source: hosted + version: "2.4.2+2" + sqflite_common: + dependency: transitive + description: + name: sqflite_common + sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6" + url: "https://pub.dev" + source: hosted + version: "2.5.6" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" + url: "https://pub.dev" + source: hosted + version: "2.4.0" stack_trace: dependency: transitive description: @@ -1290,6 +1466,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.1" + synchronized: + dependency: transitive + description: + name: synchronized + sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0 + url: "https://pub.dev" + source: hosted + version: "3.4.0" term_glyph: dependency: transitive description: @@ -1498,6 +1682,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" + win32: + dependency: transitive + description: + name: win32 + sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e + url: "https://pub.dev" + source: hosted + version: "5.15.0" xdg_directories: dependency: transitive description: @@ -1514,6 +1706,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.6.1" + xxh3: + dependency: transitive + description: + name: xxh3 + sha256: "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916" + url: "https://pub.dev" + source: hosted + version: "1.2.0" yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index c544de2..1266188 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,8 +18,8 @@ dependencies: flutter_otp_text_field: ^1.5.1+1 flutter_svg: ^2.2.3 get_it: ^9.2.0 - go_router: ^13.2.0 - injectable: 2.7.0 + go_router: ^17.1.0 + injectable: ^2.7.1+4 intl: ^0.20.2 json_annotation: ^4.9.0 pretty_dio_logger: ^1.4.0 @@ -30,14 +30,15 @@ dependencies: skeletonizer: ^2.1.2 image_picker: ^1.2.1 google_maps_flutter: ^2.14.0 - geolocator: ^10.1.0 + geolocator: ^14.0.2 firebase_core: ^4.4.0 lottie: ^3.3.2 url_launcher: ^6.1.10 firebase_messaging: ^16.1.1 flutter_local_notifications: ^20.0.0 firebase_crashlytics: ^5.0.7 - cloud_firestore: 6.1.2 + cloud_firestore: ^6.1.2 + cached_network_image: ^3.3.1 dev_dependencies: bloc_test: ^10.0.0 @@ -46,7 +47,7 @@ dev_dependencies: injectable_generator: ^2.4.1 json_serializable: ^6.8.0 mockito: ^5.4.4 - retrofit_generator: 10.0.2 + retrofit_generator: 10.2.0 network_image_mock: ^2.1.1 mocktail: ^1.0.3 diff --git a/test/features/driver_orders_details/api/datasource/order_details_remote_datasource_impl_test.dart b/test/features/driver_orders_details/api/datasource/order_details_remote_datasource_impl_test.dart new file mode 100644 index 0000000..266aaab --- /dev/null +++ b/test/features/driver_orders_details/api/datasource/order_details_remote_datasource_impl_test.dart @@ -0,0 +1,89 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:mockito/annotations.dart'; +import 'package:mockito/mockito.dart'; +import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:tracking_app/app/core/network/api_result.dart'; +import 'package:tracking_app/features/driver_orders_details/api/datasource/order_details_remote_datasource_impl.dart'; +import 'package:tracking_app/features/driver_orders_details/data/models/orders_dto.dart'; +import 'order_details_remote_datasource_impl_test.mocks.dart'; + +@GenerateMocks([ + FirebaseFirestore, + CollectionReference, + DocumentReference, + DocumentSnapshot, +]) +void main() { + late OrderDetailsRemoteDatasourceImpl dataSource; + late MockFirebaseFirestore mockFirestore; + late MockCollectionReference> mockCollection; + late MockDocumentReference> mockDocument; + late MockDocumentSnapshot> mockSnapshot; + + const String tOrderId = 'pxkMaEmWYVuvV5jkW0JK'; + + setUp(() { + mockFirestore = MockFirebaseFirestore(); + mockCollection = MockCollectionReference(); + mockDocument = MockDocumentReference(); + mockSnapshot = MockDocumentSnapshot(); + + dataSource = OrderDetailsRemoteDatasourceImpl(firestore: mockFirestore); + }); + group('getOrderStream', () { + final tOrderJson = { + 'driver_id': '1', + 'user_id': 'U11', + 'userAddress': {'name': 'mariam', 'address': 'alex', 'userId': 'U11'}, + 'oder_dt': { + 'items': [], + 'status': 'accepted', + 'totalPrice': 500.0, + 'orderId': tOrderId, + 'userAddress': 'alex', + 'pickupAddress': {'name': 'mariam', 'address': 'alex'}, + }, + }; + + test('should return SuccessApiResult with Stream of OrderDto', () async { + when(mockFirestore.collection('orders')).thenReturn(mockCollection); + when(mockCollection.doc(tOrderId)).thenReturn(mockDocument); + + when(mockSnapshot.exists).thenReturn(true); + when(mockSnapshot.data()).thenReturn(tOrderJson); + when(mockSnapshot.id).thenReturn(tOrderId); + + when( + mockDocument.snapshots(), + ).thenAnswer((_) => Stream.value(mockSnapshot)); + + final result = dataSource.getOrderStream(tOrderId); + + expect(result, isA>>()); + final stream = (result as SuccessApiResult>).data; + await expectLater( + stream, + emits( + isA() + .having((o) => o.orderId, 'orderId', tOrderId) + .having((o) => o.orderDetails.status, 'status', 'accepted'), + ), + ); + }); + + test('should return ErrorApiResult when document does not exist', () async { + when(mockFirestore.collection(any)).thenReturn(mockCollection); + when(mockCollection.doc(any)).thenReturn(mockDocument); + when(mockSnapshot.exists).thenReturn(false); + when( + mockDocument.snapshots(), + ).thenAnswer((_) => Stream.value(mockSnapshot)); + + final result = dataSource.getOrderStream(tOrderId); + + expect(result, isA>>()); + final stream = (result as SuccessApiResult>).data; + await expectLater(stream, emitsError(isA())); + }); + }); +} diff --git a/test/features/driver_orders_details/data/mapper/order_dto_mapper_test.dart b/test/features/driver_orders_details/data/mapper/order_dto_mapper_test.dart new file mode 100644 index 0000000..d11f68f --- /dev/null +++ b/test/features/driver_orders_details/data/mapper/order_dto_mapper_test.dart @@ -0,0 +1,115 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:tracking_app/features/driver_orders_details/data/mapper/order_dto_mapper.dart'; +import 'package:tracking_app/features/driver_orders_details/data/models/orders_dto.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; + +void main() { + group('OrderDtoMapper', () { + test('Convert OrderDto to OrderModel correctly', () { + final tUserAddressDto = UserAddressDto( + address: 'Alex', + name: 'Mariam', + userId: 'U123', + ); + + final tOrderDto = OrderDto( + driverId: 'D123', + userAddress: tUserAddressDto, + userId: 'U789', + orderId: '22', + orderDetails: OrderDetailsDto( + items: [], + status: 'pending', + totalPrice: 500, + pickupAddress: PickedAddressDto( + name: 'Store', + address: '123 Main St', + ), + orderId: '22', + userAddress: 'alex', + ), + ); + + final result = tOrderDto.toOrderModel(); + + expect(result, isA()); + expect(result.driverId, tOrderDto.driverId); + expect(result.userAddress.name, tOrderDto.userAddress.name); + expect(result.userAddress.address, tOrderDto.userAddress.address); + expect(result.userAddress.userId, tOrderDto.userAddress.userId); + expect(result.userId, tOrderDto.userId); + }); + }); + + group('OrderDetailsDtoMapper', () { + test('Convert OrderDetailsDto to OrderDetailsModel correctly', () { + final tpickupAddressDto = PickedAddressDto( + name: 'Store', + address: '123 Main St', + ); + final tDto = OrderDetailsDto( + items: [], + status: 'pending', + totalPrice: 500, + pickupAddress: tpickupAddressDto, + orderId: '1', + userAddress: 'alex', + ); + + final result = tDto.toOrderDetailsModel(); + + expect(result, isA()); + expect(result.items, tDto.items); + expect(result.status, tDto.status); + expect(result.totalPrice, tDto.totalPrice); + expect(result.pickupAddress.name, tDto.pickupAddress.name); + expect(result.orderId, tDto.orderId); + }); + }); + + group('OrderItemDtoMapper', () { + test('Convert OrderItemDto to OrderItemModel correctly', () { + final tDto = OrderItemDto( + productId: '1', + title: 'Item 1', + price: 100, + quantity: 2, + image: 'image_url', + ); + + final result = tDto.toOrderItemModel(); + + expect(result.productId, tDto.productId); + expect(result.title, tDto.title); + expect(result.price, tDto.price); + expect(result.quantity, tDto.quantity); + expect(result.image, tDto.image); + }); + }); + + group('PickedAddressDtoMapper', () { + test('Convert PickedAddressDto to PickedAddressModel correctly', () { + final tDto = PickedAddressDto(name: 'Store', address: '123 Main St'); + + final result = tDto.toPickedAddressModel(); + + expect(result.name, tDto.name); + expect(result.address, tDto.address); + }); + }); + + group('UserAddressDtoMapper', () { + test('Convert UserAddressDto to UserAddressModel correctly', () { + final tDto = UserAddressDto( + name: 'Store', + address: '123 Main St', + userId: 'U123', + ); + + final result = tDto.toUserAddressModel(); + + expect(result.name, tDto.name); + expect(result.address, tDto.address); + }); + }); +} diff --git a/test/features/driver_orders_details/data/models/orders_dto_test.dart b/test/features/driver_orders_details/data/models/orders_dto_test.dart new file mode 100644 index 0000000..6206376 --- /dev/null +++ b/test/features/driver_orders_details/data/models/orders_dto_test.dart @@ -0,0 +1,213 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:tracking_app/features/driver_orders_details/data/models/orders_dto.dart'; + +void main() { + group('UserAddressDto Tests', () { + test('should return a valid UserAddressDto from JSON', () { + final Map json = { + 'adress': 'Alex', + 'name': 'Mariam', + 'user_id': 'U123', + }; + + final result = UserAddressDto.fromJson(json); + + expect(result.address, 'Alex'); + expect(result.name, 'Mariam'); + expect(result.userId, 'U123'); + }); + + test('should return a valid JSON map from UserAddressDto', () { + final dto = UserAddressDto( + address: 'Alex', + name: 'Mariam', + userId: 'U123', + ); + + final result = dto.toJson(); + + expect(result['adress'], 'Alex'); + expect(result['name'], 'Mariam'); + expect(result['user_id'], 'U123'); + }); + }); + + group('PickedAddressDto Tests', () { + test('should return a valid PickedAddressDto from JSON', () { + final Map json = {'address': 'Alex', 'name': 'Mariam'}; + + final result = PickedAddressDto.fromJson(json); + + expect(result.address, 'Alex'); + expect(result.name, 'Mariam'); + }); + + test('should return a valid JSON map from PickedAddressDto', () { + final dto = PickedAddressDto(address: 'Alex', name: 'Mariam'); + + final result = dto.toJson(); + + expect(result['address'], 'Alex'); + expect(result['name'], 'Mariam'); + }); + }); + + group('OrderItemDto Tests', () { + test('should return a valid OrderItemDto from JSON', () { + final Map json = { + 'productId': '1', + 'title': 'red flower', + 'image': 'url', + 'quantity': 1, + 'price': 100, + }; + + final result = OrderItemDto.fromJson(json); + + expect(result.image, 'url'); + expect(result.title, 'red flower'); + expect(result.quantity, 1); + expect(result.price, 100); + }); + + test('should return a valid JSON map from OrderItemDto', () { + final dto = OrderItemDto( + image: 'Alex', + productId: '1', + title: 'red flower', + quantity: 1, + price: 100, + ); + + final result = dto.toJson(); + + expect(result['image'], 'Alex'); + expect(result['title'], 'red flower'); + expect(result['quantity'], 1); + expect(result['price'], 100); + }); + }); + + group('OrderDetailsDto Tests', () { + test('should return a valid OrderDetailsDto from JSON', () { + final Map json = { + 'items': [], + 'status': 'accepted', + 'totalPrice': 100.0, + 'pickupAddress': {'name': 'Mariam', 'address': 'Alex'}, + 'orderId': 'O456', + 'userAddress': 'alex', + }; + + final result = OrderDetailsDto.fromJson(json); + + expect(result.status, 'accepted'); + expect(result.totalPrice, 100.0); + expect(result.orderId, 'O456'); + }); + + test('should return a valid JSON map from OrderDetailsDto', () { + final dto = OrderDetailsDto( + items: [ + OrderItemDto( + image: 'url', + productId: '1', + title: 'red flower', + quantity: 1, + price: 100, + ), + ], + status: 'accepted', + totalPrice: 100.0, + pickupAddress: PickedAddressDto(address: 'Alex', name: 'Mariam'), + orderId: 'O456', + userAddress: 'alex', + ); + + final result = dto.toJson(); + + expect(result['status'], 'accepted'); + expect(result['totalPrice'], 100.0); + final firstItem = result['items'][0]; + expect(firstItem['image'], 'url'); + expect(firstItem['title'], 'red flower'); + expect(firstItem['price'], 100.0); + expect(result['pickupAddress']['name'], 'Mariam'); + }); + }); + + group('OrderDto Tests', () { + final Map tOrderJson = { + 'driver_id': 'D123', + 'user_id': 'U789', + 'userAddress': { + 'name': 'Home', + 'address': 'Cairo, Egypt', + 'userId': 'U789', + }, + 'oder_dt': { + 'status': 'processing', + 'totalPrice': 250.0, + 'orderId': 'O100', + 'userAddress': 'Cairo, Egypt', + 'pickupAddress': {'name': 'Pharmacy', 'address': 'Downtown'}, + 'items': [ + { + 'productId': 'p1', + 'title': 'Panadol', + 'image': 'panadol.png', + 'quantity': 2, + 'price': 125.0, + }, + ], + }, + }; + + const String tOrderId = 'O100'; + + test('should return a valid OrderDto from JSON and ID', () { + final result = OrderDto.fromJson(tOrderJson, tOrderId); + + expect(result.orderId, tOrderId); + expect(result.driverId, 'D123'); + expect(result.userId, 'U789'); + expect(result.userAddress, isA()); + expect(result.userAddress.name, 'Home'); + + expect(result.orderDetails, isA()); + expect(result.orderDetails.status, 'processing'); + expect(result.orderDetails.items.length, 1); + expect(result.orderDetails.items[0].title, 'Panadol'); + }); + + test('should return a valid JSON map from OrderDto', () { + final dto = OrderDto( + orderId: tOrderId, + driverId: 'D123', + userId: 'U789', + userAddress: UserAddressDto( + name: 'Home', + address: 'Cairo', + userId: 'U789', + ), + orderDetails: OrderDetailsDto( + items: [], + status: 'pending', + totalPrice: 0.0, + pickupAddress: PickedAddressDto(name: 'Store', address: 'Street'), + orderId: tOrderId, + userAddress: 'Cairo', + ), + ); + + final result = dto.toJson(); + + expect(result['driver_id'], 'D123'); + expect(result['user_id'], 'U789'); + + expect(result['userAddress'], isA>()); + expect(result['oder_dt'], isA>()); + expect(result['oder_dt']['status'], 'pending'); + }); + }); +} diff --git a/test/features/driver_orders_details/data/repos/order_details_repo_impl_test.dart b/test/features/driver_orders_details/data/repos/order_details_repo_impl_test.dart new file mode 100644 index 0000000..b10ab3e --- /dev/null +++ b/test/features/driver_orders_details/data/repos/order_details_repo_impl_test.dart @@ -0,0 +1,90 @@ +import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:mockito/annotations.dart'; +import 'package:mockito/mockito.dart'; +import 'package:tracking_app/app/core/network/api_result.dart'; +import 'package:tracking_app/features/driver_orders_details/data/datasource/order_details_remote_datasource.dart'; +import 'package:tracking_app/features/driver_orders_details/data/models/orders_dto.dart'; +import 'package:tracking_app/features/driver_orders_details/data/repos/order_details_repo_impl.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; +import 'order_details_repo_impl_test.mocks.dart'; + +@GenerateMocks([OrderDetailsRemoteDatasource, DocumentSnapshot]) +void main() { + late OrderDetailsRepoImpl repository; + late MockOrderDetailsRemoteDatasource mockRemoteDataSource; + + setUp(() { + mockRemoteDataSource = MockOrderDetailsRemoteDatasource(); + repository = OrderDetailsRepoImpl(mockRemoteDataSource); + provideDummy>>( + ErrorApiResult(error: 'dummy_error'), + ); + }); + + const tOrderId = 'pxkMaEmWYVuvV5jkW0JK'; + + final tOrderDto = OrderDto( + driverId: 'D123', + userAddress: UserAddressDto( + address: 'Alex', + name: 'Mariam', + userId: 'U123', + ), + userId: 'U789', + orderId: tOrderId, + orderDetails: OrderDetailsDto( + items: [], + status: 'accepted', + totalPrice: 150.0, + pickupAddress: PickedAddressDto(name: 'Pharmacy', address: 'Downtown'), + orderId: tOrderId, + userAddress: 'Alex', + ), + ); + + group('getOrderDetails', () { + test( + 'should emit OrderModel when the remote data source returns SuccessApiResult with Stream', + () async { + when( + mockRemoteDataSource.getOrderStream(tOrderId), + ).thenReturn(SuccessApiResult(data: Stream.value(tOrderDto))); + + final result = repository.getOrderDetails(tOrderId); + + expect(result, isA>>()); + final stream = (result as SuccessApiResult>).data; + await expectLater( + stream, + emits( + isA() + .having((o) => o.orderId, 'order id', tOrderId) + .having((o) => o.userAddress.name, 'user name', 'Mariam') + .having( + (o) => o.orderDetails.status, + 'order status', + 'accepted', + ) + .having((o) => o.orderDetails.totalPrice, 'total price', 150.0), + ), + ); + }, + ); + + test( + 'should throw an Exception when the document does not exist', + () async { + const errorMessage = "Network Error"; + when( + mockRemoteDataSource.getOrderStream(tOrderId), + ).thenReturn(ErrorApiResult(error: errorMessage)); + + final result = repository.getOrderDetails(tOrderId); + + expect(result, isA>>()); + expect((result as ErrorApiResult).error, errorMessage); + }, + ); + }); +} diff --git a/test/features/driver_orders_details/domain/models/orders_model_test.dart b/test/features/driver_orders_details/domain/models/orders_model_test.dart new file mode 100644 index 0000000..b4f986d --- /dev/null +++ b/test/features/driver_orders_details/domain/models/orders_model_test.dart @@ -0,0 +1,68 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; + +void main() { + group('OrderModel & UserAddressModel Tests', () { + test('should correctly initialize UserAddressModel with given values', () { + final tAddress = UserAddressModel( + address: 'Cairo', + name: 'Mohamed', + userId: '1', + ); + + expect(tAddress.address, 'Cairo'); + expect(tAddress.name, 'Mohamed'); + expect(tAddress.userId, '1'); + }); + + test('should correctly initialize OrderModel with given values', () { + final tUserAddress = UserAddressModel( + address: 'Cairo', + name: 'Mohamed', + userId: 'USR-555', + ); + + final tOrder = OrderModel( + driverId: 'DRV-101', + userAddress: tUserAddress, + userId: 'USR-555', + orderId: 'ORD-999', + orderDetails: OrderDetailsModel( + items: [], + status: 'picked_up', + totalPrice: 250, + pickupAddress: PickedAddressModel( + name: 'Pharmacy', + address: 'Downtown', + ), + orderId: 'ORD-999', + userAddress: 'Cairo', + ), + ); + + expect(tOrder.driverId, 'DRV-101'); + expect(tOrder.orderId, 'ORD-999'); + expect(tOrder.orderDetails.status, 'picked_up'); + expect(tOrder.orderDetails.totalPrice, 250); + expect(tOrder.userId, 'USR-555'); + + expect(tOrder.userAddress, isA()); + expect(tOrder.userAddress.name, 'Mohamed'); + }); + + test('should support equality check if needed (Optional)', () { + final address1 = UserAddressModel( + address: 'A', + name: 'B', + userId: 'USR-123', + ); + final address2 = UserAddressModel( + address: 'A', + name: 'B', + userId: 'USR-456', + ); + + expect(address1 == address2, isFalse); + }); + }); +} diff --git a/test/features/driver_orders_details/domain/usecases/get_order_details_usecase_test.dart b/test/features/driver_orders_details/domain/usecases/get_order_details_usecase_test.dart new file mode 100644 index 0000000..d27570b --- /dev/null +++ b/test/features/driver_orders_details/domain/usecases/get_order_details_usecase_test.dart @@ -0,0 +1,67 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:mockito/annotations.dart'; +import 'package:mockito/mockito.dart'; +import 'package:tracking_app/app/core/network/api_result.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/repos/order_details_repo.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/usecases/get_order_details_usecase.dart'; + +import 'get_order_details_usecase_test.mocks.dart'; + +@GenerateMocks([OrderDetailsRepo]) +void main() { + late GetOrderDetailsUsecase usecase; + late MockOrderDetailsRepo mockRepo; + + setUp(() { + mockRepo = MockOrderDetailsRepo(); + usecase = GetOrderDetailsUsecase(repo: mockRepo); + provideDummy>>(ErrorApiResult(error: 'dummy')); + }); + + const tOrderId = 'pxkMaEmWYVuvV5jkW0JK'; + + final tOrderModel = OrderModel( + driverId: 'D1', + userAddress: UserAddressModel(address: 'Shebin', name: 'Ali', userId: 'U1'), + userId: 'U1', + orderId: tOrderId, + orderDetails: OrderDetailsModel( + items: [], + status: 'accepted', + totalPrice: 500, + pickupAddress: PickedAddressModel(name: 'Pharmacy', address: 'Downtown'), + orderId: tOrderId, + userAddress: 'Shebin', + ), + ); + + group('GetOrderDetailsUsecase test', () { + test( + 'should return SuccessApiResult containing the Stream from the repository', + () async { + when( + mockRepo.getOrderDetails(any), + ).thenReturn(SuccessApiResult(data: Stream.value(tOrderModel))); + + final result = usecase.call(tOrderId); + + expect(result, isA>>()); + final stream = (result as SuccessApiResult>).data; + await expectLater(stream, emits(tOrderModel)); + verify(mockRepo.getOrderDetails(tOrderId)).called(1); + }, + ); + + test('should return ErrorApiResult when the repository fails', () async { + when( + mockRepo.getOrderDetails(any), + ).thenReturn(ErrorApiResult(error: 'Error from Repository')); + + final result = usecase.call(tOrderId); + + expect(result, isA>>()); + expect((result as ErrorApiResult).error, 'Error from Repository'); + }); + }); +} diff --git a/test/features/driver_orders_details/presentation/pages/drivers_orders_details_page_test.dart b/test/features/driver_orders_details/presentation/pages/drivers_orders_details_page_test.dart new file mode 100644 index 0000000..18f5d20 --- /dev/null +++ b/test/features/driver_orders_details/presentation/pages/drivers_orders_details_page_test.dart @@ -0,0 +1,123 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:mockito/annotations.dart'; +import 'package:mockito/mockito.dart'; +import 'package:tracking_app/app/config/base_state/base_state.dart'; +import 'package:tracking_app/app/config/di/di.dart'; +import 'package:tracking_app/features/driver_orders_details/domain/models/orders_model.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/manager/order_details_cubit.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/manager/order_details_states.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/pages/drivers_orders_details_page.dart'; +import 'package:tracking_app/features/driver_orders_details/presentation/widgets/address_card.dart'; +import 'drivers_orders_details_page_test.mocks.dart'; + +@GenerateMocks([OrderDetailsCubit]) +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + late MockOrderDetailsCubit mockCubit; + + setUp(() async { + await getIt.reset(); + mockCubit = MockOrderDetailsCubit(); + getIt.registerFactory(() => mockCubit); + when(mockCubit.state).thenReturn(OrderDetailsStates()); + when(mockCubit.stream).thenAnswer((_) => const Stream.empty()); + }); + + Widget buildTestableWidget() { + return EasyLocalization( + supportedLocales: const [Locale('en')], + path: 'assets/translations', + fallbackLocale: const Locale('en'), + startLocale: const Locale('en'), + saveLocale: false, + child: Builder( + builder: (context) { + return MaterialApp( + home: BlocProvider.value( + value: mockCubit, + child: const DriversOrdersDetailsPage(), + ), + ); + }, + ), + ); + } + + final tOrderModel = OrderModel( + driverId: 'D1', + userAddress: UserAddressModel(address: 'Shebin', name: 'Ali', userId: 'U1'), + userId: 'U1', + orderId: 'N123', + orderDetails: OrderDetailsModel( + items: [], + status: 'accepted', + totalPrice: 500, + pickupAddress: PickedAddressModel(name: 'Pharmacy', address: 'Downtown'), + orderId: 'N123', + userAddress: 'Shebin', + ), + ); + + group('DriversOrdersDetailsPage Widget Tests', () { + testWidgets('should show CircularProgressIndicator when state is loading', ( + tester, + ) async { + when( + mockCubit.state, + ).thenReturn(OrderDetailsStates(data: Resource.loading())); + when(mockCubit.stream).thenAnswer( + (_) => Stream.value(OrderDetailsStates(data: Resource.loading())), + ); + + await tester.pumpWidget(buildTestableWidget()); + await tester.pump(); + + expect(find.byType(CircularProgressIndicator), findsOneWidget); + }); + + testWidgets( + 'should display order details correctly when state is success', + (tester) async { + when( + mockCubit.state, + ).thenReturn(OrderDetailsStates(data: Resource.success(tOrderModel))); + when(mockCubit.stream).thenAnswer( + (_) => Stream.value( + OrderDetailsStates(data: Resource.success(tOrderModel)), + ), + ); + + await tester.pumpWidget(buildTestableWidget()); + await tester.pump(); + + expect(find.textContaining('N123'), findsOneWidget); + expect(find.text('Ali'), findsOneWidget); + expect(find.text('Shebin'), findsAtLeastNWidgets(1)); + expect(find.textContaining('500'), findsOneWidget); + expect(find.byType(AddressCard), findsAtLeastNWidgets(2)); + }, + ); + + testWidgets('should display error message when state is error', ( + tester, + ) async { + const errorMessage = 'Failed to load order'; + when( + mockCubit.state, + ).thenReturn(OrderDetailsStates(data: Resource.error(errorMessage))); + when(mockCubit.stream).thenAnswer( + (_) => Stream.value( + OrderDetailsStates(data: Resource.error(errorMessage)), + ), + ); + + await tester.pumpWidget(buildTestableWidget()); + await tester.pump(); + + expect(find.text(errorMessage), findsOneWidget); + }); + }); +} diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 8e904a1..b762e91 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,15 +6,12 @@ #include "generated_plugin_registrant.h" -#include #include #include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { - CloudFirestorePluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("CloudFirestorePluginCApi")); FileSelectorWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("FileSelectorWindows")); FirebaseCorePluginCApiRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 8d3f745..b5e0031 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,7 +3,6 @@ # list(APPEND FLUTTER_PLUGIN_LIST - cloud_firestore file_selector_windows firebase_core geolocator_windows