From 94accc951d2bbd765cdd478330ce9679d25cfcd1 Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Fri, 24 Nov 2017 21:39:30 -0500
Subject: [PATCH] Let insertLoyaltyCard return the new ID

Card IDs for new cards will soon need to be known once they
are created. This change updates this call to return the
new id.
---
 app/src/main/java/protect/card_locker/DBHelper.java  |  4 ++--
 .../test/java/protect/card_locker/DatabaseTest.java  | 12 ++++++++----
 .../java/protect/card_locker/ImportExportTest.java   |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/DBHelper.java b/app/src/main/java/protect/card_locker/DBHelper.java
index 1538a88fb..034cbea81 100644
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -51,7 +51,7 @@ public class DBHelper extends SQLiteOpenHelper
         }
     }
 
-    public boolean insertLoyaltyCard(final String store, final String note, final String cardId,
+    public long insertLoyaltyCard(final String store, final String note, final String cardId,
                                      final String barcodeType)
     {
         SQLiteDatabase db = getWritableDatabase();
@@ -61,7 +61,7 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
-        return (newId != -1);
+        return newId;
     }
 
     public boolean insertLoyaltyCard(final SQLiteDatabase db, final int id,
diff --git a/app/src/test/java/protect/card_locker/DatabaseTest.java b/app/src/test/java/protect/card_locker/DatabaseTest.java
index 7eab1444d..7d577469e 100644
--- a/app/src/test/java/protect/card_locker/DatabaseTest.java
+++ b/app/src/test/java/protect/card_locker/DatabaseTest.java
@@ -36,7 +36,8 @@ public class DatabaseTest
     public void addRemoveOneGiftCard()
     {
         assertEquals(0, db.getLoyaltyCardCount());
-        boolean result = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString());
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString());
+        boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -56,7 +57,8 @@ public class DatabaseTest
     @Test
     public void updateGiftCard()
     {
-        boolean result = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString());
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString());
+        boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -86,7 +88,8 @@ public class DatabaseTest
     @Test
     public void emptyGiftCardValues()
     {
-        boolean result = db.insertLoyaltyCard("", "", "", "");
+        long id = db.insertLoyaltyCard("", "", "", "");
+        boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -107,8 +110,9 @@ public class DatabaseTest
         // that they are sorted
         for(int index = CARDS_TO_ADD-1; index >= 0; index--)
         {
-            boolean result = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
+            long id = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
                     BarcodeFormat.UPC_A.toString());
+            boolean result = (id != -1);
             assertTrue(result);
         }
 
diff --git a/app/src/test/java/protect/card_locker/ImportExportTest.java b/app/src/test/java/protect/card_locker/ImportExportTest.java
index 7f96e5519..858e37145 100644
--- a/app/src/test/java/protect/card_locker/ImportExportTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportTest.java
@@ -65,7 +65,8 @@ public class ImportExportTest
         {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
-            boolean result = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE);
+            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE);
+            boolean result = (id != -1);
             assertTrue(result);
         }