Question collections

Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java =================================================================== diff -u -r33b937e6fb979aa7a58fd0f33d1ecf474150155b -r70353119b16530e4ef2f9c82bdaba7ca825feeb0 --- lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java (.../IQbDAO.java) (revision 33b937e6fb979aa7a58fd0f33d1ecf474150155b) +++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java (.../IQbDAO.java) (revision 70353119b16530e4ef2f9c82bdaba7ca825feeb0) @@ -52,7 +52,7 @@ List getQuestionCollections(long qbQuestionUid); - int countCollectionQuestions(long collectionUid, String search); + int getCountCollectionQuestions(long collectionUid, String search); void addCollectionQuestion(long collectionUid, long qbQuestionUid); Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java =================================================================== diff -u -r8d2337141f10b26a11e9730f9c44d53a96fcc062 -r70353119b16530e4ef2f9c82bdaba7ca825feeb0 --- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java (.../QbDAO.java) (revision 8d2337141f10b26a11e9730f9c44d53a96fcc062) +++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java (.../QbDAO.java) (revision 70353119b16530e4ef2f9c82bdaba7ca825feeb0) @@ -264,7 +264,7 @@ } @Override - public int countCollectionQuestions(long collectionUid, String search) { + public int getCountCollectionQuestions(long collectionUid, String search) { Query query = prepareCollectionQuestionsQuery(collectionUid, null, null, search, true); return ((BigInteger) query.getSingleResult()).intValue(); } Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbCollection.java =================================================================== diff -u -r374f47ea57a62a77e6faf1bb9713de1f9f53c1be -r70353119b16530e4ef2f9c82bdaba7ca825feeb0 --- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbCollection.java (.../QbCollection.java) (revision 374f47ea57a62a77e6faf1bb9713de1f9f53c1be) +++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbCollection.java (.../QbCollection.java) (revision 70353119b16530e4ef2f9c82bdaba7ca825feeb0) @@ -14,7 +14,6 @@ import javax.persistence.ManyToMany; import javax.persistence.OrderBy; import javax.persistence.Table; -import javax.persistence.Transient; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; @@ -51,9 +50,6 @@ @OrderBy("name") private List organisations = new ArrayList<>(); - @Transient - private List shareableWithOrganisations = new ArrayList<>(); - public Long getUid() { return uid; } @@ -90,14 +86,6 @@ this.organisations = organisations; } - public List getShareableWithOrganisations() { - return shareableWithOrganisations; - } - - public void setShareableWithOrganisations(List shareableWithOrganisations) { - this.shareableWithOrganisations = shareableWithOrganisations; - } - @Override public boolean equals(Object o) { QbCollection other = (QbCollection) o; Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java =================================================================== diff -u -r0952bdcd231fe03cb52b8d821bc6cc1882b7c369 -r70353119b16530e4ef2f9c82bdaba7ca825feeb0 --- lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java (.../IQbService.java) (revision 0952bdcd231fe03cb52b8d821bc6cc1882b7c369) +++ lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java (.../IQbService.java) (revision 70353119b16530e4ef2f9c82bdaba7ca825feeb0) @@ -66,7 +66,7 @@ List getCollectionQuestions(long collectionUid, Integer offset, Integer limit, String orderBy, String orderDirection, String search); - int countCollectionQuestions(long collectionUid, String search); + int getCountCollectionQuestions(long collectionUid, String search); List getQuestionCollections(long qbQuestionUid); @@ -92,4 +92,6 @@ boolean removeQuestion(long qbQuestionUid); boolean removeQuestionPossible(long qbQuestionUid); + + QbCollection getCollection(long collectionUid); } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java =================================================================== diff -u -r0952bdcd231fe03cb52b8d821bc6cc1882b7c369 -r70353119b16530e4ef2f9c82bdaba7ca825feeb0 --- lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java (.../QbService.java) (revision 0952bdcd231fe03cb52b8d821bc6cc1882b7c369) +++ lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java (.../QbService.java) (revision 70353119b16530e4ef2f9c82bdaba7ca825feeb0) @@ -85,7 +85,7 @@ @Override public QbStatsDTO getQbQuestionStats(long qbQuestionUid) { QbStatsDTO stats = new QbStatsDTO(); - QbQuestion qbQuestion = (QbQuestion) qbDAO.find(QbQuestion.class, qbQuestionUid); + QbQuestion qbQuestion = qbDAO.find(QbQuestion.class, qbQuestionUid); List qbOptions = qbQuestion.getQbOptions(); stats.setQuestion(qbQuestion); Map burningQuestions = qbDAO.getBurningQuestions(qbQuestionUid); @@ -136,17 +136,15 @@ return stats; } - @SuppressWarnings("unchecked") @Override public QbStatsActivityDTO getActivityStatsByContentId(Long toolContentId, Long qbQuestionUid) { - Activity activity = ((List) qbDAO.findByProperty(ToolActivity.class, "toolContentId", toolContentId)) - .get(0); + Activity activity = qbDAO.findByProperty(ToolActivity.class, "toolContentId", toolContentId).get(0); return getActivityStats(activity.getActivityId(), qbQuestionUid); } @Override public QbStatsActivityDTO getActivityStats(Long activityId, Long qbQuestionUid) { - QbQuestion qbQuestion = (QbQuestion) qbDAO.find(QbQuestion.class, qbQuestionUid); + QbQuestion qbQuestion = qbDAO.find(QbQuestion.class, qbQuestionUid); Set correctOptionUids = new HashSet<>(); for (QbOption option : qbQuestion.getQbOptions()) { if (option.isCorrect()) { @@ -159,7 +157,7 @@ @Override public QbStatsActivityDTO getActivityStats(Long activityId, Long qbQuestionUid, Collection correctOptionUids) { - ToolActivity activity = (ToolActivity) qbDAO.find(ToolActivity.class, activityId); + ToolActivity activity = qbDAO.find(ToolActivity.class, activityId); LearningDesign learningDesign = activity.getLearningDesign(); Lesson lesson = learningDesign.getLessons().iterator().next(); Long lessonId = lesson.getLessonId(); @@ -246,11 +244,10 @@ @Override public QbCollection getPublicCollection() { - return (QbCollection) qbDAO.find(QbCollection.class, 1L); + return qbDAO.find(QbCollection.class, 1L); } @Override - @SuppressWarnings("unchecked") public QbCollection getUserPrivateCollection(int userId) { Map map = new HashMap<>(); map.put("userId", userId); @@ -270,7 +267,6 @@ } @Override - @SuppressWarnings("unchecked") public List getUserOwnCollections(int userId) { Map map = new HashMap<>(); map.put("userId", userId); @@ -290,8 +286,8 @@ } @Override - public int countCollectionQuestions(long collectionUid, String search) { - return qbDAO.countCollectionQuestions(collectionUid, search); + public int getCountCollectionQuestions(long collectionUid, String search) { + return qbDAO.getCountCollectionQuestions(collectionUid, search); } @Override @@ -310,7 +306,10 @@ @Override public void removeCollection(long collectionUid) { - QbCollection collection = (QbCollection) qbDAO.find(QbCollection.class, collectionUid); + if (getCountCollectionQuestions(collectionUid, null) > 0) { + throw new InvalidParameterException("Can not remove a collection with questions"); + } + QbCollection collection = qbDAO.find(QbCollection.class, collectionUid); if (collection.getUserId() == null || collection.isPersonal()) { throw new InvalidParameterException("Attempt to remove a private or the public question bank collection"); } @@ -337,19 +336,19 @@ @Override public Organisation shareCollection(long collectionUid, int organisationId) { - QbCollection collection = (QbCollection) qbDAO.find(QbCollection.class, collectionUid); + QbCollection collection = qbDAO.find(QbCollection.class, collectionUid); if (collection.getUserId() == null || collection.isPersonal()) { throw new InvalidParameterException("Attempt to share a private or the public question bank collection"); } - Organisation organisation = (Organisation) qbDAO.find(Organisation.class, organisationId); + Organisation organisation = qbDAO.find(Organisation.class, organisationId); collection.getOrganisations().add(organisation); qbDAO.update(collection); return organisation; } @Override public void unshareCollection(long collectionUid, int organisationId) { - QbCollection collection = (QbCollection) qbDAO.find(QbCollection.class, collectionUid); + QbCollection collection = qbDAO.find(QbCollection.class, collectionUid); if (collection.getUserId() == null || collection.isPersonal()) { throw new InvalidParameterException("Attempt to unshare a private or the public question bank collection"); } @@ -416,7 +415,7 @@ @Override public List getShareableWithOrganisations(long collectionUid, int userId) { - QbCollection collection = (QbCollection) qbDAO.find(QbCollection.class, collectionUid); + QbCollection collection = qbDAO.find(QbCollection.class, collectionUid); if (collection.getUserId() == null || collection.isPersonal()) { return null; } @@ -432,7 +431,7 @@ } } if (organisationId != null && roleEntry.getValue().contains(Role.ROLE_AUTHOR)) { - Organisation organisation = (Organisation) qbDAO.find(Organisation.class, organisationId); + Organisation organisation = qbDAO.find(Organisation.class, organisationId); result.add(organisation); } } @@ -443,9 +442,6 @@ @Override public List getUserCollections(int userId) { List collections = getUserOwnCollections(userId); - for (QbCollection collection : collections) { - collection.setShareableWithOrganisations(getShareableWithOrganisations(collection.getUid(), userId)); - } QbCollection privateCollection = getUserPrivateCollection(userId); collections.add(privateCollection); @@ -456,6 +452,11 @@ return collections; } + @Override + public QbCollection getCollection(long collectionUid) { + return qbDAO.find(QbCollection.class, collectionUid); + } + public void setQbDAO(IQbDAO qbDAO) { this.qbDAO = qbDAO; }