Merge a2a899f into 5d572ee

TAMULib · May 13, 2020 · 0bd9b49 · 0bd9b49
2 parents 5d572ee + a2a899f
commit 0bd9b49
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/edu/tamu/app/model/Product.java b/src/main/java/edu/tamu/app/model/Product.java
@@ -6,6 +6,7 @@
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -47,7 +48,7 @@ public class Product extends ValidatingBaseEntity {
     @JsonView(ApiView.Partial.class)
     private String wikiUrl;
 
-    @ElementCollection
+    @ElementCollection(fetch = FetchType.EAGER)
     @JsonView(ApiView.Partial.class)
     private List<RemoteProductInfo> remoteProductInfo;
 

diff --git a/src/main/java/edu/tamu/app/model/validation/ProductValidator.java b/src/main/java/edu/tamu/app/model/validation/ProductValidator.java
@@ -6,8 +6,22 @@
 
 public class ProductValidator extends BaseModelValidator {
 
+    private static final String URL_REGEX = "^(https?|ftp|file|wss?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]+[-a-zA-Z0-9+&@#/%=~_|?]";
+
     public ProductValidator() {
         String nameProperty = "name";
         this.addInputValidator(new InputValidator(InputValidationType.required, "A Product requires a name", nameProperty, true));
+
+        String devUrlProperty = "devUrl";
+        this.addInputValidator(new InputValidator(InputValidationType.pattern, "The development URL must be a valid URL", devUrlProperty, URL_REGEX));
+
+        String preUrlProperty = "preUrl";
+        this.addInputValidator(new InputValidator(InputValidationType.pattern, "The pre-production URL must be a valid URL", preUrlProperty, URL_REGEX));
+
+        String productionUrlProperty = "productionUrl";
+        this.addInputValidator(new InputValidator(InputValidationType.pattern, "The production URL must be a valid URL", productionUrlProperty, URL_REGEX));
+
+        String wikiUrlProperty = "wikiUrl";
+        this.addInputValidator(new InputValidator(InputValidationType.pattern, "The wiki URL must be a valid URL", wikiUrlProperty, URL_REGEX));
     }
 }