From 03c5fc501626d07045a028f7f179630054b04bc2 Mon Sep 17 00:00:00 2001
From: phyothandar <phyo.thandar@mokkon.com>
Date: Fri, 10 Sep 2021 15:24:31 +0630
Subject: [PATCH] null safety

---
 lib/pages/invoice/model/invoice_model.dart | 10 +++++-----
 lib/pages/market/model/market_model.dart   |  4 ++--
 lib/pages/package/model/package_model.dart | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/pages/invoice/model/invoice_model.dart b/lib/pages/invoice/model/invoice_model.dart
index 2ad13f8..e1d82ab 100644
--- a/lib/pages/invoice/model/invoice_model.dart
+++ b/lib/pages/invoice/model/invoice_model.dart
@@ -52,7 +52,7 @@ class InvoiceModel extends BaseModel {
 
   Future<void> _loadInvoices(bool forCustomer) async {
     if (user == null) return;
-    if (!forCustomer && !user.hasInvoices()) return;
+    if (!forCustomer && !user!.hasInvoices()) return;
     String path = "/$invoices_collection";
     if (listener != null) listener!.cancel();
     _invoices = [];
@@ -64,7 +64,7 @@ class InvoiceModel extends BaseModel {
           .where("is_deleted", isEqualTo: false);
 
       if (forCustomer) {
-        q = q.where("user_id", isEqualTo: user.id);
+        q = q.where("user_id", isEqualTo: user!.id);
       }
 
       listener = q.snapshots().listen((QuerySnapshot snapshot) {
@@ -83,13 +83,13 @@ class InvoiceModel extends BaseModel {
 
   Paginator _getPaginator(bool isCustomer, bool isCanceled, bool isPaid) {
     if (!isCustomer) {
-      if (user == null || !(user.hasInvoices())) throw "No privilege";
+      if (user == null || !(user!.hasInvoices())) throw "No privilege";
     }
     var pageQuery = FirebaseFirestore.instance
         .collection("/$invoices_collection")
         .where("is_deleted", isEqualTo: false);
     if (isCustomer) {
-      pageQuery = pageQuery.where("user_id", isEqualTo: user.id);
+      pageQuery = pageQuery.where("user_id", isEqualTo: user!.id);
     }
     if (isCanceled) {
       pageQuery = pageQuery.where("status", isEqualTo: invoice_cancel_status);
@@ -149,7 +149,7 @@ class InvoiceModel extends BaseModel {
   }
 
   Future<void> pay(Payment payment, File file) async {
-    String path = Path.join(receipt_labels_files_path, user.id);
+    String path = Path.join(receipt_labels_files_path, user!.id);
     String url = await uploadStorage(path, file);
     payment.paymentReceiptURL = url;
     return Services.instance.invoiceService.pay(payment);
diff --git a/lib/pages/market/model/market_model.dart b/lib/pages/market/model/market_model.dart
index 7f45b50..658d2c0 100644
--- a/lib/pages/market/model/market_model.dart
+++ b/lib/pages/market/model/market_model.dart
@@ -9,7 +9,7 @@ import 'package:logging/logging.dart';
 
 class MarketModel extends BaseModel {
   final log = Logger('MarketModel');
-  StreamSubscription<QuerySnapshot> listener;
+  StreamSubscription<QuerySnapshot>? listener;
   List<Market> markets = [];
 
   MarketModel() {
@@ -18,7 +18,7 @@ class MarketModel extends BaseModel {
 
   Future<void> _loadMarkets() async {
     try {
-      if (listener != null) listener.cancel();
+      if (listener != null) listener!.cancel();
 
       listener = FirebaseFirestore.instance
           .collection("/$config_collection/$setting_doc_id/$markets_collection")
diff --git a/lib/pages/package/model/package_model.dart b/lib/pages/package/model/package_model.dart
index 0b53d77..1d2e439 100644
--- a/lib/pages/package/model/package_model.dart
+++ b/lib/pages/package/model/package_model.dart
@@ -70,7 +70,7 @@ class PackageModel extends BaseModel {
 
   Future<void> _loadPackages(bool isDelivered) async {
     if (user == null) return;
-    if (!((user.hasPackages() || user.hasReceiving() || user.hasProcessing())))
+    if (!((user!.hasPackages() || user!.hasReceiving() || user!.hasProcessing())))
       return;
     String path = "/$packages_collection";
 
@@ -97,11 +97,11 @@ class PackageModel extends BaseModel {
       Query listenerQuery = FirebaseFirestore.instance
           .collection(path)
           .where("is_delivered", isEqualTo: isDelivered)
-          .where("user_id", isEqualTo: user.id);
+          .where("user_id", isEqualTo: user!.id);
       Query pageQuery = FirebaseFirestore.instance
           .collection(path)
           .where("is_delivered", isEqualTo: isDelivered)
-          .where("user_id", isEqualTo: user.id)
+          .where("user_id", isEqualTo: user!.id)
           .orderBy("update_time", descending: true);
 
       customerPackages!.refresh(
@@ -113,7 +113,7 @@ class PackageModel extends BaseModel {
 
   Future<void> _loadActivePackages() async {
     if (user == null) return;
-    if (!((user.hasPackages() || user.hasReceiving() || user.hasProcessing())))
+    if (!((user!.hasPackages() || user!.hasReceiving() || user!.hasProcessing())))
       return;
     String path = "/$packages_collection";
 
@@ -192,7 +192,7 @@ class PackageModel extends BaseModel {
       qsnap = await FirebaseFirestore.instance
           .collection("$path")
           .where("tracking_id", isEqualTo: trackingID)
-          .where("user_id", isEqualTo: user.id)
+          .where("user_id", isEqualTo: user!.id)
           .where("is_deleted", isEqualTo: false)
           .get(const GetOptions(source: Source.server));
       if (qsnap.docs.length > 0) {