remove lengths from columns

Author: gdoenlen

src/main/java/com/github/sfxd/trust/core/instances/Instance.java

@@ -2,123 +2,107 @@
 package com.github.sfxd.trust.core.instances;
 
 import java.util.List;
-import java.util.Objects;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.OneToMany;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.sfxd.trust.core.Entity;
 import com.github.sfxd.trust.core.users.Subscription;
+import io.ebean.annotation.DbEnumType;
+import io.ebean.annotation.DbEnumValue;
 import org.apache.commons.lang3.builder.DiffBuilder;
 import org.apache.commons.lang3.builder.DiffResult;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-/**
- * Represents an SFDC instance. Sandbox or Production.
- * This model maps directly to the model from the api.
- */
+import static java.util.Objects.requireNonNull;
+
+/// Represents an SFDC instance. Sandbox or Production.
 @javax.persistence.Entity
 public class Instance extends Entity {
-    public static final String STATUS_OK = "OK";
-
-    @Column(unique = true, nullable = false, length = 255, name = "\"key\"")
-    private String key;
+    @Column(unique = true, nullable = false, name = "\"key\"", columnDefinition = "character varying")
+    private final String key;
 
-    @Column(length = 255)
+    @Column(columnDefinition = "character varying")
     private String location;
 
-    @Column(length = 255)
+    @Column(columnDefinition = "character varying")
     private String releaseVersion;
 
-    @Column(length = 255)
+    @Column(columnDefinition = "character varying")
     private String releaseNumber;
 
-    @Column(length = 255)
+    @Column(columnDefinition = "character varying")
     private String status;
 
-    @Enumerated(EnumType.STRING)
-    private Environment environment;
+    @Column(nullable = false)
+    private final Environment environment;
 
     @OneToMany(mappedBy = "instance", cascade = CascadeType.REMOVE)
     private List<Subscription> subscriptions;
 
-    public Instance() {
-
+    public Instance(String key, Environment environment) {
+        this.key = requireNonNull(key);
+        this.environment = requireNonNull(environment);
     }
 
     public String key() {
         return this.key;
     }
 
-    public Instance setKey(String key) {
-        this.key = key;
-        return this;
-    }
-
     public String location() {
         return this.location;
     }
 
-    public Instance setLocation(String location) {
+    public void setLocation(String location) {
         this.location = location;
-        return this;
     }
 
     public String releaseVersion() {
         return this.releaseVersion;
     }
 
-    public Instance setReleaseVersion(String releaseVersion) {
+    public void setReleaseVersion(String releaseVersion) {
         this.releaseVersion = releaseVersion;
-        return this;
     }
 
     public String releaseNumber() {
         return this.releaseNumber;
     }
 
-    public Instance setReleaseNumber(String releaseNumber) {
+    public void setReleaseNumber(String releaseNumber) {
         this.releaseNumber = releaseNumber;
-        return this;
     }
 
     public String status() {
         return this.status;
     }
 
-    public Instance setStatus(String status) {
+    public void setStatus(String status) {
         this.status = status;
-        return this;
     }
 
     public Environment environment() {
         return this.environment;
     }
 
-    public Instance setEnvironment(Environment environment) {
-        this.environment = environment;
-        return this;
-    }
-
     public List<Subscription> getSubscriptions() {
         return this.subscriptions;
     }
 
-    public Instance setSubscriptions(List<Subscription> subscriptions) {
-        this.subscriptions = subscriptions;
-        return this;
-    }
-
     public enum Environment {
-        @JsonProperty("sandbox")
-        SANDBOX,
+        SANDBOX(1),
+        PRODUCTION(2);
 
-        @JsonProperty("production")
-        PRODUCTION
+        private final int id;
+        Environment(int id) {
+            this.id = id;
+        }
+
+        @DbEnumValue(storage = DbEnumType.INTEGER)
+        public int id() {
+            return this.id;
+        }
     }
 
     public DiffResult<Instance> diff(Instance other) {
@@ -130,18 +114,4 @@ public DiffResult<Instance> diff(Instance other) {
             .append("releaseVersion", other.releaseVersion, this.releaseVersion)
             .build();
     }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other instanceof Instance i) {
-            return Objects.equals(this.key, i.key);
-        }
-
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(this.key);
-    }
 }

src/main/java/com/github/sfxd/trust/core/users/User.java

@@ -19,7 +19,7 @@
 @javax.persistence.Table(name = "users")
 public class User extends Entity {
 
-    @Column(unique = true, nullable = false)
+    @Column(unique = true, nullable = false, columnDefinition = "character varying")
     private final String username;
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)

src/main/java/com/github/sfxd/trust/integrations/InstancePreviewViewModel.java

@@ -0,0 +1,34 @@
+package com.github.sfxd.trust.integrations;
+
+import com.github.sfxd.trust.core.instances.Instance;
+import com.github.sfxd.trust.core.instances.Instance.Environment;
+
+import static com.github.sfxd.trust.core.instances.Instance.Environment.PRODUCTION;
+import static com.github.sfxd.trust.core.instances.Instance.Environment.SANDBOX;
+
+record InstancePreviewViewModel(
+    String key,
+    String location,
+    String releaseVersion,
+    String releaseNumber,
+    String status,
+    String environment
+) {
+    public Instance toInstance() {
+        var instance = new Instance(this.key, this.env());
+        instance.setLocation(this.location);
+        instance.setReleaseVersion(this.releaseVersion);
+        instance.setReleaseNumber(releaseNumber);
+        instance.setStatus(this.status);
+
+        return instance;
+    }
+
+    private Environment env() {
+        return switch (this.environment) {
+            case "sandbox" -> SANDBOX;
+            case "production" -> PRODUCTION;
+            default -> throw new IllegalArgumentException(this.environment);
+        };
+    }
+}

src/main/java/com/github/sfxd/trust/integrations/InstanceRefreshConsumer.java

@@ -19,7 +19,7 @@
 import static java.util.function.Function.identity;
 
 @ApplicationScoped
-class InstanceRefreshConsumer implements Consumer<Collection<Instance>> {
+class InstanceRefreshConsumer implements Consumer<Collection<InstancePreviewViewModel>> {
 
     private final InstanceRepository instanceRepository;
     private final Messages messages;
@@ -31,8 +31,9 @@ class InstanceRefreshConsumer implements Consumer<Collection<Instance>> {
     }
 
     @Override
-    public void accept(Collection<Instance> incomingInstances) {
+    public void accept(Collection<InstancePreviewViewModel> incomingInstances) {
         Map<String, Instance> instancePreviews = incomingInstances.stream()
+            .map(InstancePreviewViewModel::toInstance)
             .collect(Collectors.toMap(Instance::key, identity()));
 
         Map<String, Instance> instances = this.instanceRepository.findByKeyIn(instancePreviews.keySet())
@@ -42,20 +43,19 @@ public void accept(Collection<Instance> incomingInstances) {
         for (Instance preview : instancePreviews.values()) {
             Instance current = instances.computeIfAbsent(preview.key(), key -> preview);
             DiffResult<Instance> diff = current.diff(preview);
-            if (!diff.getDiffs().isEmpty())
+            if (!diff.getDiffs().isEmpty()) {
                 this.update(current, preview, diff);
+            }
         }
 
         this.instanceRepository.save(instances.values());
     }
 
     private void update(Instance current, Instance preview, DiffResult<Instance> diff) {
-        current
-            .setLocation(preview.location())
-            .setReleaseVersion(preview.releaseVersion())
-            .setReleaseNumber(preview.releaseNumber())
-            .setStatus(preview.status())
-            .setEnvironment(preview.environment());
+        current.setLocation(preview.location());
+        current.setReleaseVersion(preview.releaseVersion());
+        current.setReleaseNumber(preview.releaseNumber());
+        current.setStatus(preview.status());
         this.sendMessages(current, diff);
     }
 

src/main/resources/dbmigration/1.0__init.sql

@@ -1,34 +1,35 @@
 -- apply changes
 create table instance (
   id                            bigint generated by default as identity not null,
-  "key"                         varchar(255) not null,
-  location                      varchar(255),
-  release_version               varchar(255),
-  release_number                varchar(255),
-  status                        varchar(255),
-  environment                   varchar(10),
-  constraint ck_instance_environment check ( environment in ('SANDBOX','PRODUCTION')),
+  "key"                         character varying not null,
+  location                      character varying,
+  release_version               character varying,
+  release_number                character varying,
+  status                        character varying,
+  environment                   integer not null,
+  constraint ck_instance_environment check ( environment in (1,2)),
   constraint uq_instance_key unique ("key"),
   constraint pk_instance primary key (id)
 );
 
-create table instance_user (
+create table subscription (
   id                            bigint generated by default as identity not null,
   instance_id                   bigint,
   user_id                       bigint,
-  constraint pk_instance_user primary key (id)
+  constraint pk_subscription primary key (id)
 );
 
 create table users (
   id                            bigint generated by default as identity not null,
-  username                      varchar(255) not null,
+  username                      character varying not null,
   constraint uq_users_username unique (username),
   constraint pk_users primary key (id)
 );
 
-create index ix_instance_user_instance_id on instance_user (instance_id);
-alter table instance_user add constraint fk_instance_user_instance_id foreign key (instance_id) references instance (id) on delete restrict on update restrict;
+-- foreign keys and indices
+create index ix_subscription_instance_id on subscription (instance_id);
+alter table subscription add constraint fk_subscription_instance_id foreign key (instance_id) references instance (id) on delete restrict on update restrict;
 
-create index ix_instance_user_user_id on instance_user (user_id);
-alter table instance_user add constraint fk_instance_user_user_id foreign key (user_id) references users (id) on delete restrict on update restrict;
+create index ix_subscription_user_id on subscription (user_id);
+alter table subscription add constraint fk_subscription_user_id foreign key (user_id) references users (id) on delete restrict on update restrict;
 

src/main/resources/dbmigration/model/1.0__init.model.xml

@@ -3,21 +3,21 @@
     <changeSet type="apply">
         <createTable name="instance" identityType="identity" pkName="pk_instance">
             <column name="id" type="bigint" primaryKey="true"/>
-            <column name="&quot;key&quot;" type="varchar" notnull="true" unique="uq_instance_key"/>
-            <column name="location" type="varchar"/>
-            <column name="release_version" type="varchar"/>
-            <column name="release_number" type="varchar"/>
-            <column name="status" type="varchar"/>
-            <column name="environment" type="varchar(10)" checkConstraint="check ( environment in ('SANDBOX','PRODUCTION'))" checkConstraintName="ck_instance_environment"/>
+            <column name="&quot;key&quot;" type="character varying" notnull="true" unique="uq_instance_key"/>
+            <column name="location" type="character varying"/>
+            <column name="release_version" type="character varying"/>
+            <column name="release_number" type="character varying"/>
+            <column name="status" type="character varying"/>
+            <column name="environment" type="integer" notnull="true" checkConstraint="check ( environment in (1,2))" checkConstraintName="ck_instance_environment"/>
         </createTable>
-        <createTable name="instance_user" identityType="identity" pkName="pk_instance_user">
+        <createTable name="subscription" identityType="identity" pkName="pk_subscription">
             <column name="id" type="bigint" primaryKey="true"/>
-            <column name="instance_id" type="bigint" references="instance.id" foreignKeyName="fk_instance_user_instance_id" foreignKeyIndex="ix_instance_user_instance_id"/>
-            <column name="user_id" type="bigint" references="users.id" foreignKeyName="fk_instance_user_user_id" foreignKeyIndex="ix_instance_user_user_id"/>
+            <column name="instance_id" type="bigint" references="instance.id" foreignKeyName="fk_subscription_instance_id" foreignKeyIndex="ix_subscription_instance_id"/>
+            <column name="user_id" type="bigint" references="users.id" foreignKeyName="fk_subscription_user_id" foreignKeyIndex="ix_subscription_user_id"/>
         </createTable>
         <createTable name="users" identityType="identity" pkName="pk_users">
             <column name="id" type="bigint" primaryKey="true"/>
-            <column name="username" type="varchar" notnull="true" unique="uq_users_username"/>
+            <column name="username" type="character varying" notnull="true" unique="uq_users_username"/>
         </createTable>
     </changeSet>
 </migration>