fix #59

vzwingma · Oct 12, 2024 · 2b7ab73 · 2b7ab73
1 parent ced5f62
commit 2b7ab73
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/...ithub/vzwingma/finances/budget/serverless/services/operations/business/BudgetService.java b/...ithub/vzwingma/finances/budget/serverless/services/operations/business/BudgetService.java
@@ -482,7 +482,8 @@ public Uni<BudgetMensuel> createOperationsIntercomptes(String idBudget, final Li
             final String libelleOperation = ligneOperation.getLibelle();
             String idBudgetDestination = BudgetDataUtils.getBudgetId(idCompteDestination, BudgetDataUtils.getMoisFromBudgetId(idBudget), BudgetDataUtils.getAnneeFromBudgetId(idBudget));
             String idCompteSource = BudgetDataUtils.getCompteFromBudgetId(idBudget);
-
+            Month moisFromBudgetId = BudgetDataUtils.getMoisFromBudgetId(idBudget);
+            Integer anneeFromBudgetId = BudgetDataUtils.getAnneeFromBudgetId(idBudget);
             LOGGER.info("Ajout d'un transfert intercompte de {} vers {} ({}) > {} ", idBudget, idBudgetDestination, idCompteDestination, ligneOperation);
 
             /*
@@ -511,18 +512,14 @@ public Uni<BudgetMensuel> createOperationsIntercomptes(String idBudget, final Li
             /*
              * Opération sur Compte cible
              */
-
-            Uni<BudgetMensuel> budgetCible =
-                    Uni.combine().all().unis(
-                                    getBudgetAndCompteActif(idBudgetDestination).map(Tuple2::getItem1),
-                                    this.comptesService.getCompteById(idCompteSource))
-                            .asTuple()
+            Uni<BudgetMensuel> budgetCible = this.comptesService.getCompteById(idCompteDestination)
+                                                .onItem().ifNotNull()
+                                                .transformToUni(compteDestination -> chargerBudgetMensuelSurCompteActif(compteDestination, moisFromBudgetId, anneeFromBudgetId))
                             .invoke(tuple -> {
                                 BusinessTraceContext.get().put(BusinessTraceContextKeyEnum.BUDGET, idBudgetDestination).put(BusinessTraceContextKeyEnum.COMPTE, idCompteSource);
-                                String libelleOperationCible = "[depuis " + tuple.getItem2().getId() + "] " + libelleOperation;
-                                this.operationsAppProvider.addOperationIntercompte(tuple.getItem1().getListeOperations(), ligneOperation, libelleOperationCible, auteur);
+                                String libelleOperationCible = "[depuis " + idCompteSource+ "] " + libelleOperation;
+                                this.operationsAppProvider.addOperationIntercompte(tuple.getListeOperations(), ligneOperation, libelleOperationCible, auteur);
                             })
-                            .map(Tuple2::getItem1)
                             .onItem().ifNotNull()
                             .invoke(this::recalculSoldes)
                             // Sauvegarde du budget