fix(account): count net worth misused

- Fix #312
- Also fix resetDatabase() to use the last db version correctly

Author: lucaantonelli

lib/database/migrations/0002_account_net_worth.dart

@@ -0,0 +1,22 @@
+import 'package:sqflite/sqflite.dart';
+import '../migration_base.dart';
+
+// Models
+import '/model/bank_account.dart';
+
+class AccountNetWorth extends Migration {
+  AccountNetWorth() : super(
+      version: 2,
+      description: 'Add account net worth column'
+  );
+
+  @override
+  Future<void> up(Database db) async {
+    const integerNotNull = 'INTEGER NOT NULL';
+
+    // Bank accounts Table
+    await db.execute('''
+      ALTER TABLE `$bankAccountTable` ADD COLUMN `${BankAccountFields.countNetWorth}` $integerNotNull CHECK (${BankAccountFields.countNetWorth} IN (0, 1)) DEFAULT 1;
+      ''');
+  }
+}

lib/database/migrations/migration_registry.dart

@@ -13,6 +13,7 @@ library;
 
 
 import '0001_initial_schema.dart';
+import '0002_account_net_worth.dart';
 import '../migration_base.dart';
 
 
@@ -24,7 +25,8 @@ import '../migration_base.dart';
 /// determines which runs first.
 List<Migration> getMigrations() {
   return [
-    InitialSchema()
+    InitialSchema(),
+    AccountNetWorth(),
     // Add future migrations here
   ];
 }

lib/database/sossoldi_database.dart

@@ -351,7 +351,7 @@ class SossoldiDatabase {
     } catch (error) {
       throw Exception('DbBase.resetDatabase: $error');
     }
