Organisation service added back

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

@@ -14,6 +14,7 @@ import scot.carricksoftware.grants.domains.places.Organisation;
 import scot.carricksoftware.grants.domains.places.Place;
 import scot.carricksoftware.grants.domains.places.Region;
 import scot.carricksoftware.grants.services.places.countries.CountryService;
+import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.services.places.regions.RegionService;
 
@@ -26,13 +27,15 @@ public class DataLoadPlaces {
     private final CountryService countryService;
     private final RegionService regionService;
     private final PlaceService placeService;
+    private final OrganisationService organisationService;
 
     public DataLoadPlaces(CountryService countryService,
                           RegionService regionService,
-                          PlaceService placeService) {
+                          PlaceService placeService, OrganisationService organisationService) {
         this.countryService = countryService;
         this.regionService = regionService;
         this.placeService = placeService;
+        this.organisationService = organisationService;
     }
 
     public void load() {
@@ -89,7 +92,7 @@ public class DataLoadPlaces {
 
     private void loadOrganisations() {
         army.setName("The army");
-
+        organisationService.save(army);
     }
 
 }

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.services.places.organisations;
+
+import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
+import scot.carricksoftware.grants.domains.places.Organisation;
+
+import java.util.List;
+
+public interface OrganisationService {
+
+
+    void deleteById(Long id);
+
+
+    List<Organisation> getPagedOrganisations(int pageNumber);
+
+    long count();
+
+    OrganisationCommand saveOrganisationCommand(OrganisationCommand organisationCommand);
+
+    List<Organisation> findAll();
+
+    Organisation findById(Long id);
+
+    Organisation save(Organisation organisation);
+}

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

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.services.places.organisations;
+
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+import scot.carricksoftware.grants.commands.places.organisations.OrganisationCommand;
+import scot.carricksoftware.grants.constants.ApplicationConstants;
+import scot.carricksoftware.grants.converters.places.organisations.OrganisationCommandConverter;
+import scot.carricksoftware.grants.converters.places.organisations.OrganisationConverter;
+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;
+
+@Service
+public class OrganisationServiceImpl implements OrganisationService {
+
+    private static final Logger logger = LogManager.getLogger(OrganisationServiceImpl.class);
+
+    @SuppressWarnings({"unused"})
+    private final OrganisationRepository organisationRepository;
+    private final OrganisationConverter organisationConverter;
+    private final OrganisationCommandConverter organisationCommandConverter;
+
+    public OrganisationServiceImpl(
+            OrganisationRepository organisationRepository,
+            OrganisationConverter organisationConverter,
+            OrganisationCommandConverter organisationCommandConverter) {
+
+        this.organisationRepository = organisationRepository;
+        this.organisationConverter = organisationConverter;
+        this.organisationCommandConverter = organisationCommandConverter;
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        logger.debug("OrganisationServiceImpl::deleteBy");
+        organisationRepository.deleteById(id);
+    }
+
+    @Override
+    public List<Organisation> getPagedOrganisations(int pageNumber) {
+        logger.debug("OrganisationServiceImpl::getPagedOrganisation");
+        Pageable paging = PageRequest.of(pageNumber, ApplicationConstants.DEFAULT_PAGE_SIZE, getSort());
+        Page<Organisation> pagedResult = organisationRepository.findAll(paging);
+        return pagedResult.getContent();
+    }
+
+    private Sort getSort() {
+        return Sort.by(Sort.Direction.ASC, "name");
+    }
+
+    @Override
+    public long count() {
+        logger.debug("OrganisationServiceImpl::count");
+        return organisationRepository.count();
+    }
+
+    @Override
+    public OrganisationCommand saveOrganisationCommand(OrganisationCommand organisationCommand) {
+        logger.debug("OrganisationServiceImpl::saveOrganisationCommand");
+        Organisation organisation = organisationCommandConverter.convert(organisationCommand);
+        Organisation savedOrganisation = organisationRepository.save(organisation);
+        return organisationConverter.convert(savedOrganisation);
+    }
+
+    @Override
+    public List<Organisation> findAll() {
+        logger.debug("OrganisationServiceImpl::findAll");
+        List<Organisation> result = new ArrayList<>();
+        Iterable<Organisation> organisationIterable = organisationRepository.findAll();
+        organisationIterable.forEach(result::add);
+        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);
+    }
+
+
+}