#178: remove VARCHAR limit - check how it looks in db

Author: Death111

src/main/java/de/doubleslash/keeptime/model/ExternalProjectMapping.java

@@ -16,9 +16,7 @@
 
 package de.doubleslash.keeptime.model;
 
-import de.doubleslash.keeptime.model.persistenceconverter.ColorConverter;
 import jakarta.persistence.*;
-import javafx.scene.paint.Color;
 
 @Entity
 @Table(name = "ExternalProjectMapping")
@@ -29,10 +27,15 @@ public class ExternalProjectMapping {
    @Column(name = "id", updatable = false, nullable = false)
    private long id;
 
-   // TODO maybe add a externalSystem Identifier
+   @Enumerated(EnumType.STRING)
+   private ExternalSystem externalSystemId;
 
+   private String externalProjectName;
+
+   private long externalTaskId;
+   private String externalTaskName;
    @Lob
-   private String externalProjectData;
+   private String externalTaskMetadata;
 
    @ManyToOne
    private Project project;
@@ -41,24 +44,62 @@ public ExternalProjectMapping() {
       // Needed for jpa
    }
 
-   public ExternalProjectMapping(final String externalProjectData, final Project project) {
-      this.externalProjectData = externalProjectData;
+   public ExternalProjectMapping(ExternalSystem externalSystemId, String externalProjectName,
+       long externalTaskId, String externalTaskName, String externalTaskMetadata,
+       Project project) {
+      this.externalSystemId = externalSystemId;
+      this.externalProjectName = externalProjectName;
+      this.externalTaskId = externalTaskId;
+      this.externalTaskName = externalTaskName;
+      this.externalTaskMetadata = externalTaskMetadata;
       this.project = project;
    }
 
-   public String getExternalProjectData() {
-      return externalProjectData;
+   public ExternalSystem getExternalSystemId() {
+      return externalSystemId;
+   }
+
+   public void setExternalSystemId(ExternalSystem externalSystemId) {
+      this.externalSystemId = externalSystemId;
+   }
+
+   public String getExternalProjectName() {
+      return externalProjectName;
+   }
+
+   public void setExternalProjectName(String externalProjectName) {
+      this.externalProjectName = externalProjectName;
+   }
+
+   public long getExternalTaskId() {
+      return externalTaskId;
+   }
+
+   public void setExternalTaskId(long externalTaskId) {
+      this.externalTaskId = externalTaskId;
+   }
+
+   public String getExternalTaskName() {
+      return externalTaskName;
+   }
+
+   public void setExternalTaskName(String externalTaskName) {
+      this.externalTaskName = externalTaskName;
+   }
+
+   public String getExternalTaskMetadata() {
+      return externalTaskMetadata;
    }
 
-   public void setExternalProjectData(final String externalProjectData) {
-      this.externalProjectData = externalProjectData;
+   public void setExternalTaskMetadata(String externalTaskMetadata) {
+      this.externalTaskMetadata = externalTaskMetadata;
    }
 
    public Project getProject() {
       return project;
    }
 
-   public void setProject(final Project project) {
+   public void setProject(Project project) {
       this.project = project;
    }
 }

src/main/java/de/doubleslash/keeptime/model/ExternalSystem.java

@@ -0,0 +1,5 @@
+package de.doubleslash.keeptime.model;
+
+public enum ExternalSystem {
+  Heimat
+}

src/main/java/de/doubleslash/keeptime/model/Setting.java

@@ -10,7 +10,6 @@ public class Setting {
    @Column(nullable = false, unique = true)
    private String setting;
 
-   @Lob
    private String settingValue;
 
    public Setting(){

src/main/resources/db/migration/V1_1_7__migrate_settings_table_to_key_value.sql

@@ -1,6 +1,6 @@
 CREATE TABLE new_settings(
-     setting        VARCHAR(255) NOT NULL,
-     setting_value      CLOB,
+     setting        VARCHAR NOT NULL,
+     setting_value  VARCHAR NOT NULL,
      PRIMARY KEY (setting)
 );
 

src/main/resources/db/migration/V1_1_8__initial_heimat_integration.sql

@@ -1,7 +1,13 @@
 CREATE TABLE external_project_mapping (
     id                      BIGINT GENERATED BY DEFAULT AS IDENTITY,
     project_id              BIGINT NOT NULL,
-    external_project_data   CLOB NOT NULL,
+
+    external_system_id      VARCHAR NOT NULL,
+
+    external_project_name   VARCHAR NOT NULL,
+    external_task_id        BIGINT NOT NULL,
+    external_task_name      VARCHAR NOT NULL,
+    external_task_metadata  CLOB NOT NULL,
 
     PRIMARY KEY (id),
     FOREIGN KEY (project_id) REFERENCES Project(id) ON DELETE CASCADE