Skip to content
Snippets Groups Projects
Commit 02202757 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Refactor all layers again to use new names 

Some legacy identifiers remain very persistently.
parent 9af9591a
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 269 additions and 269 deletions
src/main/java/de/thm/arsnova/controller/v2/CommentController.java
+ 14
− 14
View file @ 02202757
......@@ -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);
}
}
src/main/java/de/thm/arsnova/controller/v2/RoomController.java
+ 4
− 4
View file @ 02202757
......@@ -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")
......
src/main/java/de/thm/arsnova/services/ContentService.java
+ 16
− 16
View file @ 02202757
......@@ -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);
......
src/main/java/de/thm/arsnova/services/ContentServiceImpl.java
+ 19
− 19
View file @ 02202757
......@@ -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())) {
......
src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java
+ 4
− 4
View file @ 02202757
......@@ -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()));
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment