@marcos_feitoza/personal-finance-frontend-feature-investments 1.1.1 → 1.2.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [1.2.0](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/compare/v1.1.2...v1.2.0) (2025-12-06)
+
+
+### Bug Fixes
+
+* add totals back ([0abb920](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/0abb920257d8988083f08a24f8db90ad9a24d463))
+
+
+### Features
+
+* new dividend logic ([5aed0ed](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/5aed0edd789072894c927192fb2105dd7cf1623b))
+* update dividend ([67c9dc3](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/67c9dc327a15e114c7a4acc590f797e1f89ac2ed))
+
+## [1.1.2](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/compare/v1.1.1...v1.1.2) (2025-12-03)
+
+
+### Bug Fixes
+
+* refatoração das telas InvestmentAccountScreen, CryptoAccountScreen e RrspSunLifeScreen para o padrão ViewModel com ChangeNotifier ([20419ac](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/commit/20419ac0c38259469c69389496ec7e24c6d95e3b))
+
 ## [1.1.1](https://github.com/MarcosOps/personal-finance-frontend-feature-investments/compare/v1.1.0...v1.1.1) (2025-12-02)
 
 

package/lib/screens/crypto_account_screen.dart

@@ -1,240 +1,123 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:personal_finance_frontend_core_services/services/crypto_service.dart';
-import 'package:personal_finance_frontend_core_services/services/transaction_service.dart';
-import 'package:personal_finance_frontend_core_ui/widgets/crypto_trade_form.dart';
-import 'package:personal_finance_frontend_core_ui/widgets/app_widgets.dart';
 import 'package:provider/provider.dart';
 import 'package:personal_finance_frontend_core_services/providers/auth_provider.dart';
 import 'package:personal_finance_frontend_core_ui/utils/app_dialogs.dart';
+import 'package:personal_finance_frontend_core_ui/widgets/crypto_trade_form.dart';
+import '../viewmodels/crypto_account_viewmodel.dart';
 
