Added more validation

Trails-Through-Shadows · Jan 30, 2024 · 53a7890 · 53a7890
1 parent 0b0fbfc
commit 53a7890
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/cz/trailsthroughshadows/api/rest/endpoints/ValidationController.java b/src/main/java/cz/trailsthroughshadows/api/rest/endpoints/ValidationController.java
@@ -25,15 +25,15 @@ public class ValidationController {
 
     @PostMapping("/validate/part")
     public ResponseEntity<RestResponse> validatePart(@RequestBody Part part) {
-        log.info("Validating part " + part.getTag());
+        log.debug("Validating part " + part.getTag());
         List<String> errors = validationService.validatePart(part);
 
         if (errors.isEmpty()) {
-            log.warn("Part is valid!");
+            log.debug("Part is valid!");
             return new ResponseEntity<>(new RestResponse(HttpStatus.OK, "Part is valid!"), HttpStatus.OK);
         }
 
-        log.warn("Part is not valid!");
+        log.debug("Part is not valid!");
         RestError error = new RestError(HttpStatus.NOT_ACCEPTABLE, "Part is not valid!");
         for (var e : errors) {
             log.debug(" > " + e);

diff --git a/src/main/java/cz/trailsthroughshadows/api/rest/endpoints/ValidationService.java b/src/main/java/cz/trailsthroughshadows/api/rest/endpoints/ValidationService.java
@@ -21,8 +21,6 @@ public class ValidationService {
     // 3. Part is maximum 8 hexes wide and 8 hexes tall
     // 4. All hexes must be connected
     public List<String> validatePart(Part part) {
-        log.info("2 Validating part " + part.getTag());
-        System.out.println("2 Validating part " + part.getTag());
         List<String> errors = new ArrayList<>();
 
         int minHexes = 5;
@@ -48,17 +46,20 @@ public List<String> validatePart(Part part) {
         }
 
         // no hexes can be on the same position
+        int duplicates = 0;
         for (Hex hex1 : part.getHexes()) {
             for (Hex hex2 : part.getHexes()) {
                 if (hex1 == hex2)
                     continue;
 
                 if (hex1.getQ() == hex2.getQ() && hex1.getR() == hex2.getR() && hex1.getS() == hex2.getS()) {
-                    errors.add("No hexes can be on the same position!");
+                    duplicates++;
                     break;
                 }
             }
         }
+        if (duplicates > 0)
+            errors.add("Part must not have duplicate hexes!");
 
         // every hex has to have correct coordinates
         for (Hex hex : part.getHexes()) {

diff --git a/src/main/java/cz/trailsthroughshadows/api/table/schematic/part/Part.java b/src/main/java/cz/trailsthroughshadows/api/table/schematic/part/Part.java
@@ -6,7 +6,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Set;
+import java.util.List;
 
 @Data
 @Entity
@@ -23,7 +23,7 @@ public class Part {
     private String tag;
 
     @OneToMany(mappedBy = "key.idPart", cascade = CascadeType.ALL, orphanRemoval = true)
-    private Set<Hex> hexes;
+    private List<Hex> hexes;
 
 //    @OneToMany(mappedBy = "key.fromPart", cascade = CascadeType.ALL)
 //    private Set<LocationDoor> doors;