test: trying to get a JSON formatted quiz from REST "QuizView". Reordered classes in model

gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java

@@ -4,7 +4,7 @@ import unipotsdam.gf.core.management.project.Project;
 import unipotsdam.gf.core.management.user.User;
 import unipotsdam.gf.core.management.user.UserInterests;
 import unipotsdam.gf.core.management.user.UserProfile;
-import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
 
 /**
  * Created by dehne on 31.05.2018.

gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java

@@ -6,7 +6,7 @@ import unipotsdam.gf.core.management.project.Project;
 import unipotsdam.gf.core.management.user.User;
 import unipotsdam.gf.core.management.user.UserInterests;
 import unipotsdam.gf.core.management.user.UserProfile;
-import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
 
 import java.util.ArrayList;
 import java.util.List;

gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java

 package unipotsdam.gf.interfaces;
 
-import unipotsdam.gf.modules.assessment.controller.Assessment;
-import unipotsdam.gf.modules.assessment.controller.Performance;
-import unipotsdam.gf.modules.assessment.controller.Quiz;
-import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
+import unipotsdam.gf.modules.assessment.controller.model.Assessment;
+import unipotsdam.gf.modules.assessment.controller.model.Performance;
+import unipotsdam.gf.modules.assessment.controller.model.Quiz;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
 
 /**
  * Created by dehne on 18.05.2018.

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/AssessmentDAO.java

@@ -2,6 +2,8 @@ package unipotsdam.gf.modules.assessment.controller;
 
 
 import unipotsdam.gf.interfaces.IPeerAssessment;
+import unipotsdam.gf.modules.assessment.controller.model.Assessment;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
 
 /**
  * Created by dehne on 18.05.2018.

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/FBAssessement.java

 package unipotsdam.gf.modules.assessment.controller;
 
+import unipotsdam.gf.modules.assessment.controller.model.Assessment;
+import unipotsdam.gf.modules.assessment.controller.model.Performance;
+import unipotsdam.gf.modules.assessment.controller.model.Quiz;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
+
 /**
  * Created by dehne on 18.05.2018.
  */

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Assessment.java → gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java

-package unipotsdam.gf.modules.assessment.controller;
+package unipotsdam.gf.modules.assessment.controller.model;
 
 public class Assessment {
     private StudentIdentifier student;

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Performance.java → gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Performance.java

-package unipotsdam.gf.modules.assessment.controller;
+package unipotsdam.gf.modules.assessment.controller.model;
 
 import java.util.Arrays;
 

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Quiz.java → gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Quiz.java

-package unipotsdam.gf.modules.assessment.controller;
+package unipotsdam.gf.modules.assessment.controller.model;
 
 public class Quiz {
     private String type;

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/StudentIdentifier.java → gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/StudentIdentifier.java

-package unipotsdam.gf.modules.assessment.controller;
+package unipotsdam.gf.modules.assessment.controller.model;
 
 public class StudentIdentifier {
     private String projectId;

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java

+package unipotsdam.gf.modules.assessment.controller.view;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import unipotsdam.gf.modules.assessment.controller.model.Quiz;
+import unipotsdam.gf.modules.communication.model.SampleAnswer;
+import unipotsdam.gf.modules.communication.service.SampleService;
+import unipotsdam.gf.modules.communication.view.SampleView;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+
+@Path("/rest")
+class QuizView {
+
+
+    Logger log = LoggerFactory.getLogger(SampleView.class);
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    @Path("/quiz/{projectId}/{quizId}")
+    public Quiz exampleQuiz(@PathParam("projectId") String name,@PathParam("quizId") String quiz) {
+        String[] correctAnswers = new String[2];
+        correctAnswers[0] = "42";
+        correctAnswers[1] = "24";
+        String[] wrongAnswers = {"a god created creature", "a some of my mistakes"};
+        Quiz sampleQuiz = new Quiz("multiple","Who am I and if so, how many?", correctAnswers,wrongAnswers);
+        log.info("HelloWorldview helloWorld Method answered: "+ sampleQuiz.toString());
+        return sampleQuiz;
+    }
+}

gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java

@@ -2,10 +2,10 @@ package unipotsdam.gf.modules.assessment;
 
 import org.junit.Test;
 import unipotsdam.gf.interfaces.IPeerAssessment;
-import unipotsdam.gf.modules.assessment.controller.Assessment;
+import unipotsdam.gf.modules.assessment.controller.model.Assessment;
 import unipotsdam.gf.modules.assessment.controller.FBAssessement;
-import unipotsdam.gf.modules.assessment.controller.Performance;
-import unipotsdam.gf.modules.assessment.controller.StudentIdentifier;
+import unipotsdam.gf.modules.assessment.controller.model.Performance;
+import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
 
 public class TestAddAssessment {