diff --git a/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/internal/AccountingCoreEventHandlerDuplicateEventsTest.java b/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/internal/AccountingCoreEventHandlerDuplicateEventsTest.java index 54b509a9..294a9512 100644 --- a/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/internal/AccountingCoreEventHandlerDuplicateEventsTest.java +++ b/accounting_reporting_core/src/test/java/org/cardanofoundation/lob/app/accounting_reporting_core/service/internal/AccountingCoreEventHandlerDuplicateEventsTest.java @@ -71,7 +71,7 @@ class AccountingCoreEventHandlerDuplicateEventsTest { private TransactionReconcilationRepository transactionReconcilationRepository; @BeforeEach - public void clearDatabase(@Autowired Flyway flyway){ + void clearDatabase(@Autowired Flyway flyway){ flyway.clean(); flyway.migrate(); } diff --git a/organisation/src/main/java/org/cardanofoundation/lob/app/organisation/service/OrganisationService.java b/organisation/src/main/java/org/cardanofoundation/lob/app/organisation/service/OrganisationService.java index d938aee2..2cec1e5f 100644 --- a/organisation/src/main/java/org/cardanofoundation/lob/app/organisation/service/OrganisationService.java +++ b/organisation/src/main/java/org/cardanofoundation/lob/app/organisation/service/OrganisationService.java @@ -120,25 +120,23 @@ public OrganisationView getOrganisationView(Organisation organisation) { organisation.getPostCode(), organisation.getProvince(), organisation.getCountryCode(), - getAllCostCenter(organisation.getId()).stream().map(organisationCostCenter -> { - return new OrganisationCostCenterView( + getAllCostCenter(organisation.getId()).stream().map(organisationCostCenter -> + new OrganisationCostCenterView( organisationCostCenter.getId() != null ? organisationCostCenter.getId().getCustomerCode() : null, organisationCostCenter.getExternalCustomerCode(), organisationCostCenter.getName() - ); - }).collect(Collectors.toSet()), - getAllProjects(organisation.getId()).stream().map(organisationProject -> { - return new OrganisationCostCenterView( + )).collect(Collectors.toSet()), + getAllProjects(organisation.getId()).stream().map(organisationProject -> + new OrganisationCostCenterView( organisationProject.getId() != null ? organisationProject.getId().getCustomerCode() : null, organisationProject.getExternalCustomerCode(), organisationProject.getName() - ); - }).collect(Collectors.toSet()), + )).collect(Collectors.toSet()), organisationCurrencyService.findAllByOrganisationId(organisation.getId()) .stream() - .map(organisationCurrency -> { - return organisationCurrency.getId() != null ? organisationCurrency.getId().getCustomerCode() : null; - }).collect(Collectors.toSet()), + .map(organisationCurrency -> + organisationCurrency.getId() != null ? organisationCurrency.getId().getCustomerCode() : null + ).collect(Collectors.toSet()), organisation.getWebSite(), organisation.getLogo() );