Fix database structure

adapters/database/src/main/java/net/onelitefeather/pandorascluster/database/mapper/flag/FlagContainerMappingStrategy.java

@@ -19,6 +19,11 @@
 import java.util.List;
 import java.util.function.Function;
 
+/**
+ * Must be invoked while the Hibernate {@link org.hibernate.Session} that loaded the entity
+ * is still open — this strategy traverses {@code land}, {@code naturalFlags},
+ * {@code roleFlags} and {@code entityCapFlags} lazy associations.
+ */
 public final class FlagContainerMappingStrategy implements MapperStrategy {
 
     @Override
@@ -27,25 +32,33 @@ public Function<PandorasModel, PandorasModel> entityToModel() {
             if (entity == null) return null;
             if (!(entity instanceof FlagContainerDto flagContainer)) return null;
 
-            MappingContext mappingContext = MappingContext.create();
-            mappingContext.setMappingStrategy(LandMappingStrategy.create());
-            mappingContext.setMappingType(MapperType.ENTITY_TO_MODEL);
-
-            Land land = (Land) mappingContext.doMapping(flagContainer.land());
+            MappingContext landCtx = MappingContext.create();
+            landCtx.setMappingStrategy(LandMappingStrategy.create());
+            landCtx.setMappingType(MapperType.ENTITY_TO_MODEL);
+            Land land = (Land) landCtx.doMapping(flagContainer.land());
 
+            MappingContext naturalCtx = MappingContext.create();
+            naturalCtx.setMappingStrategy(NaturalFlagMappingStrategy.create());
+            naturalCtx.setMappingType(MapperType.ENTITY_TO_MODEL);
             List<LandNaturalFlag> naturalFlags = flagContainer.naturalFlags()
                     .stream()
-                    .map(naturalFlagDBO -> (LandNaturalFlag) mappingContext.doMapping(naturalFlagDBO))
+                    .map(flag -> (LandNaturalFlag) naturalCtx.doMapping(flag))
                     .toList();
 
+            MappingContext roleCtx = MappingContext.create();
+            roleCtx.setMappingStrategy(RoleFlagMappingStrategy.create());
+            roleCtx.setMappingType(MapperType.ENTITY_TO_MODEL);
             List<LandRoleFlag> roleFlags = flagContainer.roleFlags()
                     .stream()
-                    .map(naturalFlagDBO -> (LandRoleFlag) mappingContext.doMapping(naturalFlagDBO))
+                    .map(flag -> (LandRoleFlag) roleCtx.doMapping(flag))
                     .toList();
 
+            MappingContext capCtx = MappingContext.create();
+            capCtx.setMappingStrategy(EntityCapFlagMappingStrategy.create());
+            capCtx.setMappingType(MapperType.ENTITY_TO_MODEL);
             List<LandEntityCapFlag> entityCapFlags = flagContainer.entityCapFlags()
                     .stream()
-                    .map(naturalFlagDBO -> (LandEntityCapFlag) mappingContext.doMapping(naturalFlagDBO))
+                    .map(flag -> (LandEntityCapFlag) capCtx.doMapping(flag))
                     .toList();
 
             return new FlagContainer(flagContainer.id(), land, naturalFlags, roleFlags, entityCapFlags);
@@ -59,27 +72,35 @@ public Function<PandorasModel, PandorasModel> modelToEntity() {
             if (model == null) return null;
             if(!(model instanceof FlagContainer flagContainer)) return null;
 
-            MappingContext mappingContext = MappingContext.create();
-            mappingContext.setMappingStrategy(LandMappingStrategy.create());
-            mappingContext.setMappingType(MapperType.MODEL_TO_ENTITY);
+            MappingContext landCtx = MappingContext.create();
+            landCtx.setMappingStrategy(LandMappingStrategy.create());
+            landCtx.setMappingType(MapperType.MODEL_TO_ENTITY);
+            LandEntity land = (LandEntity) landCtx.doMapping(flagContainer.getLand());
 
+            MappingContext naturalCtx = MappingContext.create();
+            naturalCtx.setMappingStrategy(NaturalFlagMappingStrategy.create());
+            naturalCtx.setMappingType(MapperType.MODEL_TO_ENTITY);
             List<LandNaturalFlagEntity> naturalFlags = flagContainer.getNaturalFlags()
                     .stream()
-                    .map(naturalFlagDBO -> (LandNaturalFlagEntity) mappingContext.doMapping(naturalFlagDBO))
+                    .map(flag -> (LandNaturalFlagEntity) naturalCtx.doMapping(flag))
                     .toList();
 
+            MappingContext roleCtx = MappingContext.create();
+            roleCtx.setMappingStrategy(RoleFlagMappingStrategy.create());
+            roleCtx.setMappingType(MapperType.MODEL_TO_ENTITY);
             List<LandRoleFlagEntity> roleFlags = flagContainer.getRoleFlags()
                     .stream()
-                    .map(naturalFlagDBO -> (LandRoleFlagEntity) mappingContext.doMapping(naturalFlagDBO))
+                    .map(flag -> (LandRoleFlagEntity) roleCtx.doMapping(flag))
                     .toList();
 
+            MappingContext capCtx = MappingContext.create();
+            capCtx.setMappingStrategy(EntityCapFlagMappingStrategy.create());
+            capCtx.setMappingType(MapperType.MODEL_TO_ENTITY);
             List<LandEntityCapFlagEntity> entityCapFlags = flagContainer.getEntityCapFlags()
                     .stream()
-                    .map(naturalFlagDBO -> (LandEntityCapFlagEntity) mappingContext.doMapping(naturalFlagDBO))
+                    .map(flag -> (LandEntityCapFlagEntity) capCtx.doMapping(flag))
                     .toList();
 
-            LandEntity land = (LandEntity) mappingContext.doMapping(flagContainer.getLand());
-
             return new FlagContainerEntity(flagContainer.getId(), land, naturalFlags, roleFlags, entityCapFlags);
         };
     }

adapters/database/src/main/java/net/onelitefeather/pandorascluster/database/mapper/land/LandAreaMappingStrategy.java

@@ -20,6 +20,10 @@
 import java.util.List;
 import java.util.function.Function;
 
+/**
+ * Must be invoked while the Hibernate {@link org.hibernate.Session} that loaded the entity
+ * is still open — this strategy traverses {@code members} and {@code chunks} lazy collections.
+ */
 public final class LandAreaMappingStrategy implements MapperStrategy {
 
     public static LandAreaMappingStrategy create() {
@@ -61,7 +65,7 @@ private Land getLand(LandDto land) {
 
     private List<ClaimedChunk> getChunks(List<ClaimedChunkDto> chunks) {
         MappingContext mappingContext = MappingContext.create();
-        mappingContext.setMappingStrategy(create());
+        mappingContext.setMappingStrategy(ClaimedChunkMappingStrategy.create());
         mappingContext.setMappingType(MapperType.ENTITY_TO_MODEL);
         return chunks.stream().map(chunk -> (ClaimedChunk) mappingContext.doMapping(chunk)).toList();
     }

adapters/database/src/main/java/net/onelitefeather/pandorascluster/database/mapper/land/LandMappingStrategy.java

@@ -18,6 +18,11 @@
 import java.util.List;
 import java.util.function.Function;
 
+/**
+ * Must be invoked while the Hibernate {@link org.hibernate.Session} that loaded the entity
+ * is still open — this strategy traverses {@code owner}, {@code home}, {@code flagContainer},
+ * and {@code areas}. Use {@code DatabaseLandService#getLands()} as the canonical JOIN FETCH pattern.
+ */
 public final class LandMappingStrategy implements MapperStrategy {
 
     @Override

adapters/database/src/main/java/net/onelitefeather/pandorascluster/database/mapper/position/HomePositionMappingStrategy.java

@@ -14,7 +14,7 @@ public Function<PandorasModel, PandorasModel> entityToModel() {
         return entity -> {
             if(entity == null) return null;
             if(!(entity instanceof HomePositionEntity home)) return null;
-            return new HomePositionEntity(home.id(), home.world(), home.posX(), home.posY(), home.posZ(), home.yaw(), home.pitch());
+            return new HomePosition(home.id(), home.world(), home.posX(), home.posY(), home.posZ(), home.yaw(), home.pitch());
         };
     }
 

adapters/database/src/main/java/net/onelitefeather/pandorascluster/database/models/chunk/ClaimedChunkEntity.java

@@ -5,19 +5,27 @@
 import net.onelitefeather.pandorascluster.dto.chunk.ClaimedChunkDto;
 import net.onelitefeather.pandorascluster.dto.land.LandAreaDto;
 
+import java.util.Objects;
+
 @Entity
-@Table(name = "land_chunks")
+@Table(
+        name = "land_chunks",
+        uniqueConstraints = @UniqueConstraint(
+                name = "uk_land_chunks_area_chunk",
+                columnNames = {"landArea_id", "chunk_index"}
+        )
+)
 public final class ClaimedChunkEntity implements ClaimedChunkDto {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column
+    @Column(name = "chunk_index", nullable = false)
     private Long chunkIndex;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "landArea_id")
+    @JoinColumn(name = "landArea_id", nullable = false)
     private LandAreaEntity landArea;
 
     public ClaimedChunkEntity() {
@@ -43,4 +51,17 @@ public Long chunkIndex() {
     public LandAreaDto landArea() {
         return landArea;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof ClaimedChunkEntity that)) return false;
+        if (id == null || that.id == null) return false;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return id == null ? System.identityHashCode(this) : Objects.hashCode(id);
+    }
 }

adapters/database/src/main/java/net/onelitefeather/pandorascluster/database/models/flag/FlagContainerEntity.java

@@ -10,6 +10,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 @Entity
 @Table(name = "flag_containers")
@@ -28,7 +29,7 @@ public final class FlagContainerEntity implements FlagContainerDto {
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "flagContainer")
     private List<LandEntityCapFlagEntity> entityCapFlags;
 
-    @OneToOne
+    @OneToOne(mappedBy = "flagContainerEntity")
     private LandEntity land;
 
     public static final FlagContainerEntity EMPTY = new FlagContainerEntity(
@@ -83,4 +84,17 @@ public List<RoleFlagDto> roleFlags() {
     public LandDto land() {
         return this.land;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof FlagContainerEntity that)) return false;
+        if (id == null || that.id == null) return false;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return id == null ? System.identityHashCode(this) : Objects.hashCode(id);
+    }
 }

adapters/database/src/main/java/net/onelitefeather/pandorascluster/database/models/flag/LandEntityCapFlagEntity.java

@@ -6,22 +6,30 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Objects;
+
 @Entity
-@Table(name = "entityCap_flags")
+@Table(
+        name = "entityCap_flags",
+        uniqueConstraints = @UniqueConstraint(
+                name = "uk_entitycap_flags_container_name",
+                columnNames = {"flagContainer_id", "name"}
+        )
+)
 public final class LandEntityCapFlagEntity implements EntityCapFlagDto {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column
+    @Column(name = "name", length = 64, nullable = false)
     private String name;
 
-    @Column
+    @Column(name = "spawn_limit", nullable = false)
     private Integer spawnLimit;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "flagContainer_id")
+    @JoinColumn(name = "flagContainer_id", nullable = false)
     private FlagContainerEntity flagContainer;
 
 
@@ -56,4 +64,17 @@ public Integer spawnLimit() {
     public FlagContainerDto flagContainer() {
         return this.flagContainer;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof LandEntityCapFlagEntity that)) return false;
+        if (id == null || that.id == null) return false;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return id == null ? System.identityHashCode(this) : Objects.hashCode(id);
+    }
 }

adapters/database/src/main/java/net/onelitefeather/pandorascluster/database/models/flag/LandNaturalFlagEntity.java

@@ -6,22 +6,30 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Objects;
+
 @Entity
-@Table(name = "natural_flags")
+@Table(
+        name = "natural_flags",
+        uniqueConstraints = @UniqueConstraint(
+                name = "uk_natural_flags_container_name",
+                columnNames = {"flagContainer_id", "name"}
+        )
+)
 public final class LandNaturalFlagEntity implements NaturalFlagDto {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column
+    @Column(name = "name", length = 64, nullable = false)
     private String name;
 
-    @Column
+    @Column(name = "state", nullable = false)
     private boolean state;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "flagContainer_id")
+    @JoinColumn(name = "flagContainer_id", nullable = false)
     private FlagContainerEntity flagContainer;
 
     public LandNaturalFlagEntity() {
@@ -54,4 +62,17 @@ public boolean state() {
     public FlagContainerDto flagContainer() {
         return flagContainer;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof LandNaturalFlagEntity that)) return false;
+        if (id == null || that.id == null) return false;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return id == null ? System.identityHashCode(this) : Objects.hashCode(id);
+    }
 }

adapters/database/src/main/java/net/onelitefeather/pandorascluster/database/models/flag/LandRoleFlagEntity.java

@@ -7,25 +7,34 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Objects;
+
 @Entity
-@Table(name = "role_flags")
+@Table(
+        name = "role_flags",
+        uniqueConstraints = @UniqueConstraint(
+                name = "uk_role_flags_container_name",
+                columnNames = {"flagContainer_id", "name"}
+        )
+)
 public final class LandRoleFlagEntity implements RoleFlagDto {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column
+    @Column(name = "name", length = 64, nullable = false)
     private String name;
 
-    @Column
+    @Column(name = "state", nullable = false)
     private boolean state;
 
     @Enumerated(EnumType.STRING)
+    @Column(name = "role", length = 32, nullable = false)
     private LandRole role;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "flagContainer_id")
+    @JoinColumn(name = "flagContainer_id", nullable = false)
     private FlagContainerEntity flagContainer;
 
     public LandRoleFlagEntity() {
@@ -65,4 +74,16 @@ public FlagContainerDto flagContainer() {
         return this.flagContainer;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof LandRoleFlagEntity that)) return false;
+        if (id == null || that.id == null) return false;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return id == null ? System.identityHashCode(this) : Objects.hashCode(id);
+    }
 }