SelectedCensusService

src/main/java/scot/carricksoftware/grants/constants/AttributeConstants.java

@@ -38,6 +38,7 @@ public class AttributeConstants {
     @SuppressWarnings("unused")
     public static final String CENSUS_COMMAND = "censusCommand";
 
+    @SuppressWarnings("unused")
     public static final String CENSUS = "census";
 
 

src/main/java/scot/carricksoftware/grants/constants/CensusMappingConstants.java

@@ -78,5 +78,6 @@ public class CensusMappingConstants {
     @SuppressWarnings({"unused"})
     public static final String SELECTED_CENSUS_EDIT = "selectedCensus/{id}/edit";
 
+    @SuppressWarnings("unused")
     public static final String SELECTED_CENSUS_ENTRIES = "/selectedCensus/{id}/entries";
 }

src/main/java/scot/carricksoftware/grants/controllers/census/census/SelectedCensusListController.java → src/main/java/scot/carricksoftware/grants/controllers/census/selectedcensus/SelectedCensusListController.java

@@ -1,11 +1,10 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 21/03/2025, 00:08. All rights reserved.
+ * Copyright (c) Andrew Grant of Carrick Software 21/03/2025, 00:07. All rights reserved.
  *
  */
 
-package scot.carricksoftware.grants.controllers.census.census;
+package scot.carricksoftware.grants.controllers.census.selectedcensus;
 
-import jakarta.validation.Valid;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -24,10 +23,7 @@ public interface SelectedCensusListController {
 
     String getLastPage(final Model model);
 
-    String censusDelete(@PathVariable String id);
-
-    @SuppressWarnings("SameReturnValue")
-    String censusEntriesEntries(@Valid @PathVariable String id, Model model);
+    String censusEntryDelete(@PathVariable String id);
 
     int getPageNumber();
 }

src/main/java/scot/carricksoftware/grants/controllers/census/census/SelectedSelectedCensusListControllerImpl.java → src/main/java/scot/carricksoftware/grants/controllers/census/selectedcensus/SelectedCensusListControllerImpl.java

@@ -1,11 +1,10 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 21/03/2025, 00:09. All rights reserved.
+ * Copyright (c) Andrew Grant of Carrick Software 21/03/2025, 00:07. All rights reserved.
  *
  */
 
-package scot.carricksoftware.grants.controllers.census.census;
+package scot.carricksoftware.grants.controllers.census.selectedcensus;
 
-import jakarta.validation.Valid;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Controller;
@@ -14,25 +13,25 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import scot.carricksoftware.grants.constants.*;
 import scot.carricksoftware.grants.controllers.ControllerHelper;
-import scot.carricksoftware.grants.services.census.census.CensusService;
+import scot.carricksoftware.grants.controllers.census.censusentry.CensusEntryListController;
 import scot.carricksoftware.grants.services.census.censusentry.CensusEntryService;
 
 import static java.lang.Integer.max;
 
 @Controller
-public class SelectedSelectedCensusListControllerImpl implements SelectedCensusListController {
+public class SelectedCensusListControllerImpl implements CensusEntryListController {
+
+    private static final Logger logger = LogManager.getLogger(SelectedCensusListControllerImpl.class);
 
-    private static final Logger logger = LogManager.getLogger(SelectedSelectedCensusListControllerImpl.class);
 
     private int currentPage = 0;
     private final ControllerHelper controllerHelper;
-    private final CensusService censusService;
     private final CensusEntryService censusEntryService;
 
-    public SelectedSelectedCensusListControllerImpl(ControllerHelper controllerHelper,
-                                                    CensusService censusService, CensusEntryService censusEntryService) {
+
+    public SelectedCensusListControllerImpl(ControllerHelper controllerHelper,
+                                            CensusEntryService censusEntryService) {
         this.controllerHelper = controllerHelper;
-        this.censusService = censusService;
         this.censusEntryService = censusEntryService;
     }
 
@@ -40,35 +39,32 @@ public class SelectedSelectedCensusListControllerImpl implements SelectedCensusL
     @GetMapping(CensusMappingConstants.SELECTED_CENSUS_LIST)
     @Override
     public final String getListPage(final Model model) {
-        logger.debug("PersonListControllerImpl::getCensusPage");
+        logger.debug("PersonListControllerImpl::getCensusEntryPage");
         currentPage = 0;
         return sendAttributesAndReturn(model);
     }
 
-
-
     @SuppressWarnings("SameReturnValue")
     private String sendAttributesAndReturn(Model model) {
-        model.addAttribute(AttributeConstants.CENSUSES, censusService.getPagedCensuses(currentPage));
+        model.addAttribute(AttributeConstants.CENSUS_ENTRIES, censusEntryService.getPagedCensusEntries(currentPage));
         controllerHelper.addAttributes(model);
-        return ViewConstants.CENSUS_LIST;
+        return ViewConstants.SELECTED_CENSUS_LIST;
     }
 
     @SuppressWarnings("SameReturnValue")
     @GetMapping(CensusMappingConstants.SELECTED_CENSUS_NEXT)
     @Override
     public final String getNextPage(final Model model) {
-        logger.debug("CensusEntriesListControllerImpl::getNextPage");
+        logger.debug("CensusEntryListControllerImpl::getNextPage");
         currentPage++;
         return sendAttributesAndReturn(model);
     }
 
-
     @SuppressWarnings("SameReturnValue")
     @GetMapping(CensusMappingConstants.SELECTED_CENSUS_PREVIOUS)
     @Override
     public final String getPreviousPage(final Model model) {
-        logger.debug("CensusEntriesListControllerImpl::getPreviousPage");
+        logger.debug("CensusEntryListControllerImpl::getPreviousPage");
         currentPage = max(0, currentPage - 1);
         return sendAttributesAndReturn(model);
     }
@@ -76,40 +72,31 @@ public class SelectedSelectedCensusListControllerImpl implements SelectedCensusL
     @SuppressWarnings("SameReturnValue")
     @GetMapping(CensusMappingConstants.SELECTED_CENSUS_REWIND)
     public final String getFirstPage(final Model model) {
-        logger.debug("CensusEntriesListControllerImpl::getFirstPage");
+        logger.debug("CensusEntryListControllerImpl::getFirstPage");
         currentPage = 0;
         return sendAttributesAndReturn(model);
     }
 
     @SuppressWarnings("SameReturnValue")
     @GetMapping(CensusMappingConstants.SELECTED_CENSUS_FF)
+    @Override
     public final String getLastPage(final Model model) {
-        logger.debug("CensusEntriesListControllerImpl::getLastPage");
-        long censusCount = censusService.count();
-        currentPage = (int) (censusCount / ApplicationConstants.DEFAULT_PAGE_SIZE);
+        logger.debug("CensusEntryListControllerImpl::getLastPage");
+        long censusEntryCount = censusEntryService.count();
+        currentPage = (int) (censusEntryCount / ApplicationConstants.DEFAULT_PAGE_SIZE);
         return sendAttributesAndReturn(model);
     }
 
+
     @SuppressWarnings("SameReturnValue")
     @GetMapping(CensusMappingConstants.SELECTED_CENSUS_DELETE)
     @Override
-    public final String censusDelete(@PathVariable final String id) {
-        logger.debug("CensusEntriesListControllerImpl::censusDelete");
-        censusService.deleteById(Long.valueOf(id));
+    public final String censusEntryDelete(@PathVariable final String id) {
+        logger.debug("CensusEntryListControllerImpl::censusEntryDelete");
+        censusEntryService.deleteById(Long.valueOf(id));
         return MappingConstants.REDIRECT + CensusMappingConstants.SELECTED_CENSUS_LIST;
     }
 
-    @SuppressWarnings("SameReturnValue")
-    @GetMapping(CensusMappingConstants.SELECTED_CENSUS_ENTRIES)
-    @Override
-    public String censusEntriesEntries(@Valid @PathVariable final String id, Model model) {
-        logger.debug("CensusEntriesListControllerImpl::censusEntriesEntries");
-        model.addAttribute(AttributeConstants.CENSUS_ENTRIES, censusEntryService.getPagedCensusEntries(currentPage));
-        model.addAttribute(AttributeConstants.CENSUS, censusService.findById(Long.valueOf(id)));
-        return ViewConstants.SELECTED_CENSUS_LIST;
-    }
-
-
     @Override
     public int getPageNumber() {
         return currentPage;