diff --git a/mozen/src/main/java/mozen/auth/WebSecurity.java b/mozen/src/main/java/mozen/auth/WebSecurity.java index 991752b2455fd291c68f95b396aa269f05f53e56..f59850d8203749885ab9e7d73865af5f4234a47c 100644 --- a/mozen/src/main/java/mozen/auth/WebSecurity.java +++ b/mozen/src/main/java/mozen/auth/WebSecurity.java @@ -38,6 +38,7 @@ public class WebSecurity extends WebSecurityConfigurerAdapter{ .antMatchers(HttpMethod.POST, "/login").permitAll() .antMatchers(HttpMethod.POST, "/user/signup").permitAll() .antMatchers(HttpMethod.GET, "/search").permitAll() + .antMatchers(HttpMethod.GET, "/comments").permitAll() .antMatchers(HttpMethod.GET, "/models").permitAll() .antMatchers(HttpMethod.GET, "/models/tags").permitAll() .antMatchers(HttpMethod.GET, "/models/download").permitAll() diff --git a/mozen/src/main/java/mozen/business/CommentManager.java b/mozen/src/main/java/mozen/business/CommentManager.java index 2c4478d10553996ff341fa750478b7a0a4201d72..395bbd46be75afa8cb15c63c9d6756d809c0b0e4 100644 --- a/mozen/src/main/java/mozen/business/CommentManager.java +++ b/mozen/src/main/java/mozen/business/CommentManager.java @@ -1,6 +1,7 @@ package mozen.business; import java.util.Collection; +import java.util.Date; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -36,6 +37,7 @@ public class CommentManager implements ICommentManager { comment.setAuthor(user); comment.setContent(message.getContent()); comment.setModel(model); + comment.setAdded(new Date()); commentRepo.save(comment); } diff --git a/mozen/src/main/java/mozen/business/ModelManager.java b/mozen/src/main/java/mozen/business/ModelManager.java index caad665bbb8c97ab5baed4a2cc78557886a22a29..214553808ed618a314558f1a0cf6994be377a598 100644 --- a/mozen/src/main/java/mozen/business/ModelManager.java +++ b/mozen/src/main/java/mozen/business/ModelManager.java @@ -43,6 +43,9 @@ public class ModelManager implements IModelManager { model.setName(message.getName()); model.setShortDescription(message.getShortDescription()); model.setLongDescription(message.getLongDescription()); + model.setPerformanceUnit(message.getPerformanceUnit()); + model.setPerformance(message.getPerformance()); + model.setParameterCount(message.getParameterCount()); if (message.getTags() != null) { Set<Tag> tags = new HashSet<Tag>(); diff --git a/mozen/src/main/java/mozen/messages/ModelMessage.java b/mozen/src/main/java/mozen/messages/ModelMessage.java index 1a3f6d5eaee6ea94bafcc4cb0bf9b0d40ffc169d..c77835cec397b5c2f301febc194a189b40830a69 100644 --- a/mozen/src/main/java/mozen/messages/ModelMessage.java +++ b/mozen/src/main/java/mozen/messages/ModelMessage.java @@ -22,17 +22,27 @@ public class ModelMessage implements Serializable { private String [] customLayers; + private int performance; + + private String performanceUnit; + + private int parameterCount; + public ModelMessage() { } - public ModelMessage(String name, String shortDescription, String longDescription, String[] tags, String[] customLayers) { + public ModelMessage(String name, String shortDescription, String longDescription, String[] tags, String[] customLayers, int performance, String performanceUnit, int parameterCount) { this.name = name; this.shortDescription = shortDescription; this.longDescription = longDescription; this.tags = tags; this.customLayers = customLayers; + this.performance = performance; + this.performanceUnit = performanceUnit; + this.parameterCount = parameterCount; } + public String getName() { return this.name; } @@ -73,4 +83,29 @@ public class ModelMessage implements Serializable { this.customLayers = customLayers; } + public int getPerformance() { + return this.performance; + } + + public void setPerformance(int performance) { + this.performance = performance; + } + + public String getPerformanceUnit() { + return this.performanceUnit; + } + + public void setPerformanceUnit(String performanceUnit) { + this.performanceUnit = performanceUnit; + } + + public int getParameterCount() { + return this.parameterCount; + } + + public void setParameterCount(int parameterCount) { + this.parameterCount = parameterCount; + } + + } \ No newline at end of file diff --git a/mozen/src/main/java/mozen/web/CommentController.java b/mozen/src/main/java/mozen/web/CommentController.java index 36f8dc90def3f949de1585aceb28131284eb6d02..29931a0a606d9a7e192bf3201f6c792d3836003d 100644 --- a/mozen/src/main/java/mozen/web/CommentController.java +++ b/mozen/src/main/java/mozen/web/CommentController.java @@ -21,7 +21,6 @@ import mozen.model.Comment; import mozen.model.User; import mozen.utils.UserHelper; - @RestController @RequestMapping("/comments") @CrossOrigin