From 782c158a94e6c1b87931e67b90ed0148b4319204 Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Thu, 7 Jun 2018 15:55:31 +0200
Subject: [PATCH] test: trying to get a JSON formatted quiz from REST
"QuizView". Reordered classes in model
---
.../gf/core/management/Management.java | 2 +-
.../gf/core/management/ManagementImpl.java | 2 +-
.../gf/interfaces/IPeerAssessment.java | 8 ++---
.../assessment/controller/AssessmentDAO.java | 2 ++
.../assessment/controller/FBAssessement.java | 5 +++
.../controller/{ => model}/Assessment.java | 2 +-
.../controller/{ => model}/Performance.java | 2 +-
.../controller/{ => model}/Quiz.java | 2 +-
.../{ => model}/StudentIdentifier.java | 2 +-
.../assessment/controller/view/QuizView.java | 34 +++++++++++++++++++
.../modules/assessment/TestAddAssessment.java | 6 ++--
11 files changed, 54 insertions(+), 13 deletions(-)
rename gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/{ => model}/Assessment.java (93%)
rename gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/{ => model}/Performance.java (94%)
rename gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/{ => model}/Quiz.java (94%)
rename gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/{ => model}/StudentIdentifier.java (92%)
create mode 100644 gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java
index dd4ebf43..1b00ee2a 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java
+++ b/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.
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
index dfffd4df..edb82a05 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
+++ b/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;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
index b0841862..7d1fcf48 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
@@ -1,9 +1,9 @@
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.
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/AssessmentDAO.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/AssessmentDAO.java
index ed7b43d3..92ddd91f 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/AssessmentDAO.java
+++ b/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.
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/FBAssessement.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/FBAssessement.java
index 0890abdc..57886716 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/FBAssessement.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/FBAssessement.java
@@ -1,5 +1,10 @@
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.
*/
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Assessment.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java
similarity index 93%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Assessment.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java
index bfd450bc..4fc53113 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Assessment.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java
@@ -1,4 +1,4 @@
-package unipotsdam.gf.modules.assessment.controller;
+package unipotsdam.gf.modules.assessment.controller.model;
public class Assessment {
private StudentIdentifier student;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Performance.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Performance.java
similarity index 94%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Performance.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Performance.java
index 7e05864f..4091c316 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Performance.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Performance.java
@@ -1,4 +1,4 @@
-package unipotsdam.gf.modules.assessment.controller;
+package unipotsdam.gf.modules.assessment.controller.model;
import java.util.Arrays;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Quiz.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Quiz.java
similarity index 94%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Quiz.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Quiz.java
index cc3bab96..fd5f5f5c 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Quiz.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Quiz.java
@@ -1,4 +1,4 @@
-package unipotsdam.gf.modules.assessment.controller;
+package unipotsdam.gf.modules.assessment.controller.model;
public class Quiz {
private String type;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/StudentIdentifier.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/StudentIdentifier.java
similarity index 92%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/StudentIdentifier.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/StudentIdentifier.java
index 05799b86..3a382e64 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/StudentIdentifier.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/StudentIdentifier.java
@@ -1,4 +1,4 @@
-package unipotsdam.gf.modules.assessment.controller;
+package unipotsdam.gf.modules.assessment.controller.model;
public class StudentIdentifier {
private String projectId;
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
new file mode 100644
index 00000000..b2c1b178
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
@@ -0,0 +1,34 @@
+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;
+ }
+}
diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java
index 78071ead..ba96ab29 100644
--- a/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/assessment/TestAddAssessment.java
+++ b/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 {
--
GitLab