Added numberOfExpenses for ExpenseView

Ka4aH4uk · Aug 18, 2023 · 08f91bb · 08f91bb
1 parent 31c93cd
commit 08f91bb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Expense Tracker/Model/ExpenseCategory.swift b/Expense Tracker/Model/ExpenseCategory.swift
@@ -9,4 +9,8 @@ struct ExpenseCategory: Codable, Identifiable {
     var id = UUID()
     let name: String
     var expenses: [Expense] = []
+
+    var numberOfExpenses: Int {
+        expenses.count
+    }
 }
diff --git a/Expense Tracker/View/Expense/ExpenseView.swift b/Expense Tracker/View/Expense/ExpenseView.swift
@@ -58,8 +58,7 @@ struct ExpenseView: View {
                                         Text(category.name)
                                             .font(.headline)
                                             .foregroundColor(isDarkMode ? .white : .black)
-                                            .padding(.vertical, 2)
-                                        Text("Кол-во платежей: \(category.expenses.count)")
+                                        Text("Кол-во платежей: \(category.numberOfExpenses)")
                                             .font(.caption2)
                                             .foregroundColor(.gray)
                                     }

diff --git a/Expense Tracker/ViewModel/ExpenseViewModel.swift b/Expense Tracker/ViewModel/ExpenseViewModel.swift
@@ -13,12 +13,26 @@ class ExpenseViewModel: ObservableObject {
     }
 
     private func loadCategories() {
-        if let savedCategories = UserDefaults.standard.data(forKey: "ExpenseCategories") {
-            if let decodedCategories = try? JSONDecoder().decode([ExpenseCategory].self, from: savedCategories) {
+        if let savedCategoriesData = UserDefaults.standard.data(forKey: "ExpenseCategories") {
+            if var decodedCategories = try? JSONDecoder().decode([ExpenseCategory].self, from: savedCategoriesData) {
+                for index in 0..<decodedCategories.count {
+                    let categoryName = decodedCategories[index].name
+                    let expenses = loadExpenses(for: categoryName)
+                    decodedCategories[index].expenses = expenses
+                }
                 expenseCategories = decodedCategories
             }
         }
     }
+
+    private func loadExpenses(for categoryName: String) -> [Expense] {
+        if let savedExpensesData = UserDefaults.standard.data(forKey: categoryName) {
+            if let loadedExpenses = try? JSONDecoder().decode([Expense].self, from: savedExpensesData) {
+                return loadedExpenses
+            }
+        }
+        return []
+    }
 
     func saveCategories() {
         if let encodedCategories = try? JSONEncoder().encode(expenseCategories) {