Transactions

lib/data/repositories/transaction_repository.dart

@@ -70,15 +70,15 @@ class TransactionRepository {
       ),
     );
 
-    final TransactionItemResponse transactionResponse = serializers
+    final TransactionListResponse transactionResponse = serializers
-        .deserializeWith(TransactionItemResponse.serializer, response);
+        .deserializeWith(TransactionListResponse.serializer, response);
 
-    return transactionResponse.data;
+    return transactionResponse.data.first;
   }
 
-  Future<TransactionEntity> convertToExpense(
+  Future<BuiltList<TransactionEntity>> convertToExpense(
     Credentials credentials,
-    String transactionId,
+    List<String> transactionIds,
     String vendorId,
     String categoryId,
   ) async {
@@ -88,19 +88,19 @@ class TransactionRepository {
       credentials.token,
       data: json.encode(
         {
-          'transactions': [
+          'transactions': transactionIds
-            {
+              .map((transactionId) => {
-              'id': transactionId,
+                    'id': transactionId,
-              'vendor_id': vendorId,
+                    'vendor_id': vendorId,
-              'ninja_category_id': categoryId,
+                    'ninja_category_id': categoryId,
-            }
+                  })
-          ]
+              .toList()
         },
       ),
     );
 
-    final TransactionItemResponse transactionResponse = serializers
+    final TransactionListResponse transactionResponse = serializers
-        .deserializeWith(TransactionItemResponse.serializer, response);
+        .deserializeWith(TransactionListResponse.serializer, response);
 
     return transactionResponse.data;
   }

lib/redux/transaction/transaction_actions.dart

@@ -218,28 +218,28 @@ class ConvertTransactionToPaymentFailure implements StopSaving {
   final dynamic error;
 }
 
-class ConvertTransactionToExpenseRequest implements StartSaving {
+class ConvertTransactionsToExpensesRequest implements StartSaving {
-  ConvertTransactionToExpenseRequest(
+  ConvertTransactionsToExpensesRequest(
     this.completer,
-    this.transactionId,
+    this.transactionIds,
     this.vendorId,
     this.categoryId,
   );
 
   final Completer completer;
-  final String transactionId;
+  final List<String> transactionIds;
   final String vendorId;
   final String categoryId;
 }
 
-class ConvertTransactionToExpenseSuccess implements StopSaving, PersistData {
+class ConvertTransactionsToExpensesSuccess implements StopSaving, PersistData {
-  ConvertTransactionToExpenseSuccess(this.transaction);
+  ConvertTransactionsToExpensesSuccess(this.transactions);
 
-  final TransactionEntity transaction;
+  final BuiltList<TransactionEntity> transactions;
 }
 
-class ConvertTransactionToExpenseFailure implements StopSaving {
+class ConvertTransactionsToExpensesFailure implements StopSaving {
-  ConvertTransactionToExpenseFailure(this.error);
+  ConvertTransactionsToExpensesFailure(this.error);
 
   final dynamic error;
 }

lib/redux/transaction/transaction_middleware.dart

@@ -1,3 +1,4 @@
+import 'package:built_collection/built_collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:redux/redux.dart';
@@ -41,7 +42,7 @@ List<Middleware<AppState>> createStoreTransactionsMiddleware([
     TypedMiddleware<AppState, ConvertTransactionsRequest>(convertTransactions),
     TypedMiddleware<AppState, ConvertTransactionToPaymentRequest>(
         convertToPayment),
-    TypedMiddleware<AppState, ConvertTransactionToExpenseRequest>(
+    TypedMiddleware<AppState, ConvertTransactionsToExpensesRequest>(
         convertToExpense),
   ];
 }
@@ -225,23 +226,23 @@ Middleware<AppState> _convertToPayment(TransactionRepository repository) {
 
 Middleware<AppState> _convertToExpense(TransactionRepository repository) {
   return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
-    final action = dynamicAction as ConvertTransactionToExpenseRequest;
+    final action = dynamicAction as ConvertTransactionsToExpensesRequest;
     repository
         .convertToExpense(
       store.state.credentials,
-      action.transactionId,
+      action.transactionIds,
       action.vendorId,
       action.categoryId,
     )
-        .then((TransactionEntity transaction) {
+        .then((BuiltList<TransactionEntity> transactions) {
-      store.dispatch(ConvertTransactionToExpenseSuccess(transaction));
+      store.dispatch(ConvertTransactionsToExpensesSuccess(transactions));
       store.dispatch(RefreshData());
       if (action.completer != null) {
         action.completer.complete(null);
       }
     }).catchError((Object error) {
       print(error);
-      store.dispatch(ConvertTransactionToExpenseFailure(error));
+      store.dispatch(ConvertTransactionsToExpensesFailure(error));
       if (action.completer != null) {
         action.completer.completeError(error);
       }

lib/redux/transaction/transaction_reducer.dart

@@ -209,7 +209,7 @@ final transactionsReducer = combineReducers<TransactionState>([
   TypedReducer<TransactionState, SaveTransactionSuccess>(_updateTransaction),
   TypedReducer<TransactionState, ConvertTransactionToPaymentSuccess>(
       _convertTransactionToPayment),
-  TypedReducer<TransactionState, ConvertTransactionToExpenseSuccess>(
+  TypedReducer<TransactionState, ConvertTransactionsToExpensesSuccess>(
       _convertTransactionToExpense),
   //TypedReducer<TransactionState, ConvertTransactionsSuccess>(_convertTransactions),
   TypedReducer<TransactionState, AddTransactionSuccess>(_addTransaction),
@@ -272,9 +272,8 @@ TransactionState _convertTransactionToPayment(TransactionState transactionState,
 }
 
 TransactionState _convertTransactionToExpense(TransactionState transactionState,
-    ConvertTransactionToExpenseSuccess action) {
+    ConvertTransactionsToExpensesSuccess action) {
-  return transactionState
+  return transactionState.loadTransactions(action.transactions);
-      .rebuild((b) => b..map[action.transaction.id] = action.transaction);
 }
 
 /*

lib/redux/transaction/transaction_state.dart

@@ -34,9 +34,9 @@ abstract class TransactionState
     }
   }
 
-  TransactionState loadTransactions(BuiltList<TransactionEntity> clients) {
+  TransactionState loadTransactions(BuiltList<TransactionEntity> transactions) {
     final map = Map<String, TransactionEntity>.fromIterable(
-      clients,
+      transactions,
       key: (dynamic item) => item.id,
       value: (dynamic item) => item,
     );

lib/ui/transaction/view/transaction_view_vm.dart

@@ -83,10 +83,10 @@ class TransactionViewVM {
       },
       onConvertToExpense: (context, transactionId, vendorId, categoryId) {
         store.dispatch(
-          ConvertTransactionToExpenseRequest(
+          ConvertTransactionsToExpensesRequest(
             snackBarCompleter<Null>(
                 context, AppLocalization.of(context).convertedTransaction),
-            transactionId,
+            [transactionId],
             vendorId,
             categoryId,
           ),