Browse Source

UpdateDateOfBirth structure

Andrew Grant 7 tháng trước cách đây
mục cha
commit
6d49ac45b7
25 tập tin đã thay đổi với 102 bổ sung37 xóa
  1. 2 2
      src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadCensus.java
  2. 1 1
      src/main/java/scot/carricksoftware/grants/controllers/census/census/CensusFormControllerImpl.java
  3. 1 1
      src/main/java/scot/carricksoftware/grants/controllers/census/census/CensusListControllerImpl.java
  4. 2 2
      src/main/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerImpl.java
  5. 1 1
      src/main/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryListControllerImpl.java
  6. 2 2
      src/main/java/scot/carricksoftware/grants/services/census/census/CensusService.java
  7. 2 2
      src/main/java/scot/carricksoftware/grants/services/census/census/CensusServiceImpl.java
  8. 2 2
      src/main/java/scot/carricksoftware/grants/services/census/censusentry/CensusEntryService.java
  9. 2 2
      src/main/java/scot/carricksoftware/grants/services/census/censusentry/CensusEntryServiceImpl.java
  10. 14 0
      src/main/java/scot/carricksoftware/grants/services/census/censusentry/UpdateYearsOfBirth.java
  11. 23 0
      src/main/java/scot/carricksoftware/grants/services/census/censusentry/UpdateYearsOfBirthImpl.java
  12. 2 2
      src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadCensusTest.java
  13. 1 1
      src/test/java/scot/carricksoftware/grants/controllers/census/census/CensusFormControllerSaveOrUpdateTest.java
  14. 1 1
      src/test/java/scot/carricksoftware/grants/controllers/census/census/CensusFormControllerTest.java
  15. 1 1
      src/test/java/scot/carricksoftware/grants/controllers/census/census/CensusListControllerTest.java
  16. 2 2
      src/test/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerSaveOrUpdateTest.java
  17. 2 2
      src/test/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerTest.java
  18. 1 1
      src/test/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryListControllerTest.java
  19. 4 2
      src/test/java/scot/carricksoftware/grants/services/census/census/CensusServiceEntrySaveTest.java
  20. 2 2
      src/test/java/scot/carricksoftware/grants/services/census/census/CensusServiceFindTest.java
  21. 2 2
      src/test/java/scot/carricksoftware/grants/services/census/census/CensusServiceSaveTest.java
  22. 2 2
      src/test/java/scot/carricksoftware/grants/services/census/census/CensusServiceTest.java
  23. 2 2
      src/test/java/scot/carricksoftware/grants/services/census/censusentry/CensusEntryServiceFindTest.java
  24. 2 2
      src/test/java/scot/carricksoftware/grants/services/census/censusentry/CensusEntryServiceTest.java
  25. 26 0
      src/test/java/scot/carricksoftware/grants/services/census/censusentry/UpdateYearsOfBirthTest.java

+ 2 - 2
src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadCensus.java

@@ -20,8 +20,8 @@ import scot.carricksoftware.grants.enums.censusentry.CensusEntryCondition;
 import scot.carricksoftware.grants.enums.censusentry.CensusEntryGaelic;
 import scot.carricksoftware.grants.enums.censusentry.CensusEntryRelationship;
 import scot.carricksoftware.grants.enums.censusentry.CensusEntryWorker;
-import scot.carricksoftware.grants.services.census.CensusEntryService;
-import scot.carricksoftware.grants.services.census.CensusService;
+import scot.carricksoftware.grants.services.census.censusentry.CensusEntryService;
+import scot.carricksoftware.grants.services.census.census.CensusService;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
 

+ 1 - 1
src/main/java/scot/carricksoftware/grants/controllers/census/census/CensusFormControllerImpl.java

@@ -21,7 +21,7 @@ import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.constants.MappingConstants;
 import scot.carricksoftware.grants.constants.ViewConstants;
 import scot.carricksoftware.grants.converters.census.CensusConverter;
