Organisation service tests

src/main/java/scot/carricksoftware/grants/repositories/places/OrganisationRepository.java

@@ -10,9 +10,12 @@ import org.springframework.stereotype.Repository;
 import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
 import scot.carricksoftware.grants.domains.places.Organisation;
 
+import java.util.Optional;
+
 @Repository
 public interface OrganisationRepository extends PagingAndSortingRepository<Organisation, Long> {
 
+    @SuppressWarnings("unused")
     OrganisationCommand saveOrganisationCommand(OrganisationCommand organisationCommand);
 
     Iterable<Organisation> findAll();
@@ -22,4 +25,6 @@ public interface OrganisationRepository extends PagingAndSortingRepository<Organ
     long count();
 
     Organisation save(Organisation organisation);
+
+    Optional<Organisation> findById(Long id);
 }

src/main/java/scot/carricksoftware/grants/services/places/organisations/OrganisationService.java

@@ -16,7 +16,6 @@ public interface OrganisationService {
     @SuppressWarnings("unused")
     OrganisationCommand saveOrganisationCommand(OrganisationCommand organisationCommand);
 
-
     void deleteById(Long id);
 
     List<Organisation> getPagedOrganisations(int pageNumber);
@@ -26,4 +25,8 @@ public interface OrganisationService {
 
     @SuppressWarnings("unused")
     List<Organisation> findAll();
+
+    Organisation findById(Long id);
+
+    Organisation save(Organisation organisation);
 }

src/main/java/scot/carricksoftware/grants/services/places/organisations/OrganisationServiceImpl.java

@@ -22,6 +22,7 @@ import scot.carricksoftware.grants.repositories.places.OrganisationRepository;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class OrganisationServiceImpl implements OrganisationService {
@@ -88,4 +89,17 @@ public class OrganisationServiceImpl implements OrganisationService {
         return result;
     }
 
+    @Override
+    public Organisation findById(Long id) {
+        logger.debug("OrganisationServiceImpl::findById");
+        Optional<Organisation> organisation = organisationRepository.findById(id);
+        return organisation.orElse(null);
+    }
+
+    @Override
+    public Organisation save(Organisation organisation) {
+        logger.debug("OrganisationServiceImpl::save");
+        return organisationRepository.save(organisation);
+    }
+
 }

src/test/java/scot/carricksoftware/grants/GenerateRandomPlaceValues.java

@@ -13,6 +13,7 @@ import scot.carricksoftware.grants.commands.places.countries.CountryCommand;
 import scot.carricksoftware.grants.commands.places.regions.RegionCommand;
 import scot.carricksoftware.grants.commands.places.regions.RegionCommandImpl;
 import scot.carricksoftware.grants.domains.places.Country;
+import scot.carricksoftware.grants.domains.places.Organisation;
 import scot.carricksoftware.grants.domains.places.Place;
 import scot.carricksoftware.grants.domains.places.Region;
 
@@ -62,5 +63,12 @@ public class GenerateRandomPlaceValues {
         return regionCommand;
     }
 
+    @SuppressWarnings("unused")
+    public static Organisation GetRandomOrganisation() {
+        Organisation organisation = new Organisation();
+        organisation.setName(GetRandomString());
+        return organisation;
+    }
+
 
 }

src/test/java/scot/carricksoftware/grants/services/places/organisations/OrganisationServiceFindTest.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.services.places.organisations;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverterImpl;
+import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverterImpl;
+import scot.carricksoftware.grants.domains.places.Organisation;
+import scot.carricksoftware.grants.repositories.places.OrganisationRepository;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.when;
+import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrganisation;
+
+@ExtendWith(MockitoExtension.class)
+public class OrganisationServiceFindTest {
+
+    OrganisationService organisationService;
+
+    @Mock
+    OrganisationRepository organisationRepositoryMock;
+
+    @Mock
+    OrganisationConverterImpl organisationConverterMock;
+
+    @Mock
+    OrganisationCommandConverterImpl organisationCommandConverterMock;
+
+    @BeforeEach
+    public void setUp() {
+        organisationService = new OrganisationServiceImpl(organisationRepositoryMock,
+                organisationConverterMock,
+                organisationCommandConverterMock);
+    }
+
+    @Test
+    public void testFindAll() {
+        List<Organisation> organisations = new ArrayList<>();
+        organisations.add(GetRandomOrganisation());
+        when(organisationRepositoryMock.findAll()).thenReturn(organisations);
+        assertEquals(organisations, organisationService.findAll());
+    }
+
+    @Test
+    public void testFindByFoundId() {
+        Long id = GetRandomLong();
+        Organisation organisation = GetRandomOrganisation();
+        Optional<Organisation> organisationOptional = Optional.of(organisation);
+        when(organisationRepositoryMock.findById(id)).thenReturn(organisationOptional);
+        assertEquals(organisation, organisationService.findById(id));
+    }
+
+    @Test
+    public void testFindByNotFoundId() {
+        Long id = GetRandomLong();
+        Optional<Organisation> empty = Optional.empty();
+        when(organisationRepositoryMock.findById(id)).thenReturn(empty);
+        assertNull(organisationService.findById(id));
+    }
+
+}

