add encoded codes sorter

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog  
 All notable changes to this project will be documented in this file.
 
+## [0.16.7]
+
+### Added
+- Encoded codes can now be sorted by using EncodedCodesOptions.sorter 
+
 ## [0.16.6]
 
 ### Changed 

core/src/main/java/io/snabble/sdk/encodedcodes/EncodedCodesGenerator.java

@@ -13,6 +13,18 @@
 import io.snabble.sdk.codes.templates.groups.EmbedGroup;
 
 public class EncodedCodesGenerator {
+    public class ProductInfo {
+        Product product;
+        int quantity;
+        ScannedCode scannedCode;
+
+        public ProductInfo(Product product, int quantity, ScannedCode scannedCode) {
+            this.product = product;
+            this.quantity = quantity;
+            this.scannedCode = scannedCode;
+        }
+    }
+
     private StringBuilder stringBuilder;
     private EncodedCodesOptions options;
     private ArrayList<String> encodedCodes;
@@ -34,8 +46,27 @@ public void add(String code) {
     }
 
     public void add(ShoppingCart shoppingCart) {
-        addProducts(shoppingCart, false);
-        addProducts(shoppingCart, true);
+        List<ProductInfo> productInfos = new ArrayList<>();
+        for (int i = 0; i < shoppingCart.size(); i++) {
+            ShoppingCart.Item item = shoppingCart.get(i);
+            Product product = item.getProduct();
+
+            productInfos.add(new ProductInfo(product,
+                    item.getQuantity(),
+                    item.getScannedCode()));
+        }
+
+        if (options.sorter != null) {
+            Collections.sort(productInfos, new Comparator<ProductInfo>() {
+                @Override
+                public int compare(ProductInfo o1, ProductInfo o2) {
+                    return options.sorter.compare(o1, o2);
+                }
+            });
+        }
+
+        addProducts(productInfos, false);
+        addProducts(productInfos, true);
     }
 
     public void clear() {
@@ -44,14 +75,14 @@ public void clear() {
     }
 
     public ArrayList<String> generate() {
-        if (options.finalCode.length() != 0) {
+        if (options.finalCode != null && options.finalCode.length() != 0) {
             append(options.finalCode);
         }
 
         finishCode();
 
         ArrayList<String> ret = new ArrayList<>();
-        for (int i=0; i<encodedCodes.size(); i++) {
+        for (int i = 0; i < encodedCodes.size(); i++) {
             String code = encodedCodes.get(i);
             code = code.replace("{qrCodeCount}", String.valueOf(encodedCodes.size()));
             code = code.replace("{qrCodeIndex}", String.valueOf(i + 1));
@@ -62,9 +93,9 @@ public ArrayList<String> generate() {
         return ret;
     }
 
-    private boolean hasAgeRestrictedCode(ShoppingCart shoppingCart) {
-        for (int i = 0; i < shoppingCart.size(); i++) {
-            Product product = shoppingCart.get(i).getProduct();
+    private boolean hasAgeRestrictedCode(List<ProductInfo> productInfos) {
+        for (int i = 0; i < productInfos.size(); i++) {
+            Product product = productInfos.get(i).product;
 
             if (product.getSaleRestriction().isAgeRestriction()
                     && product.getSaleRestriction().getValue() >= 16) {
@@ -84,33 +115,8 @@ private boolean isAgeRestricted(Product product) {
         return false;
     }
 
-    private class ProductInfo {
-        Product product;
-        int quantity;
-        ScannedCode scannedCode;
-
-        public ProductInfo(Product product, int quantity, ScannedCode scannedCode) {
-            this.product = product;
-            this.quantity = quantity;
-            this.scannedCode = scannedCode;
-        }
-    }
-
-    private void addProducts(final ShoppingCart shoppingCart, boolean ageRestricted) {
-        hasAgeRestrictedCode = hasAgeRestrictedCode(shoppingCart);
-
-        List<ProductInfo> productInfos = new ArrayList<>();
-        for (int i = 0; i < shoppingCart.size(); i++) {
-            ShoppingCart.Item item = shoppingCart.get(i);
-            Product product = item.getProduct();
-            if (ageRestricted != isAgeRestricted(product)) {
-                continue;
-            }
-
-            productInfos.add(new ProductInfo(product,
-                    item.getQuantity(),
-                    item.getScannedCode()));
-        }
+    private void addProducts(final List<ProductInfo> productInfos, boolean ageRestricted) {
+        hasAgeRestrictedCode = hasAgeRestrictedCode(productInfos);
 
         for (ProductInfo productInfo : productInfos) {
             if (ageRestricted != isAgeRestricted(productInfo.product)) {

core/src/main/java/io/snabble/sdk/encodedcodes/EncodedCodesOptions.java

@@ -3,12 +3,16 @@
 import android.util.SparseArray;
 
 import com.google.gson.JsonObject;
-import com.google.gson.annotations.SerializedName;
 
 import io.snabble.sdk.Project;
 import io.snabble.sdk.utils.JsonUtils;
 
 public class EncodedCodesOptions {
+    public interface Sorter {
+        int compare(EncodedCodesGenerator.ProductInfo productInfo1,
+                     EncodedCodesGenerator.ProductInfo productInfo2);
+    }
+
     public static final int DEFAULT_MAX_CHARS = 2953;
     public static final int DEFAULT_MAX_CODES = 100;
 
@@ -25,12 +29,14 @@ public class EncodedCodesOptions {
     public final String countSeparator;
     public final int maxSizeMm;
     public final Project project;
+    public final Sorter sorter;
 
     private EncodedCodesOptions(String prefix, SparseArray<String> prefixMap, String separator, String suffix, int maxChars,
                                 int maxCodes, String finalCode, String nextCode,
                                 String nextCodeWithCheck, boolean repeatCodes, String countSeparator,
                                 int maxSizeMm,
-                                Project project) {
+                                Project project,
+                                Sorter sorter) {
         this.prefix = prefix;
         this.prefixMap = prefixMap;
         this.separator = separator;
@@ -44,6 +50,7 @@ private EncodedCodesOptions(String prefix, SparseArray<String> prefixMap, String
         this.countSeparator = countSeparator;
         this.maxSizeMm = maxSizeMm;
         this.project = project;
+        this.sorter = sorter;
     }
 
     public static class Builder {
@@ -60,6 +67,7 @@ public static class Builder {
         private boolean repeatCodes = true;
         private String countSeparator = ";";
         private int maxSizeMm;
+        private Sorter sorter;
 
         public Builder(Project project) {
             this.project = project;
@@ -125,9 +133,15 @@ public Builder maxSizeMm(int maxSizeMm) {
             return this;
         }
 
+        public Builder maxSizeMm(Sorter sorter) {
+            this.sorter = sorter;
+            return this;
+        }
+
         public EncodedCodesOptions build() {
             return new EncodedCodesOptions(prefix, prefixMap, separator, suffix, maxChars, maxCodes,
-                    finalCode, nextCode, nextCodeWithCheck, repeatCodes, countSeparator, maxSizeMm, project);
+                    finalCode, nextCode, nextCodeWithCheck, repeatCodes, countSeparator,
+                    maxSizeMm, project, sorter);
         }
     }
 
@@ -178,7 +192,7 @@ public static EncodedCodesOptions fromJsonObject(Project project, JsonObject jso
                                 .build();
             case "simple":
             default:
-                return new EncodedCodesOptions.Builder(project)
+                EncodedCodesOptions.Builder builder = new EncodedCodesOptions.Builder(project)
                         .prefix(JsonUtils.getStringOpt(jsonObject, "prefix", ""))
                         .suffix(JsonUtils.getStringOpt(jsonObject, "suffix", ""))
                         .separator(separator)
@@ -187,8 +201,35 @@ public static EncodedCodesOptions fromJsonObject(Project project, JsonObject jso
                         .finalCode(finalCode)
                         .nextCode(JsonUtils.getStringOpt(jsonObject, "nextCode", ""))
                         .nextCodeWithCheck(JsonUtils.getStringOpt(jsonObject, "nextCodeWithCheck", ""))
-                        .maxSizeMm(JsonUtils.getIntOpt(jsonObject, "maxSizeMM", -1))
-                        .build();
+                        .maxSizeMm(JsonUtils.getIntOpt(jsonObject, "maxSizeMM", -1));
+
+                if (project.getId().contains("knauber")) {
+                    builder.sorter = new Sorter() {
+                        @Override
+                        public int compare(EncodedCodesGenerator.ProductInfo productInfo1,
+                                            EncodedCodesGenerator.ProductInfo productInfo2) {
+                            final String catchAll = "2030801009887";
+
+                            String tc1 = productInfo1.product.getTransmissionCode(
+                                    productInfo1.scannedCode.getTemplateName(),
+                                    productInfo1.scannedCode.getLookupCode());
+
+                            String tc2 = productInfo2.product.getTransmissionCode(
+                                    productInfo2.scannedCode.getTemplateName(),
+                                    productInfo2.scannedCode.getLookupCode());
+
+                            if (catchAll.equals(tc1)) {
+                                return 1;
+                            } else if (catchAll.equals(tc2)) {
+                                return -1;
+                            } else {
+                                return 0;
+                            }
+                        }
+                    };
+                }
+
+                return builder.build();
         }
     }
 }