return results

backend/src/main/java/api/JsonKeys.java

@@ -9,7 +9,11 @@ public enum JsonKeys implements JsonKey {
     KEY_ANSWERS("answers"),
     KEY_DESCRIPTION("description"),
     KEY_NAME("name"),
-    KEY_ID("id");
+    KEY_ID("id"),
+    KEY_TRAIT("trait"),
+    KEY_TRAITS("traits"),
+    KEY_WEIGHT("weight"),
+    KEY_RESULTS("results");
 
 
     private final Object value;

backend/src/main/java/controller/SessionController.java

@@ -16,6 +16,11 @@ public class SessionController extends ModelController {
         return new Session().asJsonObject();
     }
 
+    public JsonObject getEntriesForId(String iId, JsonObject iBody) {
+        Session vSession = Session.getSessionForUUID(UUID.fromString(iId));
+        return vSession.asJsonObject();
+    }
+
     public JsonObject updateEntry(String iID, JsonObject iBody) throws Exception{
         Session vSession = Session.getSessionForUUID(UUID.fromString(iID));
         if(null == vSession)

backend/src/main/java/model/personnality/Trait.java

@@ -1,6 +1,17 @@
 package model.personnality;
 
-public class Trait {
+import com.github.cliftonlabs.json_simple.JsonObject;
+import com.github.cliftonlabs.json_simple.Jsonable;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+
+import static api.JsonKeys.KEY_DESCRIPTION;
+import static api.JsonKeys.KEY_NAME;
+
+public class Trait implements Jsonable {
 
     private String fName;
     private String fDescription;
@@ -9,4 +20,32 @@ public class Trait {
         fName           = iName;
         fDescription    = iDescription;
     }
+
+    // ------------------------------------------------------------------
+    // Jsonable Implementation
+    // ------------------------------------------------------------------
+    public JsonObject asJsonObject(){
+        JsonObject vResult = new JsonObject();
+        vResult.put(KEY_NAME, fName);
+        vResult.put(KEY_DESCRIPTION, fDescription);
+        return vResult;
+    }
+
+    @Override
+    public String toJson() {
+        final StringWriter writable = new StringWriter();
+        try{
+            this.toJson(writable);
+        }catch(final IOException caught)
+        {
+            caught.printStackTrace();
+        }
+        return writable.toString();
+    }
+
+    @Override
+    public void toJson(Writer writable) throws IOException {
+
+        writable.write(new String(asJsonObject().toJson().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
+    }
 }

backend/src/main/java/model/questionnaire/Answer.java

@@ -10,8 +10,7 @@ import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
-import static api.JsonKeys.KEY_DESCRIPTION;
-import static api.JsonKeys.KEY_ID;
+import static api.JsonKeys.*;
 
 public class Answer implements Jsonable {
 
@@ -33,6 +32,18 @@ public class Answer implements Jsonable {
     public float getWeight() { return fWeight; }
     public UUID getId() { return fId; }
 
+
+    // ------------------------------------------------------------------
+    // Jsonable Implementation
+    // ------------------------------------------------------------------
+    public JsonObject asJsonObject(){
+        final JsonObject vResult = new JsonObject();
+        vResult.put(KEY_DESCRIPTION, fDescription);
+        vResult.put(KEY_ID, fId.toString());
+        return vResult;
+    }
+
+
     @Override
     public String toJson() {
         final StringWriter writable = new StringWriter();
@@ -45,11 +56,10 @@ public class Answer implements Jsonable {
         return writable.toString();
     }
 
+
     @Override
     public void toJson(Writer writable) throws IOException {
-        final JsonObject vResult = new JsonObject();
-        vResult.put(KEY_DESCRIPTION, fDescription);
-        vResult.put(KEY_ID, fId.toString());
-        writable.write(new String(vResult.toJson().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
+
+        writable.write(new String(asJsonObject().toJson().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
     }
 }

backend/src/main/java/model/questionnaire/Question.java

@@ -41,7 +41,14 @@ public class Question implements Jsonable {
     // ------------------------------------------------------------------
     // Jsonable Implementation
     // ------------------------------------------------------------------
-
+    public JsonObject asJsonObject()
+    {
+        JsonObject vResult = new JsonObject();
+        vResult.put(KEY_NAME, fName);
+        vResult.put(KEY_ANSWERS, fAnswers);
+        vResult.put(KEY_ID, fId.toString());
+        return vResult;
+    }
     @Override
     public String toJson() {
         final StringWriter writable = new StringWriter();
@@ -56,10 +63,6 @@ public class Question implements Jsonable {
 
     @Override
     public void toJson(Writer writable) throws IOException {
-        JsonObject vResult = new JsonObject();
-        vResult.put(KEY_NAME, fName);
-        vResult.put(KEY_ANSWERS, fAnswers);
-        vResult.put(KEY_ID, fId.toString());
-        writable.write(new String(vResult.toJson().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
+        writable.write(new String(asJsonObject().toJson().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
     }
 }

backend/src/main/java/model/questionnaire/Session.java

@@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.UUID;
 
-import static api.JsonKeys.KEY_ID;
+import static api.JsonKeys.*;
 
 public class Session implements Jsonable {
 
@@ -41,7 +41,7 @@ public class Session implements Jsonable {
     public JsonObject asJsonObject() {
         JsonObject vResult = new JsonObject();
         vResult.put(KEY_ID, fId.toString());
-
+        vResult.put(KEY_RESULTS, fAnswers.toJson());
         return vResult;
     }
 

backend/src/main/java/model/questionnaire/SessionAnswers.java

@@ -1,14 +1,24 @@
 package model.questionnaire;
 
+import com.github.cliftonlabs.json_simple.JsonArray;
+import com.github.cliftonlabs.json_simple.JsonObject;
+import com.github.cliftonlabs.json_simple.Jsonable;
 import model.personnality.Personality;
 import model.personnality.Trait;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.HashMap;
 
+import static api.JsonKeys.*;
+
 /**
  * Stores answers provided for a session of answers
  */
-public class SessionAnswers {
+public class SessionAnswers implements Jsonable {
 
     private HashMap<Question, Answer> fAnswers;
     private HashMap<Trait, Float> fTraits;
@@ -47,4 +57,35 @@ public class SessionAnswers {
         fTraits.put(vNewTrait, vNewTraitWeight);
     }
 
+    // ------------------------------------------------------------------
+    // Jsonable Implementation
+    // ------------------------------------------------------------------
+    @Override
+    public String toJson() {
+        final StringWriter writable = new StringWriter();
+        try{
+            this.toJson(writable);
+        }catch(final IOException caught)
+        {
+            caught.printStackTrace();
+        }
+        return writable.toString();
+    }
+
+    @Override
+    public void toJson(Writer writable) throws IOException {
+        JsonObject vResult = new JsonObject();
+        JsonArray vAnswers = new JsonArray();
+        fAnswers.forEach( (question, answer) -> {
+            vAnswers.add(answer.asJsonObject().putChain(KEY_QUESTION, question.asJsonObject()));
+        });
+        vResult.put(KEY_ANSWERS, vAnswers);
+        JsonArray vTraits = new JsonArray();
+        fTraits.forEach( (trait, weight) -> {
+            vTraits.add(trait.asJsonObject().putChain(KEY_WEIGHT, weight));
+        });
+        vResult.put(KEY_TRAITS, vTraits);
+        writable.write(new String(vResult.toJson().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
+    }
+
 }

frontend/src/component/questionnaire.js

@@ -52,7 +52,7 @@ function Questionnaire(props){
     )
     else
     return(
-        <QuestionnaireResult/>
+        <QuestionnaireResult sessionId={props.sessionId}/>
     )
 }
 

frontend/src/component/questionnaire_result.js

@@ -6,7 +6,12 @@ function QuestionnaireResult(props){
 
     if(null === resultsFetched)
     {
-        
+        fetch(url+"/session/"+props.sessionId) 
+        .then(response => response.json())
+        .then(result => {
+            onResultsFetched(result);
+        })
+        .catch( e => console.error(e));
     }
     return(
         <div>