add permanent storage for item in the list

Author: hubjac1

.idea/.name

@@ -1,50 +1,108 @@
 package hubjac1.mysmartshoppinglist.DAO;
 
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+
 import java.util.HashSet;
 import java.util.Set;
 
 /**
  * DAO class to access caddy model from storage
  */
-public class CaddyDao {
+public class CaddyDao extends DAOBase {
     //private static int [] prod = new int[]{R.string.Bath, R.string.Bottles};
-    private  static Set<Integer> product = new HashSet<Integer>();
+    private  static Set<Integer> product = new HashSet<>();
+
+    public CaddyDao(Context pContext) {
+        super(pContext);
+    }
 
     /**
-     * Reset caddy. Will empty the caddy
+     * Reset caddy. Will empty the caddy table
      */
     public void reset(){
-        product.clear();
+        mDb.execSQL(DatabaseSchema.Caddy.TABLE_DROP);
+        mDb.execSQL(DatabaseSchema.Caddy.TABLE_CREATE);
+    }
+
+    /**
+     *  Add a product to a caddy
+     * @param product CaddyModel
+     */
+    private void add(CaddyModel product) {
+        ContentValues value = new ContentValues();
+        value.put(DatabaseSchema.Caddy.PRODUCT, product.getProduct());
+        value.put(DatabaseSchema.Caddy.STATUS, product.getStatus());
+
+        mDb.insert(DatabaseSchema.Caddy.TABLE_NAME, null, value);
+    }
+
+    private void delete(CaddyModel product){
+        mDb.delete(DatabaseSchema.Caddy.TABLE_NAME,
+                DatabaseSchema.Caddy.KEY + " = ?", new String[]{product.getKey()});
+    }
+    private void delete(long key){
+        mDb.delete(DatabaseSchema.Caddy.TABLE_NAME,
+                DatabaseSchema.Caddy.KEY + " = ?", new String[]{String.valueOf(key)});
+    }
+
+    private void update(CaddyModel product){
+        ContentValues value = new ContentValues();
+        value.put(DatabaseSchema.Caddy.PRODUCT, product.getProduct());
+        value.put(DatabaseSchema.Caddy.STATUS, product.getStatus());
+
+        mDb.update(DatabaseSchema.Caddy.TABLE_NAME, value,
+                DatabaseSchema.Caddy.KEY + " = ?", new String[]{product.getKey()});
+    }
+
+    private CaddyModel get(int id){
+        Cursor cursor = mDb.rawQuery("select * from " + DatabaseSchema.Caddy.TABLE_NAME +
+                "where " + DatabaseSchema.Caddy.KEY + "= ?", new String[]{String.valueOf(id)});
+        CaddyModel product = new CaddyModel(cursor.getInt(2), cursor.getInt(1));
+        product.setKey(cursor.getLong(0));
+        cursor.close();
+        return product;
     }
 
     /**
      * Add product to caddy
      * @param productId : int
-     * @param status
+     * @param status: boolean
      */
-    public static void update(int productId, boolean status){
-        if (status)
-            product.add(productId);
-        else if (product.contains(productId))
+    public void update(int productId, boolean status){
+        if (status) {
+            CaddyModel product = new CaddyModel(1, productId);
+            add(product);
+        }
+        else
         {
-            product.remove(productId);
+            delete(productId);
         }
     }
 
     /**
      * Get list of product in the caddy
      * @return list of product
      */
-    public static Set<Integer> getProductsId(){
-        return product;
+    public Set<Integer> getProductsId(){
+        Set<Integer> products = new HashSet<>();
+        Cursor cursor = mDb.rawQuery("select " + DatabaseSchema.Caddy.PRODUCT + " from " + DatabaseSchema.Caddy.TABLE_NAME, new String[]{});
+
+        while (cursor.moveToNext()) {
+            products.add(cursor.getInt(0));
+        }
+        cursor.close();
+
+        return products;
 
     }
 
     /**
      * get table of product in the Caddy
      * @return ProductModel []
      */
-    public static ProductModel [] getProducts(){
-        return ProductDao.getProducts(product).toArray(new ProductModel []{});
+    public ProductModel [] getProducts(ProductDao productDao){
+        return productDao.getProducts(getProductsId()).toArray(new ProductModel[]{});
     }
 }

.idea/vcs.xml

@@ -0,0 +1,43 @@
+package hubjac1.mysmartshoppinglist.DAO;
+
+/**
+ * Data model for Caddy storage
+ */
+public class CaddyModel {
+    private long mKey;
+    private int mStatus;
+    private int mProduct;
+
+    public CaddyModel(int status, int product){
+        mStatus = status;
+        mProduct = product;
+    }
+
+    public int getId(){
+        return (int) mKey;
+    }
+
+    public String getKey() {
+        return String.valueOf(mKey);
+    }
+
+    public void setKey(long mKey) {
+        this.mKey = mKey;
+    }
+
+    public int getStatus() {
+        return mStatus;
+    }
+
+    public void setStatus(int mStatus) {
+        this.mStatus = mStatus;
+    }
+
+    public int getProduct() {
+        return mProduct;
+    }
+
+    public void setProduct(int mProduct) {
+        this.mProduct = mProduct;
+    }
+}

app/src/main/bath-web.png

@@ -0,0 +1,34 @@
+package hubjac1.mysmartshoppinglist.DAO;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+
+public abstract class DAOBase {
+
+    protected final static int VERSION = 1;
+
+    // Database file name
+    protected final static String NOM = "smartShoppingList.db";
+
+    protected SQLiteDatabase mDb = null;
+
+    protected DatabaseHandler mHandler = null;
+
+    public DAOBase(Context pContext) {
+        this.mHandler = new DatabaseHandler(pContext, NOM, null, VERSION);
+    }
+
+    public SQLiteDatabase open() {
+        // No need to close the previous database because getWritableDatabase take care
+        mDb = mHandler.getWritableDatabase();
+        return mDb;
+    }
+
+    public void close() {
+        mDb.close();
+    }
+
+    public SQLiteDatabase getDb() {
+        return mDb;
+    }
+}

app/src/main/bottles-web.png

@@ -0,0 +1,23 @@
+package hubjac1.mysmartshoppinglist.DAO;
+
+        import android.content.Context;
+        import android.database.sqlite.SQLiteDatabase;
+        import android.database.sqlite.SQLiteOpenHelper;
+
+public class DatabaseHandler extends SQLiteOpenHelper {
+
+    public DatabaseHandler(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) {
+        super(context, name, factory, version);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL(DatabaseSchema.Caddy.TABLE_CREATE);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL(DatabaseSchema.Caddy.TABLE_DROP);
+        onCreate(db);
+    }
+}

app/src/main/bread_loaf-web.png

@@ -0,0 +1,22 @@
+package hubjac1.mysmartshoppinglist.DAO;
+
+/**
+ * Class to describe data base schema
+ */
+public class DatabaseSchema {
+    static public class Caddy {
+        public static final String KEY = "id";
+        public static final String PRODUCT = "product";
+        public static final String STATUS = "status";
+
+        public static final String TABLE_NAME = "Caddy";
+        public static final String TABLE_CREATE =
+                "CREATE TABLE " + TABLE_NAME + " (" +
+                        KEY + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
+                        PRODUCT + " INTEGER, " +
+                        STATUS + " INTEGER);";
+
+        public static final String TABLE_DROP = "DROP TABLE IF EXISTS " + TABLE_NAME + ";";
+    }
+
+}

app/src/main/bread_stick-web.png

@@ -1,11 +1,9 @@
 package hubjac1.mysmartshoppinglist.DAO;
 
-import android.util.Log;
+import android.content.Context;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 import hubjac1.mysmartshoppinglist.R;
@@ -37,12 +35,16 @@ public class ProductDao {
             new ProductModel(R.string.Wraps, R.mipmap.wraps)
     }));
 
+    public ProductDao(Context context) {
+
+    }
+
     /**
      * Get products in a given category
      * @param category : int
      * @return ArrayList<ProductModel>
      */
-    static public ArrayList<ProductModel> getProductsInCategory(int category)
+    public ArrayList<ProductModel> getProductsInCategory(int category)
     {
         ArrayList<ProductModel> products;
         if (category == R.string.baby){
@@ -54,7 +56,6 @@ else if (category == R.string.bakery) {
         else {
             products = new ArrayList<>();
         }
-        setProductStatus(products);
         return products;
     }
 
@@ -63,7 +64,7 @@ else if (category == R.string.bakery) {
      * @param idList : Set<Integer>
      * @return ArrayList<ProductModel>
      */
-    static public ArrayList<ProductModel> getProducts( Set<Integer> idList)
+    public ArrayList<ProductModel> getProducts( Set<Integer> idList)
     {
         ArrayList<ProductModel> allProducts = new ArrayList<ProductModel>(){};
         ArrayList<ProductModel> caddy = new ArrayList<ProductModel>(){};
@@ -82,8 +83,8 @@ static public ArrayList<ProductModel> getProducts( Set<Integer> idList)
      * Set product status to true for priduct in the caddy.
      * @param modelArray: ArrayList<ProductModel>
      */
-    private static void setProductStatus(ArrayList<ProductModel> modelArray) {
-        Set<Integer> selectedProduct = CaddyDao.getProductsId();
+    private void setProductStatus(ArrayList<ProductModel> modelArray, CaddyDao caddyDao) {
+        Set<Integer> selectedProduct = caddyDao.getProductsId();
 
         for (ProductModel model : modelArray) {
             if (selectedProduct.contains(model.getId())){

app/src/main/cakes-web.png

@@ -9,6 +9,11 @@ public class ProductModel {
     private int mId;
     private boolean mStatus;
 
+    private static CaddyDao mCaddyDao = new CaddyDao(null);
+    public static void setCaddyDao (CaddyDao caddyDao){
+        mCaddyDao =  caddyDao;
+    }
+
     ProductModel(int text, int image){
         mText = text;
         mImage = image;
@@ -42,6 +47,6 @@ public boolean isSelected(){
 
     public void setSelected(boolean selected) {
         mStatus = selected;
-        CaddyDao.update(mId, selected);
+        mCaddyDao.update(mId, selected);
     }
 }