Merge pull request #374 from lucaantonelli/main

lucaantonelli · web-flow · commit 6abc456d2cb6 · 2025-03-25T07:50:01.000+01:00
Fix: CountNetWorth and Main Account removal correct handling
diff --git a/lib/custom_widgets/transactions_list.dart b/lib/custom_widgets/transactions_list.dart
@@ -16,10 +16,12 @@ class TransactionsList extends StatefulWidget {
   const TransactionsList({
     super.key,
     required this.transactions,
+    this.margin = const EdgeInsets.symmetric(horizontal: 16),
     this.padding,
   });
 
   final List<Transaction> transactions;
+  final EdgeInsetsGeometry? margin;
   final EdgeInsetsGeometry? padding;
 
   @override
@@ -62,6 +64,7 @@ class _TransactionsListState extends State<TransactionsList> with Functions {
   Widget build(BuildContext context) {
     return transactions.isNotEmpty
         ? DefaultContainer(
+            margin: widget.margin,
             child: ListView.separated(
               physics: const NeverScrollableScrollPhysics(),
               padding: widget.padding,
diff --git a/lib/database/migrations/0002_account_net_worth.dart b/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;
+      ''');
+  }
+}
diff --git a/lib/database/migrations/migration_registry.dart b/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
   ];
 }
diff --git a/lib/database/sossoldi_database.dart b/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 {
diff --git a/lib/model/bank_account.dart b/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,46 +51,52 @@ class BankAccount extends BaseEntity {
     required this.color,
     required this.startingValue,
     required this.active,
+    required this.countNetWorth,
     required this.mainAccount,
     this.total,
     super.createdAt,
     super.updatedAt,
   });
 
-  BankAccount copy(
-          {int? id,
-          String? name,
-          String? symbol,
-          int? color,
-          num? startingValue,
-          bool? active,
-          bool? mainAccount,
-          DateTime? createdAt,
-          DateTime? updatedAt,}) =>
+  BankAccount copy({
+    int? id,
+    String? name,
+    String? symbol,
+    int? color,
+    num? startingValue,
+    bool? active,
+    bool? countNetWorth,
+    bool? mainAccount,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+  }) =>
       BankAccount(
-          id: id ?? this.id,
-          name: name ?? this.name,
-          symbol: symbol ?? this.symbol,
-          color: color ?? this.color,
-          startingValue: startingValue ?? this.startingValue,
-          active: active ?? this.active,
-          mainAccount: mainAccount ?? this.mainAccount,
-          createdAt: createdAt ?? this.createdAt,
-          updatedAt: updatedAt ?? this.updatedAt,
-          total: total
-          );
+        id: id ?? this.id,
+        name: name ?? this.name,
+        symbol: symbol ?? this.symbol,
+        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,
+        total: total,
+      );
 
   static BankAccount fromJson(Map<String, Object?> json) => BankAccount(
-      id: json[BaseEntityFields.id] as int,
-      name: json[BankAccountFields.name] as String,
-      symbol: json[BankAccountFields.symbol] as String,
-      color: json[BankAccountFields.color] as int,
-      startingValue: json[BankAccountFields.startingValue] as num,
-      active: json[BankAccountFields.active] == 1 ? true : false,
-      mainAccount: json[BankAccountFields.mainAccount] == 1 ? true : false,
-      total: json[BankAccountFields.total] as num?,
-      createdAt: DateTime.parse(json[BaseEntityFields.createdAt] as String),
-      updatedAt: DateTime.parse(json[BaseEntityFields.updatedAt] as String));
+        id: json[BaseEntityFields.id] as int,
+        name: json[BankAccountFields.name] as String,
+        symbol: json[BankAccountFields.symbol] as String,
+        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),
+        updatedAt: DateTime.parse(json[BaseEntityFields.updatedAt] as String),
+      );
 
   Map<String, Object?> toJson({bool update = false}) => {
         BaseEntityFields.id: id,
@@ -96,9 +105,11 @@ 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() : DateTime.now().toIso8601String(),
+        BaseEntityFields.createdAt: update
+            ? createdAt?.toIso8601String()
+            : DateTime.now().toIso8601String(),
         BaseEntityFields.updatedAt: DateTime.now().toIso8601String(),
       };
 }
@@ -152,7 +163,8 @@ class BankAccountMethods extends SossoldiDatabase {
 
     final orderByASC = '${BankAccountFields.createdAt} ASC';
     final where = '${BankAccountFields.active} = 1 ';
-    final recurringFilter = '(t.${TransactionFields.recurring} = 0 OR t.${TransactionFields.recurring} IS NULL)';
+    final recurringFilter =
+        '(t.${TransactionFields.recurring} = 0 OR t.${TransactionFields.recurring} IS NULL)';
 
     final result = await db.rawQuery('''
       SELECT b.*, (b.${BankAccountFields.startingValue} +
@@ -207,15 +219,19 @@ class BankAccountMethods extends SossoldiDatabase {
   Future<int> deleteById(int id) async {
     final db = await database;
 
-    return await db.delete(bankAccountTable, where: '${BankAccountFields.id} = ?', whereArgs: [id]);
+    return await db.delete(
+      bankAccountTable,
+      where: '${BankAccountFields.id} = ?',
+      whereArgs: [id],
+    );
   }
 
   Future<int> deactivateById(int id) async {
     final db = await database;
 
     return await db.update(
       bankAccountTable,
-      {'active': 0},
+      {BankAccountFields.active: 0, BankAccountFields.mainAccount: 0},
       where: '${BankAccountFields.id} = ?',
       whereArgs: [id],
     );
@@ -225,8 +241,11 @@ class BankAccountMethods extends SossoldiDatabase {
     final db = await database;
 
     //get account infos first
-    final result =
-        await db.query(bankAccountTable, where: '${BankAccountFields.id}  = $id', limit: 1);
+    final result = await db.query(
+      bankAccountTable,
+      where: '${BankAccountFields.id}  = $id',
+      limit: 1,
+    );
     final singleObject = result.isNotEmpty ? result[0] : null;
 
     if (singleObject != null) {
@@ -323,14 +342,16 @@ class BankAccountMethods extends SossoldiDatabase {
     double runningTotal = statritngValue[0]['Value'] as double;
 
     var result = resultQuery.map((e) {
-      runningTotal += double.parse(e['income'].toString()) - double.parse(e['expense'].toString());
+      runningTotal += double.parse(e['income'].toString()) -
+          double.parse(e['expense'].toString());
       return {"day": e["day"], "balance": runningTotal};
     }).toList();
 
     if (dateRangeStart != null) {
       return result
-          .where((element) => dateRangeStart
-              .isBefore(DateTime.parse(element["day"].toString()).add(const Duration(days: 1))))
+          .where((element) => dateRangeStart.isBefore(
+              DateTime.parse(element["day"].toString())
+                  .add(const Duration(days: 1))))
           .toList();
     }
 
diff --git a/lib/model/transaction.dart b/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
     ''');
 
diff --git a/lib/pages/accounts/add_account.dart b/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();
@@ -367,7 +367,7 @@ class _AddAccountState extends ConsumerState<AddAccount> with Functions {
                                 account: selectedAccount,
                                 onPressed: () => ref
                                     .read(accountsProvider.notifier)
-                                    .removeAccount(selectedAccount.id!)
+                                    .removeAccount(selectedAccount)
                                     .whenComplete(
                                   () {
                                     if (context.mounted) {
@@ -430,24 +430,16 @@ class _AddAccountState extends ConsumerState<AddAccount> with Functions {
                           name: nameController.text,
                           icon: accountIcon,
                           color: accountColor,
-                          active: countNetWorth,
+                          balance: currencyToNum(balanceController.text),
+                          countNetWorth: countNetWorth,
                           mainAccount: mainAccount,
                         );
-                    if (currencyToNum(balanceController.text) !=
-                        selectedAccount.total) {
-                      await ref
-                          .read(accountsProvider.notifier)
-                          .reconcileAccount(
-                            newBalance: currencyToNum(balanceController.text),
-                            account: selectedAccount,
-                          );
-                    }
                   } else {
                     await ref.read(accountsProvider.notifier).addAccount(
                           name: nameController.text,
                           icon: accountIcon,
                           color: accountColor,
-                          active: countNetWorth,
+                          countNetWorth: countNetWorth,
                           mainAccount: mainAccount,
                           startingValue: currencyToNum(balanceController.text),
                         );
diff --git a/lib/pages/transactions_page/widgets/list_tab.dart b/lib/pages/transactions_page/widgets/list_tab.dart
@@ -16,7 +16,7 @@ class ListTab extends ConsumerWidget with Functions {
       child: asyncTransactions.when(
         data: (transactions) {
           return TransactionsList(
-            padding: const EdgeInsets.symmetric(vertical: 16.0),
+            margin: const EdgeInsets.all(16.0),
             transactions: transactions,
           );
         },
diff --git a/lib/providers/accounts_provider.dart b/lib/providers/accounts_provider.dart
diff --git a/lib/providers/transactions_provider.dart b/lib/providers/transactions_provider.dart
diff --git a/test/model/bank_account_test.dart b/test/model/bank_account_test.dart
diff --git a/test/widget/accounts_sum_test.dart b/test/widget/accounts_sum_test.dart

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ class SossoldiDatabase {`
`351`	`351`	`} catch (error) {`
`352`	`352`	`throw Exception('DbBase.resetDatabase: $error');`
`353`	`353`	`}`
`354`		`- await _createDB(_database!, 1);`
	`354`	`+ await _createDB(_database!, _migrationManager.latestVersion);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`Future clearDatabase() async {`