-    await _createDB(_database!, 1);
+    await _createDB(_database!, _migrationManager.latestVersion);
   }
 
   Future clearDatabase() async {

lib/model/bank_account.dart

@@ -14,6 +14,7 @@ class BankAccountFields extends BaseEntityFields {
   static String color = 'color';
   static String startingValue = 'startingValue';
   static String active = 'active';
+  static String countNetWorth = 'countNetWorth';
   static String mainAccount = 'mainAccount';
   static String total = 'total';
   static String createdAt = BaseEntityFields.getCreatedAt;
@@ -26,6 +27,7 @@ class BankAccountFields extends BaseEntityFields {
     color,
     startingValue,
     active,
+    countNetWorth,
     mainAccount,
     BaseEntityFields.createdAt,
     BaseEntityFields.updatedAt
@@ -38,6 +40,7 @@ class BankAccount extends BaseEntity {
   final int color;
   final num startingValue;
   final bool active;
+  final bool countNetWorth;
   final bool mainAccount;
   final num? total;
 
@@ -48,6 +51,7 @@ class BankAccount extends BaseEntity {
     required this.color,
     required this.startingValue,
     required this.active,
+    required this.countNetWorth,
     required this.mainAccount,
     this.total,
     super.createdAt,
@@ -61,6 +65,7 @@ class BankAccount extends BaseEntity {
     int? color,
     num? startingValue,
     bool? active,
+    bool? countNetWorth,
     bool? mainAccount,
     DateTime? createdAt,
     DateTime? updatedAt,
@@ -72,6 +77,7 @@ class BankAccount extends BaseEntity {
         color: color ?? this.color,
         startingValue: startingValue ?? this.startingValue,
         active: active ?? this.active,
+        countNetWorth: countNetWorth ?? this.countNetWorth,
         mainAccount: mainAccount ?? this.mainAccount,
         createdAt: createdAt ?? this.createdAt,
         updatedAt: updatedAt ?? this.updatedAt,
@@ -85,6 +91,7 @@ class BankAccount extends BaseEntity {
         color: json[BankAccountFields.color] as int,
         startingValue: json[BankAccountFields.startingValue] as num,
         active: json[BankAccountFields.active] == 1 ? true : false,
+        countNetWorth: json[BankAccountFields.countNetWorth] == 1 ? true : false,
         mainAccount: json[BankAccountFields.mainAccount] == 1 ? true : false,
         total: json[BankAccountFields.total] as num?,
         createdAt: DateTime.parse(json[BaseEntityFields.createdAt] as String),
@@ -98,6 +105,7 @@ class BankAccount extends BaseEntity {
         BankAccountFields.color: color,
         BankAccountFields.startingValue: startingValue,
         BankAccountFields.active: active ? 1 : 0,
+        BankAccountFields.countNetWorth: countNetWorth ? 1 : 0,
         BankAccountFields.mainAccount: mainAccount ? 1 : 0,
         BaseEntityFields.createdAt: update
             ? createdAt?.toIso8601String()

lib/model/transaction.dart

@@ -396,11 +396,12 @@ class TransactionMethods extends SossoldiDatabase {
 
     final result = await db.rawQuery('''
       SELECT
-        strftime('$frequencyDateParser', ${TransactionFields.date}) as $freqencyString,
-        SUM(CASE WHEN ${TransactionFields.type} = 'IN' THEN ${TransactionFields.amount} ELSE 0 END) as income,
-        SUM(CASE WHEN ${TransactionFields.type} = 'OUT' THEN ${TransactionFields.amount} ELSE 0 END) as expense
-      FROM "$transactionTable"
-      WHERE $sqlFilters
+        strftime('$frequencyDateParser', t.${TransactionFields.date}) as $freqencyString,
+        SUM(CASE WHEN t.${TransactionFields.type} = 'IN' THEN t.${TransactionFields.amount} ELSE 0 END) as income,
+        SUM(CASE WHEN t.${TransactionFields.type} = 'OUT' THEN t.${TransactionFields.amount} ELSE 0 END) as expense
+      FROM "$transactionTable" t
+      JOIN $bankAccountTable b ON t.${TransactionFields.idBankAccount} = b.${BankAccountFields.id}
+      WHERE $sqlFilters AND b.${BankAccountFields.countNetWorth} = 1 AND b.${BankAccountFields.active} = 1
       GROUP BY $freqencyString
     ''');
 

lib/pages/accounts/add_account.dart

@@ -34,7 +34,7 @@ class _AddAccountState extends ConsumerState<AddAccount> with Functions {
       balanceController.text = numToCurrency(selectedAccount.total);
       accountIcon = selectedAccount.symbol;
       accountColor = selectedAccount.color;
-      countNetWorth = selectedAccount.active;
+      countNetWorth = selectedAccount.countNetWorth;
       mainAccount = selectedAccount.mainAccount;
     }
     super.initState();
@@ -431,15 +431,15 @@ class _AddAccountState extends ConsumerState<AddAccount> with Functions {
                           icon: accountIcon,
                           color: accountColor,
                           balance: currencyToNum(balanceController.text),
-                          active: countNetWorth,
+                          countNetWorth: countNetWorth,
                           mainAccount: mainAccount,
                         );
                   } else {
                     await ref.read(accountsProvider.notifier).addAccount(
                           name: nameController.text,
                           icon: accountIcon,
                           color: accountColor,
-                          active: countNetWorth,
+                          countNetWorth: countNetWorth,
                           mainAccount: mainAccount,
                           startingValue: currencyToNum(balanceController.text),
                         );

lib/providers/accounts_provider.dart

@@ -3,6 +3,7 @@ import 'package:fl_chart/fl_chart.dart';
 
 import '../model/bank_account.dart';
 import '../model/transaction.dart';
+import 'dashboard_provider.dart';
 import 'transactions_provider.dart';
 
 final mainAccountProvider = StateProvider<BankAccount?>((ref) => null);
@@ -42,6 +43,7 @@ class AsyncAccountsNotifier extends AsyncNotifier<List<BankAccount>> {
     required String icon,
     required int color,
     bool active = true,
+    bool countNetWorth = true,
     bool mainAccount = false,
     num startingValue = 0,
   }) async {
@@ -51,6 +53,7 @@ class AsyncAccountsNotifier extends AsyncNotifier<List<BankAccount>> {
       color: color,
       startingValue: startingValue,
       active: active,
+      countNetWorth: countNetWorth,
       mainAccount: mainAccount,
     );
 
@@ -67,13 +70,15 @@ class AsyncAccountsNotifier extends AsyncNotifier<List<BankAccount>> {
     int? color,
     num? balance,
     bool? mainAccount,
+    bool? countNetWorth,
     bool active = true,
   }) async {
     BankAccount account = ref.read(selectedAccountProvider)!.copy(
           name: name,
           symbol: icon,
           color: color,
           active: active,
+          countNetWorth: countNetWorth,
           mainAccount: mainAccount,
         );
     state = const AsyncValue.loading();
@@ -86,6 +91,8 @@ class AsyncAccountsNotifier extends AsyncNotifier<List<BankAccount>> {
       if (account.mainAccount) {
         ref.read(mainAccountProvider.notifier).state = account;
       }
+      ref.invalidate(dashboardProvider);
+      
       return _getAccounts();
     });
   }