null safety
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import 'dart:async';
|
||||
import 'package:barcode_scan2/gen/protos/protos.pb.dart';
|
||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||
import 'package:fcs/data/services/services.dart';
|
||||
import 'package:fcs/domain/vo/delivery_address.dart';
|
||||
@@ -10,13 +11,13 @@ class DeliveryAddressModel extends BaseModel {
|
||||
final log = Logger('FcsShipmentModel');
|
||||
List<DeliveryAddress> deliveryAddresses = [];
|
||||
|
||||
StreamSubscription<QuerySnapshot> listener;
|
||||
StreamSubscription<QuerySnapshot>? listener;
|
||||
|
||||
DeliveryAddress get defalutAddress =>
|
||||
deliveryAddresses.firstWhere((e) => e.isDefault, orElse: () => null);
|
||||
deliveryAddresses.firstWhere((e) => e.isDefault, orElse: () => DeliveryAddress());
|
||||
|
||||
DeliveryAddress getLocalDeliveryAddress(String id) =>
|
||||
deliveryAddresses.firstWhere((e) => e.id == id, orElse: () => null);
|
||||
deliveryAddresses.firstWhere((e) => e.id == id, orElse: () => DeliveryAddress());
|
||||
|
||||
@override
|
||||
void privilegeChanged() {
|
||||
@@ -26,26 +27,26 @@ class DeliveryAddressModel extends BaseModel {
|
||||
|
||||
@override
|
||||
logout() async {
|
||||
if (listener != null) await listener.cancel();
|
||||
if (listener != null) await listener!.cancel();
|
||||
deliveryAddresses = [];
|
||||
}
|
||||
|
||||
Future<void> _loadDeliveryAddresses() async {
|
||||
if (user == null) return;
|
||||
String path = "$delivery_address_collection/";
|
||||
if (listener != null) listener.cancel();
|
||||
if (listener != null) listener!.cancel();
|
||||
deliveryAddresses = [];
|
||||
try {
|
||||
listener = Firestore.instance
|
||||
listener = FirebaseFirestore.instance
|
||||
.collection('users')
|
||||
.document("${user.id}")
|
||||
.doc("${user!.id}")
|
||||
.collection("$path")
|
||||
.snapshots()
|
||||
.listen((QuerySnapshot snapshot) {
|
||||
deliveryAddresses.clear();
|
||||
deliveryAddresses = snapshot.documents.map((documentSnapshot) {
|
||||
deliveryAddresses = snapshot.docs.map((documentSnapshot) {
|
||||
var s = DeliveryAddress.fromMap(
|
||||
documentSnapshot.data, documentSnapshot.documentID);
|
||||
documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
|
||||
return s;
|
||||
}).toList();
|
||||
notifyListeners();
|
||||
@@ -56,9 +57,9 @@ class DeliveryAddressModel extends BaseModel {
|
||||
}
|
||||
|
||||
Future<DeliveryAddress> getDeliveryAddress(String id) async {
|
||||
String path = "/$user_collection/${user.id}/$delivery_address_collection";
|
||||
var snap = await Firestore.instance.collection(path).document(id).get();
|
||||
return DeliveryAddress.fromMap(snap.data, snap.documentID);
|
||||
String path = "/$user_collection/${user!.id}/$delivery_address_collection";
|
||||
var snap = await FirebaseFirestore.instance.collection(path).doc(id).get();
|
||||
return DeliveryAddress.fromMap(snap.data as Map<String,dynamic>, snap.id);
|
||||
}
|
||||
|
||||
void initUser(user) {
|
||||
@@ -87,14 +88,14 @@ class DeliveryAddressModel extends BaseModel {
|
||||
|
||||
Future<List<DeliveryAddress>> getDeliveryAddresses(String userID) async {
|
||||
String path = "$delivery_address_collection/";
|
||||
var querySnap = await Firestore.instance
|
||||
var querySnap = await FirebaseFirestore.instance
|
||||
.collection('users')
|
||||
.document("$userID")
|
||||
.doc("$userID")
|
||||
.collection("$path")
|
||||
.orderBy("full_name")
|
||||
.getDocuments();
|
||||
return querySnap.documents
|
||||
.map((e) => DeliveryAddress.fromMap(e.data, e.documentID))
|
||||
.get();
|
||||
return querySnap.docs
|
||||
.map((e) => DeliveryAddress.fromMap(e.data as Map<String,dynamic>, e.id))
|
||||
.toList();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user