-class CryptoAccountScreen extends StatefulWidget {
+class CryptoAccountScreen extends StatelessWidget {
   final String accountName;
 
-  const CryptoAccountScreen({Key? key, required this.accountName}) : super(key: key);
-
-  @override
-  _CryptoAccountScreenState createState() => _CryptoAccountScreenState();
-}
-
-class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
-  final TransactionService _transactionService = TransactionService();
-  final CryptoService _cryptoService = CryptoService();
-
-  List<Map<String, dynamic>> _trades = [];
-  List<Map<String, dynamic>> _assets = [];
-  List<Map<String, dynamic>> _portfolioSummary = [];
-  Map<String, double> _livePrices = {};
-  double _cashBalance = 0.0;
-  double _accountTotalValue = 0.0;
-  double _totalPortfolioBookCost = 0.0;
-  bool _isLoading = true;
-  bool _isFetchingPrices = false;
-  String? _selectedSymbolForFilter;
-  String? _token;
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final authProvider = Provider.of<AuthProvider>(context, listen: false);
-      setState(() {
-        _token = authProvider.token;
-      });
-      _fetchData();
-    });
-  }
-
-  String currencySymbol = r'$';
-
-  String _formatCurrency(double value) {
-    return '$currencySymbol${value.toStringAsFixed(2)}';
-  }
-
-  Future<void> _fetchData() async {
-    if (_token == null) return;
-    setState(() => _isLoading = true);
-    try {
-      final futures = <Future>[
-        _transactionService.getTrades(investmentAccount: widget.accountName, token: _token),
-        _transactionService.getAccountBalance(widget.accountName, token: _token),
-        _transactionService.getAssets(investmentAccount: widget.accountName, token: _token),
-        _transactionService.getTotalPortfolioBookCost(token: _token), // Fetch total cost
-      ];
-      final results = await Future.wait(futures);
-
-      final trades = results[0] as List<Map<String, dynamic>>;
-      final balance = results[1] as double;
-      final assets = results[2] as List<Map<String, dynamic>>;
-      final totalPortfolioBookCost = results[3] as double;
-
-      final summaryData = _calculatePortfolioSummary(trades, totalPortfolioBookCost);
-
-      setState(() {
-        _trades = trades;
-        _cashBalance = balance;
-        _assets = assets;
-        _portfolioSummary = summaryData['summary'];
-        _accountTotalValue = summaryData['total_value'] + _cashBalance;
-        _totalPortfolioBookCost = totalPortfolioBookCost;
-      });
-
-      if (mounted) await _fetchLivePrices();
-    } catch (e) {
-      if (mounted) ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Error fetching data: $e')));
-    } finally {
-      if (mounted) setState(() => _isLoading = false);
-    }
-  }
-
-  Future<void> _fetchLivePrices() async {
-    if (_portfolioSummary.isEmpty || !mounted) return;
-    setState(() => _isFetchingPrices = true);
-
-    final idsToFetch = _portfolioSummary.map((p) => p['id_crypto'] as String? ?? p['symbol'] as String).where((s) => s.isNotEmpty).toList();
-
-    if (idsToFetch.isEmpty) {
-      setState(() => _isFetchingPrices = false);
-      return;
-    }
-
-    final livePrices = await _cryptoService.getLiveCryptoPrices(idsToFetch);
-
-    if (!mounted) return;
-
-    double newTotalValue = _cashBalance;
-    for (final position in _portfolioSummary) {
-      final shares = double.parse(position['shares'].toString());
-      final idForLookup = (position['id_crypto'] as String? ?? position['symbol'] as String).toLowerCase();
-      final livePrice = livePrices[idForLookup];
-      if (livePrice != null) {
-        newTotalValue += shares * livePrice;
-      } else {
-        newTotalValue += (position['total_cost'] as num?)?.toDouble() ?? 0.0;
-      }
-    }
-
-    setState(() {
-      _livePrices = livePrices;
-      _accountTotalValue = newTotalValue;
-      _isFetchingPrices = false;
-    });
-  }
-
-  Map<String, dynamic> _calculatePortfolioSummary(List<Map<String, dynamic>> trades, double totalPortfolioBookCost) {
-    Map<String, dynamic> summary = {};
-    double accountPortfolioBookCost = 0;
-
-    for (var trade in trades) {
-      final asset = trade['asset'];
-      if (asset == null || asset['symbol'] == null) continue;
-      String symbol = asset['symbol'];
-      String idCrypto = asset['id_crypto'] ?? symbol;
-
-      double shares = double.parse(trade['shares'].toString());
-      double price = double.parse(trade['price'].toString());
-      String tradeType = trade['trade_type'];
-
-      if (!summary.containsKey(symbol)) {
-        summary[symbol] = {
-          'symbol': symbol,
-          'id_crypto': idCrypto,
-          'name': asset['name'] ?? symbol,
-          'shares': 0.0,
-          'total_cost': 0.0,
-        };
-      }
-
-      if (tradeType == 'buy') {
-        summary[symbol]['shares'] += shares;
-        summary[symbol]['total_cost'] += shares * price;
-      } else if (tradeType == 'sell') {
-        double originalShares = summary[symbol]['shares'];
-        if (originalShares > 0) {
-          double avgPrice = summary[symbol]['total_cost'] / originalShares;
-          summary[symbol]['total_cost'] -= shares * avgPrice;
-        }
-        summary[symbol]['shares'] -= shares;
-      }
-    }
-
-    summary.removeWhere((key, value) => value['shares'] < 0.01);
-    accountPortfolioBookCost = summary.values.fold(0.0, (sum, item) => sum + item['total_cost']);
-
-    List<Map<String, dynamic>> result = [];
-    summary.forEach((symbol, data) {
-      double shares = data['shares'];
-      double totalCost = data['total_cost'];
-      data['avg_price'] = (shares > 0) ? totalCost / shares : 0.0;
-      data['account_allocation'] = (accountPortfolioBookCost > 0) ? (totalCost / accountPortfolioBookCost) * 100 : 0.0;
-      data['stocks_allocation'] = (totalPortfolioBookCost > 0) ? (totalCost / totalPortfolioBookCost) * 100 : 0.0;
-      result.add(data);
-    });
-
-    return {'summary': result, 'total_value': accountPortfolioBookCost};
-  }
-
+  const CryptoAccountScreen({Key? key, required this.accountName})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text('${widget.accountName} Portfolio'),
-        actions: [
-          Center(
-            child: Padding(
-              padding: const EdgeInsets.only(right: 16.0),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.end,
-                children: [
-                  Text('Total Portfolio: ${_formatCurrency(_accountTotalValue)}', style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
-                  Text('Account Balance: ${_formatCurrency(_cashBalance)}', style: const TextStyle(fontSize: 12)),
-                ],
-              ),
-            ),
-          ),
-          IconButton(icon: const Icon(Icons.refresh), onPressed: _fetchData, tooltip: 'Refresh Data'),
-        ],
+    final authProvider = Provider.of<AuthProvider>(context, listen: false);
+
+    return ChangeNotifierProvider(
+      create: (_) => CryptoAccountViewModel(
+        accountName: accountName,
+        token: authProvider.token,
       ),
-      body: _isLoading
-          ? const Center(child: CircularProgressIndicator())
-          : RefreshIndicator(
-              onRefresh: _fetchData,
-              child: SingleChildScrollView(
-                physics: const AlwaysScrollableScrollPhysics(),
-                padding: const EdgeInsets.all(16.0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: [
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      child: Consumer<CryptoAccountViewModel>(
+        builder: (context, viewModel, child) {
+          return Scaffold(
+            appBar: AppBar(
+              title: Text('$accountName Portfolio'),
+              actions: [
+                Center(
+                  child: Padding(
+                    padding: const EdgeInsets.only(right: 16.0),
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      crossAxisAlignment: CrossAxisAlignment.end,
                       children: [
-                        Text('Portfolio Summary', style: Theme.of(context).textTheme.titleLarge),
-                        if (_isFetchingPrices) const SizedBox(height: 20, width: 20, child: CircularProgressIndicator(strokeWidth: 2.0)),
+                        Text(
+                          'Total Portfolio: ${_formatCurrency(viewModel.accountTotalValue)}',
+                          style: const TextStyle(
+                              fontSize: 16, fontWeight: FontWeight.bold),
+                        ),
+                        Text(
+                          'Account Balance: ${_formatCurrency(viewModel.cashBalance)}',
+                          style: const TextStyle(fontSize: 12),
+                        ),
                       ],
                     ),
-                    _buildSinteticoTable(),
-                    const SizedBox(height: 24),
-                    CryptoTradeForm(
-                        accountName: widget.accountName,
-                        portfolioSummary: _portfolioSummary,
-                        onTradeCreated: (_) => _fetchData(),
-                        token: _token),
-                    const SizedBox(height: 24),
-                    Text('Trade History', style: Theme.of(context).textTheme.titleLarge),
-                    const SizedBox(height: 8),
-                    _buildAnaliticoTable(),
-                  ],
+                  ),
                 ),
-              ),
+                IconButton(
+                  icon: const Icon(Icons.refresh),
+                  onPressed: viewModel.fetchData,
+                  tooltip: 'Refresh Data',
+                ),
+              ],
             ),
+            body: viewModel.isLoading
+                ? const Center(child: CircularProgressIndicator())
+                : RefreshIndicator(
+                    onRefresh: viewModel.fetchData,
+                    child: SingleChildScrollView(
+                      physics: const AlwaysScrollableScrollPhysics(),
+                      padding: const EdgeInsets.all(16.0),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                        children: [
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: [
+                              Text('Portfolio Summary',
+                                  style:
+                                      Theme.of(context).textTheme.titleLarge),
+                              if (viewModel.isFetchingPrices)
+                                const SizedBox(
+                                  height: 20,
+                                  width: 20,
+                                  child: CircularProgressIndicator(
+                                      strokeWidth: 2.0),
+                                ),
+                            ],
+                          ),
+                          _buildSinteticoTable(context, viewModel),
+                          const SizedBox(height: 24),
+                          CryptoTradeForm(
+                            accountName: accountName,
+                            portfolioSummary: viewModel.portfolioSummary,
+                            onTradeCreated: (_) => viewModel.fetchData(),
+                            token: viewModel.token,
+                          ),
+                          const SizedBox(height: 24),
+                          Text('Trade History',
+                              style: Theme.of(context).textTheme.titleLarge),
+                          const SizedBox(height: 8),
+                          _buildAnaliticoTable(context, viewModel),
+                        ],
+                      ),
+                    ),
+                  ),
+          );
+        },
+      ),
     );
   }
 