src/test/java/scot/carricksoftware/grants/services/places/organisations/OrganisationServiceSaveTest.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.services.places.organisations;
+
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.domain.Pageable;
+import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
+import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommandImpl;
+import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverterImpl;
+import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverterImpl;
+import scot.carricksoftware.grants.domains.places.Organisation;
+import scot.carricksoftware.grants.repositories.places.OrganisationRepository;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrganisation;
+
+
+@ExtendWith(MockitoExtension.class)
+public class OrganisationServiceSaveTest {
+
+    OrganisationService organisationService;
+
+    @Mock
+    OrganisationRepository organisationRepositoryMock;
+
+    @Mock
+    OrganisationConverterImpl organisationConverterImplMock;
+
+    @Mock
+    OrganisationCommandConverterImpl organisationCommandConverterImplMock;
+
+
+    @BeforeEach
+    public void setUp() {
+        organisationService = new OrganisationServiceImpl(organisationRepositoryMock,
+                organisationConverterImplMock,
+                organisationCommandConverterImplMock);
+    }
+
+    @SuppressWarnings("unused")
+    @Mock
+    Pageable pageableMock;
+
+
+    @Test
+    public void saveTest() {
+        Organisation organisation = new Organisation();
+        organisation.setName(GetRandomString());
+
+        when(organisationRepositoryMock.save(organisation)).thenReturn(organisation);
+
+        assertEquals(organisation, organisationService.save(organisation));
+    }
+
+    @Test
+    public void saveOrganisationCommandTest() {
+        Organisation organisation = GetRandomOrganisation();
+        OrganisationCommand organisationCommand = new OrganisationCommandImpl();
+        when(organisationCommandConverterImplMock.convert(organisationCommand)).thenReturn(organisation);
+        when(organisationRepositoryMock.save(organisation)).thenReturn(organisation);
+        when(organisationConverterImplMock.convert((organisation))).thenReturn(organisationCommand);
+
+        assertEquals(organisationCommand, organisationService.saveOrganisationCommand(organisationCommand));
+    }
+
+
+}

src/test/java/scot/carricksoftware/grants/services/places/organisations/OrganisationServiceTest.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.services.places.organisations;
+
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverterImpl;
+import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverterImpl;
+import scot.carricksoftware.grants.domains.places.Organisation;
+import scot.carricksoftware.grants.repositories.places.OrganisationRepository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrganisation;
+
+
+@ExtendWith(MockitoExtension.class)
+public class OrganisationServiceTest {
+
+    OrganisationService organisationService;
+
+    @Mock
+    OrganisationRepository organisationRepositoryMock;
+
+    @Mock
+    OrganisationConverterImpl organisationConverterImplMock;
+
+    @Mock
+    OrganisationCommandConverterImpl organisationCommandConverterImplMock;
+
+
+    @BeforeEach
+    public void setUp() {
+        organisationService = new OrganisationServiceImpl(organisationRepositoryMock,
+                organisationConverterImplMock,
+                organisationCommandConverterImplMock);
+    }
+
+    @SuppressWarnings("unused")
+    @Mock
+    Pageable pageableMock;
+
+    @Mock
+    Page<Organisation> pageMock;
+
+    @Test
+    public void deleteByIdTest() {
+        Long id = GetRandomLong();
+        organisationService.deleteById(id);
+        verify(organisationRepositoryMock).deleteById(id);
+    }
+
+    @Test
+    public void CountTest() {
+        long result = GetRandomLong();
+        when(organisationRepositoryMock.count()).thenReturn(result);
+        assertEquals(result, organisationService.count());
+    }
+
+    @Test
+    public void getPagedCountriesTest() {
+        List<Organisation> result = new ArrayList<>();
+        Organisation organisation = GetRandomOrganisation();
+        result.add(organisation);
+        when(pageMock.getContent()).thenReturn(result);
+        when(organisationRepositoryMock.findAll(any(Pageable.class))).thenReturn(pageMock);
+        assertEquals(result, organisationService.getPagedOrganisations(0));
+    }
+
+
+}