#21[1h]. Add Rates table to DB. Add currency column to Records table.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/DbHelper.java

@@ -43,19 +43,26 @@ public class DbHelper extends SQLiteOpenHelper {
     public static final String TO_AMOUNT_COLUMN = "to_amount";
     public static final String CREATED_AT_COLUMN = "created_at";
 
+    /* DB_VERSION = 3 */
+    public static final String TABLE_RATES = "rates";
+    public static final String FROM_CURRENCY_COLUMN = "from_currency";
+    public static final String TO_CURRENCY_COLUMN = "to_currency";
+    public static final String AMOUNT_COLUMN = "amount";
+
     public DbHelper(Context context) {
         super(context, DB_NAME, null, DB_VERSION);
     }
 
     @Override
     public void onCreate(SQLiteDatabase db) {
         //createDbVersion1(db);
-        createDbVersion2(db);
+        //createDbVersion2(db);
+        createDbVersion3(db);
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        if (oldVersion == 1 && newVersion == 2) {
+        if (oldVersion < 2) {
             db.beginTransaction();
 
             createAccountsTable(db);
@@ -77,6 +84,19 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
 
             db.endTransaction();
         }
+
+        if (oldVersion < 3) {
+            db.beginTransaction();
+
+            createRatesTable(db);
+
+            /* Add account_id column into the records table */
+            db.execSQL("ALTER TABLE " + TABLE_RECORDS + " ADD COLUMN " + CURRENCY_COLUMN + " INTEGER;");
+
+            db.setTransactionSuccessful();
+
+            db.endTransaction();
+        }
     }
 
     @SuppressWarnings("unused")
@@ -94,6 +114,7 @@ private void createDbVersion1(SQLiteDatabase db) {
                 + NAME_COLUMN + " TEXT" + ");");
     }
 
+    @SuppressWarnings("unused")
     private void createDbVersion2(SQLiteDatabase db) {
         db.execSQL("CREATE TABLE " + TABLE_RECORDS + "("
                 + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT,"
@@ -115,6 +136,30 @@ private void createDbVersion2(SQLiteDatabase db) {
         insertDefaultAccount(db);
     }
 
+    private void createDbVersion3(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);");
+
+        db.execSQL("CREATE TABLE " + TABLE_CATEGORIES + "("
+                + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT,"
+                + NAME_COLUMN + " TEXT" + ");");
+
+        createAccountsTable(db);
+
+        createTransfersTable(db);
+
+        createRatesTable(db);
+
+        insertDefaultAccount(db);
+    }
+
     private void createAccountsTable(SQLiteDatabase db) {
         db.execSQL("CREATE TABLE " + TABLE_ACCOUNTS + "("
                 + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT,"
@@ -134,6 +179,15 @@ private void createTransfersTable(SQLiteDatabase db) {
                 + TO_AMOUNT_COLUMN + " INTEGER);");
     }
 
+    private void createRatesTable(SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE " + TABLE_RATES + "("
+                + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT,"
+                + CREATED_AT_COLUMN + " INTEGER,"
+                + FROM_CURRENCY_COLUMN + " INTEGER,"
+                + TO_CURRENCY_COLUMN + " INTEGER,"
+                + AMOUNT_COLUMN + " REAL);");
+    }
+
     private long insertDefaultAccount(SQLiteDatabase db) {
         /* Insert default account for all records from DB_VERSION = 1 */
         ContentValues contentValues = new ContentValues();

app/src/main/java/com/blogspot/e_kanivets/moneytracker/model/Record.java

@@ -2,6 +2,7 @@
 
 import com.blogspot.e_kanivets.moneytracker.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.MtApp;
+import com.blogspot.e_kanivets.moneytracker.controller.CategoryController;
 import com.blogspot.e_kanivets.moneytracker.repo.CategoryRepo;
 
 import java.io.Serializable;
@@ -33,7 +34,8 @@ public Record(long id, long time, int type, String title, long categoryId, int p
         this.accountId = accountId;
 
         // TODO: Refactor this shit.
-        Category categoryActual = new CategoryRepo(new DbHelper(MtApp.get())).read(categoryId);
+        CategoryRepo categoryRepo = new CategoryRepo(new DbHelper(MtApp.get()));
+        Category categoryActual = new CategoryController(categoryRepo).read(categoryId);
         if (categoryActual != null) category = categoryActual.getName();
     }