#46[1h]. Add goal, archived, color columns to DB and account entity.

Evgenii Kanivets · Evgenii Kanivets · commit 4e2ce06fbbc7 · 2017-08-14T17:44:20.000+03:00
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java
@@ -97,7 +97,11 @@ private boolean addAccount() {
             String title = etTitle.getText().toString().trim();
             double initSum = Double.parseDouble(etInitSum.getText().toString().trim());
             String currency = (String) spinner.getSelectedItem();
-            return accountController.create(new Account(title, initSum, currency)) != null;
+            double goal = 0;
+            int color = 0;
+
+            Account account = new Account(title, initSum, currency, goal, false, color);
+            return accountController.create(account) != null;
         } else {
             return false;
         }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ImportController.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ImportController.java
@@ -55,7 +55,7 @@ public List<Record> importRecordsFromCsv(@Nullable String csv) {
                 else type = Record.TYPE_INCOME;
 
                 Category category = new Category(categoryName);
-                Account account = new Account(-1, "MOCK", -1, currency, 0);
+                Account account = new Account(-1, "MOCK", -1, currency, 0, -1, false, 0);
 
                 Record record = new Record(time, type, title, category, Math.abs(price), account, currency);
                 Record createdRecord = recordController.create(record);
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Account.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Account.java
@@ -16,21 +16,32 @@ public class Account extends BaseEntity implements Parcelable {
     private long curSum;
     private final String currency;
     private long decimals;
+    private double goal;
+    private boolean archived;
+    private int color;
 
-    public Account(long id, String title, long curSum, String currency, long decimals) {
+    public Account(long id, String title, long curSum, String currency, long decimals, double goal,
+                   boolean archived, int color) {
         this.id = id;
         this.title = title;
         this.curSum = curSum;
         this.currency = currency;
         this.decimals = decimals;
+        this.goal = goal;
+        this.archived = archived;
+        this.color = color;
     }
 
-    public Account(String title, double curSum, String currency) {
+    public Account(String title, double curSum, String currency, double goal,
+                   boolean archived, int color) {
         this.id = -1;
         this.title = title;
         this.currency = currency;
         this.curSum = getLong(curSum);
         this.decimals = getDecimal(curSum);
+        this.goal = goal;
+        this.archived = archived;
+        this.color = color;
     }
 
     protected Account(Parcel in) {
@@ -39,6 +50,9 @@ protected Account(Parcel in) {
         curSum = in.readLong();
         currency = in.readString();
         decimals = in.readLong();
+        goal = in.readDouble();
+        archived = in.readByte() != 0;
+        color = in.readInt();
     }
 
     public static final Creator<Account> CREATOR = new Creator<Account>() {
@@ -96,7 +110,10 @@ public boolean equals(Object o) {
                     && equals(this.title, account.getTitle())
                     && this.curSum == account.getCurSum()
                     && equals(this.currency, account.getCurrency())
-                    && this.decimals == account.decimals;
+                    && this.decimals == account.decimals
+                    && this.goal == account.goal
+                    && this.archived == account.archived
+                    && this.color == account.color;
         } else return false;
     }
 
@@ -109,7 +126,10 @@ public String toString() {
         sb.append("title = ").append(title).append(", ");
         sb.append("curSum = ").append(curSum).append(", ");
         sb.append("currency = ").append(currency).append(", ");
-        sb.append("decimals = ").append(decimals);
+        sb.append("decimals = ").append(decimals).append(", ");
+        sb.append("goal = ").append(goal).append(", ");
+        sb.append("archived = ").append(archived).append(", ");
+        sb.append("color = ").append(color);
         sb.append("}");
 
         return sb.toString();
@@ -127,5 +147,8 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeLong(curSum);
         dest.writeString(currency);
         dest.writeLong(decimals);
+        dest.writeDouble(goal);
+        dest.writeByte((byte) (archived ? 1 : 0));
+        dest.writeInt(color);
     }
 }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java
@@ -32,7 +32,7 @@ public Record(long id, long time, int type, String title, long categoryId, long
         this.title = title;
         this.category = new Category(categoryId, null);
         this.price = price;
-        this.account = new Account(accountId, null, -1, null, 0);
+        this.account = new Account(accountId, null, -1, null, 0, -1, false, -1);
         this.currency = currency;
         this.decimals = decimals;
     }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java
@@ -15,7 +15,7 @@ public class DbHelper extends SQLiteOpenHelper {
 
     /* DB_VERSION = 1 */
     public static final String DB_NAME = "database";
-    public static final int DB_VERSION = 4;
+    public static final int DB_VERSION = 5;
     public static final String TABLE_RECORDS = "records";
     public static final String TABLE_CATEGORIES = "categories";
 
@@ -54,6 +54,11 @@ public class DbHelper extends SQLiteOpenHelper {
     public static final String DECIMALS_FROM_COLUMN = "decimals_from";
     public static final String DECIMALS_TO_COLUMN = "decimals_to";
 
+    /* DB_VERSION = 5 */
+    public static final String GOAL_COLUMN = "goal";
+    public static final String ARCHIVED_COLUMN = "archived";
+    public static final String COLOR_COLUMN = "color";
+
     public DbHelper(Context context) {
         super(context, DB_NAME, null, DB_VERSION);
     }
@@ -63,7 +68,8 @@ public void onCreate(SQLiteDatabase db) {
         //createDbVersion1(db);
         //createDbVersion2(db);
         //createDbVersion3(db);
-        createDbVersion4(db);
+        //createDbVersion4(db);
+        createDbVersion5(db);
     }
 
     @Override
@@ -133,6 +139,25 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             db.setTransactionSuccessful();
             db.endTransaction();
         }
+
+        if (oldVersion < 5) {
+            db.beginTransaction();
+
+            /* Add goal column to the accounts table */
+            db.execSQL("ALTER TABLE " + TABLE_ACCOUNTS + " ADD COLUMN "
+                    + GOAL_COLUMN + " REAL;");
+
+            /* Add archived flag column to the accounts table */
+            db.execSQL("ALTER TABLE " + TABLE_ACCOUNTS + " ADD COLUMN "
+                    + ARCHIVED_COLUMN + " INTEGER;");
+
+            /* Add color column to the accounts table */
+            db.execSQL("ALTER TABLE " + TABLE_ACCOUNTS + " ADD COLUMN "
+                    + COLOR_COLUMN + " INTEGER;");
+
+            db.setTransactionSuccessful();
+            db.endTransaction();
+        }
     }
 
     @SuppressWarnings("unused")
@@ -258,6 +283,48 @@ private void createDbVersion4(SQLiteDatabase db) {
         insertDefaultAccount(db);
     }
 
+    private void createDbVersion5(SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE " + TABLE_RECORDS + "("
+                + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT,"
+                + TIME_COLUMN + " INTEGER,"
+                + TYPE_COLUMN + " INTEGER,"
+                + TITLE_COLUMN + " TEXT,"
+                + CATEGORY_ID_COLUMN + " INTEGER,"
+                + PRICE_COLUMN + " INTEGER,"
+                + ACCOUNT_ID_COLUMN + " INTEGER,"
+                + CURRENCY_COLUMN + " TEXT,"
+                + DECIMALS_COLUMN + " INTEGER);");
+
+        db.execSQL("CREATE TABLE " + TABLE_CATEGORIES + "("
+                + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT,"
+                + NAME_COLUMN + " TEXT" + ");");
+
+        db.execSQL("CREATE TABLE " + TABLE_ACCOUNTS + "("
+                + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT,"
+                + CREATED_AT_COLUMN + " INTEGER,"
+                + TITLE_COLUMN + " TEXT,"
+                + CUR_SUM_COLUMN + " INTEGER,"
+                + CURRENCY_COLUMN + " TEXT,"
+                + DECIMALS_COLUMN + " INTEGER,"
+                + GOAL_COLUMN + " REAL,"
+                + ARCHIVED_COLUMN + " INTEGER,"
+                + COLOR_COLUMN + " INTEGER);");
+
+        db.execSQL("CREATE TABLE " + TABLE_TRANSFERS + "("
+                + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT,"
+                + TIME_COLUMN + " INTEGER,"
+                + FROM_ACCOUNT_ID_COLUMN + " INTEGER,"
+                + TO_ACCOUNT_ID_COLUMN + " INTEGER,"
+                + FROM_AMOUNT_COLUMN + " INTEGER,"
+                + TO_AMOUNT_COLUMN + " INTEGER,"
+                + DECIMALS_FROM_COLUMN + " INTEGER,"
+                + DECIMALS_TO_COLUMN + " INTEGER);");
+
+        createRatesTable(db);
+
+        insertDefaultAccount(db);
+    }
+
     private void createRatesTable(SQLiteDatabase db) {
         db.execSQL("CREATE TABLE " + TABLE_RATES + "("
                 + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT,"
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/AccountRepo.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/AccountRepo.java
@@ -60,19 +60,25 @@ protected List<Account> getListFromCursor(@Nullable Cursor cursor) {
             int curSumColIndex = cursor.getColumnIndex(DbHelper.CUR_SUM_COLUMN);
             int currencyColIndex = cursor.getColumnIndex(DbHelper.CURRENCY_COLUMN);
             int decimalsColIndex = cursor.getColumnIndex(DbHelper.DECIMALS_COLUMN);
+            int goalColIndex = cursor.getColumnIndex(DbHelper.GOAL_COLUMN);
+            int archivedIndex = cursor.getColumnIndex(DbHelper.ARCHIVED_COLUMN);
+            int colorIndex = cursor.getColumnIndex(DbHelper.COLOR_COLUMN);
 
             do {
                 // Read a account from DB
                 Account account = new Account(cursor.getLong(idColIndex),
                         cursor.getString(titleColIndex),
                         cursor.getLong(curSumColIndex),
                         cursor.getString(currencyColIndex),
-                        cursor.getLong(decimalsColIndex));
+                        cursor.getLong(decimalsColIndex),
+                        cursor.getDouble(goalColIndex),
+                        cursor.getInt(archivedIndex) != 0,
+                        cursor.getInt(colorIndex));
 
                 accountList.add(account);
             } while (cursor.moveToNext());
         }
 
         return accountList;
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public Record(long id, long time, int type, String title, long categoryId, long`
`32`	`32`	`this.title = title;`
`33`	`33`	`this.category = new Category(categoryId, null);`
`34`	`34`	`this.price = price;`
`35`		`- this.account = new Account(accountId, null, -1, null, 0);`
	`35`	`+ this.account = new Account(accountId, null, -1, null, 0, -1, false, -1);`
`36`	`36`	`this.currency = currency;`
`37`	`37`	`this.decimals = decimals;`
`38`	`38`	`}`