refine sampleData and retrive user_version / schema version

moneymanagerex · Sep 25, 2024 · a167302 · a167302
1 parent 050a7b1
commit a167302
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 13 deletions.
diff --git a/MMEX/DatabaseManager.swift b/MMEX/DatabaseManager.swift
@@ -53,6 +53,13 @@ class DataManager {
         }
     }
 
+    func getSchemaVersion() -> Int32? {
+        if let db {
+            return db.userVersion
+        }
+        return nil
+    }
+
     func getRepository() -> Repository {
         return Repository(db: db)
     }

diff --git a/MMEX/Models/AccountData.swift b/MMEX/Models/AccountData.swift
@@ -109,19 +109,19 @@ struct AccountWithCurrency: ExportableEntity {
 extension AccountData {
     static let sampleDataWithCurrency : [AccountWithCurrency] = [
         AccountWithCurrency(data: AccountData(
-            id: 1, name: "Account A", type: AccountType.cash,
+            id: 1, name: "Cash Account", type: AccountType.cash,
             status: AccountStatus.open, notes:"",
-            initialBal: 0.0, favoriteAcct: "TRUE", currencyId: 1
+            initialBal: 100.01, favoriteAcct: "TRUE", currencyId: 1
         ), currency: CurrencyData.sampleData[0]),
         AccountWithCurrency(data: AccountData(
-            id: 2, name: "Account B", type: AccountType.cash,
+            id: 2, name: "Chcking Account", type: AccountType.checking,
             status: AccountStatus.open, notes:"",
-            initialBal: 0.0, favoriteAcct: "TRUE", currencyId: 2
+            initialBal: 200.02, favoriteAcct: "TRUE", currencyId: 2
         ), currency: CurrencyData.sampleData[1]),
         AccountWithCurrency(data: AccountData(
             id: 3, name: "Investment Account", type: AccountType.investment,
             status: AccountStatus.open, notes:"",
-            initialBal: 0.0, favoriteAcct: "TRUE", currencyId: 2
+            initialBal: 300.03, favoriteAcct: "TRUE", currencyId: 2
         ), currency: CurrencyData.sampleData[1]),
     ]
 }
diff --git a/MMEX/Models/CategoryData.swift b/MMEX/Models/CategoryData.swift
@@ -91,7 +91,7 @@ extension CategoryData {
 
 extension CategoryData {
     static let sampleData: [CategoryData] = [
-        CategoryData(id: 1, name: "root cateogry",     active: true, parentId: -1),
-        CategoryData(id: 2, name: "non-root category", active: true, parentId: 1),
+        CategoryData(id: 1, name: "Bills",     active: true, parentId: -1),
+        CategoryData(id: 2, name: "Telephone", active: true, parentId: 1),
     ]
 }
diff --git a/MMEX/Models/InfotableData.swift b/MMEX/Models/InfotableData.swift
@@ -54,5 +54,8 @@ extension InfotableData {
 extension InfotableData {
     static let sampleData: [InfotableData] = [
         InfotableData(id: 1, name: "DATAVERSION", value: "3"),
+        InfotableData(id: 2, name: InfoKey.createDate.id, value: Date().ISO8601Format()),
+        InfotableData(id: 3, name: InfoKey.baseCurrencyID.id, value: "1"),
+        InfotableData(id: 4, name: InfoKey.defaultAccountID.id, value: "1")
     ]
 }
diff --git a/MMEX/Models/TransactionData.swift b/MMEX/Models/TransactionData.swift
@@ -111,17 +111,17 @@ extension TransactionData {
         TransactionData(
             id: 1, accountId: 1, payeeId: 1, transCode: TransactionType.withdrawal,
             transAmount: 10.01, status: TransactionStatus.none, categId: 1,
-            transDate: Date().ISO8601Format()
+            transDate: String(Date().ISO8601Format().dropLast())
         ),
         TransactionData(
             id: 2, accountId: 2, payeeId: 2, transCode: TransactionType.deposit,
             transAmount: 20.02, status: TransactionStatus.none, categId: 1,
-            transDate: Date().ISO8601Format()
+            transDate: String(Date().ISO8601Format().dropLast())
         ),
         TransactionData(
-            id: 3, accountId: 3, payeeId: 3, transCode: TransactionType.transfer,
+            id: 3, accountId: 3, payeeId: 2, transCode: TransactionType.transfer,
             transAmount: 30.03, status: TransactionStatus.none, categId: 1,
-            transDate: Date().ISO8601Format()
+            transDate: String(Date().ISO8601Format().dropLast())
         ),
     ]
 }
diff --git a/MMEX/ViewModels/InfotableViewModel.swift b/MMEX/ViewModels/InfotableViewModel.swift
@@ -65,6 +65,10 @@ class InfotableViewModel: ObservableObject {
             )
         }
     }
+
+    func getSchemaVersion() -> Int32 {
+        return self.dataManager.getSchemaVersion() ?? 0
+    }
 
     // Set up individual bindings for each @Published property
     private func setupBindings() {

diff --git a/MMEX/Views/Settings/SettingsView.swift b/MMEX/Views/Settings/SettingsView.swift
@@ -13,7 +13,6 @@ struct SettingsView: View {
     @AppStorage("defaultPayeeSetting") private var defaultPayeeSetting: DefaultPayeeSetting = .none
     @AppStorage("defaultStatus") private var defaultStatus = TransactionStatus.defaultValue
 
-    @State private var schemaVersion: Int32 = 19
     @State private var dateFormat: String = "%Y-%m-%d"
 
     var body: some View {
@@ -65,7 +64,7 @@ struct SettingsView: View {
                 HStack {
                     Text("Schema Version")
                     Spacer()
-                    Text("\(schemaVersion)")
+                    Text("\(viewModel.getSchemaVersion())")
                 }
                 HStack {
                     Text("Date Format")