🔥 (213): remove migration which is cannot work

hopps-app · Dec 23, 2024 · 09f51de · 09f51de
1 parent bca4ed9
commit 09f51de
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/backend/app.hopps.org/src/main/java/app/hopps/org/jpa/Bommel.java b/backend/app.hopps.org/src/main/java/app/hopps/org/jpa/Bommel.java
@@ -3,7 +3,15 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
-import jakarta.persistence.*;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Index;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 
 import java.util.Objects;
 import java.util.Set;
@@ -15,9 +23,9 @@ with parents as (
                         select n.parent.id as bommel
                         from Bommel n
                         where n.id = :startId
-
+        
                         union
-
+        
                         select n.parent.id as bommel
                         from Bommel n
                         join parents c on n.id = c.bommel
@@ -31,9 +39,9 @@ with children_query as (
                         select n.id as bommel
                         from Bommel n
                         where n.id = :startId
-
+        
                         union
-
+        
                         select n.id as bommel
                         from Bommel n
                         join children_query c on n.parent.id = c.bommel
@@ -43,25 +51,24 @@ with children_query as (
                     join children_query c on n.id = c.bommel
                     where n.id != :startId or cycleMark = true
         """)
-@SequenceGenerator(name = "Bommel_SEQ", allocationSize = 1)
 public class Bommel extends PanacheEntity {
     public static final String DEFAULT_ROOT_BOMMEL_EMOJI = "\uD83C\uDF33"; // tree
 
     private String name;
     private String emoji;
 
-    @ManyToOne(cascade = { CascadeType.DETACH, CascadeType.REFRESH })
+    @ManyToOne(cascade = {CascadeType.DETACH, CascadeType.REFRESH})
     private Member responsibleMember;
 
-    @OneToOne(mappedBy = "rootBommel", cascade = { CascadeType.DETACH, CascadeType.REFRESH, CascadeType.PERSIST,
-            CascadeType.MERGE })
+    @OneToOne(mappedBy = "rootBommel", cascade = {CascadeType.DETACH, CascadeType.REFRESH, CascadeType.PERSIST,
+            CascadeType.MERGE})
     private Organization organization;
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = { CascadeType.REFRESH, CascadeType.DETACH })
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.REFRESH, CascadeType.DETACH})
     private Bommel parent;
 
-    @OneToMany(fetch = FetchType.LAZY, cascade = { CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH,
-            CascadeType.REMOVE }, mappedBy = "parent")
+    @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH,
+            CascadeType.REMOVE}, mappedBy = "parent")
     private Set<Bommel> children;
 
     /**
@@ -154,9 +161,9 @@ public boolean equals(Object o) {
                 && Objects.equals(getName(), bommel.getName())
                 && Objects.equals(getResponsibleMember(), bommel.getResponsibleMember())
                 && Objects.equals(getParent() != null ? getParent().id : null,
-                        bommel.getParent() != null ? bommel.getParent().id : null)
+                bommel.getParent() != null ? bommel.getParent().id : null)
                 && Objects.equals(getOrganization() != null ? getOrganization().getId() : null,
-                        bommel.getOrganization() != null ? bommel.getOrganization().getId() : null)
+                bommel.getOrganization() != null ? bommel.getOrganization().getId() : null)
                 && Objects.equals(getChildren(), bommel.getChildren());
     }
 

diff --git a/backend/app.hopps.org/src/main/java/app/hopps/org/jpa/Member.java b/backend/app.hopps.org/src/main/java/app/hopps/org/jpa/Member.java
@@ -2,15 +2,17 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
 @Entity
-@SequenceGenerator(name = "Member_SEQ", allocationSize = 1)
 public class Member extends PanacheEntity {
 
     // TODO: Add OneToMany to Bommel here and test it

diff --git a/backend/app.hopps.org/src/main/java/app/hopps/org/jpa/Organization.java b/backend/app.hopps.org/src/main/java/app/hopps/org/jpa/Organization.java
@@ -1,7 +1,11 @@
 package app.hopps.org.jpa;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntity;
-import jakarta.persistence.*;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToOne;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
@@ -11,7 +15,6 @@
 import java.util.Set;
 
 @Entity
-@SequenceGenerator(name = "Organization_SEQ", allocationSize = 1)
 public class Organization extends PanacheEntity {
 
     @NotBlank
@@ -27,7 +30,7 @@ public class Organization extends PanacheEntity {
     @Embedded
     private Address address;
 
-    @OneToOne(cascade = { CascadeType.DETACH, CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.MERGE })
+    @OneToOne(cascade = {CascadeType.DETACH, CascadeType.REFRESH, CascadeType.PERSIST, CascadeType.MERGE})
     private Bommel rootBommel;
 
     @ManyToMany(mappedBy = "organizations", cascade = CascadeType.PERSIST)

diff --git a/backend/app.hopps.org/src/main/resources/db/migration/V1.0.1__alter_sequences.sql b/backend/app.hopps.org/src/main/resources/db/migration/V1.0.1__alter_sequences.sql