From 87193bf168e68cb162208c19b896cfb18c43fd6e Mon Sep 17 00:00:00 2001
From: unknown <hillelcoren@gmail.com>
Date: Thu, 31 May 2018 00:33:23 -0700
Subject: [PATCH] Sorting..

---
 lib/data/models/product_model.dart       | 17 +++++++++++++++++
 lib/redux/product/product_selectors.dart |  9 +--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/data/models/product_model.dart b/lib/data/models/product_model.dart
index 240e15e4e..63bde7d71 100644
--- a/lib/data/models/product_model.dart
+++ b/lib/data/models/product_model.dart
@@ -71,6 +71,23 @@ abstract class ProductEntity implements Built<ProductEntity, ProductEntityBuilde
   //@JsonKey(name: 'custom_value2')
   //String customValue2;
 
+  int compareTo(ProductEntity product, String sortField, bool sortAscending) {
+    int response = 0;
+    ProductEntity productA = sortAscending ? this : product;
+    ProductEntity productB = sortAscending ? product: this;
+
+    switch (sortField) {
+      case ProductFields.cost:
+        response = productA.cost.compareTo(productB.cost);
+    }
+
+    if (response == 0) {
+      return productA.productKey.compareTo(productB.productKey);
+    } else {
+      return response;
+    }
+  }
+
   ProductEntity._();
   factory ProductEntity([updates(ProductEntityBuilder b)]) = _$ProductEntity;
   static Serializer<ProductEntity> get serializer => _$productEntitySerializer;
diff --git a/lib/redux/product/product_selectors.dart b/lib/redux/product/product_selectors.dart
index 91cae0f50..3d7f7101f 100644
--- a/lib/redux/product/product_selectors.dart
+++ b/lib/redux/product/product_selectors.dart
@@ -21,14 +21,7 @@ List<ProductEntity> filteredProductsSelector(
   list.sort((productAId, productBId) {
     var productA = productState.map[productAId];
     var productB = productState.map[productBId];
-    var sortField = productUIState.sortField;
-
-    switch (sortField) {
-      case ProductFields.productKey:
-        return productA.productKey.compareTo(productB.productKey);
-      case ProductFields.cost:
-        return productA.cost.compareTo(productB.cost);
-    }
+    return productA.compareTo(productB, productUIState.sortField, productUIState.sortAscending);
   });
 
   print('== SORTING LIST');