-import scot.carricksoftware.grants.services.census.CensusService;
+import scot.carricksoftware.grants.services.census.census.CensusService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.census.CensusCommandValidator;
 

+ 1 - 1
src/main/java/scot/carricksoftware/grants/controllers/census/census/CensusListControllerImpl.java

@@ -16,7 +16,7 @@ import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.constants.MappingConstants;
 import scot.carricksoftware.grants.constants.ViewConstants;
 import scot.carricksoftware.grants.controllers.ControllerHelper;
-import scot.carricksoftware.grants.services.census.CensusService;
+import scot.carricksoftware.grants.services.census.census.CensusService;
 
 import static java.lang.Integer.max;
 

+ 2 - 2
src/main/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerImpl.java

@@ -22,8 +22,8 @@ import scot.carricksoftware.grants.constants.MappingConstants;
 import scot.carricksoftware.grants.constants.ViewConstants;
 import scot.carricksoftware.grants.converters.Capitalisation;
 import scot.carricksoftware.grants.converters.census.CensusEntryConverter;
-import scot.carricksoftware.grants.services.census.CensusEntryService;
-import scot.carricksoftware.grants.services.census.CensusService;
+import scot.carricksoftware.grants.services.census.censusentry.CensusEntryService;
+import scot.carricksoftware.grants.services.census.census.CensusService;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.validators.census.CensusEntryCommandValidator;
 

+ 1 - 1
src/main/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryListControllerImpl.java

@@ -16,7 +16,7 @@ import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.constants.MappingConstants;
 import scot.carricksoftware.grants.constants.ViewConstants;
 import scot.carricksoftware.grants.controllers.ControllerHelper;
-import scot.carricksoftware.grants.services.census.CensusEntryService;
+import scot.carricksoftware.grants.services.census.censusentry.CensusEntryService;
 
 import static java.lang.Integer.max;
 

+ 2 - 2
src/main/java/scot/carricksoftware/grants/services/census/CensusService.java → src/main/java/scot/carricksoftware/grants/services/census/census/CensusService.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:23. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
-package scot.carricksoftware.grants.services.census;
+package scot.carricksoftware.grants.services.census.census;
 
 import org.springframework.stereotype.Service;
 import scot.carricksoftware.grants.commands.census.CensusCommand;

+ 2 - 2
src/main/java/scot/carricksoftware/grants/services/census/CensusServiceImpl.java → src/main/java/scot/carricksoftware/grants/services/census/census/CensusServiceImpl.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:23. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
-package scot.carricksoftware.grants.services.census;
+package scot.carricksoftware.grants.services.census.census;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

+ 2 - 2
src/main/java/scot/carricksoftware/grants/services/census/CensusEntryService.java → src/main/java/scot/carricksoftware/grants/services/census/censusentry/CensusEntryService.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:23. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
-package scot.carricksoftware.grants.services.census;
+package scot.carricksoftware.grants.services.census.censusentry;
 
 import org.springframework.stereotype.Service;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommand;

+ 2 - 2
src/main/java/scot/carricksoftware/grants/services/census/CensusEntryServiceImpl.java → src/main/java/scot/carricksoftware/grants/services/census/censusentry/CensusEntryServiceImpl.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:23. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
-package scot.carricksoftware.grants.services.census;
+package scot.carricksoftware.grants.services.census.censusentry;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

+ 14 - 0
src/main/java/scot/carricksoftware/grants/services/census/censusentry/UpdateYearsOfBirth.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.services.census.censusentry;
+
+import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
+import scot.carricksoftware.grants.domains.people.Person;
+
+public interface UpdateYearsOfBirth {
+     @SuppressWarnings({"EmptyMethod", "unused"})
+     void updateRecordedYearOfBirth(@SuppressWarnings("unused") CensusEntryCommand censusEntryCommand, @SuppressWarnings("unused") Person person);
+}

