Fixes to POST endpoints for model, element, relationship

Author: manasbajaj

app/controllers/ModelController.java

@@ -1,12 +1,12 @@
 package controllers;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import models.Element;
+
 import models.Model;
 import play.libs.Json;
 import play.mvc.Controller;
 import play.mvc.Result;
-import services.ElementService;
+
 import services.ModelService;
 
 import javax.inject.Inject;
@@ -45,6 +45,7 @@ public Result all() {
 
     public Result create() {
         JsonNode requestBodyJson = request().body().asJson();
+        System.out.println(requestBodyJson);
         Model newModel = Json.fromJson(requestBodyJson, Model.class);
         Model createdModel = modelService.create(newModel);
         if(createdModel!=null)

app/models/Element.java

@@ -15,6 +15,10 @@ public class Element {
     public UUID parent_model;
     public String type;
 
+    public Element() {
+        super();
+    }
+
     public Element(String name, UUID parent_model, String type) {
         this.identifier = UUID.randomUUID();
         this.name = name;

app/models/Model.java

@@ -13,10 +13,13 @@ public class Model {
     public String name;
     public String description;
 
-    public Model(String name) {
+    public Model() {
+        super();
+    }
+    public Model(String name, String description) {
         this.identifier = UUID.randomUUID();
         this.name = name;
-        this.description = name;
+        this.description = description;
     }
 
     public Model(UUID identifier, String name, String description) {

app/models/Relationship.java

@@ -19,6 +19,10 @@ public class Relationship {
     public String target_element_role;
     public UUID target_element;
 
+    public Relationship() {
+        super();
+    }
+
     public Relationship(String name, UUID parent_model, String type, String source_element_role, UUID source_element,
                         String target_element_role, UUID target_element) {
         this.identifier = UUID.randomUUID();

app/services/ElementService.java

@@ -22,15 +22,15 @@ public class ElementService {
 
     public Set<Element> getAll() {
         Set<Element> elements = new HashSet<>();
-        ResultSet resultSet = sessionBuilder.getSession().execute("select * from sysml2.elements;");
+        ResultSet resultSet = sessionBuilder.getSession().execute("select identifier, name, description, parent_model, type from sysml2.elements;");
         for(Row r: resultSet)
             elements.add(new Element(r.getUUID(0), r.getString(1), r.getString(2), r.getUUID(3), r.getString(4)));
 
         return elements;
     }
 
     public Element getById(UUID identifier) {
-        ResultSet resultSet = sessionBuilder.getSession().execute("select * from sysml2.elements where identifier = " + identifier);
+        ResultSet resultSet = sessionBuilder.getSession().execute("select identifier, name, description, parent_model, type from sysml2.elements where identifier = " + identifier);
         Row result = resultSet.one();
         if(result!=null)
             return new Element(result.getUUID(0), result.getString(1), result.getString(2), result.getUUID(3),result.getString(4));
@@ -43,11 +43,12 @@ public Element create(Element elem) {
             UUID elementIdentifier = elem.identifier;
             if(elementIdentifier == null) elementIdentifier = UUIDs.timeBased();
 
-            String cqlCommand = String.format("INSERT INTO sysml2.elements(identifier,name,description, parent_model, type) VALUES (%s,%s,%s,%s,%s)",
+            String cqlCommand = String.format("INSERT INTO sysml2.elements(identifier,name,description, parent_model, type) " +
+                            "VALUES (%s,'%s','%s',%s,'%s')",
                     elementIdentifier, elem.name, elem.description, elem.parent_model, elem.type);
 
             sessionBuilder.getSession().execute(cqlCommand);
-            return getById(elem.identifier);
+            return getById(elementIdentifier);
         }
         else
             return null;

app/services/ModelService.java

@@ -23,15 +23,15 @@ public class ModelService {
 
     public Set<Model> getAll() {
         Set<Model> models = new HashSet<>();
-        ResultSet resultSet = sessionBuilder.getSession().execute("select * from sysml2.models;");
+        ResultSet resultSet = sessionBuilder.getSession().execute("select identifier, name, description from sysml2.models;");
         for(Row r: resultSet)
             models.add(new Model(r.getUUID(0), r.getString(1), r.getString(2)));
 
         return models;
     }
 
     public Model getById(UUID identifier) {
-        ResultSet resultSet = sessionBuilder.getSession().execute("select * from sysml2.models where identifier = " + identifier);
+        ResultSet resultSet = sessionBuilder.getSession().execute("select identifier, name, description from sysml2.models where identifier = " + identifier);
         Row result = resultSet.one();
         if(result!=null)
             return new Model(result.getUUID(0), result.getString(1), result.getString(2));
@@ -44,11 +44,11 @@ public Model create(Model model) {
             UUID modelIdentifier = model.identifier;
             if(modelIdentifier == null) modelIdentifier = UUIDs.timeBased();
 
-            String cqlCommand = String.format("INSERT INTO sysml2.models(identifier,name,description VALUES (%s,%s,%s,%s,%s)",
+            String cqlCommand = String.format("INSERT INTO sysml2.models(identifier,name,description) VALUES (%s,'%s','%s');",
                     modelIdentifier, model.name, model.description);
 
             sessionBuilder.getSession().execute(cqlCommand);
-            return getById(model.identifier);
+            return getById(modelIdentifier);
         }
         else
             return null;

app/services/RelationshipService.java

@@ -53,8 +53,8 @@ public Relationship create(Relationship relation) {
             UUID identifier = relation.identifier;
             if(identifier == null) identifier = UUIDs.timeBased();
 
-            String cqlCommand = String.format("INSERT INTO sysml2.relationships(identifier,name,description, parent_model, type, source_element_role, source_element, target_element_role, target_element)" +
-                            " VALUES (%s,%s,%s, %s, %s, %s, %s, %s, %s);", identifier, relation.name, relation.description, relation.parent_model, relation.type,
+            String cqlCommand = String.format("INSERT INTO sysml2.relationships(identifier, name, description, parent_model, type, source_element_role, source_element, target_element_role, target_element)" +
+                            " VALUES (%s,'%s','%s',%s,'%s','%s',%s,'%s',%s);", identifier, relation.name, relation.description, relation.parent_model, relation.type,
                             relation.source_element_role, relation.source_element, relation.target_element_role, relation.target_element);
 
             sessionBuilder.getSession().execute(cqlCommand);

conf/generate_cas_schema.cql

@@ -12,6 +12,8 @@ CREATE TABLE IF NOT EXISTS sysml2.relationships (identifier timeuuid, name text,
 // Insert some test data
 INSERT INTO sysml2.models(identifier,name,description) VALUES (65df24d2-b52e-11e8-96f8-529269fb1459,'Sandbox model', 'This is a sandbox SysML v2 model.');
 
+INSERT INTO sysml2.models(identifier,name,description) VALUES (c76fde60-b562-11e8-8e53-dbf8bfefb057,'MyModel','Description of My Model');
+
 INSERT INTO sysml2.elements(identifier,name,description, parent_model, type) VALUES (65df2770-b52e-11e8-96f8-529269fb1459,'Shapes','Package of shapes',65df24d2-b52e-11e8-96f8-529269fb1459,'Package');
 INSERT INTO sysml2.elements(identifier,name,description, parent_model, type) VALUES (65df28c4-b52e-11e8-96f8-529269fb1459,'Triangle','Triangle shape',65df24d2-b52e-11e8-96f8-529269fb1459,'Class');
 INSERT INTO sysml2.elements(identifier,name,description, parent_model, type) VALUES (65df2a04-b52e-11e8-96f8-529269fb1459,'Quadrilateral','Quadrilateral shape',65df24d2-b52e-11e8-96f8-529269fb1459,'Class');