DataLoadOrganisationsTest::registrationAuthorityIsLoadedTest()

src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadCertificateAuthorities.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c)  18 Feb 2025, Andrew Grant of Carrick Software .
+ * All rights reserved.
+ */
+
+package scot.carricksoftware.grants.bootstrap;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
+import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommandImpl;
+import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
+
+
+@Component
+@Profile("dev")
+public class DataLoadCertificateAuthorities {
+
+    private static final Logger logger = LogManager.getLogger(DataLoadCertificateAuthorities.class);
+
+    private final OrganisationService organisationService;
+
+    public DataLoadCertificateAuthorities(OrganisationService organisationService) {
+        this.organisationService = organisationService;
+    }
+
+    public void load() {
+        logger.debug("DataLoadCertificateAuthorities::load");
+        loadCertificateSource();
+    }
+
+    private void loadCertificateSource() {
+        logger.debug("DataLoadCertificateAuthorities::loadCertificateSource");
+        OrganisationCommand certificateSourceCommand = new OrganisationCommandImpl();
+        certificateSourceCommand.setName("General Register Office For Scotland");
+        organisationService.saveOrganisationCommand(certificateSourceCommand);
+    }
+
+
+}

src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadOrganisations.java

@@ -9,9 +9,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommandImpl;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 
 
 @Component
@@ -20,30 +17,20 @@ public class DataLoadOrganisations {
 
     private static final Logger logger = LogManager.getLogger(DataLoadOrganisations.class);
 
-    private final OrganisationService organisationService;
+    private final DataLoadCertificateAuthorities dataLoadCertificateAuthorities;
 
-    public DataLoadOrganisations(OrganisationService organisationService) {
-        this.organisationService = organisationService;
+    private final DataLoadRegistrationAuthorities dataLoadRegistrationAuthorities;
+
+    public DataLoadOrganisations(DataLoadCertificateAuthorities dataLoadCertificateAuthorities, DataLoadRegistrationAuthorities dataLoadRegistrationAuthorities) {
+        this.dataLoadCertificateAuthorities = dataLoadCertificateAuthorities;
+        this.dataLoadRegistrationAuthorities = dataLoadRegistrationAuthorities;
     }
 
     public void load() {
         logger.debug("DataLoadOrganisation::load");
-        loadRegistrationAuthority();
-        loadCertificateSource();
-    }
-
-    private void loadCertificateSource() {
-        logger.debug("DataLoadOrganisation::loadCertificateSource");
-        OrganisationCommand certificateSourceCommand = new OrganisationCommandImpl();
-        certificateSourceCommand.setName("General Register Office For Scotland");
-        organisationService.saveOrganisationCommand(certificateSourceCommand);
+        dataLoadCertificateAuthorities.load();
+        dataLoadRegistrationAuthorities.load();
     }
 
-    private void loadRegistrationAuthority() {
-        logger.debug("DataLoadOrganisation::loadRegistrationAuthority");
-        OrganisationCommand registrationAuthorityCommand = new OrganisationCommandImpl();
-        registrationAuthorityCommand.setName("Registration Authority");
-        organisationService.saveOrganisationCommand(registrationAuthorityCommand);
-    }
 
 }

src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadRegistrationAuthorities.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c)  18 Feb 2025, Andrew Grant of Carrick Software .
+ * All rights reserved.
+ */
+
+package scot.carricksoftware.grants.bootstrap;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
+import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommandImpl;
+import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
+
+
+@Component
+@Profile("dev")
+public class DataLoadRegistrationAuthorities {
+
+    private static final Logger logger = LogManager.getLogger(DataLoadRegistrationAuthorities.class);
+
+    private final OrganisationService organisationService;
+
+    public DataLoadRegistrationAuthorities(OrganisationService organisationService) {
+        this.organisationService = organisationService;
+    }
+
+    public void load() {
+        logger.debug("DataLoadOrganisation::load");
+        loadRegistrationAuthority();
+        loadCertificateSource();
+    }
+
+    private void loadCertificateSource() {
+        logger.debug("DataLoadOrganisation::loadCertificateSource");
+        OrganisationCommand certificateSourceCommand = new OrganisationCommandImpl();
+        certificateSourceCommand.setName("General Register Office For Scotland");
+        organisationService.saveOrganisationCommand(certificateSourceCommand);
+    }
+
+    private void loadRegistrationAuthority() {
+        logger.debug("DataLoadOrganisation::loadRegistrationAuthority");
+        OrganisationCommand registrationAuthorityCommand = new OrganisationCommandImpl();
+        registrationAuthorityCommand.setName("Registration Authority");
+        organisationService.saveOrganisationCommand(registrationAuthorityCommand);
+    }
+
+}