+ 23 - 0
src/main/java/scot/carricksoftware/grants/services/census/censusentry/UpdateYearsOfBirthImpl.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.services.census.censusentry;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
+import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
+import scot.carricksoftware.grants.domains.people.Person;
+
+@Component
+public class UpdateYearsOfBirthImpl implements UpdateYearsOfBirth {
+
+    private static final Logger logger = LogManager.getLogger(UpdateYearsOfBirthImpl.class);
+
+    @Override
+    public void updateRecordedYearOfBirth(CensusEntryCommand censusEntryCommand, Person person) {
+        logger.debug("updateYearOfBirth::updateRecordedYearOfBirth");
+    }
+}

+ 2 - 2
src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadCensusTest.java

@@ -17,8 +17,8 @@ import scot.carricksoftware.grants.enums.censusentry.CensusEntryCondition;
 import scot.carricksoftware.grants.enums.censusentry.CensusEntryGaelic;
 import scot.carricksoftware.grants.enums.censusentry.CensusEntryRelationship;
 import scot.carricksoftware.grants.enums.censusentry.CensusEntryWorker;
-import scot.carricksoftware.grants.services.census.CensusEntryService;
-import scot.carricksoftware.grants.services.census.CensusService;
+import scot.carricksoftware.grants.services.census.censusentry.CensusEntryService;
+import scot.carricksoftware.grants.services.census.census.CensusService;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
 

+ 1 - 1
src/test/java/scot/carricksoftware/grants/controllers/census/census/CensusFormControllerSaveOrUpdateTest.java

@@ -15,7 +15,7 @@ import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.census.CensusCommand;
 import scot.carricksoftware.grants.commands.census.CensusCommandImpl;
 import scot.carricksoftware.grants.converters.census.CensusConverterImpl;
-import scot.carricksoftware.grants.services.census.CensusService;
+import scot.carricksoftware.grants.services.census.census.CensusService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.census.CensusCommandValidator;
 

+ 1 - 1
src/test/java/scot/carricksoftware/grants/controllers/census/census/CensusFormControllerTest.java

@@ -17,7 +17,7 @@ import scot.carricksoftware.grants.commands.census.CensusCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.converters.census.CensusConverterImpl;
 import scot.carricksoftware.grants.domains.census.Census;
-import scot.carricksoftware.grants.services.census.CensusService;
+import scot.carricksoftware.grants.services.census.census.CensusService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.census.CensusCommandValidator;
 

+ 1 - 1
src/test/java/scot/carricksoftware/grants/controllers/census/census/CensusListControllerTest.java

@@ -14,7 +14,7 @@ import org.springframework.ui.Model;
 import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.controllers.ControllerHelper;
 import scot.carricksoftware.grants.domains.census.Census;
-import scot.carricksoftware.grants.services.census.CensusService;
+import scot.carricksoftware.grants.services.census.census.CensusService;
 
 import java.util.ArrayList;
 import java.util.List;

+ 2 - 2
src/test/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerSaveOrUpdateTest.java

@@ -16,8 +16,8 @@ import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommandImpl;
 import scot.carricksoftware.grants.converters.Capitalisation;
 import scot.carricksoftware.grants.converters.census.CensusEntryConverterImpl;
-import scot.carricksoftware.grants.services.census.CensusEntryService;
-import scot.carricksoftware.grants.services.census.CensusService;
+import scot.carricksoftware.grants.services.census.censusentry.CensusEntryService;
+import scot.carricksoftware.grants.services.census.census.CensusService;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.validators.census.CensusEntryCommandValidator;
 

+ 2 - 2
src/test/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryFormControllerTest.java

@@ -18,8 +18,8 @@ import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.converters.Capitalisation;
 import scot.carricksoftware.grants.converters.census.CensusEntryConverterImpl;
 import scot.carricksoftware.grants.domains.census.CensusEntry;
-import scot.carricksoftware.grants.services.census.CensusEntryService;
-import scot.carricksoftware.grants.services.census.CensusService;
+import scot.carricksoftware.grants.services.census.censusentry.CensusEntryService;
+import scot.carricksoftware.grants.services.census.census.CensusService;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.validators.census.CensusEntryCommandValidator;
 

