uploaded state

backend/.idea/artifacts/backend_src_main_jar.xml

@@ -0,0 +1,11 @@
+<component name="ArtifactManager">
+  <artifact type="jar" name="backend.src.main:jar">
+    <output-path>$PROJECT_DIR$/out/artifacts/backend_src_main_jar</output-path>
+    <root id="archive" name="backend.src.main.jar">
+      <element id="directory" name="META-INF">
+        <element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
+      </element>
+      <element id="module-output" name="backend.src.main" />
+    </root>
+  </artifact>
+</component>

backend/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Application
+

backend/build.gradle

@@ -13,11 +13,30 @@ dependencies {
     compile 'com.github.cliftonlabs:json-simple:3.1.1'
 }
 
+
 dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 }
 
+//create a single Jar with all dependencies
+task fatJar(type: Jar) {
+    manifest {
+        attributes 'Implementation-Title': 'Gradle Jar Package',
+                'Implementation-Version': version,
+                'Main-Class': 'Application'
+    }
+    baseName = project.name
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+
+    }
+    from('src/main/java'){
+        include 'resources/*'
+    }
+    with jar
+}
+
 test {
     useJUnitPlatform()
 }

backend/src/main/java/Application.java

@@ -10,15 +10,22 @@ import java.util.Arrays;
 
 public class Application {
 
+
+
     public static void main(String [] args)
     {
+        int port = 8080;
+        //Optionally expect a port number as argument
+        if(args.length > 0)
+            port = Integer.parseInt(args[0]);
 
         Questionnaire vQuestionnaire = getQuestionnaire();
+
         //------------------------------------
         // Start server
         //------------------------------------
         try {
-            HttpServer vServer = HttpServer.create(new InetSocketAddress(8080), 0);
+            HttpServer vServer = HttpServer.create(new InetSocketAddress(port), 0);
             vServer.createContext("/", new ResponseHandler());
             vServer.setExecutor(null);
             vServer.start();

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

@@ -10,7 +10,6 @@ public enum JsonKeys implements JsonKey {
     KEY_DESCRIPTION("description"),
     KEY_NAME("name"),
     KEY_ID("id"),
-    KEY_TRAIT("trait"),
     KEY_TRAITS("traits"),
     KEY_WEIGHT("weight"),
     KEY_RESULTS("results");

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

@@ -28,6 +28,7 @@ public class Question implements Jsonable {
         sQuestions.put(fId, this);
     }
 
+    public UUID getId(){return fId;}
 
     public static Question getForUUID(UUID iId) {
         return sQuestions.get(iId);

backend/src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Application
+

backend/src/test/java/api/ResponseHandlerTest.java

@@ -10,6 +10,14 @@ import static org.junit.jupiter.api.Assertions.*;
 
 class ResponseHandlerTest {
 
+    public String getSessionId(ResponseHandler iResponseHandler){
+        //Get a valid session id
+        SessionController vSessionController = new SessionController();
+        JsonObject vSessionObject = iResponseHandler.getResponse("GET",new String[]{},"", vSessionController);
+        assertTrue(vSessionObject.containsKey("id"));
+        return (String) vSessionObject.get("id");
+    }
+
     @Test
     public void TestGetResponse(){
         ResponseHandler vResponseHandler = new ResponseHandler();
@@ -29,9 +37,7 @@ class ResponseHandlerTest {
 
         //Get a valid session id
         SessionController vSessionController = new SessionController();
-        JsonObject vSessionObject = vResponseHandler.getResponse("GET",new String[]{},"", vSessionController);
-        assertTrue(vSessionObject.containsKey("id"));
-        String vSessionId = (String) vSessionObject.get("id");
+        String vSessionId = getSessionId(vResponseHandler);
 
         //Verify error management in various cases
         String[] vPathSession = new String[]{vSessionId};
@@ -50,6 +56,7 @@ class ResponseHandlerTest {
             assertNotEquals(null, vResponseObject.get("error"));
         }
 
-
     }
+
+
 }

backend/src/test/java/controller/SessionControllerTest.java

@@ -1,4 +1,108 @@
+package controller;
+
+import api.ResponseHandler;
+import com.github.cliftonlabs.json_simple.JsonArray;
+import com.github.cliftonlabs.json_simple.JsonObject;
+import model.personnality.Trait;
+import model.questionnaire.Answer;
+import model.questionnaire.Question;
+import model.questionnaire.Questionnaire;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
 import static org.junit.jupiter.api.Assertions.*;
+
 class SessionControllerTest {
-  
+
+    public String getSessionId(ResponseHandler iResponseHandler){
+        //Get a valid session id
+        SessionController vSessionController = new SessionController();
+        JsonObject vSessionObject = iResponseHandler.getResponse("GET",new String[]{},"", vSessionController);
+        assertTrue(vSessionObject.containsKey("id"));
+        return (String) vSessionObject.get("id");
+    }
+
+    public float getTraitWeight(JsonObject iJsonObject)
+    {
+        return (float) ((JsonObject)((JsonArray)((JsonObject) iJsonObject.get("results")).get("traits")).get(0)).get("weight");
+    }
+
+    @Test
+    public void TestSessionController(){
+        ResponseHandler vHandler = new ResponseHandler();
+        SessionController vController = new SessionController();
+        String vSessionId = getSessionId(vHandler);
+
+        Trait vTrait1 = new Trait("1","desc1");
+        Trait vTrait2 = new Trait("2","desc2");
+
+        Answer vAnswer0 = new Answer("1",vTrait1,0);
+        Answer vAnswerMax = new Answer("2",vTrait1,Float.MAX_VALUE);
+        Answer vAnswerMin = new Answer("3",vTrait1,Float.MIN_VALUE);
+
+        Question vQuestion1 = new Question("1", Arrays.asList(
+                vAnswer0,
+                vAnswerMax,
+                vAnswerMin
+        ));
+        Question vQuestion2 = new Question("2", Arrays.asList(
+                vAnswer0,
+                vAnswerMax,
+                vAnswerMin
+        ));
+
+        Questionnaire vQuestionnaire = new Questionnaire("1",Arrays.asList(
+                vQuestion1,vQuestion2
+        ));
+        //Verify update session question answer
+        JsonObject vObject = new JsonObject().putChain("question",vQuestion1.getId().toString()).putChain("answer",vAnswerMax.getId().toString());
+        try {
+            vController.updateEntry(vSessionId,vObject);
+        } catch (Exception e) {
+            assertNotEquals(false,true);
+            e.printStackTrace();
+        }
+        assertEquals(Float.MAX_VALUE,getTraitWeight(vController.getEntriesForId(vSessionId,null)));
+        try {
+            vController.updateEntry(vSessionId,vObject);
+        } catch (Exception e) {
+            assertNotEquals(false,true);
+            e.printStackTrace();
+        }
+        assertEquals(Float.MAX_VALUE,getTraitWeight(vController.getEntriesForId(vSessionId,null)));
+
+        vObject.putChain("answer", vAnswerMin.getId().toString());
+
+        try {
+            vController.updateEntry(vSessionId,vObject);
+        } catch (Exception e) {
+            assertNotEquals(false,true);
+            e.printStackTrace();
+        }
+        assertEquals(Float.MIN_VALUE,getTraitWeight(vController.getEntriesForId(vSessionId,null)));
+
+        try {
+            vController.updateEntry(vSessionId,vObject);
+        } catch (Exception e) {
+            assertNotEquals(false,true);
+            e.printStackTrace();
+        }
+        assertEquals(Float.MIN_VALUE,getTraitWeight(vController.getEntriesForId(vSessionId,null)));
+
+        vObject.putChain("answer",1);
+        assertThrows(Exception.class, () -> vController.updateEntry(vSessionId,vObject));
+        assertEquals(Float.MIN_VALUE,getTraitWeight(vController.getEntriesForId(vSessionId,null)));
+
+        vObject.putChain("answer","12");
+        assertThrows(Exception.class, () -> vController.updateEntry(vSessionId,vObject));
+        assertEquals(Float.MIN_VALUE,getTraitWeight(vController.getEntriesForId(vSessionId,null)));
+
+        vObject.putChain("answer", UUID.randomUUID().toString());
+        assertThrows(Exception.class, () -> vController.updateEntry(vSessionId,vObject));
+        assertEquals(Float.MIN_VALUE,getTraitWeight(vController.getEntriesForId(vSessionId,null)));
+
+    }
 }

frontend/package-lock.json

@@ -7995,17 +7995,19 @@
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="
     },
     "mini-css-extract-plugin": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.0.tgz",
-      "integrity": "sha512-hWAswjzsausaaIjk4GiUtoiNnsMc8tLAA2TZ0vbMDZcxKYS/b3UBGNElBjgQ4QYztYR+nsKp5h2Lo1NL3zz2bg==",
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.5.tgz",
+      "integrity": "sha512-oEIhRucyn1JbT/1tU2BhnwO6ft1jjH1iCX9Gc59WFMg0n5773rQU0oyQ0zzeYFFuBfONaRbQJyGoPtuNseMxjA==",
+      "dev": true,
       "requires": {
         "schema-utils": "^4.0.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "8.8.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
-          "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
+          "version": "8.9.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
+          "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+          "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "json-schema-traverse": "^1.0.0",
@@ -8017,6 +8019,7 @@
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
           "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+          "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.3"
           }
@@ -8024,12 +8027,14 @@
         "json-schema-traverse": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
         },
         "schema-utils": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
           "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.9",
             "ajv": "^8.8.0",
@@ -9568,6 +9573,13 @@
         "webpack-dev-server": "^4.6.0",
         "webpack-manifest-plugin": "^4.0.2",
         "workbox-webpack-plugin": "^6.4.1"
+      },
+      "dependencies": {
+        "mini-css-extract-plugin": {
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.5.tgz",
+          "integrity": "sha512-oEIhRucyn1JbT/1tU2BhnwO6ft1jjH1iCX9Gc59WFMg0n5773rQU0oyQ0zzeYFFuBfONaRbQJyGoPtuNseMxjA=="
+        }
       }
     },
     "readable-stream": {

frontend/package.json

@@ -2,6 +2,7 @@
   "name": "frontend",
   "version": "0.1.0",
   "private": true,
+  "homepage": "https://demisel.space/teamway",
   "dependencies": {
     "@nivo/core": "^0.79.0",
     "@nivo/radar": "^0.79.1",

frontend/src/component/question.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import url from '../server';
-import Questionnaire from './questionnaire';
 
 function Question(props){
     let current_question = props.questions[props.index];

frontend/src/component/questionnaire_result.js

@@ -1,5 +1,4 @@
 import React from 'react';
-import { createPortal } from 'react-dom';
 import url from '../server';
 import {ResponsiveRadar} from "@nivo/radar"
 
@@ -44,12 +43,12 @@ function QuestionnaireResult(props){
         })
 
         // two traits : display them on a scale
-        if(radar_data.length == 2)
+        if(radar_data.length === 2)
         {
              
             scale_start = dominant.name;
             
-            scale_end = radar_data[0].trait == scale_start ? radar_data[1].trait : radar_data[0].trait;
+            scale_end = radar_data[0].trait === scale_start ? radar_data[1].trait : radar_data[0].trait;
         }
     }
 
@@ -70,7 +69,7 @@ function QuestionnaireResult(props){
         />
         </div>
         }
-        { radar_data.length == 2 &&
+        { radar_data.length === 2 &&
         <div className="gradient bordered" 
         style={{
             "--data-weight": dominant_weight+"%",

frontend/src/server.js

@@ -1,7 +1,7 @@
 let url = "";
 switch(process.env.NODE_ENV) {
   case 'production':
-    url = 'https://demisel.space/garage/';
+    url = 'https://demisel.space/teamway/garage/';
     break;
   case 'development':
   default: