Fisheye: Tag 2f40e3672352c86f848e42e0902277023757fe4f refers to a dead (removed) revision in file `lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/DAO.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewDAO.java =================================================================== diff -u -rf059acd48464d2785b1ab003d64cc21747bba49d -r2f40e3672352c86f848e42e0902277023757fe4f --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewDAO.java (.../PeerreviewDAO.java) (revision f059acd48464d2785b1ab003d64cc21747bba49d) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewDAO.java (.../PeerreviewDAO.java) (revision 2f40e3672352c86f848e42e0902277023757fe4f) @@ -25,16 +25,15 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.tool.peerreview.dto.PeerreviewStatisticsDTO; import org.lamsfoundation.lams.tool.peerreview.model.Peerreview; -public interface PeerreviewDAO extends DAO { +public interface PeerreviewDAO extends IBaseDAO { Peerreview getByContentId(Long contentId); Peerreview getByUid(Long peerreviewUid); - void delete(Peerreview peerreview); - List getStatistics(Long toolContentId); } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewSessionDAO.java =================================================================== diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2f40e3672352c86f848e42e0902277023757fe4f --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewSessionDAO.java (.../PeerreviewSessionDAO.java) (revision 2f725f8ef2aa09a2663b2335bf67213074426d11) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewSessionDAO.java (.../PeerreviewSessionDAO.java) (revision 2f40e3672352c86f848e42e0902277023757fe4f) @@ -25,9 +25,10 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession; -public interface PeerreviewSessionDAO extends DAO { +public interface PeerreviewSessionDAO extends IBaseDAO { PeerreviewSession getSessionBySessionId(Long sessionId); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java =================================================================== diff -u -r8e090b3ddf269cdffececa4bc55a9333da5b0858 -r2f40e3672352c86f848e42e0902277023757fe4f --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java (.../PeerreviewUserDAO.java) (revision 8e090b3ddf269cdffececa4bc55a9333da5b0858) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java (.../PeerreviewUserDAO.java) (revision 2f40e3672352c86f848e42e0902277023757fe4f) @@ -25,17 +25,18 @@ import java.util.List; +import org.lamsfoundation.lams.dao.IBaseDAO; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.rating.service.IRatingService; import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession; import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -public interface PeerreviewUserDAO extends DAO { +public interface PeerreviewUserDAO extends IBaseDAO { PeerreviewUser getUserByUserIDAndSessionID(Long userID, Long sessionId); - + PeerreviewUser getUserByUid(Long userUid); PeerreviewUser getUserByUserIDAndContentID(Long userId, Long contentId); @@ -44,40 +45,40 @@ /** * Counts number of users in a session excluding specified user. Besides, it also *excludes all hidden users*. - * + * * @param toolSessionId * @param excludeUserId - * @param includeHiddenUsers whether hidden users should be counted as well or not + * @param includeHiddenUsers + * whether hidden users should be counted as well or not * @return */ int getCountUsersBySession(final Long toolSessionId, final Long excludeUserId); - List getRatingsComments(Long toolContentId, Long toolSessionId, RatingCriteria criteria, Long userId, Integer page, - Integer size, int sorting, String searchString, boolean getByUser, IRatingService coreRatingService, - IUserManagementService userManagementService); - - List getCommentsCounts(Long toolContentId, Long toolSessionId, RatingCriteria criteria, - Integer page, Integer size, int sorting, String searchString, - IUserManagementService userManagementService); - - List getDetailedRatingsComments(Long toolContentId, Long toolSessionId, Long criteriaId, Long itemId ); - + List getRatingsComments(Long toolContentId, Long toolSessionId, RatingCriteria criteria, Long userId, + Integer page, Integer size, int sorting, String searchString, boolean getByUser, + IRatingService coreRatingService, IUserManagementService userManagementService); + + List getCommentsCounts(Long toolContentId, Long toolSessionId, RatingCriteria criteria, Integer page, + Integer size, int sorting, String searchString, IUserManagementService userManagementService); + + List getDetailedRatingsComments(Long toolContentId, Long toolSessionId, Long criteriaId, Long itemId); + /** * Counts number of users in a specified session. It counts it regardless whether a user is hidden or not. - * + * * @param toolSessionId * @return */ int getCountUsersBySession(Long toolSessionId); int createUsersForSession(PeerreviewSession session); - - List getUserNotebookEntriesForTablesorter(final Long toolSessionId, int page, int size, int sorting, String searchString, - ICoreNotebookService coreNotebookService); - + + List getUserNotebookEntriesForTablesorter(final Long toolSessionId, int page, int size, int sorting, + String searchString, ICoreNotebookService coreNotebookService); + /** * Returns list of pairs. Used by monitor's manageUsers functionality. - * + * * @param toolSessionId * @param page * @param size Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java =================================================================== diff -u -r8a760d56403394acfc11cf4ba9fe6a3fccfc83b9 -r2f40e3672352c86f848e42e0902277023757fe4f --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java (.../PeerreviewDAOHibernate.java) (revision 8a760d56403394acfc11cf4ba9fe6a3fccfc83b9) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java (.../PeerreviewDAOHibernate.java) (revision 2f40e3672352c86f848e42e0902277023757fe4f) @@ -65,11 +65,6 @@ return (Peerreview) getObject(Peerreview.class, peerreviewUid); } - @Override - public void delete(Peerreview peerreview) { - delete(peerreview); - } - @SuppressWarnings("unchecked") @Override public List getStatistics(Long toolContentId) { Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== diff -u -r58de3acfcde3052a939146df7d0172599e56633a -r2f40e3672352c86f848e42e0902277023757fe4f --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 58de3acfcde3052a939146df7d0172599e56633a) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 2f40e3672352c86f848e42e0902277023757fe4f) @@ -159,7 +159,7 @@ @Override public void createUser(PeerreviewUser peerreviewUser) { - peerreviewUserDao.saveObject(peerreviewUser); + peerreviewUserDao.insert(peerreviewUser); } @Override @@ -174,7 +174,7 @@ @Override public void saveOrUpdatePeerreview(Peerreview peerreview) { - peerreviewDao.saveObject(peerreview); + peerreviewDao.insertOrUpdate(peerreview); } @Override @@ -193,14 +193,14 @@ @Override public void saveOrUpdatePeerreviewSession(PeerreviewSession resSession) { - peerreviewSessionDao.saveObject(resSession); + peerreviewSessionDao.insertOrUpdate(resSession); } @Override public void markUserFinished(Long toolSessionId, Long userId) { PeerreviewUser user = peerreviewUserDao.getUserByUserIDAndSessionID(userId, toolSessionId); user.setSessionFinished(true); - peerreviewUserDao.saveObject(user); + peerreviewUserDao.update(user); } @Override @@ -246,7 +246,7 @@ public int getCountUsersBySession(final Long toolSessionId, final Long excludeUserId) { return peerreviewUserDao.getCountUsersBySession(toolSessionId, excludeUserId); } - + @Override public int getCountUsersBySession(final Long toolSessionId) { return peerreviewUserDao.getCountUsersBySession(toolSessionId); @@ -276,7 +276,7 @@ @Override public PeerreviewUser getUser(Long uid) { - return (PeerreviewUser) peerreviewUserDao.getObject(PeerreviewUser.class, uid); + return (PeerreviewUser) peerreviewUserDao.find(PeerreviewUser.class, uid); } @Override @@ -321,23 +321,25 @@ if (user == null) { return; } - + //If user is marked as hidden - it will automatically remove all rating left by him to prevent statistics mess up. if (isHidden) { ratingService.removeUserCommitsByContent(toolContentId, user.getUserId().intValue()); } - + user.setHidden(isHidden); - peerreviewUserDao.saveObject(user); + peerreviewUserDao.update(user); } @Override - public int rateItems(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Map newRatings) { + public int rateItems(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, + Map newRatings) { return ratingService.rateItems(ratingCriteria, toolSessionId, userId, newRatings); } @Override - public void commentItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId, String comment) { + public void commentItem(RatingCriteria ratingCriteria, Long toolSessionId, Integer userId, Long itemId, + String comment) { ratingService.commentItem(ratingCriteria, toolSessionId, userId, itemId, comment); } @@ -356,11 +358,10 @@ } List rawData = peerreviewUserDao.getRatingsComments(toolContentId, toolSessionId, criteria, - currentUserId, null, null, sorting, searchString, getByUser, ratingService, - userManagementService); + currentUserId, null, null, sorting, searchString, getByUser, ratingService, userManagementService); for (Object[] raw : rawData) { - raw[raw.length - 2] = (Object) StringEscapeUtils.escapeCsv((String)raw[raw.length - 2]); + raw[raw.length - 2] = StringEscapeUtils.escapeCsv((String) raw[raw.length - 2]); } // if !getByUser -> is get current user's ratings from other users -> // convertToStyledJSON.getAllUsers needs to be true otherwise current user (the only one in the set!) is dropped @@ -376,12 +377,12 @@ currentUserId, page, size, sorting, searchString, getByUser, ratingService, userManagementService); for (Object[] raw : rawData) { - raw[raw.length - 2] = (Object) StringEscapeUtils.escapeCsv((String)raw[raw.length - 2]); + raw[raw.length - 2] = StringEscapeUtils.escapeCsv((String) raw[raw.length - 2]); } // if !getByUser -> is get current user's ratings from other users -> // convertToStyledJSON.getAllUsers needs to be true otherwise current user (the only one in the set!) is dropped - return ratingService.convertToStyledJSON(criteria, toolSessionId, currentUserId, !getByUser || getAllUsers, rawData, - needRatesPerUser); + return ratingService.convertToStyledJSON(criteria, toolSessionId, currentUserId, !getByUser || getAllUsers, + rawData, needRatesPerUser); } @Override @@ -394,10 +395,10 @@ List rawData = peerreviewUserDao.getDetailedRatingsComments(toolContentId, toolSessionId, criteriaId, itemId); for (Object[] raw : rawData) { - raw[2] = (raw[2] == null ? null : numberFormat.format((Float) raw[2])); // format rating + raw[2] = (raw[2] == null ? null : numberFormat.format(raw[2])); // format rating // format name StringBuilder description = new StringBuilder((String) raw[3]).append(" ").append((String) raw[4]); - raw[4] = (Object) StringEscapeUtils.escapeCsv(description.toString()); + raw[4] = StringEscapeUtils.escapeCsv(description.toString()); } return rawData; @@ -412,7 +413,7 @@ // raw data: user_id, comment_count, first_name last_name, portrait id for (Object[] raw : rawData) { - raw[2] = (Object) StringEscapeUtils.escapeCsv((String)raw[2]); + raw[2] = StringEscapeUtils.escapeCsv((String) raw[2]); } return rawData; @@ -422,10 +423,10 @@ public boolean isGroupedActivity(long toolContentID) { return toolService.isGroupedActivity(toolContentID); } - + @Override public void auditLogStartEditingActivityInMonitor(long toolContentID) { - toolService.auditLogStartEditingActivityInMonitor(toolContentID); + toolService.auditLogStartEditingActivityInMonitor(toolContentID); } @Override @@ -446,7 +447,7 @@ for (Object[] raw : rawData) { StringBuilder description = new StringBuilder((String) raw[1]).append(" ").append((String) raw[2]); - raw[2] = (Object) StringEscapeUtils.escapeCsv(description.toString()); + raw[2] = StringEscapeUtils.escapeCsv(description.toString()); } return rawData; @@ -462,7 +463,6 @@ return getLocalisedMessage("event.sent.results.subject", new Object[] { peerreview.getTitle() }); } - @Override public int emailReportToUser(Long toolContentId, Long sessionId, Long userId) { PeerreviewSession session = peerreviewSessionDao.getSessionBySessionId(sessionId); @@ -479,12 +479,11 @@ public int emailReportToSessionUsers(Long toolContentId, Long sessionId) { PeerreviewSession session = peerreviewSessionDao.getSessionBySessionId(sessionId); Peerreview peerreview = getPeerreviewByContentId(toolContentId); - Map emails = new EmailAnalysisBuilder(peerreview, session, ratingService, - peerreviewSessionDao, peerreviewUserDao, this, messageService).generateHTMLEmailsForSession(); - for ( Map.Entry entry : emails.entrySet() ) { - eventNotificationService.sendMessage(null, entry.getKey().intValue(), - IEventNotificationService.DELIVERY_METHOD_MAIL, - getResultsEmailSubject(peerreview), + Map emails = new EmailAnalysisBuilder(peerreview, session, ratingService, peerreviewSessionDao, + peerreviewUserDao, this, messageService).generateHTMLEmailsForSession(); + for (Map.Entry entry : emails.entrySet()) { + eventNotificationService.sendMessage(null, entry.getKey().intValue(), + IEventNotificationService.DELIVERY_METHOD_MAIL, getResultsEmailSubject(peerreview), entry.getValue(), true); } return emails.size(); @@ -511,7 +510,8 @@ ArrayList itemIds = new ArrayList(1); itemIds.add(userId); - Map numRatingsForUserMap = ratingService.countUsersRatedEachItem(toolContentId, toolSessionId, itemIds, -1); + Map numRatingsForUserMap = ratingService.countUsersRatedEachItem(toolContentId, toolSessionId, + itemIds, -1); Long numRatingsForUser = numRatingsForUserMap.get(userId); retValue[0] = numRatingsForUser != null ? numRatingsForUser.intValue() : 0; @@ -623,7 +623,7 @@ } toolContentObj.setCreatedBy(user); - peerreviewDao.saveObject(toolContentObj); + peerreviewDao.insertOrUpdate(toolContentObj); } catch (ImportToolContentException e) { throw new ToolException(e); } @@ -654,7 +654,7 @@ } Peerreview toContent = Peerreview.newInstance(peerreview, toContentId); - peerreviewDao.saveObject(toContent); + peerreviewDao.insert(toContent); } @Override @@ -736,7 +736,7 @@ NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, PeerreviewConstants.TOOL_SIGNATURE, userId); if (entry != null) { - peerreviewDao.removeObject(NotebookEntry.class, entry.getUid()); + peerreviewDao.deleteById(NotebookEntry.class, entry.getUid()); } } @@ -750,7 +750,7 @@ session.setSessionName(toolSessionName); Peerreview peerreview = peerreviewDao.getByContentId(toolContentId); session.setPeerreview(peerreview); - peerreviewSessionDao.saveObject(session); + peerreviewSessionDao.insert(session); } @Override @@ -767,7 +767,7 @@ PeerreviewSession session = peerreviewSessionDao.getSessionBySessionId(toolSessionId); if (session != null) { session.setStatus(PeerreviewConstants.COMPLETED); - peerreviewSessionDao.saveObject(session); + peerreviewSessionDao.update(session); } else { log.error("Fail to leave tool Session.Could not find peerreview " + "session by given session id: " + toolSessionId); @@ -806,17 +806,18 @@ @Override public List getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection itemIds, boolean isCommentsByOtherUsersRequired, Long userId) { - return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired, userId); + return ratingService.getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired, + userId); } @Override public List getRatingCriteriaDtos(Long contentId, Long toolSessionId, Collection itemIds, boolean isCommentsByOtherUsersRequired, Long userId, boolean isCountUsersRatedEachItem) { - List itemRatingDTOs = getRatingCriteriaDtos(contentId, toolSessionId, itemIds, isCommentsByOtherUsersRequired, - userId); + List itemRatingDTOs = getRatingCriteriaDtos(contentId, toolSessionId, itemIds, + isCommentsByOtherUsersRequired, userId); if (isCountUsersRatedEachItem) { - Map itemIdToRatedUsersCountMap = ratingService.countUsersRatedEachItem(contentId, toolSessionId, + Map itemIdToRatedUsersCountMap = ratingService.countUsersRatedEachItem(contentId, toolSessionId, itemIds, userId.intValue()); for (ItemRatingDTO itemRatingDTO : itemRatingDTOs) { @@ -835,6 +836,7 @@ return ratingService.getCountItemsRatedByUser(toolContentId, userId); } + @Override public int getCountItemsRatedByUserByCriteria(final Long criteriaId, final Integer userId) { return ratingService.getCountItemsRatedByUserByCriteria(criteriaId, userId); } @@ -870,7 +872,7 @@ public List getToolOutputs(String name, Long toolContentId) { return new ArrayList(); } - + @Override public List getConfidenceLevels(Long toolSessionId) { return null;