chore: adjusting tests

cardano-foundation · Mar 3, 2025 · 2702c5a · 2702c5a
1 parent 3f2099d
commit 2702c5a
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 8 deletions.
diff --git a/...rc/main/java/org/cardanofoundation/lob/app/organisation/domain/view/OrganisationView.java b/...rc/main/java/org/cardanofoundation/lob/app/organisation/domain/view/OrganisationView.java
@@ -63,7 +63,7 @@ public class OrganisationView {
     @Schema(example = "IE")
     private String countryCode;
 
-    private Set<OrganisationCostCenterView> costCenter;
+    private Set<OrganisationCostCenterView> costCenters;
 
     private Set<OrganisationCostCenterView> projects;
 

diff --git a/...src/main/java/org/cardanofoundation/lob/app/organisation/service/OrganisationService.java b/...src/main/java/org/cardanofoundation/lob/app/organisation/service/OrganisationService.java
@@ -30,11 +30,8 @@ public class OrganisationService {
     private final ProjectMappingRepository projectMappingRepository;
     private final OrganisationChartOfAccountTypeRepository organisationChartOfAccountTypeRepository;
     private final ChartOfAccountRepository organisationChartOfAccountRepository;
-    private final OrganisationChartOfAccountSubTypeRepository organisationChartOfAccountSubTypeRepository;
     private final AccountEventRepository accountEventRepository;
     private final OrganisationCurrencyService organisationCurrencyService;
-    private final OrganisationChartOfAccountSubTypeRepository chartOfAccountSubTypeRepository;
-
 
     public Optional<Organisation> findById(String organisationId) {
         return organisationRepository.findById(organisationId);
@@ -110,7 +107,7 @@ public OrganisationView getOrganisationView(Organisation organisation) {
         return new OrganisationView(
                 organisation.getId(),
                 organisation.getName(),
-                organisation.getTaxIdNumber(),
+                "", // Description is deprecated and should be removed
                 organisation.getTaxIdNumber(),
                 organisation.getCurrencyId(),
                 organisation.getReportCurrencyId(),

diff --git a/...test/java/org/cardanofoundation/lob/app/organisation/service/OrganisationServiceTest.java b/...test/java/org/cardanofoundation/lob/app/organisation/service/OrganisationServiceTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -11,6 +12,11 @@
 import java.util.Optional;
 import java.util.Set;
 
+import org.cardanofoundation.lob.app.organisation.domain.entity.AccountEvent;
+import org.cardanofoundation.lob.app.organisation.domain.entity.OrganisationChartOfAccount;
+import org.cardanofoundation.lob.app.organisation.domain.entity.OrganisationChartOfAccountType;
+import org.cardanofoundation.lob.app.organisation.domain.entity.OrganisationCurrency;
+import org.cardanofoundation.lob.app.organisation.domain.view.OrganisationView;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -44,9 +50,6 @@ class OrganisationServiceTest {
     @Mock
     private ChartOfAccountRepository organisationChartOfAccountRepository;
 
-    @Mock
-    private OrganisationChartOfAccountSubTypeRepository organisationChartOfAccountSubTypeRepository;
-
     @Mock
     private AccountEventRepository accountEventRepository;
 
@@ -160,4 +163,51 @@ void testCreateOrganisation_NewOrganisation() {
         verify(organisationRepository).saveAndFlush(any());
         verifyNoMoreInteractions(organisationRepository);
     }
+
+    @Test
+    void testGetOrganisationView() {
+        Organisation org = new Organisation();
+        org.setId("orgId");
+        org.setName("orgName");
+        org.setTaxIdNumber("taxId");
+        org.setCurrencyId("currencyId");
+        org.setAdminEmail("adminEmail");
+        org.setPhoneNumber("phoneNumber");
+        org.setAddress("address");
+        org.setCity("city");
+        org.setPostCode("postCode");
+        org.setProvince("province");
+        org.setCountryCode("countryCode");
+        org.setWebSite("webSite");
+        org.setLogo("logo");
+
+        when(costCenterService.getAllCostCenter(anyString())).thenReturn(Set.of(new OrganisationCostCenter()));
+        when(projectMappingRepository.findAllByOrganisationId(anyString())).thenReturn(Set.of(new OrganisationProject()));
+        when(organisationCurrencyService.findAllByOrganisationId(anyString())).thenReturn(Set.of(new OrganisationCurrency()));
+
+        OrganisationView organisationView = organisationService.getOrganisationView(org);
+
+        assertNotNull(organisationView);
+        assertEquals(org.getId(), organisationView.getId());
+        assertEquals(org.getName(), organisationView.getName());
+        assertEquals(org.getTaxIdNumber(), organisationView.getTaxIdNumber());
+        assertEquals(org.getCurrencyId(), organisationView.getCurrencyId());
+        assertEquals(org.getAdminEmail(), organisationView.getAdminEmail());
+        assertEquals(org.getPhoneNumber(), organisationView.getPhoneNumber());
+        assertEquals(org.getAddress(), organisationView.getAddress());
+        assertEquals(org.getCity(), organisationView.getCity());
+        assertEquals(org.getPostCode(), organisationView.getPostCode());
+        assertEquals(org.getProvince(), organisationView.getProvince());
+        assertEquals(org.getCountryCode(), organisationView.getCountryCode());
+        assertEquals(org.getWebSite(), organisationView.getWebSite());
+        assertEquals(org.getLogo(), organisationView.getLogo());
+        assertEquals(1, organisationView.getCostCenters().size());
+        assertEquals(1, organisationView.getProjects().size());
+        assertEquals(1, organisationView.getOrganisationCurrencies().size());
+
+        verify(costCenterService).getAllCostCenter(anyString());
+        verify(projectMappingRepository).findAllByOrganisationId(anyString());
+        verify(organisationCurrencyService).findAllByOrganisationId(anyString());
+        verifyNoMoreInteractions(costCenterService, projectMappingRepository, organisationCurrencyService);
+    }
 }