avniproject/avni-webapp#1254 | Remove FEG.display column and setters,…

… use FEG.name instead
avniproject · Aug 28, 2024 · 73d8c2d · 73d8c2d
1 parent 6c5a334
commit 73d8c2d
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 25 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/application/FormElementGroup.java b/avni-server-api/src/main/java/org/avni/server/application/FormElementGroup.java
@@ -19,9 +19,6 @@ public class FormElementGroup extends OrganisationAwareEntity {
     @NotNull
     private String name;
 
-    @Column
-    private String display;
-
     @NotNull
     private Double displayOrder;
 
@@ -99,12 +96,9 @@ public static FormElementGroup create() {
     }
 
     public String getDisplay() {
-        return display;
+        return getName();
     }
 
-    public void setDisplay(String display) {
-        this.display = display;
-    }
 
     FormElement findFormElementByConcept(String conceptName) {
         return formElements.stream().filter(x -> x.getConcept().getName().equals(conceptName)).findAny().orElse(null);

diff --git a/avni-server-api/src/main/java/org/avni/server/builder/FormBuilder.java b/avni-server-api/src/main/java/org/avni/server/builder/FormBuilder.java
@@ -94,7 +94,6 @@ public FormBuilder withFormElementGroups(List<FormElementGroupContract> formElem
                         .withBackgroundColour(formElementGroupContract.getBackgroundColour())
                         .withStartTime(formElementGroupContract.getStartTime())
                         .withStayTime(formElementGroupContract.getStayTime())
-                        .withDisplay(formElementGroupContract.getDisplay())
                         .withDisplayOrder(formElementGroupContract.getDisplayOrder())
                         .withRule(formElementGroupContract.getRule())
                         .withDeclarativeRule(formElementGroupContract.getDeclarativeRule())

diff --git a/avni-server-api/src/main/java/org/avni/server/builder/FormElementGroupBuilder.java b/avni-server-api/src/main/java/org/avni/server/builder/FormElementGroupBuilder.java
@@ -45,11 +45,6 @@ public FormElementGroupBuilder withIsVoided(boolean isVoided) {
         return this;
     }
 
-    public FormElementGroupBuilder withDisplay(String display) {
-        this.set("Display", display, String.class);
-        return this;
-    }
-
     public FormElementGroupBuilder withRule(String rule) {
         this.get().setRule(rule);
         return this;

diff --git a/avni-server-api/src/main/java/org/avni/server/web/FormController.java b/avni-server-api/src/main/java/org/avni/server/web/FormController.java
@@ -298,7 +298,6 @@ public FormContract export(@RequestParam String formUUID) {
 
         form.getFormElementGroups().stream().sorted(Comparator.comparingDouble(FormElementGroup::getDisplayOrder)).forEach(formElementGroup -> {
             FormElementGroupContract formElementGroupContract = new FormElementGroupContract(formElementGroup.getUuid(), formElementGroup.getName(), formElementGroup.getDisplayOrder());
-            formElementGroupContract.setDisplay(formElementGroup.getDisplay());
             formElementGroupContract.setVoided(formElementGroup.isVoided());
             formElementGroupContract.setOrganisationId(formElementGroup.getOrganisationId());
             formElementGroupContract.setRule(formElementGroup.getRule());

diff --git a/...r-api/src/main/java/org/avni/server/web/request/application/FormElementGroupContract.java b/...r-api/src/main/java/org/avni/server/web/request/application/FormElementGroupContract.java
@@ -62,12 +62,9 @@ public void addFormElement(FormElementContract formElementContract) {
     }
 
     public String getDisplay() {
-        return display;
+        return getName();
     }
 
-    public void setDisplay(String display) {
-        this.display = display;
-    }
 
     public DeclarativeRule getDeclarativeRule() {
         return declarativeRule;
@@ -122,7 +119,6 @@ public String toString() {
         return "{" +
                 "name=" + this.getName() + '\'' +
                 "displayOrder=" + displayOrder +
-                ", display='" + display + '\'' +
                 '}';
     }
 
@@ -138,7 +134,6 @@ public static FormElementGroupContract fromFormElementGroup(FormElementGroup feg
         FormElementGroupContract fegContract = new FormElementGroupContract();
         fegContract.setName(feg.getName());
         fegContract.setUuid(feg.getUuid());
-        fegContract.setDisplay(feg.getDisplay());
         fegContract.setDisplayOrder(feg.getDisplayOrder());
         fegContract.setVoided(feg.isVoided());
         fegContract.setRule(feg.getRule());

diff --git a/avni-server-api/src/main/resources/db/migration/V1_344__OverwriteFEGNameWithDisplayName.sql b/avni-server-api/src/main/resources/db/migration/V1_344__OverwriteFEGNameWithDisplayName.sql
@@ -0,0 +1,2 @@
+update form_element_group set name = display, last_modified_date_time = current_timestamp + random() * 5000 * (interval '1 millisecond') where display is not null and display <> '' and name <> display;
+ALTER TABLE form_element_group DROP COLUMN display;
diff --git a/avni-server-api/src/test/java/org/avni/server/application/TestFormElementGroupBuilder.java b/avni-server-api/src/test/java/org/avni/server/application/TestFormElementGroupBuilder.java
@@ -33,11 +33,6 @@ public TestFormElementGroupBuilder withIsVoided(boolean isVoided) {
         return this;
     }
 
-    public TestFormElementGroupBuilder withDisplay(String display) {
-        formElementGroup.setDisplay(display);
-        return this;
-    }
-
     public TestFormElementGroupBuilder withRule(String rule) {
         formElementGroup.setRule(rule);
         return this;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		update form_element_group set name = display, last_modified_date_time = current_timestamp + random() * 5000 * (interval '1 millisecond') where display is not null and display <> '' and name <> display;
		ALTER TABLE form_element_group DROP COLUMN display;