-  Widget _buildSinteticoTable() {
-    if (_portfolioSummary.isEmpty) return const Center(child: Padding(padding: EdgeInsets.all(16.0), child: Text('No positions held.')));
-    
+  String _formatCurrency(double value) {
+    String currencySymbol = r'$';
+    return '$currencySymbol${value.toStringAsFixed(2)}';
+  }
+
+  Widget _buildSinteticoTable(
+      BuildContext context, CryptoAccountViewModel viewModel) {
+    if (viewModel.portfolioSummary.isEmpty) {
+      return const Center(
+        child: Padding(
+          padding: EdgeInsets.all(16.0),
+          child: Text('No positions held.'),
+        ),
+      );
+    }
+
     return SingleChildScrollView(
       scrollDirection: Axis.horizontal,
       child: DataTable(
@@ -251,51 +134,75 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
           DataColumn(label: Text('Return')),
           DataColumn(label: Text('% Return')),
         ],
-        rows: _portfolioSummary.map((position) {
+        rows: viewModel.portfolioSummary.map((position) {
           final symbol = position['symbol'] as String;
-          final idForLookup = (position['id_crypto'] as String? ?? symbol).toLowerCase();
-          final livePrice = _livePrices[idForLookup];
-          final shares = double.parse(position['shares'].toString());
-          final avgPrice = double.parse(position['avg_price'].toString());
-          final totalPurchased = double.parse(position['total_cost'].toString());
-          final accountAllocation = (position['account_allocation'] as num?)?.toDouble() ?? 0.0;
-          final stocksAllocation = (position['stocks_allocation'] as num?)?.toDouble() ?? 0.0;
-
-          double? totalReturnValue, percentageReturn;
+          final idForLookup =
+              (position['id_crypto'] as String? ?? symbol).toLowerCase();
+          final livePrice = viewModel.livePrices[idForLookup];
+          final shares = double.tryParse(position['shares']?.toString() ?? '0.0') ?? 0.0;
+          final avgPrice = double.tryParse(position['avg_price']?.toString() ?? '0.0') ?? 0.0;
+          final totalPurchased = double.tryParse(position['total_cost']?.toString() ?? '0.0') ?? 0.0;
+          final accountAllocation = double.tryParse(position['account_allocation']?.toString() ?? '0.0') ?? 0.0;
+          final stocksAllocation = double.tryParse(position['stocks_allocation']?.toString() ?? '0.0') ?? 0.0;
 
-          if (livePrice != null && shares > 0) {
-            final currentMarketValue = livePrice * shares;
-            totalReturnValue = currentMarketValue - totalPurchased;
-            if (totalPurchased > 0) percentageReturn = (totalReturnValue / totalPurchased) * 100;
-          }
+          final totalReturnValue = double.tryParse(position['total_return_value']?.toString() ?? '0.0') ?? 0.0;
+          final percentageReturn = double.tryParse(position['percentage_return']?.toString() ?? '0.0') ?? 0.0;
 
-          final returnColor = (totalReturnValue ?? 0) >= 0 ? Colors.green : Colors.red;
+          final returnColor =
+              totalReturnValue >= 0 ? Colors.green : Colors.red;
 
           return DataRow(cells: [
-            DataCell(SizedBox(width: 150, child: Text(position['name'] as String, overflow: TextOverflow.ellipsis))),
+            DataCell(SizedBox(
+                width: 150,
+                child: Text(position['name'] as String,
+                    overflow: TextOverflow.ellipsis))),
             DataCell(Text(symbol)),
             DataCell(Text(shares.toStringAsFixed(6))),
             DataCell(Text(_formatCurrency(avgPrice))),
-            DataCell(livePrice != null ? Text(_formatCurrency(livePrice)) : const Text('N/A')),
+            DataCell(livePrice != null
+                ? Text(_formatCurrency(livePrice))
+                : const Text('N/A')),
             DataCell(Text(_formatCurrency(totalPurchased))),
             DataCell(Text('${accountAllocation.toStringAsFixed(2)}%')),
             DataCell(Text('${stocksAllocation.toStringAsFixed(2)}%')),
-            DataCell(totalReturnValue != null ? Text(_formatCurrency(totalReturnValue), style: TextStyle(color: returnColor)) : const Text('N/A')),
-            DataCell(percentageReturn != null ? Text('${percentageReturn.toStringAsFixed(2)}%', style: TextStyle(color: returnColor)) : const Text('N/A')),
+            DataCell(
+              totalReturnValue != null
+                  ? Text(_formatCurrency(totalReturnValue),
+                      style: TextStyle(color: returnColor))
+                  : const Text('N/A'),
+            ),
+            DataCell(
+              percentageReturn != null
+                  ? Text('${percentageReturn.toStringAsFixed(2)}%',
+                      style: TextStyle(color: returnColor))
+                  : const Text('N/A'),
+            ),
           ]);
         }).toList(),
       ),
     );
   }
 
-  Widget _buildAnaliticoTable() {
-    if (_trades.isEmpty) return const Center(child: Padding(padding: EdgeInsets.all(16.0), child: Text('No trades found.')));
+  Widget _buildAnaliticoTable(
+      BuildContext context, CryptoAccountViewModel viewModel) {
+    if (viewModel.trades.isEmpty) {
+      return const Center(
+        child: Padding(
+          padding: EdgeInsets.all(16.0),
+          child: Text('No trades found.'),
+        ),
+      );
+    }
 
-    final sortedTrades = List<Map<String, dynamic>>.from(_trades)..sort((a, b) {
-      try {
-        return DateTime.parse(b['date'] as String).compareTo(DateTime.parse(a['date'] as String));
-      } catch (e) { return 0; }
-    });
+    final sortedTrades = List<Map<String, dynamic>>.from(viewModel.trades)
+      ..sort((a, b) {
+        try {
+          return DateTime.parse(b['date'] as String)
+              .compareTo(DateTime.parse(a['date'] as String));
+        } catch (e) {
+          return 0;
+        }
+      });
 
     return DataTable(
       columns: const [
@@ -305,14 +212,14 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
         DataColumn(label: Text('Quantity')),
         DataColumn(label: Text('Price')),
         DataColumn(label: Text('Total')),
-        DataColumn(label: Text('Actions')), // New column
+        DataColumn(label: Text('Actions')),
       ],
       rows: sortedTrades.map((trade) {
-        final double shares = double.parse(trade['shares'].toString());
-        final double price = double.parse(trade['price'].toString());
+        final double shares = double.tryParse(trade['shares']?.toString() ?? '0.0') ?? 0.0;
+        final double price = double.tryParse(trade['price']?.toString() ?? '0.0') ?? 0.0;
         final double total = shares * price;
         final tradeDate = DateTime.parse(trade['date'] as String);
-        final int tradeId = trade['id'] as int; // Get trade ID
+        final int tradeId = trade['id'] as int;
 
         return DataRow(cells: [
           DataCell(Text(DateFormat('yyyy-MM-dd').format(tradeDate))),
@@ -321,10 +228,11 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
           DataCell(Text(shares.toStringAsFixed(6))),
           DataCell(Text(_formatCurrency(price))),
           DataCell(Text(_formatCurrency(total))),
-          DataCell( // New cell for the delete button
+          DataCell(
             IconButton(
               icon: const Icon(Icons.delete, color: Colors.red),
-              onPressed: () => _confirmAndDeleteTrade(tradeId),
+              onPressed: () =>
+                  _confirmAndDeleteTrade(context, viewModel, tradeId),
               tooltip: 'Delete Trade',
             ),
           ),
@@ -333,31 +241,20 @@ class _CryptoAccountScreenState extends State<CryptoAccountScreen> {
     );
   }
 
-  Future<void> _confirmAndDeleteTrade(int tradeId) async {
-    final bool? confirm = await AppDialogs.showDeleteConfirmationDialog(context, 'this trade');
+  Future<void> _confirmAndDeleteTrade(BuildContext context,
+      CryptoAccountViewModel viewModel, int tradeId) async {
+    final bool? confirm =
+        await AppDialogs.showDeleteConfirmationDialog(context, 'this trade');
 
     if (confirm == true) {
-      if (_token == null) {
+      final success = await viewModel.deleteTrade(tradeId);
+      if (ScaffoldMessenger.of(context).mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(content: Text('Authentication token not available.')),
-        );
-        return;
-      }
-      try {
-        final success = await _transactionService.deleteTrade(tradeId, token: _token);
-        if (success) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(content: Text('Trade deleted successfully.')),
-          );
-          _fetchData(); // Refresh data after deletion
-        } else {
-          ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(content: Text('Failed to delete trade.')),
-          );
-        }
-      } catch (e) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Error deleting trade: $e')),
+          SnackBar(
+            content: Text(success
+                ? 'Trade deleted successfully.'
+                : 'Failed to delete trade.'),
+          ),
         );
       }
     }