Andrew Grant 2 kuukautta sitten
vanhempi
commit
7a9b02c16c

+ 27 - 0
src/main/java/scot/carricksoftware/grants/domains/images/Image.java

@@ -5,10 +5,37 @@
 
 package scot.carricksoftware.grants.domains.images;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.Lob;
 import scot.carricksoftware.grants.BaseEntity;
 
+
 @Entity
 public class Image extends BaseEntity {
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`name`")
+    private String name;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Lob
+    @Column(name = "`imageData`")
+    private byte[] imageData;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public byte[] getImageData() {
+        return imageData;
+    }
+
+    public void setImageData(byte[] imageData) {
+        this.imageData = imageData;
+    }
 }

+ 1 - 0
src/main/java/scot/carricksoftware/grants/validators/text/AppendixTextCommandValidator.java

@@ -9,5 +9,6 @@ import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.text.AppendixTextCommand;
 
 public interface AppendixTextCommandValidator {
+    @SuppressWarnings("unused")
     void validate(AppendixTextCommand appendixTextCommand, BindingResult bindingResult);
 }

+ 1 - 0
src/main/java/scot/carricksoftware/grants/validators/text/PersonTextCommandValidator.java

@@ -13,6 +13,7 @@ import scot.carricksoftware.grants.commands.text.PersonTextCommand;
 @Component
 public interface PersonTextCommandValidator {
 
+    @SuppressWarnings("unused")
     void validate(PersonTextCommand personTextCommand, BindingResult bindingResult);
 
 }

+ 0 - 1
src/main/java/scot/carricksoftware/grants/validators/text/PlaceTextCommandValidator.java

@@ -22,6 +22,5 @@ public class PlaceTextCommandValidator {
       logger.debug("PlaceTextCommandValidator::validate");
     }
 
-
 }
 

+ 19 - 0
src/main/resources/db/changelog/2025/09/20-01-changelog.sql

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+-- liquibase formatted sql
+
+-- changeset apg:1758399661903-5
+CREATE TABLE appendix_text
+(
+    id      BIGINT AUTO_INCREMENT NOT NULL,
+    level   VARCHAR(255)          NULL,
+    `order` VARCHAR(255)          NULL,
+    heading VARCHAR(255)          NULL,
+    content LONGTEXT              NULL,
+    CONSTRAINT pk_appendixtext PRIMARY KEY (id)
+);
+
+

+ 9 - 0
src/main/resources/db/changelog/2025/09/20-02-changelog.sql

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+-- liquibase formatted sql
+
+ALTER TABLE person_text
+    DROP COLUMN level;

+ 9 - 0
src/main/resources/db/changelog/2025/09/20-03-changelog.sql

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+-- liquibase formatted sql
+
+ALTER TABLE person_text
+    DROP COLUMN `order`;

+ 11 - 0
src/main/resources/db/changelog/2025/09/20-04-changelog.sql

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+-- liquibase formatted sql
+
+ALTER TABLE person_text
+    ADD level VARCHAR(255) NULL;
+
+

+ 11 - 0
src/main/resources/db/changelog/2025/09/20-05-changelog.sql

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+-- liquibase formatted sql
+
+-- changeset apg:1758399661903-4
+ALTER TABLE person_text
+    ADD `order` VARCHAR(255) NULL;
+

+ 5 - 0
src/main/resources/db/changelog/master.xml

@@ -53,6 +53,11 @@
     <include file="/db/changelog/2025/08/12-01-changelog.sql"/>
     <include file="/db/changelog/2025/08/30-01-changelog.sql"/>
     <include file="/db/changelog/2025/09/03-01-changelog.sql"/>
+    <include file="/db/changelog/2025/09/20-01-changelog.sql"/>
+    <include file="/db/changelog/2025/09/20-02-changelog.sql"/>
+    <include file="/db/changelog/2025/09/20-03-changelog.sql"/>
+    <include file="/db/changelog/2025/09/20-04-changelog.sql"/>
+    <include file="/db/changelog/2025/09/20-05-changelog.sql"/>
 
 
 </databaseChangeLog>

+ 27 - 0
src/test/java/scot/carricksoftware/grants/domains/images/ImageTest.java

@@ -8,7 +8,9 @@ package scot.carricksoftware.grants.domains.images;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+
 import static org.junit.jupiter.api.Assertions.*;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
 class ImageTest {
@@ -31,4 +33,29 @@ class ImageTest {
         assertEquals(id, image.getId());
     }
 
+    @Test
+    public void getNameTest() {
+        assertNull(image.getName());
+    }
+
+    @Test
+    public void setNameTest() {
+        String name = GetRandomString();
+        image.setName(name);
+        assertEquals(name, image.getName());
+    }
+
+    @Test
+    public void getImageDataTest() {
+        assertNull(image.getImageData());
+    }
+
+    @Test
+    public void setImageDataTest() {
+        String string = GetRandomString();
+        image.setImageData(string.getBytes());
+        assertArrayEquals(string.getBytes(), image.getImageData());
+    }
+
+
 }