src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadCertificateAuthoritiesTest.java

@@ -0,0 +1,42 @@
+package scot.carricksoftware.grants.bootstrap;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
+import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+public class DataLoadCertificateAuthoritiesTest {
+
+    private DataLoadCertificateAuthorities dataLoadCertificateAuthorities;
+
+    @Mock
+    private OrganisationService organisationServiceMock;
+
+    @BeforeEach
+    public void setUp() {
+        dataLoadCertificateAuthorities = new DataLoadCertificateAuthorities(organisationServiceMock);
+    }
+
+    @Test
+    void certificateSourcesIsLoadedTest() {
+        ArgumentCaptor<OrganisationCommand> captor = ArgumentCaptor.forClass(OrganisationCommand.class);
+        dataLoadCertificateAuthorities.load();
+        verify(organisationServiceMock, atLeast(1)).saveOrganisationCommand(captor.capture());
+        for (OrganisationCommand command : captor.getAllValues()) {
+            if (command.getName().equals("General Register Office For Scotland")) {
+                assertTrue(true);
+                return;
+            }
+        }
+    }
+
+}

src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadOrganisationsTest.java

@@ -3,14 +3,9 @@ package scot.carricksoftware.grants.bootstrap;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.verify;
 
 @ExtendWith(MockitoExtension.class)
@@ -18,37 +13,28 @@ public class DataLoadOrganisationsTest {
 
     private DataLoadOrganisations dataLoadOrganisations;
 
+
+    @Mock
+    private DataLoadCertificateAuthorities dataLoadCertificateAuthoritiesMock;
+
     @Mock
-    private OrganisationService organisationServiceMock;
+    private DataLoadRegistrationAuthorities dataLoadRegistrationAuthoritiesMock;
 
     @BeforeEach
     public void setUp() {
-        dataLoadOrganisations = new DataLoadOrganisations(organisationServiceMock);
+        dataLoadOrganisations = new DataLoadOrganisations(dataLoadCertificateAuthoritiesMock, dataLoadRegistrationAuthoritiesMock);
     }
 
     @Test
-    void certificateSourcesIsLoadedTest() {
-        ArgumentCaptor<OrganisationCommand> captor = ArgumentCaptor.forClass(OrganisationCommand.class);
+    void certificateAuthoritiesAreLoadedTest() {
         dataLoadOrganisations.load();
-        verify(organisationServiceMock, atLeast(1)).saveOrganisationCommand(captor.capture());
-        for (OrganisationCommand command : captor.getAllValues()) {
-            if (command.getName().equals("General Register Office For Scotland")) {
-                assertTrue(true);
-                return;
-            }
-        }
+        verify(dataLoadCertificateAuthoritiesMock).load();
     }
 
     @Test
-    void registrationAuthorityIsLoadedTest() {
-        ArgumentCaptor<OrganisationCommand> captor = ArgumentCaptor.forClass(OrganisationCommand.class);
+    void registrationAuthoritiesAreLoadedTest() {
         dataLoadOrganisations.load();
-        verify(organisationServiceMock, atLeast(1)).saveOrganisationCommand(captor.capture());
-        for (OrganisationCommand command : captor.getAllValues()) {
-            if (command.getName().equals("Registration Authority")) {
-                assertTrue(true);
-                return;
-            }
-        }
+        verify(dataLoadRegistrationAuthoritiesMock).load();
     }
+
 }

src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadRegistrationAuthoritiesTest.java

@@ -0,0 +1,41 @@
+package scot.carricksoftware.grants.bootstrap;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
+import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+public class DataLoadRegistrationAuthoritiesTest {
+
+    private DataLoadRegistrationAuthorities dataLoadRegistrationAuthorities;
+
+    @Mock
+    private OrganisationService organisationServiceMock;
+
+    @BeforeEach
+    public void setUp() {
+        dataLoadRegistrationAuthorities = new DataLoadRegistrationAuthorities(organisationServiceMock);
+    }
+
+    @Test
+    void registrationAuthorityIsLoadedTest() {
+        ArgumentCaptor<OrganisationCommand> captor = ArgumentCaptor.forClass(OrganisationCommand.class);
+        dataLoadRegistrationAuthorities.load();
+        verify(organisationServiceMock, atLeast(1)).saveOrganisationCommand(captor.capture());
+        for (OrganisationCommand command : captor.getAllValues()) {
+            if (command.getName().equals("Registration Authority")) {
+                assertTrue(true);
+                return;
+            }
+        }
+    }
+}