Add isCache on StoreService

playmoweb · Jan 25, 2018 · 79b68f0 · 79b68f0
1 parent bbeb33f
commit 79b68f0
Show file tree

Hide file tree

Showing 3 changed files with 131 additions and 72 deletions.
diff --git a/store2store/src/androidTest/java/com/playmoweb/store2store/mock/MemoryDao.java b/store2store/src/androidTest/java/com/playmoweb/store2store/mock/MemoryDao.java
@@ -6,6 +6,7 @@
 import com.playmoweb.store2store.utils.SortType;
 import com.playmoweb.store2store.utils.SortingMode;
 
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -45,8 +46,17 @@ public Flowable<Optional<List<TestModel>>> getAll(final List<TestModel> items) {
 
     @Override
     public Flowable<Optional<TestModel>> getOne(Filter filter, SortingMode sortingMode) {
-        if(sortingMode != null && sortingMode.sort == SortType.DESCENDING){
-            return Flowable.just(Optional.wrap(models.get(models.size() - 1)));
+        if(sortingMode != null){
+            boolean reverse = false;
+            for(AbstractMap.SimpleEntry<String, SortType> e : sortingMode.entries){
+                if(e.getValue() == SortType.DESCENDING){
+                    reverse = true;
+                    break;
+                }
+            }
+            if(reverse) {
+                return Flowable.just(Optional.wrap(models.get(models.size() - 1)));
+            }
         }
         return Flowable.just(Optional.wrap(models.get(0)));
     }

diff --git a/store2store/src/androidTest/java/com/playmoweb/store2store/mock/TestStore.java b/store2store/src/androidTest/java/com/playmoweb/store2store/mock/TestStore.java
@@ -7,6 +7,7 @@
 import com.playmoweb.store2store.utils.SortType;
 import com.playmoweb.store2store.utils.SortingMode;
 
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -44,8 +45,17 @@ public Flowable<Optional<List<TestModel>>> getAll(Filter filter, SortingMode sor
             list.add(new TestModel(20));
             list.add(new TestModel(30));
 
-            if(sortingMode != null && sortingMode.sort == SortType.DESCENDING){
-                Collections.reverse(list);
+            if(sortingMode != null){
+                boolean reverse = false;
+                for(AbstractMap.SimpleEntry<String, SortType> e : sortingMode.entries){
+                    if(e.getValue() == SortType.DESCENDING){
+                        reverse = true;
+                        break;
+                    }
+                }
+                if(reverse) {
+                    Collections.reverse(list);
+                }
             }
 
             return Flowable.just(Optional.wrap(list)).delay(1, TimeUnit.SECONDS);