Order and level changed to strings

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

@@ -57,8 +57,8 @@ public class DataLoadTexts {
     private void loadPersonText() {
         PersonTextCommand personTextCommand = new PersonTextCommandImpl();
         personTextCommand.setPerson(personService.findById(1L));
-        personTextCommand.setOrder(1L);
-        personTextCommand.setLevel(4L);
+        personTextCommand.setOrder("1");
+        personTextCommand.setLevel("2");
         personTextCommand.setHeading("Edinburgh");
 
         personTextService.savePersonTextCommand(personTextCommand);
@@ -66,8 +66,8 @@ public class DataLoadTexts {
 
     private void loadAppendixText() {
         AppendixTextCommand appendixTextCommand = new AppendixTextCommandImpl();
-        appendixTextCommand.setOrder(1L);
-        appendixTextCommand.setLevel(4L);
+        appendixTextCommand.setOrder("1");
+        appendixTextCommand.setLevel("4");
         appendixTextCommand.setHeading("Edinburgh");
 
         appendixTextService.saveAppendixTextCommand(appendixTextCommand);

src/main/java/scot/carricksoftware/grants/commands/text/AppendixTextCommand.java

@@ -10,13 +10,13 @@ public interface AppendixTextCommand {
 
     void setId(Long id);
 
-    Long getLevel();
+    String getLevel();
 
-    void setLevel(Long level);
+    void setLevel(String level);
 
-    Long getOrder();
+    String getOrder();
 
-    void setOrder(Long order);
+    void setOrder(String order);
 
     String getHeading();
 

src/main/java/scot/carricksoftware/grants/commands/text/AppendixTextCommandImpl.java

@@ -8,8 +8,8 @@ package scot.carricksoftware.grants.commands.text;
 public class AppendixTextCommandImpl implements AppendixTextCommand {
 
     Long Id;
-    private Long level;
-    private Long order;
+    private String level;
+    private String order;
     private String heading;
     private String content;
 
@@ -25,22 +25,22 @@ public class AppendixTextCommandImpl implements AppendixTextCommand {
 
 
     @Override
-    public Long getLevel() {
+    public String getLevel() {
         return level;
     }
 
     @Override
-    public void setLevel(Long level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
     @Override
-    public Long getOrder() {
+    public String getOrder() {
         return order;
     }
 
     @Override
-    public void setOrder(Long order) {
+    public void setOrder(String order) {
         this.order = order;
     }
 

src/main/java/scot/carricksoftware/grants/commands/text/PersonTextCommand.java

@@ -17,13 +17,13 @@ PersonTextCommand {
 
     void setPerson(Person person);
 
-    Long getLevel();
+    String getLevel();
 
-    void setLevel(Long level);
+    void setLevel(String level);
 
-    Long getOrder();
+    String getOrder();
 
-    void setOrder(Long order);
+    void setOrder(String order);
 
     String getHeading();
 

src/main/java/scot/carricksoftware/grants/commands/text/PersonTextCommandImpl.java

@@ -11,8 +11,8 @@ public class PersonTextCommandImpl implements PersonTextCommand {
 
     private Long Id;
     private Person person;
-    private Long level;
-    private Long order;
+    private String level;
+    private String order;
     private String heading;
     private String content;
 
@@ -37,22 +37,22 @@ public class PersonTextCommandImpl implements PersonTextCommand {
     }
 
     @Override
-    public Long getLevel() {
+    public String getLevel() {
         return level;
     }
 
     @Override
-    public void setLevel(Long level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
     @Override
-    public Long getOrder() {
+    public String getOrder() {
         return order;
     }
 
     @Override
-    public void setOrder(Long order) {
+    public void setOrder(String order) {
         this.order = order;
     }
 

src/main/java/scot/carricksoftware/grants/domains/text/AppendixText.java

@@ -15,11 +15,11 @@ public class AppendixText extends BaseEntity {
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`level`")
-    private Long level;
+    private String level;
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`order`")
-    private Long order;
+    private String order;
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`heading`")
@@ -30,19 +30,19 @@ public class AppendixText extends BaseEntity {
     @Lob
     private String content;
 
-    public Long getLevel() {
+    public String getLevel() {
         return level;
     }
 
-    public void setLevel(Long level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-    public Long getOrder() {
+    public String getOrder() {
         return order;
     }
 
-    public void setOrder(Long order) {
+    public void setOrder(String order) {
         this.order = order;
     }
 

src/main/java/scot/carricksoftware/grants/domains/text/PersonText.java

@@ -23,11 +23,11 @@ public class PersonText extends BaseEntity {
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`level`")
-    private Long level;
+    private String level;
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`order`")
-    private Long order;
+    private String order;
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @Column(name = "`heading`")
@@ -46,19 +46,19 @@ public class PersonText extends BaseEntity {
         this.person = person;
     }
 
-    public Long getLevel() {
+    public String getLevel() {
         return level;
     }
 
-    public void setLevel(Long level) {
+    public void setLevel(String level) {
         this.level = level;
     }
 
-    public Long getOrder() {
+    public String getOrder() {
         return order;
     }
 
-    public void setOrder(Long order) {
+    public void setOrder(String order) {
         this.order = order;
     }
 

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

@@ -75,8 +75,8 @@ public class DataLoadTextTest {
 
         verify(personTextServiceMock).savePersonTextCommand(captor.capture());
         assertEquals(person, captor.getValue().getPerson());
-        assertEquals(1L, captor.getValue().getOrder());
-        assertEquals(4L, captor.getValue().getLevel());
+        assertEquals("1", captor.getValue().getOrder());
+        assertEquals("2", captor.getValue().getLevel());
         assertEquals("Edinburgh", captor.getValue().getHeading());
     }
 
@@ -87,8 +87,8 @@ public class DataLoadTextTest {
         dataLoadTexts.load();
 
         verify(appendixTextServiceMock).saveAppendixTextCommand(captor.capture());
-        assertEquals(1L, captor.getValue().getOrder());
-        assertEquals(4L, captor.getValue().getLevel());
+        assertEquals("1", captor.getValue().getOrder());
+        assertEquals("4", captor.getValue().getLevel());
         assertEquals("Edinburgh", captor.getValue().getHeading());
     }
 

src/test/java/scot/carricksoftware/grants/commands/text/AppendixTextCommandTest.java

@@ -42,7 +42,7 @@ class AppendixTextCommandTest {
 
     @Test
     void setLevelTest() {
-        Long level = GetRandomLong();
+        String level = GetRandomString();
         appendixTextCommand.setLevel(level);
         assertEquals(level, appendixTextCommand.getLevel());
     }
@@ -54,7 +54,7 @@ class AppendixTextCommandTest {
 
     @Test
     void setOrderTest() {
-        Long order = GetRandomLong();
+        String order = GetRandomString();
         appendixTextCommand.setOrder(order);
         assertEquals(order, appendixTextCommand.getOrder());
     }

src/test/java/scot/carricksoftware/grants/commands/text/PersonTextCommandTest.java

@@ -55,7 +55,7 @@ class PersonTextCommandTest {
 
     @Test
     void setLevelTest() {
-        Long level = GetRandomLong();
+        String level = GetRandomString();
         personTextCommand.setLevel(level);
         assertEquals(level, personTextCommand.getLevel());
     }
@@ -67,7 +67,7 @@ class PersonTextCommandTest {
 
     @Test
     void setOrderTest() {
-        Long order = GetRandomLong();
+        String order = GetRandomString();
         personTextCommand.setOrder(order);
         assertEquals(order, personTextCommand.getOrder());
     }

src/test/java/scot/carricksoftware/grants/converters/text/appendixtext/AppendixTextCommandConverterTest.java

@@ -28,8 +28,8 @@ class AppendixTextCommandConverterTest {
     @Test
     void covertTest() {
         Long Id = GetRandomLong();
-        Long order = GetRandomLong();
-        Long level = GetRandomLong();
+        String order = GetRandomString();
+        String level = GetRandomString();
         String heading = GetRandomString();
         String content = GetRandomString();
 

src/test/java/scot/carricksoftware/grants/converters/text/appendixtext/AppendixTextConverterTest.java

@@ -27,8 +27,8 @@ class AppendixTextConverterTest {
     @Test
     void covertTest() {
         Long Id = GetRandomLong();
-        Long order = GetRandomLong();
-        Long level = GetRandomLong();
+        String order = GetRandomString();
+        String level = GetRandomString();
         String heading = GetRandomString();
         String content = GetRandomString();
         AppendixText source = new AppendixText();

src/test/java/scot/carricksoftware/grants/converters/text/persontext/PersonTextCommandConverterTest.java

@@ -31,8 +31,8 @@ class PersonTextCommandConverterTest {
     void covertTest() {
         Long Id = GetRandomLong();
         Person person = GetRandomPerson();
-        Long order = GetRandomLong();
-        Long level = GetRandomLong();
+        String order = GetRandomString();
+        String level = GetRandomString();
         String heading = GetRandomString();
         String content = GetRandomString();
 
@@ -43,7 +43,6 @@ class PersonTextCommandConverterTest {
         source.setOrder(order);
         source.setLevel(level);
         source.setHeading(heading);
-        source.setOrder(order);
         source.setContent(content);
 
         PersonText target = converter.convert(source);

src/test/java/scot/carricksoftware/grants/converters/text/persontext/PersonTextConverterTest.java

@@ -30,8 +30,8 @@ class PersonTextConverterTest {
     void covertTest() {
         Long Id = GetRandomLong();
         Person person = GetRandomPerson();
-        Long order = GetRandomLong();
-        Long level = GetRandomLong();
+        String order = GetRandomString();
+        String level = GetRandomString();
         String heading = GetRandomString();
         String content = GetRandomString();
         PersonText source = new PersonText();

src/test/java/scot/carricksoftware/grants/domains/text/AppendixTextTest.java

@@ -45,7 +45,7 @@ class AppendixTextTest {
 
     @Test
     void setLevelTest() {
-        Long level = GetRandomLong();
+        String level = GetRandomString();
         appendixText.setLevel(level);
         assertEquals(level, appendixText.getLevel());
     }
@@ -57,7 +57,7 @@ class AppendixTextTest {
 
     @Test
     void setOrderTest() {
-        Long order = GetRandomLong();
+        String order = GetRandomString();
         appendixText.setOrder(order);
         assertEquals(order, appendixText.getOrder());
     }

src/test/java/scot/carricksoftware/grants/domains/text/PersonTextTest.java

@@ -56,7 +56,7 @@ class PersonTextTest {
 
     @Test
     void setLevelTest() {
-        Long level = GetRandomLong();
+        String level = GetRandomString();
         personText.setLevel(level);
         assertEquals(level, personText.getLevel());
     }
@@ -68,7 +68,7 @@ class PersonTextTest {
 
     @Test
     void setOrderTest() {
-        Long order = GetRandomLong();
+        String order = GetRandomString();
         personText.setOrder(order);
         assertEquals(order, personText.getOrder());
     }