add support for transmission codes

Author: ajungg

core/src/androidTest/assets/product2.json

@@ -7,8 +7,14 @@
   "price": 399,
   "decimalDigits": 2,
   "taxCategory": "normal",
-  "scannableCodes": [
+  "eans": [
     "1"
   ],
+  "codes": [
+    {
+      "code": "1",
+      "transmissionCode": "000001"
+    }
+  ],
   "productType": "default"
 }

core/src/androidTest/java/io/snabble/sdk/ProductDatabaseTest.java

@@ -22,6 +22,7 @@
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -175,9 +176,13 @@ public void testFindBySkuOnline() {
         ProductDatabase productDatabase = project.getProductDatabase();
         final Product product = findBySkuBlocking(productDatabase, "online1");
         assertEquals(product.getSku(), "online1");
+        assertArrayEquals(product.getScannableCodes(), new String[]{"0"});
+        assertEquals(product.getTransmissionCode("0"), "0");
 
         final Product product2 = findBySkuBlocking(productDatabase, "online2");
         assertEquals(product2.getSku(), "online2");
+        assertArrayEquals(product2.getScannableCodes(), new String[]{"1"});
+        assertEquals(product2.getTransmissionCode("1"), "000001");
 
         assertNull(findBySkuBlocking(productDatabase, "unknownCode"));
     }
@@ -372,4 +377,15 @@ public void testFindProductWithEan13ByEan8() throws IOException, Snabble.Snabble
         String[] codes = product.getScannableCodes();
         Assert.assertTrue(ArrayUtils.contains(codes, "0000040084015"));
     }
+
+    @Test
+    public void testTransmissionCodeIsSameOnOldDbVersion() throws IOException, Snabble.SnabbleException {
+        setupSdkWithDb("demoDb_1_6.sqlite3");
+
+        ProductDatabase productDatabase = project.getProductDatabase();
+        Product product = productDatabase.findBySku("48");
+        Assert.assertNotNull(product);
+
+        Assert.assertEquals(product.getTransmissionCode(product.getScannableCodes()[0]), product.getScannableCodes()[0]);
+    }
  }

core/src/main/java/io/snabble/sdk/Product.java

