add pickup provider

This commit is contained in:
2021-10-09 09:27:51 +06:30
parent 2a3277035e
commit 46da87dc0e
7 changed files with 102 additions and 5 deletions

View File

@@ -0,0 +1,20 @@
import 'dart:convert';
import 'package:fcs/config.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/pickup.dart';
import 'package:fcs/helpers/api_helper.dart';
import 'package:fcs/helpers/firebase_helper.dart';
import 'package:logging/logging.dart';
class PickupDataProvider {
final log = Logger('PickupDataProvider');
static final PickupDataProvider instance = PickupDataProvider._();
PickupDataProvider._();
Future<void> completePickup(Pickup pickup) async {
return await requestAPI("/pickups/complete", "PUT",
payload: pickup.toMapForComplete(), token: await getToken());
}
}

View File

@@ -0,0 +1,19 @@
import 'package:fcs/data/provider/pickup_data_provider.dart';
import 'package:fcs/data/services/pickup_service.dart';
import 'package:fcs/domain/entities/connectivity.dart';
import 'package:fcs/domain/entities/pickup.dart';
class PickupServiceImp implements PickupService {
PickupServiceImp({
required this.connectivity,
required this.pickupDataProvider,
});
final Connectivity? connectivity;
final PickupDataProvider pickupDataProvider;
@override
Future<void> completePickup(Pickup pickup) {
return pickupDataProvider.completePickup(pickup);
}
}

View File

@@ -0,0 +1,6 @@
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/pickup.dart';
abstract class PickupService {
Future<void> completePickup(Pickup pickup);
}

View File

@@ -5,6 +5,7 @@ import 'package:fcs/data/provider/delivery_address_data_provider.dart';
import 'package:fcs/data/provider/fcs_shipment_data_provider.dart';
import 'package:fcs/data/provider/invoice_data_provider.dart';
import 'package:fcs/data/provider/package_data_provider.dart';
import 'package:fcs/data/provider/pickup_data_provider.dart';
import 'package:fcs/data/provider/rate_data_provider.dart';
import 'package:fcs/data/provider/shipment_data_provider.dart';
import 'package:fcs/data/provider/user_data_provider.dart';
@@ -16,6 +17,8 @@ import 'package:fcs/data/services/fcs_shipment_imp.dart';
import 'package:fcs/data/services/fcs_shipment_service.dart';
import 'package:fcs/data/services/invoice_imp.dart';
import 'package:fcs/data/services/invoice_service.dart';
import 'package:fcs/data/services/pickup_imp.dart';
import 'package:fcs/data/services/pickup_service.dart';
import 'package:fcs/data/services/rate_imp.dart';
import 'package:fcs/data/services/rate_service.dart';
import 'package:fcs/data/services/shipment_imp.dart';
@@ -46,6 +49,7 @@ class Services {
late ShipmentService _shipmentService;
late CartonService _cartonService;
late InvoiceService _invoiceService;
late PickupService _pickupService;
Services._() {
_authService = AuthServiceImp(
@@ -72,6 +76,8 @@ class Services {
cartonDataProvider: CartonDataProvider.instance, connectivity: null);
_invoiceService = InvoiceServiceImp(
invoiceDataProvider: InvoiceDataProvider.instance, connectivity: null);
_pickupService = PickupServiceImp(
connectivity: null, pickupDataProvider: PickupDataProvider.instance);
}
AuthService get authService => _authService;
@@ -85,4 +91,5 @@ class Services {
ShipmentService get shipmentService => _shipmentService;
CartonService get cartonService => _cartonService;
InvoiceService get invoiceService => _invoiceService;
PickupService get pickupService => _pickupService;
}

View File

@@ -32,6 +32,7 @@ const user_joined_status = "joined";
const pkg_files_path = "/packages";
const shipment_labels_files_path = "/shipment_labels";
const receipt_labels_files_path = "/receipts";
const pickups_files_path = "/pickups";
// Link page
const page_payment_methods = "payment_methods";
@@ -79,7 +80,7 @@ const shipment_courier_dropoff = "Courier drop off";
//Carton types
const carton_from_packages = "From packages";
const carton_from_cartons="From cartons";
const carton_from_cartons = "From cartons";
const carton_from_shipments = "From shipments";
const carton_mix_carton = "Mix carton";
const carton_small_bag = "Small bag";

View File

@@ -20,6 +20,10 @@ class Pickup {
String? shipperPhoneNumber;
String? status;
// for complete
String? completeRemark;
List<String> photoUrls;
List<Package> packages;
Pickup(
@@ -37,7 +41,8 @@ class Pickup {
this.shipperName,
this.shipperPhoneNumber,
this.status,
this.packages = const []});
this.packages = const [],
this.photoUrls = const []});
@override
bool operator ==(Object other) => other is Pickup && other.id == id;
@@ -83,6 +88,14 @@ class Pickup {
};
}
Map<String, dynamic> toMapForComplete() {
return {
"id": id,
"complete_remark": completeRemark,
'photo_urls': photoUrls ?? [],
};
}
@override
String toString() {
return 'Pickup{id: $id}';

View File

@@ -1,15 +1,20 @@
import 'dart:async';
import 'dart:io';
import 'dart:math';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/data/services/services.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/pickup.dart';
import 'package:fcs/domain/entities/processing.dart';
import 'package:fcs/helpers/firebase_helper.dart';
import 'package:fcs/pages/main/model/base_model.dart';
import 'package:fcs/pagination/paginator_listener.dart';
import 'package:logging/logging.dart';
import 'package:path/path.dart' as Path;
class PickupModel extends BaseModel {
// List<Processing> pickups = [];
final log = Logger('PickupModel');
StreamSubscription<QuerySnapshot>? listener;
@@ -48,7 +53,33 @@ class PickupModel extends BaseModel {
// pickups = [];
}
Future<void> createProcessing(Processing processing) async {}
Future<void> complete(
Pickup pickup, List<File?> files, List<String?> deletedUrls) async {
for (String? url in deletedUrls) {
pickup.photoUrls.remove(url);
}
Future<void> updateProcessing(Processing processing) async {}
// check files count
var count = (pickup.photoUrls.length) + files.length - (deletedUrls.length);
if (count > uploadPhotoLimit)
throw Exception("Exceed number of file upload");
List<String> uploadedURLs = [];
String path = Path.join(pickups_files_path, pickup.id);
uploadedURLs = await uploadFiles(path, files);
pickup.photoUrls.addAll(uploadedURLs);
pickup.photoUrls.removeWhere((e) => deletedUrls.contains(e));
try {
await Services.instance.pickupService.completePickup(pickup);
} catch (e) {
// delete newly uploaded photos if fails
try {
deleteStorageFromUrls(uploadedURLs);
pickup.photoUrls.removeWhere((i) => uploadedURLs.contains(i));
} catch (e) {}
throw e;
}
return deleteStorageFromUrls(deletedUrls);
}
}