WT1.1.11 Null-Safe migration

lib/bloc/sales/sales_bloc.dart

@@ -8,21 +8,19 @@ import 'package:aitrainer_app/model/product_test.dart';
 import 'package:aitrainer_app/model/purchase.dart';
 import 'package:aitrainer_app/service/logging.dart';
 import 'package:aitrainer_app/service/purchase_service.dart';
-import 'package:aitrainer_app/util/common.dart';
 import 'package:aitrainer_app/util/enums.dart';
 import 'package:aitrainer_app/util/purchases.dart';
 import 'package:aitrainer_app/util/track.dart';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
-import 'package:flurry/flurry.dart';
 import 'package:purchases_flutter/offering_wrapper.dart';
 
 part 'sales_event.dart';
 part 'sales_state.dart';
 
 class SalesBloc extends Bloc<SalesEvent, SalesState> with Logging {
-  List<ProductTest> tests = List();
-  List<Product> product2Display = List();
+  List<ProductTest>? tests = [];
+  List<Product> product2Display = [];
   int productSet = -1;
   SalesBloc() : super(SalesInitial());
 
@@ -35,7 +33,6 @@ class SalesBloc extends Bloc<SalesEvent, SalesState> with Logging {
         yield SalesLoading();
         log("Load Sales");
         Track().track(TrackingEvent.sales_page);
-        //await PlatformPurchaseApi().initPurchasePlatform();
         await RevenueCatPurchases().getOfferings();
         this.getProductSet();
         yield SalesReady();
@@ -47,27 +44,30 @@ class SalesBloc extends Bloc<SalesEvent, SalesState> with Logging {
         final int productId = event.productId;
         log("Requesting purchase for: " + productId.toString());
         Track().track(TrackingEvent.purchase_request);
-        final Product selectedProduct = this.getSelectedProduct(productId);
-        log("SelectedProduct for purchase " + selectedProduct.toString());
-        await RevenueCatPurchases().makePurchase(selectedProduct);
-        if (Cache().hasPurchased) {
-          Purchase purchase = Purchase(customerId: Cache().userLoggedIn.customerId, productId: productId);
-          purchase.dateAdd = DateTime.now();
-          purchase.purchaseSum = 0;
-          purchase.currency = "EUR";
-          await PurchaseApi().savePurchase(purchase);
-          Track().track(TrackingEvent.purchase_successful, eventValue: selectedProduct.localizedPrice.toString());
-          Common.sendMessage("Purchase: " + purchase.toJson().toString());
+        final Product? selectedProduct = this.getSelectedProduct(productId);
+        log("SelectedProduct for purchase $selectedProduct");
+        if (selectedProduct != null) {
+          await RevenueCatPurchases().makePurchase(selectedProduct);
+          if (Cache().hasPurchased) {
+            Purchase purchase = Purchase(customerId: Cache().userLoggedIn!.customerId!, productId: productId);
+            purchase.dateAdd = DateTime.now();
+            purchase.purchaseSum = 0;
+            purchase.currency = "EUR";
+            await PurchaseApi().savePurchase(purchase);
+            Track().track(TrackingEvent.purchase_successful, eventValue: selectedProduct.localizedPrice.toString());
+          }
+          yield SalesSuccessful();
+        } else {
+          yield SalesError(message: "No selected product");
         }
-        yield SalesSuccessful();
       }
     } on Exception catch (ex) {
       yield SalesError(message: ex.toString());
     }
   }
 
-  Product getSelectedProduct(int productId) {
-    Product prod;
+  Product? getSelectedProduct(int productId) {
+    Product? prod;
     for (var product in this.product2Display) {
       if (product.productId == productId) {
         prod = product;
@@ -78,7 +78,7 @@ class SalesBloc extends Bloc<SalesEvent, SalesState> with Logging {
 
   String getLocalizedPrice(String productId) {
     String price = "";
-    Offering offering = RevenueCatPurchases().offering;
+    Offering? offering = RevenueCatPurchases().offering;
     if (offering != null) {
       for (var package in offering.availablePackages) {
         log("PlatformProduct " + package.toString());
@@ -100,15 +100,19 @@ class SalesBloc extends Bloc<SalesEvent, SalesState> with Logging {
   void getProductSet() {
     int productId = 0;
     this.tests = Cache().productTests;
+    List<Product>? products = Cache().products;
+    if (products == null) {
+      return;
+    }
 
-    if (tests.isEmpty) {
+    if (tests != null && tests!.isEmpty) {
       var rand = math.Random.secure();
       productSet = rand.nextInt(5) + 1;
     } else {
-      trace("Previous ProductTest: " + tests[0].toJson().toString());
-      productId = tests[0].productId;
-      for (var elem in Cache().products) {
-        final Product product = elem as Product;
+      trace("Previous ProductTest: " + tests![0].toJson().toString());
+      productId = tests![0].productId;
+      for (var elem in products) {
+        final Product product = elem;
         if (product.productId == productId) {
           productSet = product.productSet;
           break;
@@ -120,12 +124,12 @@ class SalesBloc extends Bloc<SalesEvent, SalesState> with Logging {
 
     productSet = 2;
     log("ProductSet: " + productSet.toString());
-    for (var elem in Cache().products) {
-      Product product = elem as Product;
+    for (var elem in products) {
+      Product product = elem;
 
       if (product.productSet == productSet) {
         productId = product.productId;
-        final String platformProductId = Platform.isAndroid ? product.productIdAndroid : product.productIdIos;
+        final String platformProductId = Platform.isAndroid ? product.productIdAndroid! : product.productIdIos!;
         product.localizedPrice = getLocalizedPrice(platformProductId);
         product2Display.add(product);
       }
@@ -136,7 +140,7 @@ class SalesBloc extends Bloc<SalesEvent, SalesState> with Logging {
     });
 
     productTest.productId = productId;
-    productTest.customerId = Cache().userLoggedIn.customerId;
+    productTest.customerId = Cache().userLoggedIn!.customerId!;
     productTest.dateView = DateTime.now();
     //ProductTestApi().saveProductTest(productTest);
     //Cache().productTests.add(productTest);

lib/bloc/sales/sales_event.dart

@@ -13,5 +13,5 @@ class SalesLoad extends SalesEvent {
 
 class SalesPurchase extends SalesEvent {
   final int productId;
-  const SalesPurchase({this.productId});
+  const SalesPurchase({required this.productId});
 }

lib/bloc/sales/sales_state.dart

@@ -25,7 +25,7 @@ class SalesSuccessful extends SalesState {
 
 class SalesError extends SalesState {
   final String message;
-  const SalesError({this.message});
+  const SalesError({required this.message});
 
   @override
   List<Object> get props => [message];