Эх сурвалжийг харах

Rooms added to Census Domain

Andrew Grant 7 сар өмнө
parent
commit
fc43cfff07

+ 20 - 0
src/main/java/scot/carricksoftware/grants/domains/census/Census.java

@@ -30,6 +30,10 @@ public class Census extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private CensusBoundaryType boundaryType;
 
+    private String inhabitedRooms;
+
+    private String roomsWithWindows;
+
     public CensusDate getCensusDate() {
         return censusDate;
     }
@@ -66,4 +70,20 @@ public class Census extends BaseEntity {
     public void setBoundaryType(CensusBoundaryType boundaryType) {
         this.boundaryType = boundaryType;
     }
+
+    public String getInhabitedRooms() {
+        return inhabitedRooms;
+    }
+
+    public void setInhabitedRooms(String inhabitedRooms) {
+        this.inhabitedRooms = inhabitedRooms;
+    }
+
+    public String getRoomsWithWindows() {
+        return roomsWithWindows;
+    }
+
+    public void setRoomsWithWindows(String roomsWithWindows) {
+        this.roomsWithWindows = roomsWithWindows;
+    }
 }

+ 1 - 1
src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=grants
 server.port=8086
 server.servlet.context-path=/grants
 spring.mvc.format.date=dd-MM-yyyy
-spring.profiles.active=uat
+spring.profiles.active=dev
 logging.level.scot.carricksoftware=debug
 
 

+ 54 - 0
src/test/java/scot/carricksoftware/grants/domains/census/CensusRoomsTest.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 01:42. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.domains.census;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+
+
+@ExtendWith(MockitoExtension.class)
+public class CensusRoomsTest {
+
+    private Census census;
+
+    @BeforeEach
+    public void setUp() {
+        census = new Census();
+    }
+
+    @Test
+    public void getInhabitedRoomsTest() {
+        assertNull(census.getInhabitedRooms());
+    }
+
+    @Test
+    public void setInhabitedRoomsTest() {
+        String string = GetRandomString();
+        census.setInhabitedRooms(string);
+        assertEquals(string, census.getInhabitedRooms());
+    }
+
+    @Test
+    public void getRoomsWithWidowsTest() {
+        assertNull(census.getRoomsWithWindows());
+    }
+
+    @Test
+    public void setRoomsWithWidowsTest() {
+        String string = GetRandomString();
+        census.setRoomsWithWindows(string);
+        assertEquals(string, census.getRoomsWithWindows());
+    }
+
+
+}

+ 2 - 0
src/test/java/scot/carricksoftware/grants/domains/census/CensusTest.java

@@ -85,4 +85,6 @@ public class CensusTest {
         assertEquals(placeString + ", " + censusDate.label, census.toString());
     }
 
+
+
 }