From 022027573ae1f013754bd475b06369906c8b9296 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Sat, 10 Feb 2018 11:13:10 +0100
Subject: [PATCH] Refactor all layers again to use new names
Some legacy identifiers remain very persistently.
---
.../controller/v2/CommentController.java | 28 +-
.../controller/v2/ContentController.java | 424 +++++++++---------
.../arsnova/controller/v2/RoomController.java | 8 +-
.../thm/arsnova/services/ContentService.java | 32 +-
.../arsnova/services/ContentServiceImpl.java | 38 +-
.../websocket/ArsnovaSocketioServerImpl.java | 8 +-
6 files changed, 269 insertions(+), 269 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/v2/CommentController.java b/src/main/java/de/thm/arsnova/controller/v2/CommentController.java
index e7476e865..d79b860ca 100644
--- a/src/main/java/de/thm/arsnova/controller/v2/CommentController.java
+++ b/src/main/java/de/thm/arsnova/controller/v2/CommentController.java
@@ -66,13 +66,13 @@ public class CommentController extends PaginationController {
@Autowired
private FromV2Migrator fromV2Migrator;
- @ApiOperation(value = "Count all the comments in current session",
+ @ApiOperation(value = "Count all the comments in current room",
nickname = "getCommentCount")
@RequestMapping(value = "/count", method = RequestMethod.GET)
@DeprecatedApi
@Deprecated
- public int getCommentCount(@ApiParam(value = "Room-Key from current session", required = true) @RequestParam final String sessionkey) {
- return commentService.count(sessionkey);
+ public int getCommentCount(@ApiParam(value = "Room-Key from current room", required = true) @RequestParam("sessionkey") final String roomShortId) {
+ return commentService.count(roomShortId);
}
@ApiOperation(value = "count all unread comments",
@@ -80,24 +80,24 @@ public class CommentController extends PaginationController {
@RequestMapping(value = "/readcount", method = RequestMethod.GET)
@DeprecatedApi
@Deprecated
- public CommentReadingCount getUnreadCommentCount(@ApiParam(value = "Room-Key from current session", required = true) @RequestParam("sessionkey") final String sessionkey, String user) {
- return commentService.countRead(sessionkey, user);
+ public CommentReadingCount getUnreadCommentCount(@ApiParam(value = "Room-Key from current room", required = true) @RequestParam("sessionkey") final String roomShortId, String user) {
+ return commentService.countRead(roomShortId, user);
}
@ApiOperation(value = "Retrieves all Comments for a Room",
nickname = "getComments")
@RequestMapping(value = "/", method = RequestMethod.GET)
@Pagination
- public List<Comment> getComments(@ApiParam(value = "Room-Key from current session", required = true) @RequestParam final String sessionkey) {
- return commentService.getByRoomShortId(sessionkey, offset, limit).stream()
+ public List<Comment> getComments(@ApiParam(value = "Room-Key from current room", required = true) @RequestParam("sessionkey") final String roomShortId) {
+ return commentService.getByRoomShortId(roomShortId, offset, limit).stream()
.map(toV2Migrator::migrate).collect(Collectors.toList());
}
@ApiOperation(value = "Retrieves an Comment",
nickname = "getComment")
- @RequestMapping(value = "/{questionId}", method = RequestMethod.GET)
- public Comment getComment(@ApiParam(value = "ID of the Comment that needs to be deleted", required = true) @PathVariable final String questionId) {
- return toV2Migrator.migrate(commentService.getAndMarkRead(questionId));
+ @RequestMapping(value = "/{commentId}", method = RequestMethod.GET)
+ public Comment getComment(@ApiParam(value = "ID of the Comment that needs to be deleted", required = true) @PathVariable final String commentId) {
+ return toV2Migrator.migrate(commentService.getAndMarkRead(commentId));
}
@ApiOperation(value = "Creates a new Comment for a Room and returns the Comment's data",
@@ -108,7 +108,7 @@ public class CommentController extends PaginationController {
@RequestMapping(value = "/", method = RequestMethod.POST)
@ResponseStatus(HttpStatus.CREATED)
public void postComment(
- @ApiParam(value = "Room-Key from current session", required = true) @RequestParam final String sessionkey,
+ @ApiParam(value = "Room-Key from current room", required = true) @RequestParam("sessionkey") final String roomShortId,
@ApiParam(value = "the body from the new comment", required = true) @RequestBody final Comment comment
) {
UserProfile profile = userService.getByUsername(comment.getCreator());
@@ -121,8 +121,8 @@ public class CommentController extends PaginationController {
@ApiOperation(value = "Deletes a Comment",
nickname = "deleteComment")
- @RequestMapping(value = "/{questionId}", method = RequestMethod.DELETE)
- public void deleteComment(@ApiParam(value = "ID of the comment that needs to be deleted", required = true) @PathVariable final String questionId) {
- commentService.delete(questionId);
+ @RequestMapping(value = "/{commentId}", method = RequestMethod.DELETE)
+ public void deleteComment(@ApiParam(value = "ID of the comment that needs to be deleted", required = true) @PathVariable final String commentId) {
+ commentService.delete(commentId);
}
}
diff --git a/src/main/java/de/thm/arsnova/controller/v2/ContentController.java b/src/main/java/de/thm/arsnova/controller/v2/ContentController.java
index 074b1a02b..c83c07b66 100644
--- a/src/main/java/de/thm/arsnova/controller/v2/ContentController.java
+++ b/src/main/java/de/thm/arsnova/controller/v2/ContentController.java
@@ -57,7 +57,7 @@ import java.util.List;
import java.util.stream.Collectors;
/**
- * Handles requests related to questions teachers are asking their students.
+ * Handles requests related to contents.
*/
@RestController("v2ContentController")
@RequestMapping("/v2/lecturerquestion")
@@ -75,14 +75,14 @@ public class ContentController extends PaginationController {
@Autowired
private FromV2Migrator fromV2Migrator;
- @ApiOperation(value = "Get question with provided question Id",
- nickname = "getQuestion")
+ @ApiOperation(value = "Get content with provided content Id",
+ nickname = "getContent")
@ApiResponses(value = {
@ApiResponse(code = 404, message = HTML_STATUS_404)
})
- @RequestMapping(value = "/{questionId}", method = RequestMethod.GET)
- public Content getQuestion(@PathVariable final String questionId) {
- final de.thm.arsnova.entities.Content content = contentService.get(questionId);
+ @RequestMapping(value = "/{contentId}", method = RequestMethod.GET)
+ public Content getContent(@PathVariable final String contentId) {
+ final de.thm.arsnova.entities.Content content = contentService.get(contentId);
if (content != null) {
return toV2Migrator.migrate(content);
}
@@ -91,13 +91,13 @@ public class ContentController extends PaginationController {
}
@ApiOperation(value = "Post provided content",
- nickname = "postQuestion")
+ nickname = "postContent")
@ApiResponses(value = {
@ApiResponse(code = 400, message = HTML_STATUS_400)
})
@RequestMapping(value = "/", method = RequestMethod.POST)
@ResponseStatus(HttpStatus.CREATED)
- public Content postQuestion(@RequestBody final Content content) {
+ public Content postContent(@RequestBody final Content content) {
de.thm.arsnova.entities.Content contentV3 = fromV2Migrator.migrate(content);
if (contentService.save(contentV3) != null) {
return toV2Migrator.migrate(contentV3);
@@ -105,26 +105,26 @@ public class ContentController extends PaginationController {
throw new BadRequestException();
}
- @ApiOperation(value = "Post provided contents", nickname = "bulkPostQuestions")
+ @ApiOperation(value = "Post provided contents", nickname = "bulkPostContents")
@ApiResponses(value = {
@ApiResponse(code = 400, message = HTML_STATUS_400)
})
@RequestMapping(value = "/bulk", method = RequestMethod.POST)
@ResponseStatus(HttpStatus.CREATED)
- public List<Content> bulkPostQuestions(@RequestBody final List<Content> contents) {
+ public List<Content> bulkPostContents(@RequestBody final List<Content> contents) {
List<de.thm.arsnova.entities.Content> contentsV3 =
contents.stream().map(c -> contentService.save(fromV2Migrator.migrate(c))).collect(Collectors.toList());
return contentsV3.stream().map(toV2Migrator::migrate).collect(Collectors.toList());
}
@ApiOperation(value = "Update the content, identified by provided id, with the provided content in the Request Body",
- nickname = "updateQuestion")
+ nickname = "updateContent")
@ApiResponses(value = {
@ApiResponse(code = 400, message = HTML_STATUS_400)
})
- @RequestMapping(value = "/{questionId}", method = RequestMethod.PUT)
- public Content updateQuestion(
- @PathVariable final String questionId,
+ @RequestMapping(value = "/{contentId}", method = RequestMethod.PUT)
+ public Content updateContent(
+ @PathVariable final String contentId,
@RequestBody final Content content
) {
try {
@@ -134,53 +134,53 @@ public class ContentController extends PaginationController {
}
}
- @ApiOperation(value = "Start new Pi Round on question, identified by provided id, with an optional time",
+ @ApiOperation(value = "Start new Pi Round on content, identified by provided id, with an optional time",
nickname = "startPiRound")
- @RequestMapping(value = "/{questionId}/questionimage", method = RequestMethod.GET)
- public String getQuestionImage(
- @PathVariable final String questionId,
+ @RequestMapping(value = "/{contentId}/questionimage", method = RequestMethod.GET)
+ public String getContentImage(
+ @PathVariable final String contentId,
@RequestParam(value = "fcImage", defaultValue = "false", required = false) final boolean fcImage
) {
throw new NotImplementedException();
}
- @RequestMapping(value = "/{questionId}/startnewpiround", method = RequestMethod.POST)
+ @RequestMapping(value = "/{contentId}/startnewpiround", method = RequestMethod.POST)
public void startPiRound(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
@RequestParam(value = "time", defaultValue = "0", required = false) final int time
) {
if (time == 0) {
- timerService.startNewRound(questionId, null);
+ timerService.startNewRound(contentId, null);
} else {
- timerService.startNewRoundDelayed(questionId, time);
+ timerService.startNewRoundDelayed(contentId, time);
}
}
- @RequestMapping(value = "/{questionId}/canceldelayedpiround", method = RequestMethod.POST)
- @ApiOperation(value = "Cancel Pi Round on question, identified by provided id",
+ @RequestMapping(value = "/{contentId}/canceldelayedpiround", method = RequestMethod.POST)
+ @ApiOperation(value = "Cancel Pi Round on content, identified by provided id",
nickname = "cancelPiRound")
public void cancelPiRound(
- @PathVariable final String questionId
+ @PathVariable final String contentId
) {
- timerService.cancelRoundChange(questionId);
+ timerService.cancelRoundChange(contentId);
}
- @RequestMapping(value = "/{questionId}/resetpiroundstate", method = RequestMethod.POST)
- @ApiOperation(value = "Reset Pi Round on question, identified by provided id",
- nickname = "resetPiQuestion")
- public void resetPiQuestion(
- @PathVariable final String questionId
+ @RequestMapping(value = "/{contentId}/resetpiroundstate", method = RequestMethod.POST)
+ @ApiOperation(value = "Reset Pi Round on content, identified by provided id",
+ nickname = "resetPiContent")
+ public void resetPiContent(
+ @PathVariable final String contentId
) {
- timerService.resetRoundState(questionId);
+ timerService.resetRoundState(contentId);
}
- @ApiOperation(value = "Set voting admission on question, identified by provided id",
+ @ApiOperation(value = "Set voting admission on content, identified by provided id",
nickname = "setVotingAdmission")
- @RequestMapping(value = "/{questionId}/disablevote", method = RequestMethod.POST)
+ @RequestMapping(value = "/{contentId}/disablevote", method = RequestMethod.POST)
public void setVotingAdmission(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
@RequestParam(value = "disable", defaultValue = "false", required = false) final Boolean disableVote
) {
boolean disable = false;
@@ -189,17 +189,17 @@ public class ContentController extends PaginationController {
disable = disableVote;
}
- contentService.setVotingAdmission(questionId, disable);
+ contentService.setVotingAdmission(contentId, disable);
}
- @ApiOperation(value = "Set voting admission for all questions",
- nickname = "setVotingAdmissionForAllQuestions")
+ @ApiOperation(value = "Set voting admission for all contents",
+ nickname = "setVotingAdmissionForAllContents")
@RequestMapping(value = "/disablevote", method = RequestMethod.POST)
- public void setVotingAdmissionForAllQuestions(
- @RequestParam final String sessionkey,
+ public void setVotingAdmissionForAllContents(
+ @RequestParam(value = "sessionkey") final String roomShortId,
@RequestParam(value = "disable", defaultValue = "false", required = false) final Boolean disableVote,
- @RequestParam(value = "lecturequestionsonly", defaultValue = "false", required = false) final boolean lectureQuestionsOnly,
- @RequestParam(value = "preparationquestionsonly", defaultValue = "false", required = false) final boolean preparationQuestionsOnly
+ @RequestParam(value = "lecturequestionsonly", defaultValue = "false", required = false) final boolean lectureContentsOnly,
+ @RequestParam(value = "preparationquestionsonly", defaultValue = "false", required = false) final boolean preparationContentsOnly
) {
boolean disable = false;
List<de.thm.arsnova.entities.Content> contents;
@@ -208,22 +208,22 @@ public class ContentController extends PaginationController {
disable = disableVote;
}
- if (lectureQuestionsOnly) {
- contents = contentService.getLectureQuestions(sessionkey);
- contentService.setVotingAdmissions(sessionkey, disable, contents);
- } else if (preparationQuestionsOnly) {
- contents = contentService.getPreparationQuestions(sessionkey);
- contentService.setVotingAdmissions(sessionkey, disable, contents);
+ if (lectureContentsOnly) {
+ contents = contentService.getLectureContents(roomShortId);
+ contentService.setVotingAdmissions(roomShortId, disable, contents);
+ } else if (preparationContentsOnly) {
+ contents = contentService.getPreparationContents(roomShortId);
+ contentService.setVotingAdmissions(roomShortId, disable, contents);
} else {
- contentService.setVotingAdmissionForAllContents(sessionkey, disable);
+ contentService.setVotingAdmissionForAllContents(roomShortId, disable);
}
}
@ApiOperation(value = "Publish a content, identified by provided id and content in Request Body.",
- nickname = "publishQuestion")
- @RequestMapping(value = "/{questionId}/publish", method = RequestMethod.POST)
- public void publishQuestion(
- @PathVariable final String questionId,
+ nickname = "publishContent")
+ @RequestMapping(value = "/{contentId}/publish", method = RequestMethod.POST)
+ public void publishContent(
+ @PathVariable final String contentId,
@RequestParam(required = false) final Boolean publish,
@RequestBody final Content content
) {
@@ -234,34 +234,34 @@ public class ContentController extends PaginationController {
contentService.update(contentV3);
}
- @ApiOperation(value = "Publish all questions",
- nickname = "publishAllQuestions")
+ @ApiOperation(value = "Publish all contents",
+ nickname = "publishAllContents")
@RequestMapping(value = "/publish", method = RequestMethod.POST)
- public void publishAllQuestions(
- @RequestParam final String sessionkey,
+ public void publishAllContents(
+ @RequestParam(value = "sessionkey") final String roomShortId,
@RequestParam(required = false) final Boolean publish,
- @RequestParam(value = "lecturequestionsonly", defaultValue = "false", required = false) final boolean lectureQuestionsOnly,
- @RequestParam(value = "preparationquestionsonly", defaultValue = "false", required = false) final boolean preparationQuestionsOnly
+ @RequestParam(value = "lecturequestionsonly", defaultValue = "false", required = false) final boolean lectureContentsOnly,
+ @RequestParam(value = "preparationquestionsonly", defaultValue = "false", required = false) final boolean preparationContentsOnly
) {
boolean p = publish == null || publish;
List<de.thm.arsnova.entities.Content> contents;
- if (lectureQuestionsOnly) {
- contents = contentService.getLectureQuestions(sessionkey);
- contentService.publishQuestions(sessionkey, p, contents);
- } else if (preparationQuestionsOnly) {
- contents = contentService.getPreparationQuestions(sessionkey);
- contentService.publishQuestions(sessionkey, p, contents);
+ if (lectureContentsOnly) {
+ contents = contentService.getLectureContents(roomShortId);
+ contentService.publishContents(roomShortId, p, contents);
+ } else if (preparationContentsOnly) {
+ contents = contentService.getPreparationContents(roomShortId);
+ contentService.publishContents(roomShortId, p, contents);
} else {
- contentService.publishAll(sessionkey, p);
+ contentService.publishAll(roomShortId, p);
}
}
@ApiOperation(value = "Publish statistics from content with provided id",
nickname = "publishStatistics")
- @RequestMapping(value = "/{questionId}/publishstatistics", method = RequestMethod.POST)
+ @RequestMapping(value = "/{contentId}/publishstatistics", method = RequestMethod.POST)
public void publishStatistics(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
@RequestParam(required = false) final Boolean showStatistics,
@RequestBody final Content content
) {
@@ -274,9 +274,9 @@ public class ContentController extends PaginationController {
@ApiOperation(value = "Publish correct answer from content with provided id",
nickname = "publishCorrectAnswer")
- @RequestMapping(value = "/{questionId}/publishcorrectanswer", method = RequestMethod.POST)
+ @RequestMapping(value = "/{contentId}/publishcorrectanswer", method = RequestMethod.POST)
public void publishCorrectAnswer(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
@RequestParam(required = false) final Boolean showCorrectAnswer,
@RequestBody final Content content
) {
@@ -287,27 +287,27 @@ public class ContentController extends PaginationController {
contentService.update(contentV3);
}
- @ApiOperation(value = "Get skill questions",
- nickname = "getSkillQuestions")
+ @ApiOperation(value = "Get contents",
+ nickname = "getContents")
@RequestMapping(value = "/", method = RequestMethod.GET)
@Pagination
- public List<Content> getSkillQuestions(
- @RequestParam final String sessionkey,
- @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureQuestionsOnly,
+ public List<Content> getContents(
+ @RequestParam(value = "sessionkey") final String roomShortId,
+ @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureContentsOnly,
@RequestParam(value = "flashcardsonly", defaultValue = "false") final boolean flashcardsOnly,
- @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationQuestionsOnly,
+ @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationContentsOnly,
@RequestParam(value = "requestImageData", defaultValue = "false") final boolean requestImageData,
final HttpServletResponse response
) {
List<de.thm.arsnova.entities.Content> contents;
- if (lectureQuestionsOnly) {
- contents = contentService.getLectureQuestions(sessionkey);
+ if (lectureContentsOnly) {
+ contents = contentService.getLectureContents(roomShortId);
} else if (flashcardsOnly) {
- contents = contentService.getFlashcards(sessionkey);
- } else if (preparationQuestionsOnly) {
- contents = contentService.getPreparationQuestions(sessionkey);
+ contents = contentService.getFlashcards(roomShortId);
+ } else if (preparationContentsOnly) {
+ contents = contentService.getPreparationContents(roomShortId);
} else {
- contents = contentService.getByRoomShortId(sessionkey);
+ contents = contentService.getByRoomShortId(roomShortId);
}
if (contents == null || contents.isEmpty()) {
response.setStatus(HttpStatus.NO_CONTENT.value());
@@ -318,75 +318,75 @@ public class ContentController extends PaginationController {
contents.stream().map(toV2Migrator::migrate).collect(Collectors.toList()), offset, limit);
}
- @ApiOperation(value = "Delete skill questions",
- nickname = "deleteSkillQuestions")
+ @ApiOperation(value = "Delete contents",
+ nickname = "deleteContents")
@RequestMapping(value = { "/" }, method = RequestMethod.DELETE)
- public void deleteSkillQuestions(
- @RequestParam final String sessionkey,
- @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureQuestionsOnly,
+ public void deleteContents(
+ @RequestParam(value = "sessionkey") final String roomShortId,
+ @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureContentsOnly,
@RequestParam(value = "flashcardsonly", defaultValue = "false") final boolean flashcardsOnly,
- @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationQuestionsOnly,
+ @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationContentsOnly,
final HttpServletResponse response
) {
- if (lectureQuestionsOnly) {
- contentService.deleteLectureQuestions(sessionkey);
- } else if (preparationQuestionsOnly) {
- contentService.deletePreparationQuestions(sessionkey);
+ if (lectureContentsOnly) {
+ contentService.deleteLectureContents(roomShortId);
+ } else if (preparationContentsOnly) {
+ contentService.deletePreparationContents(roomShortId);
} else if (flashcardsOnly) {
- contentService.deleteFlashcards(sessionkey);
+ contentService.deleteFlashcards(roomShortId);
} else {
- contentService.deleteAllContent(sessionkey);
+ contentService.deleteAllContents(roomShortId);
}
}
- @ApiOperation(value = "Get the amount of skill questions by the sessionkey",
- nickname = "getSkillQuestionCount")
+ @ApiOperation(value = "Get the amount of contents by the room-key",
+ nickname = "getContentCount")
@DeprecatedApi
@Deprecated
@RequestMapping(value = "/count", method = RequestMethod.GET)
- public int getSkillQuestionCount(
- @RequestParam final String sessionkey,
- @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureQuestionsOnly,
+ public int getContentCount(
+ @RequestParam(value = "sessionkey") final String roomShortId,
+ @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureContentsOnly,
@RequestParam(value = "flashcardsonly", defaultValue = "false") final boolean flashcardsOnly,
- @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationQuestionsOnly
+ @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationContentsOnly
) {
- if (lectureQuestionsOnly) {
- return contentService.countLectureQuestions(sessionkey);
- } else if (preparationQuestionsOnly) {
- return contentService.countPreparationQuestions(sessionkey);
+ if (lectureContentsOnly) {
+ return contentService.countLectureContents(roomShortId);
+ } else if (preparationContentsOnly) {
+ return contentService.countPreparationContents(roomShortId);
} else if (flashcardsOnly) {
- return contentService.countFlashcards(sessionkey);
+ return contentService.countFlashcards(roomShortId);
} else {
- return contentService.countByRoomShortId(sessionkey);
+ return contentService.countByRoomShortId(roomShortId);
}
}
- @ApiOperation(value = "Delete answers and questions",
- nickname = "deleteAnswersAndQuestion")
- @RequestMapping(value = "/{questionId}", method = RequestMethod.DELETE)
- public void deleteAnswersAndQuestion(
- @PathVariable final String questionId
+ @ApiOperation(value = "Delete answers and content",
+ nickname = "deleteAnswersAndContent")
+ @RequestMapping(value = "/{contentId}", method = RequestMethod.DELETE)
+ public void deleteAnswersAndContent(
+ @PathVariable final String contentId
) {
- contentService.delete(questionId);
+ contentService.delete(contentId);
}
- @ApiOperation(value = "Get unanswered skill question ID by provided session ID",
- nickname = "getUnAnsweredSkillQuestionIds")
+ @ApiOperation(value = "Get unanswered content IDs by provided room short ID",
+ nickname = "getUnAnsweredContentIds")
@DeprecatedApi
@Deprecated
@RequestMapping(value = "/unanswered", method = RequestMethod.GET)
- public List<String> getUnAnsweredSkillQuestionIds(
- @RequestParam final String sessionkey,
- @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureQuestionsOnly,
- @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationQuestionsOnly
+ public List<String> getUnAnsweredContentIds(
+ @RequestParam(value = "sessionkey") final String roomShortId,
+ @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureContentsOnly,
+ @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationContentsOnly
) {
List<String> answers;
- if (lectureQuestionsOnly) {
- answers = contentService.getUnAnsweredLectureQuestionIds(sessionkey);
- } else if (preparationQuestionsOnly) {
- answers = contentService.getUnAnsweredPreparationQuestionIds(sessionkey);
+ if (lectureContentsOnly) {
+ answers = contentService.getUnAnsweredLectureContentIds(roomShortId);
+ } else if (preparationContentsOnly) {
+ answers = contentService.getUnAnsweredPreparationContentIds(roomShortId);
} else {
- answers = contentService.getUnAnsweredQuestionIds(sessionkey);
+ answers = contentService.getUnAnsweredContentIds(roomShortId);
}
if (answers == null || answers.isEmpty()) {
throw new NoContentException();
@@ -396,29 +396,29 @@ public class ContentController extends PaginationController {
}
/**
- * returns a JSON document which represents the given answer of a question.
+ * returns a JSON document which represents the given answer of a content.
*
- * @param questionId
+ * @param contentId
* CouchDB Content ID for which the given answer should be
* retrieved
* @return JSON Document of {@link Answer} or {@link NotFoundException}
* @throws NotFoundException
- * if wrong session, wrong question or no answer was given by
+ * if wrong room, wrong content or no answer was given by
* the current user
* @throws ForbiddenException
* if not logged in
*/
- @ApiOperation(value = "Get my answer for a question, identified by provided question ID",
+ @ApiOperation(value = "Get my answer for a content, identified by provided content ID",
nickname = "getMyAnswer")
@DeprecatedApi
@Deprecated
- @RequestMapping(value = "/{questionId}/myanswer", method = RequestMethod.GET)
+ @RequestMapping(value = "/{contentId}/myanswer", method = RequestMethod.GET)
public Answer getMyAnswer(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
final HttpServletResponse response
) {
- final de.thm.arsnova.entities.Content content = contentService.get(questionId);
- final de.thm.arsnova.entities.Answer answer = contentService.getMyAnswer(questionId);
+ final de.thm.arsnova.entities.Content content = contentService.get(contentId);
+ final de.thm.arsnova.entities.Answer answer = contentService.getMyAnswer(contentId);
if (answer == null) {
response.setStatus(HttpStatus.NO_CONTENT.value());
return null;
@@ -433,27 +433,27 @@ public class ContentController extends PaginationController {
/**
* returns a list of {@link Answer}s encoded as a JSON document for a given
- * question id. In this case only {@link Answer} <tt>questionId</tt>,
+ * content id. In this case only {@link Answer} <tt>contentId</tt>,
* <tt>answerText</tt>, <tt>answerSubject</tt> and <tt>answerCount</tt>
* properties are set
*
- * @param questionId
+ * @param contentId
* CouchDB Content ID for which the given answers should be
* retrieved
* @throws NotFoundException
- * if wrong session, wrong question or no answers was given
+ * if wrong room, wrong content or no answers was given
* @throws ForbiddenException
* if not logged in
*/
- @ApiOperation(value = "Get answers for a question, identified by provided question ID",
+ @ApiOperation(value = "Get answers for a content, identified by provided content ID",
nickname = "getAnswers")
- @RequestMapping(value = "/{questionId}/answer/", method = RequestMethod.GET)
+ @RequestMapping(value = "/{contentId}/answer/", method = RequestMethod.GET)
public List<Answer> getAnswers(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
@RequestParam(value = "piround", required = false) final Integer piRound,
@RequestParam(value = "all", required = false, defaultValue = "false") final Boolean allAnswers,
final HttpServletResponse response) throws OperationNotSupportedException {
- final de.thm.arsnova.entities.Content content = contentService.get(questionId);
+ final de.thm.arsnova.entities.Content content = contentService.get(contentId);
if (content instanceof ChoiceQuestionContent) {
// FIXME migration needed!
// contentService.getAllStatistics()
@@ -461,16 +461,16 @@ public class ContentController extends PaginationController {
} else {
List<de.thm.arsnova.entities.TextAnswer> answers;
if (allAnswers) {
- answers = contentService.getAllTextAnswers(questionId, -1, -1);
+ answers = contentService.getAllTextAnswers(contentId, -1, -1);
} else if (null == piRound) {
- answers = contentService.getTextAnswers(questionId, offset, limit);
+ answers = contentService.getTextAnswers(contentId, offset, limit);
} else {
if (piRound < 1 || piRound > 2) {
response.setStatus(HttpStatus.BAD_REQUEST.value());
return null;
}
- answers = contentService.getTextAnswers(questionId, piRound, offset, limit);
+ answers = contentService.getTextAnswers(contentId, piRound, offset, limit);
}
if (answers == null) {
return new ArrayList<>();
@@ -479,35 +479,35 @@ public class ContentController extends PaginationController {
}
}
- @ApiOperation(value = "Save answer, provided in the Request Body, for a question, identified by provided question ID",
+ @ApiOperation(value = "Save answer, provided in the Request Body, for a content, identified by provided content ID",
nickname = "saveAnswer")
- @RequestMapping(value = "/{questionId}/answer/", method = RequestMethod.POST)
+ @RequestMapping(value = "/{contentId}/answer/", method = RequestMethod.POST)
public Answer saveAnswer(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
@RequestBody final Answer answer,
final HttpServletResponse response
) {
- final de.thm.arsnova.entities.Content content = contentService.get(questionId);
+ final de.thm.arsnova.entities.Content content = contentService.get(contentId);
final Content contentV2 = toV2Migrator.migrate(content);
final de.thm.arsnova.entities.Answer answerV3 = fromV2Migrator.migrate(answer, contentV2);
if (answerV3 instanceof TextAnswer) {
- return toV2Migrator.migrate((TextAnswer) contentService.saveAnswer(questionId, answerV3));
+ return toV2Migrator.migrate((TextAnswer) contentService.saveAnswer(contentId, answerV3));
} else {
- return toV2Migrator.migrate((ChoiceAnswer) contentService.saveAnswer(questionId, answerV3), (ChoiceQuestionContent) content);
+ return toV2Migrator.migrate((ChoiceAnswer) contentService.saveAnswer(contentId, answerV3), (ChoiceQuestionContent) content);
}
}
- @ApiOperation(value = "Update answer, provided in Request Body, identified by question ID and answer ID",
+ @ApiOperation(value = "Update answer, provided in Request Body, identified by content ID and answer ID",
nickname = "updateAnswer")
- @RequestMapping(value = "/{questionId}/answer/{answerId}", method = RequestMethod.PUT)
+ @RequestMapping(value = "/{contentId}/answer/{answerId}", method = RequestMethod.PUT)
public Answer updateAnswer(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
@PathVariable final String answerId,
@RequestBody final Answer answer,
final HttpServletResponse response
) {
- final de.thm.arsnova.entities.Content content = contentService.get(questionId);
+ final de.thm.arsnova.entities.Content content = contentService.get(contentId);
final Content contentV2 = toV2Migrator.migrate(content);
final de.thm.arsnova.entities.Answer answerV3 = fromV2Migrator.migrate(answer, contentV2);
@@ -518,11 +518,11 @@ public class ContentController extends PaginationController {
}
}
- @ApiOperation(value = "Get Image, identified by question ID and answer ID",
+ @ApiOperation(value = "Get Image, identified by content ID and answer ID",
nickname = "getImage")
- @RequestMapping(value = "/{questionId}/answer/{answerId}/image", method = RequestMethod.GET)
+ @RequestMapping(value = "/{contentId}/answer/{answerId}/image", method = RequestMethod.GET)
public String getImage(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
@PathVariable final String answerId,
final HttpServletResponse response
) {
@@ -530,128 +530,128 @@ public class ContentController extends PaginationController {
throw new NotImplementedException();
}
- @ApiOperation(value = "Delete answer, identified by question ID and answer ID",
+ @ApiOperation(value = "Delete answer, identified by content ID and answer ID",
nickname = "deleteAnswer")
- @RequestMapping(value = "/{questionId}/answer/{answerId}", method = RequestMethod.DELETE)
+ @RequestMapping(value = "/{contentId}/answer/{answerId}", method = RequestMethod.DELETE)
public void deleteAnswer(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
@PathVariable final String answerId,
final HttpServletResponse response
) {
- contentService.deleteAnswer(questionId, answerId);
+ contentService.deleteAnswer(contentId, answerId);
}
- @ApiOperation(value = "Delete answers from a question, identified by question ID",
+ @ApiOperation(value = "Delete answers from a content, identified by content ID",
nickname = "deleteAnswers")
- @RequestMapping(value = "/{questionId}/answer/", method = RequestMethod.DELETE)
+ @RequestMapping(value = "/{contentId}/answer/", method = RequestMethod.DELETE)
public void deleteAnswers(
- @PathVariable final String questionId,
+ @PathVariable final String contentId,
final HttpServletResponse response
) {
- contentService.deleteAnswers(questionId);
+ contentService.deleteAnswers(contentId);
}
- @ApiOperation(value = "Delete all answers and questions from a session, identified by sessionkey",
- nickname = "deleteAllQuestionsAnswers")
+ @ApiOperation(value = "Delete all answers and contents from a room, identified by room short ID",
+ nickname = "deleteAllContentsAnswers")
@RequestMapping(value = "/answers", method = RequestMethod.DELETE)
- public void deleteAllQuestionsAnswers(
- @RequestParam final String sessionkey,
- @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureQuestionsOnly,
- @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationQuestionsOnly,
+ public void deleteAllContentsAnswers(
+ @RequestParam(value = "sessionkey") final String roomShortId,
+ @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureContentsOnly,
+ @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationContentsOnly,
final HttpServletResponse response
) {
- if (lectureQuestionsOnly) {
- contentService.deleteAllLectureAnswers(sessionkey);
- } else if (preparationQuestionsOnly) {
- contentService.deleteAllPreparationAnswers(sessionkey);
+ if (lectureContentsOnly) {
+ contentService.deleteAllLectureAnswers(roomShortId);
+ } else if (preparationContentsOnly) {
+ contentService.deleteAllPreparationAnswers(roomShortId);
} else {
- contentService.deleteAllQuestionsAnswers(sessionkey);
+ contentService.deleteAllContentsAnswers(roomShortId);
}
}
/**
*
- * @param questionId
- * CouchDB Content ID for which the given answers should be
+ * @param contentId
+ * Content ID for which the given answers should be
* retrieved
- * @return count of answers for given question id
+ * @return count of answers for given content ID
* @throws NotFoundException
- * if wrong session or wrong question
+ * if wrong room or wrong content
* @throws ForbiddenException
* if not logged in
*/
- @ApiOperation(value = "Get the amount of answers for a question, identified by question ID",
+ @ApiOperation(value = "Get the amount of answers for a content, identified by content ID",
nickname = "getAnswerCount")
@DeprecatedApi
@Deprecated
- @RequestMapping(value = "/{questionId}/answercount", method = RequestMethod.GET)
- public int getAnswerCount(@PathVariable final String questionId) {
- return contentService.countAnswersByContentIdAndRound(questionId);
+ @RequestMapping(value = "/{contentId}/answercount", method = RequestMethod.GET)
+ public int getAnswerCount(@PathVariable final String contentId) {
+ return contentService.countAnswersByContentIdAndRound(contentId);
}
- @ApiOperation(value = "Get the amount of answers for a question, identified by the question ID",
+ @ApiOperation(value = "Get the amount of answers for a content, identified by the content ID",
nickname = "getAllAnswerCount")
- @RequestMapping(value = "/{questionId}/allroundanswercount", method = RequestMethod.GET)
- public List<Integer> getAllAnswerCount(@PathVariable final String questionId) {
+ @RequestMapping(value = "/{contentId}/allroundanswercount", method = RequestMethod.GET)
+ public List<Integer> getAllAnswerCount(@PathVariable final String contentId) {
return Arrays.asList(
- contentService.countAnswersByContentIdAndRound(questionId, 1),
- contentService.countAnswersByContentIdAndRound(questionId, 2)
+ contentService.countAnswersByContentIdAndRound(contentId, 1),
+ contentService.countAnswersByContentIdAndRound(contentId, 2)
);
}
- @ApiOperation(value = "Get the total amount of answers by a question, identified by the question ID",
- nickname = "getTotalAnswerCountByQuestion")
- @RequestMapping(value = "/{questionId}/totalanswercount", method = RequestMethod.GET)
- public int getTotalAnswerCountByQuestion(@PathVariable final String questionId) {
- return contentService.countTotalAnswersByContentId(questionId);
+ @ApiOperation(value = "Get the total amount of answers by a content, identified by the content ID",
+ nickname = "getTotalAnswerCountByContent")
+ @RequestMapping(value = "/{contentId}/totalanswercount", method = RequestMethod.GET)
+ public int getTotalAnswerCountByContent(@PathVariable final String contentId) {
+ return contentService.countTotalAnswersByContentId(contentId);
}
- @ApiOperation(value = "Get the amount of answers and abstention answers by a question, identified by the question ID",
+ @ApiOperation(value = "Get the amount of answers and abstention answers by a content, identified by the content ID",
nickname = "getAnswerAndAbstentionCount")
- @RequestMapping(value = "/{questionId}/answerandabstentioncount", method = RequestMethod.GET)
- public List<Integer> getAnswerAndAbstentionCount(@PathVariable final String questionId) {
+ @RequestMapping(value = "/{contentId}/answerandabstentioncount", method = RequestMethod.GET)
+ public List<Integer> getAnswerAndAbstentionCount(@PathVariable final String contentId) {
return Arrays.asList(
- contentService.countAnswersByContentIdAndRound(questionId),
- contentService.countTotalAbstentionsByContentId(questionId)
+ contentService.countAnswersByContentIdAndRound(contentId),
+ contentService.countTotalAbstentionsByContentId(contentId)
);
}
- @ApiOperation(value = "Get all Freetext answers by a question, identified by the question ID",
+ @ApiOperation(value = "Get all Freetext answers by a content, identified by the content ID",
nickname = "getFreetextAnswers")
- @RequestMapping(value = "/{questionId}/freetextanswer/", method = RequestMethod.GET)
+ @RequestMapping(value = "/{contentId}/freetextanswer/", method = RequestMethod.GET)
@Pagination
- public List<Answer> getFreetextAnswers(@PathVariable final String questionId) {
- return contentService.getTextAnswersByContentId(questionId, offset, limit).stream()
+ public List<Answer> getFreetextAnswers(@PathVariable final String contentId) {
+ return contentService.getTextAnswersByContentId(contentId, offset, limit).stream()
.map(toV2Migrator::migrate).collect(Collectors.toList());
}
- @ApiOperation(value = "Get my answers of an session, identified by the sessionkey",
+ @ApiOperation(value = "Get my answers of an room, identified by the room short ID",
nickname = "getMyAnswers")
@DeprecatedApi
@Deprecated
@RequestMapping(value = "/myanswers", method = RequestMethod.GET)
- public List<Answer> getMyAnswers(@RequestParam final String sessionkey) throws OperationNotSupportedException {
+ public List<Answer> getMyAnswers(@RequestParam(value = "sessionkey") final String roomShortId) throws OperationNotSupportedException {
throw new OperationNotSupportedException();
-// return contentService.getMyAnswersByRoomShortId(sessionkey).stream()
+// return contentService.getMyAnswersByRoomShortId(roomShortId).stream()
// .map(toV2Migrator::migrate).collect(Collectors.toList());
}
- @ApiOperation(value = "Get the total amount of answers of an session, identified by the sessionkey",
+ @ApiOperation(value = "Get the total amount of answers of a room, identified by the room short ID",
nickname = "getTotalAnswerCount")
@DeprecatedApi
@Deprecated
@RequestMapping(value = "/answercount", method = RequestMethod.GET)
public int getTotalAnswerCount(
- @RequestParam final String sessionkey,
- @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureQuestionsOnly,
- @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationQuestionsOnly
+ @RequestParam(value = "sessionkey") final String roomShortId,
+ @RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureContentsOnly,
+ @RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationContentsOnly
) {
- if (lectureQuestionsOnly) {
- return contentService.countLectureQuestionAnswers(sessionkey);
- } else if (preparationQuestionsOnly) {
- return contentService.countPreparationQuestionAnswers(sessionkey);
+ if (lectureContentsOnly) {
+ return contentService.countLectureContentAnswers(roomShortId);
+ } else if (preparationContentsOnly) {
+ return contentService.countPreparationContentAnswers(roomShortId);
} else {
- return contentService.countTotalAnswersByRoomShortId(sessionkey);
+ return contentService.countTotalAnswersByRoomShortId(roomShortId);
}
}
}
diff --git a/src/main/java/de/thm/arsnova/controller/v2/RoomController.java b/src/main/java/de/thm/arsnova/controller/v2/RoomController.java
index de51c43be..00603eb58 100644
--- a/src/main/java/de/thm/arsnova/controller/v2/RoomController.java
+++ b/src/main/java/de/thm/arsnova/controller/v2/RoomController.java
@@ -138,7 +138,7 @@ public class RoomController extends PaginationController {
@RequestMapping(value = "/{shortId}", method = RequestMethod.PUT)
public Room updateRoom(
@ApiParam(value = "Room-Key from current Room", required = true) @PathVariable final String shortId,
- @ApiParam(value = "current session", required = true) @RequestBody final Room room
+ @ApiParam(value = "current room", required = true) @RequestBody final Room room
) {
return toV2Migrator.migrate(roomService.update(shortId, fromV2Migrator.migrate(room)));
}
@@ -305,17 +305,17 @@ public class RoomController extends PaginationController {
@ApiParam(value = "wether comments shall be exported", required = true) @RequestParam(value = "withFeedbackQuestions", defaultValue = "false") final Boolean withFeedbackQuestions,
final HttpServletResponse response
) {
- List<ImportExportContainer> sessions = new ArrayList<>();
+ List<ImportExportContainer> rooms = new ArrayList<>();
ImportExportContainer temp;
for (String shortId : shortIds) {
roomService.setActive(shortId, false);
temp = roomService.exportRoom(shortId, withAnswerStatistics, withFeedbackQuestions);
if (temp != null) {
- sessions.add(temp);
+ rooms.add(temp);
}
roomService.setActive(shortId, true);
}
- return sessions;
+ return rooms;
}
@ApiOperation(value = "copy a Rooms to the public pool if enabled")
diff --git a/src/main/java/de/thm/arsnova/services/ContentService.java b/src/main/java/de/thm/arsnova/services/ContentService.java
index 95f6b4059..eb75d3f5b 100644
--- a/src/main/java/de/thm/arsnova/services/ContentService.java
+++ b/src/main/java/de/thm/arsnova/services/ContentService.java
@@ -40,7 +40,7 @@ public interface ContentService extends EntityService<Content> {
void delete(String questionId);
- List<String> getUnAnsweredQuestionIds(String roomShortId);
+ List<String> getUnAnsweredContentIds(String roomShortId);
Answer getMyAnswer(String contentId);
@@ -82,51 +82,51 @@ public interface ContentService extends EntityService<Content> {
void deleteAnswer(String contentId, String answerId);
- List<Content> getLectureQuestions(String roomShortId);
+ List<Content> getLectureContents(String roomShortId);
List<Content> getFlashcards(String roomShortId);
- List<Content> getPreparationQuestions(String roomShortId);
+ List<Content> getPreparationContents(String roomShortId);
- int countLectureQuestions(String roomShortId);
+ int countLectureContents(String roomShortId);
int countFlashcards(String roomShortId);
- int countPreparationQuestions(String roomShortId);
+ int countPreparationContents(String roomShortId);
Map<String, Object> countAnswersAndAbstentionsInternal(String contentId);
- int countLectureQuestionAnswers(String roomShortId);
+ int countLectureContentAnswers(String roomShortId);
int countLectureQuestionAnswersInternal(String roomShortId);
- int countPreparationQuestionAnswers(String roomShortId);
+ int countPreparationContentAnswers(String roomShortId);
int countPreparationQuestionAnswersInternal(String roomShortId);
int countFlashcardsForUserInternal(String roomShortId);
- void deleteAllContent(String roomShortId);
+ void deleteAllContents(String roomShortId);
- void deleteLectureQuestions(String roomShortId);
+ void deleteLectureContents(String roomShortId);
- void deletePreparationQuestions(String roomShortId);
+ void deletePreparationContents(String roomShortId);
void deleteFlashcards(String roomShortId);
- List<String> getUnAnsweredLectureQuestionIds(String roomShortId);
+ List<String> getUnAnsweredLectureContentIds(String roomShortId);
- List<String> getUnAnsweredLectureQuestionIds(String roomShortId, UserAuthentication user);
+ List<String> getUnAnsweredLectureContentIds(String roomShortId, UserAuthentication user);
- List<String> getUnAnsweredPreparationQuestionIds(String roomShortId);
+ List<String> getUnAnsweredPreparationContentIds(String roomShortId);
- List<String> getUnAnsweredPreparationQuestionIds(String roomShortId, UserAuthentication user);
+ List<String> getUnAnsweredPreparationContentIds(String roomShortId, UserAuthentication user);
void publishAll(String roomShortId, boolean publish);
- void publishQuestions(String roomShortId, boolean publish, List<Content> contents);
+ void publishContents(String roomShortId, boolean publish, List<Content> contents);
- void deleteAllQuestionsAnswers(String roomShortId);
+ void deleteAllContentsAnswers(String roomShortId);
void deleteAllPreparationAnswers(String roomShortId);
diff --git a/src/main/java/de/thm/arsnova/services/ContentServiceImpl.java b/src/main/java/de/thm/arsnova/services/ContentServiceImpl.java
index 4a834fc9e..7d679f2e7 100644
--- a/src/main/java/de/thm/arsnova/services/ContentServiceImpl.java
+++ b/src/main/java/de/thm/arsnova/services/ContentServiceImpl.java
@@ -310,21 +310,21 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
@Override
@PreAuthorize("isAuthenticated()")
- public void deleteAllContent(final String roomShortId) {
+ public void deleteAllContents(final String roomShortId) {
final Room room = getRoomWithAuthCheck(roomShortId);
deleteBySessionAndVariant(room, "all");
}
@Override
@PreAuthorize("isAuthenticated()")
- public void deleteLectureQuestions(final String roomShortId) {
+ public void deleteLectureContents(final String roomShortId) {
final Room room = getRoomWithAuthCheck(roomShortId);
deleteBySessionAndVariant(room, "lecture");
}
@Override
@PreAuthorize("isAuthenticated()")
- public void deletePreparationQuestions(final String roomShortId) {
+ public void deletePreparationContents(final String roomShortId) {
final Room room = getRoomWithAuthCheck(roomShortId);
deleteBySessionAndVariant(room, "preparation");
}
@@ -418,7 +418,7 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
@Override
@PreAuthorize("isAuthenticated()")
- public List<String> getUnAnsweredQuestionIds(final String roomShortId) {
+ public List<String> getUnAnsweredContentIds(final String roomShortId) {
final UserAuthentication user = getCurrentUser();
final Room room = getRoom(roomShortId);
return contentRepository.findUnansweredIdsByRoomIdAndUser(room.getId(), user);
@@ -714,7 +714,7 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
@Override
@PreAuthorize("isAuthenticated()")
//@Cacheable("lecturecontentlists")
- public List<Content> getLectureQuestions(final String roomShortId) {
+ public List<Content> getLectureContents(final String roomShortId) {
final Room room = getRoom(roomShortId);
final UserAuthentication user = userService.getCurrentUser();
if (room.getOwnerId().equals(user.getId())) {
@@ -742,7 +742,7 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
@Override
@PreAuthorize("isAuthenticated()")
//@Cacheable("preparationcontentlists")
- public List<Content> getPreparationQuestions(final String roomShortId) {
+ public List<Content> getPreparationContents(final String roomShortId) {
final Room room = getRoom(roomShortId);
final UserAuthentication user = userService.getCurrentUser();
if (room.getOwnerId().equals(user.getId())) {
@@ -762,7 +762,7 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
@Override
@PreAuthorize("isAuthenticated()")
- public int countLectureQuestions(final String roomShortId) {
+ public int countLectureContents(final String roomShortId) {
return contentRepository.countLectureVariantByRoomId(getRoom(roomShortId).getId());
}
@@ -774,13 +774,13 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
@Override
@PreAuthorize("isAuthenticated()")
- public int countPreparationQuestions(final String roomShortId) {
+ public int countPreparationContents(final String roomShortId) {
return contentRepository.countPreparationVariantByRoomId(getRoom(roomShortId).getId());
}
@Override
@PreAuthorize("isAuthenticated()")
- public int countLectureQuestionAnswers(final String roomShortId) {
+ public int countLectureContentAnswers(final String roomShortId) {
return this.countLectureQuestionAnswersInternal(roomShortId);
}
@@ -811,7 +811,7 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
@Override
@PreAuthorize("isAuthenticated()")
- public int countPreparationQuestionAnswers(final String roomShortId) {
+ public int countPreparationContentAnswers(final String roomShortId) {
return this.countPreparationQuestionAnswersInternal(roomShortId);
}
@@ -835,26 +835,26 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
@Override
@PreAuthorize("isAuthenticated()")
- public List<String> getUnAnsweredLectureQuestionIds(final String roomShortId) {
+ public List<String> getUnAnsweredLectureContentIds(final String roomShortId) {
final UserAuthentication user = getCurrentUser();
- return this.getUnAnsweredLectureQuestionIds(roomShortId, user);
+ return this.getUnAnsweredLectureContentIds(roomShortId, user);
}
@Override
- public List<String> getUnAnsweredLectureQuestionIds(final String roomShortId, final UserAuthentication user) {
+ public List<String> getUnAnsweredLectureContentIds(final String roomShortId, final UserAuthentication user) {
final Room room = getRoom(roomShortId);
return contentRepository.findUnansweredIdsByRoomIdAndUserOnlyLectureVariant(room.getId(), user);
}
@Override
@PreAuthorize("isAuthenticated()")
- public List<String> getUnAnsweredPreparationQuestionIds(final String roomShortId) {
+ public List<String> getUnAnsweredPreparationContentIds(final String roomShortId) {
final UserAuthentication user = getCurrentUser();
- return this.getUnAnsweredPreparationQuestionIds(roomShortId, user);
+ return this.getUnAnsweredPreparationContentIds(roomShortId, user);
}
@Override
- public List<String> getUnAnsweredPreparationQuestionIds(final String roomShortId, final UserAuthentication user) {
+ public List<String> getUnAnsweredPreparationContentIds(final String roomShortId, final UserAuthentication user) {
final Room room = getRoom(roomShortId);
return contentRepository.findUnansweredIdsByRoomIdAndUserOnlyPreparationVariant(room.getId(), user);
}
@@ -869,7 +869,7 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
throw new UnauthorizedException();
}
final List<Content> contents = contentRepository.findByRoomId(room.getId());
- publishQuestions(roomShortId, publish, contents);
+ publishContents(roomShortId, publish, contents);
}
@Override
@@ -879,7 +879,7 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
@CacheEvict(value = "lecturecontentlists", key = "#roomShortId"),
@CacheEvict(value = "preparationcontentlists", key = "#roomShortId"),
@CacheEvict(value = "flashcardcontentlists", key = "#roomShortId") })
- public void publishQuestions(final String roomShortId, final boolean publish, List<Content> contents) {
+ public void publishContents(final String roomShortId, final boolean publish, List<Content> contents) {
final UserAuthentication user = getCurrentUser();
final Room room = getRoom(roomShortId);
if (!room.getOwnerId().equals(user.getId())) {
@@ -901,7 +901,7 @@ public class ContentServiceImpl extends DefaultEntityServiceImpl<Content> implem
@Override
@PreAuthorize("isAuthenticated()")
@CacheEvict(value = "answerlists", allEntries = true)
- public void deleteAllQuestionsAnswers(final String roomShortId) {
+ public void deleteAllContentsAnswers(final String roomShortId) {
final UserAuthentication user = getCurrentUser();
final Room room = getRoom(roomShortId);
if (!room.getOwnerId().equals(user.getId())) {
diff --git a/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java b/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java
index 671cc61eb..d62fdb3d1 100644
--- a/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java
+++ b/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java
@@ -367,8 +367,8 @@ public class ArsnovaSocketioServerImpl implements ArsnovaSocketioServer, Arsnova
final de.thm.arsnova.entities.Room room = roomService.getInternal(shortRoomId, user);
final de.thm.arsnova.entities.Room.Settings settings = roomService.getFeatures(shortRoomId);
- client.sendEvent("unansweredLecturerQuestions", contentService.getUnAnsweredLectureQuestionIds(shortRoomId, user));
- client.sendEvent("unansweredPreparationQuestions", contentService.getUnAnsweredPreparationQuestionIds(shortRoomId, user));
+ client.sendEvent("unansweredLecturerQuestions", contentService.getUnAnsweredLectureContentIds(shortRoomId, user));
+ client.sendEvent("unansweredPreparationQuestions", contentService.getUnAnsweredPreparationContentIds(shortRoomId, user));
client.sendEvent("countLectureQuestionAnswers", contentService.countLectureQuestionAnswersInternal(shortRoomId));
client.sendEvent("countPreparationQuestionAnswers", contentService.countPreparationQuestionAnswersInternal(shortRoomId));
client.sendEvent("activeUserCountData", roomService.activeUsers(shortRoomId));
@@ -520,9 +520,9 @@ public class ArsnovaSocketioServerImpl implements ArsnovaSocketioServer, Arsnova
// Update the unanswered count for the content variant that was answered.
final de.thm.arsnova.entities.Content content = event.getContent();
if ("lecture".equals(content.getGroup())) {
- sendToUser(event.getUser(), "unansweredLecturerQuestions", contentService.getUnAnsweredLectureQuestionIds(shortRoomId, event.getUser()));
+ sendToUser(event.getUser(), "unansweredLecturerQuestions", contentService.getUnAnsweredLectureContentIds(shortRoomId, event.getUser()));
} else if ("preparation".equals(content.getGroup())) {
- sendToUser(event.getUser(), "unansweredPreparationQuestions", contentService.getUnAnsweredPreparationQuestionIds(shortRoomId, event.getUser()));
+ sendToUser(event.getUser(), "unansweredPreparationQuestions", contentService.getUnAnsweredPreparationContentIds(shortRoomId, event.getUser()));
}
}
--
GitLab