@@ -4,6 +4,8 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Class that holds all of the product information.
@@ -98,6 +100,7 @@ public static SaleRestriction fromDatabaseField(long dbType, long value){
     private String subtitle;
     private String basePrice;
     private SaleRestriction saleRestriction = SaleRestriction.NONE;
+    private Map<String, String> transmissionCodes;
     private boolean saleStop;
 
     /**
@@ -120,6 +123,17 @@ public String[] getScannableCodes() {
         return scannableCodes;
     }
 
+    public String getTransmissionCode(String code) {
+        if(transmissionCodes != null) {
+            String newCode = transmissionCodes.get(code);
+            if(newCode != null) {
+                return newCode;
+            }
+        }
+
+        return code;
+    }
+
     public String[] getWeighedItemIds() {
         return weighedItemIds;
     }
@@ -332,6 +346,15 @@ public Builder setSaleStop(boolean saleStop){
             return this;
         }
 
+        public Builder addTransmissionCode(String fromCode, String transmissionCode){
+            if(product.transmissionCodes == null) {
+                product.transmissionCodes = new HashMap<>();
+            }
+
+            product.transmissionCodes.put(fromCode, transmissionCode);
+            return this;
+        }
+
         public Product build() {
             if (product.scannableCodes == null) {
                 product.scannableCodes = new String[0];

core/src/main/java/io/snabble/sdk/ProductApi.java

@@ -13,6 +13,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
 import io.snabble.sdk.utils.Logger;
@@ -36,16 +37,21 @@ private static class ApiProduct {
         private boolean deleted;
         private String imageUrl;
         private String productType;
-        @SerializedName(value = "eans", alternate = "scannableCodes")
         private String[] eans;
         private int price;
         private int discountedPrice;
         private String basePrice;
         private boolean saleStop;
+        private ApiScannableCode[] codes;
         private Product.SaleRestriction saleRestriction = Product.SaleRestriction.NONE;
         private ApiWeighing weighing;
     }
 
+    private static class ApiScannableCode {
+        private String code;
+        private String transmissionCode;
+    }
+
     private static class ApiWeighing {
         private String[] weighedItemIds;
         private boolean weighByCustomer;
@@ -377,6 +383,12 @@ private Product toProduct(ApiProduct apiProduct, Product depositProduct, Product
                 .setSaleRestriction(apiProduct.saleRestriction)
                 .setSaleStop(apiProduct.saleStop);
 
+        if(apiProduct.codes != null) {
+            for (ApiScannableCode apiScannableCode : apiProduct.codes) {
+                builder.addTransmissionCode(apiScannableCode.code, apiScannableCode.transmissionCode);
+            }
+        }
+
         if (apiProduct.weighing != null) {
             builder.setWeighedItemIds(apiProduct.weighing.weighedItemIds);
 

core/src/main/java/io/snabble/sdk/ProductDatabase.java

@@ -714,8 +714,11 @@ public Product productAtCursor(Cursor cursor) {
         builder.setDepositProduct(findBySku(depositSku));
 
         String codes = cursor.getString(7);
+        String[] scannableCodes = null;
+
         if (codes != null) {
-            builder.setScannableCodes(codes.split(","));
+            scannableCodes = codes.split(",");
+            builder.setScannableCodes(scannableCodes);
         }
 
         builder.setPrice(cursor.getInt(8))
@@ -739,6 +742,18 @@ public Product productAtCursor(Cursor cursor) {
             builder.setBundleProducts(findBundlesOfProduct(builder.build()));
         }
 
+        if(scannableCodes != null && schemaVersionMajor >= 1 && schemaVersionMinor >= 11) {
+            String transmissionCodesStr = cursor.getString(16);
+            if (transmissionCodesStr != null) {
+                String[] transmissionCodes = transmissionCodesStr.split(",");
+                for(int i=0; i<transmissionCodes.length; i++) {
+                    String tc = transmissionCodes[i];
+                    if(!tc.equals("")){
+                        builder.addTransmissionCode(scannableCodes[i], tc);
+                    }
+                }
+            }
+        }
         return builder.build();
     }
 
@@ -792,9 +807,12 @@ private Cursor productQuery(String appendSql, String[] args, boolean distinct, C
                     sql += ",p.saleStop";
                 }
 
-                sql += " FROM products p " +
-                "JOIN prices pr ON pr.sku = p.sku " +
-                appendSql;
+                if(schemaVersionMajor >= 1 && schemaVersionMinor >= 11) {
+                    sql += ",(SELECT group_concat(ifnull(s.transmissionCode, \"\")) FROM scannableCodes s WHERE s.sku = p.sku)";
+                }
+
+                sql += " FROM products p JOIN prices pr ON pr.sku = p.sku ";
+                sql += appendSql;
 
         return rawQuery(sql, args, cancellationSignal);
     }
@@ -819,9 +837,6 @@ private Cursor productQuery(String appendSql, String[] args, boolean distinct) {
     }
 
     /**
-     * This function is deprecated and will be removed from the SDK in the future. There will be no
-     * alternative function to find products by name.
-     *
      * Find a product by its name. Matching is normalized, so "Apple" finds also "apple".
      *
      * @param name The name of the product.

ui/src/main/java/io/snabble/sdk/ui/checkout/CheckoutEncodedCodesView.java

@@ -192,7 +192,7 @@ private void addCodes() {
                     }
                 } else {
                     for (int j = 0; j < shoppingCart.getQuantity(i); j++) {
-                        addScannableCode(shoppingCart.getScannedCode(i));
+                        addScannableCode(product.getTransmissionCode(shoppingCart.getScannedCode(i)));
                     }
                 }
             }