+ 1 - 1
src/test/java/scot/carricksoftware/grants/controllers/census/censusentry/CensusEntryListControllerTest.java

@@ -14,7 +14,7 @@ import org.springframework.ui.Model;
 import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.controllers.ControllerHelper;
 import scot.carricksoftware.grants.domains.census.CensusEntry;
-import scot.carricksoftware.grants.services.census.CensusEntryService;
+import scot.carricksoftware.grants.services.census.censusentry.CensusEntryService;
 
 import java.util.ArrayList;
 import java.util.List;

+ 4 - 2
src/test/java/scot/carricksoftware/grants/services/census/CensusServiceEntrySaveTest.java → src/test/java/scot/carricksoftware/grants/services/census/census/CensusServiceEntrySaveTest.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
-package scot.carricksoftware.grants.services.census;
+package scot.carricksoftware.grants.services.census.census;
 
 
 import org.junit.jupiter.api.BeforeEach;
@@ -17,6 +17,8 @@ import scot.carricksoftware.grants.converters.census.CensusEntryCommandConverter
 import scot.carricksoftware.grants.converters.census.CensusEntryConverterImpl;
 import scot.carricksoftware.grants.domains.census.CensusEntry;
 import scot.carricksoftware.grants.repositories.census.CensusEntryRepository;
+import scot.carricksoftware.grants.services.census.censusentry.CensusEntryService;
+import scot.carricksoftware.grants.services.census.censusentry.CensusEntryServiceImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;

+ 2 - 2
src/test/java/scot/carricksoftware/grants/services/census/CensusServiceFindTest.java → src/test/java/scot/carricksoftware/grants/services/census/census/CensusServiceFindTest.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
-package scot.carricksoftware.grants.services.census;
+package scot.carricksoftware.grants.services.census.census;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

+ 2 - 2
src/test/java/scot/carricksoftware/grants/services/census/CensusServiceSaveTest.java → src/test/java/scot/carricksoftware/grants/services/census/census/CensusServiceSaveTest.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
-package scot.carricksoftware.grants.services.census;
+package scot.carricksoftware.grants.services.census.census;
 
 
 import org.junit.jupiter.api.BeforeEach;

+ 2 - 2
src/test/java/scot/carricksoftware/grants/services/census/CensusServiceTest.java → src/test/java/scot/carricksoftware/grants/services/census/census/CensusServiceTest.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
-package scot.carricksoftware.grants.services.census;
+package scot.carricksoftware.grants.services.census.census;
 
 
 import org.junit.jupiter.api.BeforeEach;

+ 2 - 2
src/test/java/scot/carricksoftware/grants/services/census/CensusEntryServiceFindTest.java → src/test/java/scot/carricksoftware/grants/services/census/censusentry/CensusEntryServiceFindTest.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
-package scot.carricksoftware.grants.services.census;
+package scot.carricksoftware.grants.services.census.censusentry;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

+ 2 - 2
src/test/java/scot/carricksoftware/grants/services/census/CensusEntryServiceTest.java → src/test/java/scot/carricksoftware/grants/services/census/censusentry/CensusEntryServiceTest.java

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 20:24. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
-package scot.carricksoftware.grants.services.census;
+package scot.carricksoftware.grants.services.census.censusentry;
 
 
 import org.junit.jupiter.api.BeforeEach;

+ 26 - 0
src/test/java/scot/carricksoftware/grants/services/census/censusentry/UpdateYearsOfBirthTest.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.services.census.censusentry;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class UpdateYearsOfBirthTest {
+
+    private UpdateYearsOfBirth updateYearsOfBirth;
+
+    @BeforeEach
+    void setUp() {
+        updateYearsOfBirth = new UpdateYearsOfBirthImpl();
+    }
+
+    @Test
+    public void existsTest() {
+       assertNotNull(updateYearsOfBirth);
+    }
+}