diff --git a/src/main/java/org/olat/modules/quality/QualityDataCollectionViewSearchParams.java b/src/main/java/org/olat/modules/quality/QualityDataCollectionViewSearchParams.java
index 2a117c7b9b0c6fba35ddebbc527e7587de6a4edc..703b0abea2cbc06b84a29e086aaf89da1d31a840 100644
--- a/src/main/java/org/olat/modules/quality/QualityDataCollectionViewSearchParams.java
+++ b/src/main/java/org/olat/modules/quality/QualityDataCollectionViewSearchParams.java
@@ -19,7 +19,7 @@
*/
package org.olat.modules.quality;
-import java.util.List;
+import java.util.Collection;
import org.olat.basesecurity.IdentityRef;
import org.olat.core.id.OrganisationRef;
@@ -33,7 +33,7 @@ import org.olat.core.id.OrganisationRef;
public class QualityDataCollectionViewSearchParams {
private QualityDataCollectionRef dataCollectionRef;
- private List<? extends OrganisationRef> organisationRefs;
+ private Collection<? extends OrganisationRef> organsationRefs;
private IdentityRef reportAccessIdentity;
public QualityDataCollectionRef getDataCollectionRef() {
@@ -44,12 +44,12 @@ public class QualityDataCollectionViewSearchParams {
this.dataCollectionRef = dataCollectionRef;
}
- public List<? extends OrganisationRef> getOrganisationRefs() {
- return organisationRefs;
+ public Collection<? extends OrganisationRef> getOrgansationRefs() {
+ return organsationRefs;
}
- public void setOrganisationRefs(List<? extends OrganisationRef> organisationRefs) {
- this.organisationRefs = organisationRefs;
+ public void setOrgansationRefs(Collection<? extends OrganisationRef> organsationRefs) {
+ this.organsationRefs = organsationRefs;
}
public IdentityRef getReportAccessIdentity() {
diff --git a/src/main/java/org/olat/modules/quality/analysis/EvaluationFormViewSearchParams.java b/src/main/java/org/olat/modules/quality/analysis/EvaluationFormViewSearchParams.java
index 3b9cbd7179ebf75fd007060921048e165518841e..063d86f5c2459065a8d0d70005e17b6cd4b9cb6c 100644
--- a/src/main/java/org/olat/modules/quality/analysis/EvaluationFormViewSearchParams.java
+++ b/src/main/java/org/olat/modules/quality/analysis/EvaluationFormViewSearchParams.java
@@ -19,7 +19,7 @@
*/
package org.olat.modules.quality.analysis;
-import java.util.List;
+import java.util.Collection;
import org.olat.core.id.OrganisationRef;
@@ -31,13 +31,13 @@ import org.olat.core.id.OrganisationRef;
*/
public class EvaluationFormViewSearchParams {
- private List<? extends OrganisationRef> organisationRefs;
+ private Collection<? extends OrganisationRef> organisationRefs;
- public List<? extends OrganisationRef> getOrganisationRefs() {
+ public Collection<? extends OrganisationRef> getOrganisationRefs() {
return organisationRefs;
}
- public void setOrganisationRefs(List<? extends OrganisationRef> organisationRefs) {
+ public void setOrganisationRefs(Collection<? extends OrganisationRef> organisationRefs) {
this.organisationRefs = organisationRefs;
}
diff --git a/src/main/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAO.java b/src/main/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAO.java
index d222e69da568562cfc60c245b40bc39ed9826150..6f75b1c7caa280a1369736357e5cd2712ce9fb31 100644
--- a/src/main/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAO.java
+++ b/src/main/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAO.java
@@ -20,11 +20,13 @@
package org.olat.modules.quality.analysis.manager;
import java.util.List;
+import java.util.stream.Collectors;
import javax.persistence.TypedQuery;
import org.olat.core.commons.persistence.DB;
import org.olat.core.commons.persistence.QueryBuilder;
+import org.olat.core.id.OrganisationRef;
import org.olat.modules.forms.EvaluationFormSessionStatus;
import org.olat.modules.quality.QualityDataCollectionLight;
import org.olat.modules.quality.QualityDataCollectionStatus;
@@ -81,31 +83,15 @@ public class EvaluationFormDAO {
sb.append("collection.key in (");
sb.append(" select dataCollection.key");
sb.append(" from qualitydatacollectiontoorganisation dcToOrg");
- sb.append(" where ");
- // load the organisations and all children
- for (int i = 0; i < searchParams.getOrganisationRefs().size(); i++) {
- if (i == 0) {
- sb.append("(");
- } else {
- sb.append(" or ");
- }
- sb.append("dcToOrg.organisation.materializedPathKeys like :orgPath").append(i);
- if (i == searchParams.getOrganisationRefs().size() - 1) {
- sb.append(")");
- }
- }
+ sb.append(" where dcToOrg.organisation.key in :organisationKeys");
sb.append(")");
}
}
private void appendParameters(TypedQuery<EvaluationFormView> query, EvaluationFormViewSearchParams searchParams) {
if (searchParams.getOrganisationRefs() != null) {
- for (int i = 0; i < searchParams.getOrganisationRefs().size(); i++) {
- String parameter = new StringBuilder(12).append("orgPath").append(i).toString();
- Long key = searchParams.getOrganisationRefs().get(i).getKey();
- String value = new StringBuilder(32).append("%/").append(key).append("/%").toString();
- query.setParameter(parameter, value);
- }
+ List<Long> organisationKeys = searchParams.getOrganisationRefs().stream().map(OrganisationRef::getKey).collect(Collectors.toList());
+ query.setParameter("organisationKeys", organisationKeys);
}
}
diff --git a/src/main/java/org/olat/modules/quality/generator/QualityGeneratorSearchParams.java b/src/main/java/org/olat/modules/quality/generator/QualityGeneratorSearchParams.java
index 7990379b4ce6025d522c07921d76d501bd3c2f51..81926b3b99137aa320773c7c0ce850f4a158dd07 100644
--- a/src/main/java/org/olat/modules/quality/generator/QualityGeneratorSearchParams.java
+++ b/src/main/java/org/olat/modules/quality/generator/QualityGeneratorSearchParams.java
@@ -20,7 +20,6 @@
package org.olat.modules.quality.generator;
import java.util.Collection;
-import java.util.List;
import org.olat.core.id.OrganisationRef;
@@ -33,7 +32,7 @@ import org.olat.core.id.OrganisationRef;
public class QualityGeneratorSearchParams {
private Collection<? extends QualityGeneratorRef> generatorRefs;
- private List<? extends OrganisationRef> organisationRefs;
+ private Collection<? extends OrganisationRef> organisationRefs;
private String providerType;
public Collection<? extends QualityGeneratorRef> getGeneratorRefs() {
@@ -44,11 +43,11 @@ public class QualityGeneratorSearchParams {
this.generatorRefs = generatorRefs;
}
- public List<? extends OrganisationRef> getOrganisationRefs() {
+ public Collection<? extends OrganisationRef> getOrganisationRefs() {
return organisationRefs;
}
- public void setOrganisationRefs(List<? extends OrganisationRef> organisationRefs) {
+ public void setOrganisationRefs(Collection<? extends OrganisationRef> organisationRefs) {
this.organisationRefs = organisationRefs;
}
diff --git a/src/main/java/org/olat/modules/quality/generator/manager/QualityGeneratorDAO.java b/src/main/java/org/olat/modules/quality/generator/manager/QualityGeneratorDAO.java
index f1f34894efd966bf20f1fa07e921e9a3829ac2db..50f9065738c59651dc3eebe5d1b296414eb3976d 100644
--- a/src/main/java/org/olat/modules/quality/generator/manager/QualityGeneratorDAO.java
+++ b/src/main/java/org/olat/modules/quality/generator/manager/QualityGeneratorDAO.java
@@ -27,6 +27,7 @@ import java.util.List;
import javax.persistence.TypedQuery;
import org.olat.core.commons.persistence.DB;
+import org.olat.core.id.OrganisationRef;
import org.olat.core.util.StringHelper;
import org.olat.modules.quality.generator.QualityGenerator;
import org.olat.modules.quality.generator.QualityGeneratorRef;
@@ -139,19 +140,7 @@ public class QualityGeneratorDAO {
sb.append(" and generator.key in (");
sb.append(" select generatorToOrganisation.generator.key");
sb.append(" from qualitygeneratortoorganisation as generatorToOrganisation");
- sb.append(" where ");
- // load the organisations and all children
- for (int i = 0; i < searchParams.getOrganisationRefs().size(); i++) {
- if (i == 0) {
- sb.append("(");
- } else {
- sb.append(" or ");
- }
- sb.append("generatorToOrganisation.organisation.materializedPathKeys like :orgPath").append(i);
- if (i == searchParams.getOrganisationRefs().size() - 1) {
- sb.append(")");
- }
- }
+ sb.append(" where generatorToOrganisation.organisation.key in :organisationKeys");
sb.append(" )");
}
if (StringHelper.containsNonWhitespace(searchParams.getProviderType())) {
@@ -168,12 +157,8 @@ public class QualityGeneratorDAO {
query.setParameter("generatorKeys", generatorKeys);
}
if (searchParams.getOrganisationRefs() != null && !searchParams.getOrganisationRefs().isEmpty()) {
- for (int i = 0; i < searchParams.getOrganisationRefs().size(); i++) {
- String parameter = new StringBuilder(12).append("orgPath").append(i).toString();
- Long key = searchParams.getOrganisationRefs().get(i).getKey();
- String value = new StringBuilder(32).append("%/").append(key).append("/%").toString();
- query.setParameter(parameter, value);
- }
+ List<Long> organiationKeys = searchParams.getOrganisationRefs().stream().map(OrganisationRef::getKey).collect(toList());
+ query.setParameter("organisationKeys", organiationKeys);
}
if (StringHelper.containsNonWhitespace(searchParams.getProviderType())) {
query.setParameter("providerType", searchParams.getProviderType());
diff --git a/src/main/java/org/olat/modules/quality/manager/QualityDataCollectionDAO.java b/src/main/java/org/olat/modules/quality/manager/QualityDataCollectionDAO.java
index 80964916293e77c003fe5840e9b690e8670f93cf..b4b20212b75780fc74aebf7bcc6351a884af6020 100644
--- a/src/main/java/org/olat/modules/quality/manager/QualityDataCollectionDAO.java
+++ b/src/main/java/org/olat/modules/quality/manager/QualityDataCollectionDAO.java
@@ -19,6 +19,7 @@
*/
package org.olat.modules.quality.manager;
+import static java.util.stream.Collectors.toList;
import static org.olat.modules.quality.QualityDataCollectionStatus.READY;
import static org.olat.modules.quality.QualityDataCollectionStatus.RUNNING;
@@ -419,26 +420,14 @@ public class QualityDataCollectionDAO {
if (searchParams.getDataCollectionRef() != null && searchParams.getDataCollectionRef().getKey() != null) {
sb.and().append("collection.key = :collectionKey");
}
- if (hasEntries(searchParams.getOrganisationRefs()) || searchParams.getReportAccessIdentity() != null) {
+ if (hasEntries(searchParams.getOrgansationRefs()) || searchParams.getReportAccessIdentity() != null) {
sb.and().append("(");
boolean or = false;
- if (hasEntries(searchParams.getOrganisationRefs())) {
+ if (hasEntries(searchParams.getOrgansationRefs())) {
sb.append("collection.key in (");
sb.append("select collectionToOrganisation.dataCollection.key");
sb.append(" from qualitydatacollectiontoorganisation as collectionToOrganisation");
- sb.append(" where ");
- // load the organisations and all children
- for (int i = 0; i < searchParams.getOrganisationRefs().size(); i++) {
- if (i == 0) {
- sb.append("(");
- } else {
- sb.append(" or ");
- }
- sb.append("collectionToOrganisation.organisation.materializedPathKeys like :orgPath").append(i);
- if (i == searchParams.getOrganisationRefs().size() - 1) {
- sb.append(")");
- }
- }
+ sb.append(" where collectionToOrganisation.organisation.key in :organisationKeys");
sb.append(")");
or = true;
}
@@ -518,14 +507,10 @@ public class QualityDataCollectionDAO {
if (searchParams.getDataCollectionRef() != null && searchParams.getDataCollectionRef().getKey() != null) {
query.setParameter("collectionKey", searchParams.getDataCollectionRef().getKey());
}
- if (hasEntries(searchParams.getOrganisationRefs()) || searchParams.getReportAccessIdentity() != null) {
- if (hasEntries(searchParams.getOrganisationRefs())) {
- for (int i = 0; i < searchParams.getOrganisationRefs().size(); i++) {
- String parameter = new StringBuilder(12).append("orgPath").append(i).toString();
- Long key = searchParams.getOrganisationRefs().get(i).getKey();
- String value = new StringBuilder(32).append("%/").append(key).append("/%").toString();
- query.setParameter(parameter, value);
- }
+ if (hasEntries(searchParams.getOrgansationRefs()) || searchParams.getReportAccessIdentity() != null) {
+ if (hasEntries(searchParams.getOrgansationRefs())) {
+ List<Long> organiationKeys = searchParams.getOrgansationRefs().stream().map(OrganisationRef::getKey).collect(toList());
+ query.setParameter("organisationKeys", organiationKeys);
}
if (searchParams.getReportAccessIdentity() != null) {
query.setParameter("reportAccessIdentityKey", searchParams.getReportAccessIdentity().getKey());
diff --git a/src/main/java/org/olat/modules/quality/ui/DataCollectionDataSource.java b/src/main/java/org/olat/modules/quality/ui/DataCollectionDataSource.java
index d23ced8dadb2507b3b1ec24ed76e4552ec60461c..4ba409d40eec1c2a08d53d87d2f7b021d4bbb385 100644
--- a/src/main/java/org/olat/modules/quality/ui/DataCollectionDataSource.java
+++ b/src/main/java/org/olat/modules/quality/ui/DataCollectionDataSource.java
@@ -20,6 +20,7 @@
package org.olat.modules.quality.ui;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -51,11 +52,11 @@ public class DataCollectionDataSource implements FlexiTableDataSourceDelegate<Da
@Autowired
private QualityService qualityService;
- public DataCollectionDataSource(Translator translator, List<? extends OrganisationRef> organsationRefs,
+ public DataCollectionDataSource(Translator translator, Collection<? extends OrganisationRef> organsationRefs,
IdentityRef identityRef) {
this.translator = translator;
searchParams = new QualityDataCollectionViewSearchParams();
- searchParams.setOrganisationRefs(organsationRefs);
+ searchParams.setOrgansationRefs(organsationRefs);
searchParams.setReportAccessIdentity(identityRef);
CoreSpringFactory.autowireObject(this);
}
diff --git a/src/main/java/org/olat/modules/quality/ui/DataCollectionListController.java b/src/main/java/org/olat/modules/quality/ui/DataCollectionListController.java
index 7d1d5ab48f39a92401c7b9571d0cb60184a39e58..c40e770d437eb03cb7c0d5eba5f7cf6eb0a9468b 100644
--- a/src/main/java/org/olat/modules/quality/ui/DataCollectionListController.java
+++ b/src/main/java/org/olat/modules/quality/ui/DataCollectionListController.java
@@ -19,6 +19,7 @@
*/
package org.olat.modules.quality.ui;
+import java.util.Collection;
import java.util.List;
import org.olat.basesecurity.OrganisationRoles;
@@ -119,7 +120,7 @@ public class DataCollectionListController extends FormBasicController implements
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, DataCollectionCols.creationDate));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, DataCollectionCols.generatorTitle));
- List<? extends OrganisationRef> organisationRefs = organisationService.getOrganisations(getIdentity(),
+ Collection<? extends OrganisationRef> organisationRefs = organisationService.getOrganisations(getIdentity(),
ureq.getUserSession().getRoles(), secCallback.getViewDataCollectionRoles());
DataCollectionDataSource dataSource = new DataCollectionDataSource(getTranslator(), organisationRefs, getIdentity());
dataModel = new DataCollectionDataModel(dataSource, columnsModel, getTranslator(), secCallback);
diff --git a/src/test/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAOTest.java b/src/test/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAOTest.java
index 2b604a031f5614004554ce63c2a1db9df608922d..3087a4f8639cba640d2cbc9f2e58590cfdf9b976 100644
--- a/src/test/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAOTest.java
+++ b/src/test/java/org/olat/modules/quality/analysis/manager/EvaluationFormDAOTest.java
@@ -21,11 +21,11 @@ package org.olat.modules.quality.analysis.manager;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
import static java.util.stream.Collectors.toMap;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
@@ -233,20 +233,14 @@ public class EvaluationFormDAOTest extends OlatTestCase {
public void shouldFilterByOrganisations() {
RepositoryEntry formEntry = JunitTestHelper.createAndPersistRepositoryEntry();
RepositoryEntry otherFormEntry = JunitTestHelper.createAndPersistRepositoryEntry();
- Organisation superOrganisation = organisationService.createOrganisation("", "", null, null, null);
- Organisation organisation = organisationService.createOrganisation("", "", null, superOrganisation, null);
- Organisation subOrganisation = organisationService.createOrganisation("", "", null, organisation, null);
- List<Organisation> organisations = singletonList(organisation);
+ Organisation organisation = organisationService.createOrganisation("", "", null, null, null);
+ List<Organisation> organisations = Collections.singletonList(organisation);
Organisation otherOrganisation = organisationService.createOrganisation("", "", null, null, null);
- List<Organisation> otherOrganisations = singletonList(otherOrganisation);
- QualityDataCollection dataCollectionSuper = qualityService.createDataCollection(singletonList(superOrganisation), formEntry);
- qualityTestHelper.updateStatus(dataCollectionSuper, QualityDataCollectionStatus.FINISHED);
+ List<Organisation> otherOrganisations = Collections.singletonList(otherOrganisation);
QualityDataCollection dataCollection1 = qualityService.createDataCollection(organisations, formEntry);
qualityTestHelper.updateStatus(dataCollection1, QualityDataCollectionStatus.FINISHED);
QualityDataCollection dataCollection2 = qualityService.createDataCollection(organisations, formEntry);
qualityTestHelper.updateStatus(dataCollection2, QualityDataCollectionStatus.FINISHED);
- QualityDataCollection dataCollectionSub = qualityService.createDataCollection(singletonList(subOrganisation), formEntry);
- qualityTestHelper.updateStatus(dataCollectionSub, QualityDataCollectionStatus.FINISHED);
QualityDataCollection dataCollectionOtherOrganisation = qualityService.createDataCollection(otherOrganisations, formEntry);
qualityTestHelper.updateStatus(dataCollectionOtherOrganisation, QualityDataCollectionStatus.FINISHED);
QualityDataCollection dataCollectionOtherForm = qualityService.createDataCollection(otherOrganisations, otherFormEntry);
@@ -258,7 +252,7 @@ public class EvaluationFormDAOTest extends OlatTestCase {
searchParams.setOrganisationRefs(organisations);
List<EvaluationFormView> forms = sut.load(searchParams);
- Long expectedNumberDataCollections = (long) asList(dataCollection1, dataCollection2, dataCollectionSub).size();
+ Long expectedNumberDataCollections = (long) asList(dataCollection1, dataCollection2).size();
assertThat(forms)
.hasSize(1)
.extracting(EvaluationFormView::getNumberDataCollections)
diff --git a/src/test/java/org/olat/modules/quality/generator/manager/QualityGeneratorDAOTest.java b/src/test/java/org/olat/modules/quality/generator/manager/QualityGeneratorDAOTest.java
index c0d7f4103608ee963d64b59ee3eea54b294eff6d..b0dff07d263de76b926651a0e8d1c007b2786301 100644
--- a/src/test/java/org/olat/modules/quality/generator/manager/QualityGeneratorDAOTest.java
+++ b/src/test/java/org/olat/modules/quality/generator/manager/QualityGeneratorDAOTest.java
@@ -178,15 +178,11 @@ public class QualityGeneratorDAOTest extends OlatTestCase {
@Test
public void shouldFilterGeneratorViewByOrganisations() {
- Organisation superOrganisation = qualityTestHelper.createOrganisation();
- Organisation organisation1 = qualityTestHelper.createOrganisation(superOrganisation);
- Organisation subOrganisation = qualityTestHelper.createOrganisation(organisation1);
+ Organisation organisation1 = qualityTestHelper.createOrganisation();
Organisation organisation2 = qualityTestHelper.createOrganisation();
Organisation otherOrganisation = qualityTestHelper.createOrganisation();
- QualityGenerator generatorSuper = qualityTestHelper.createGenerator(singletonList(superOrganisation));
QualityGenerator generator1 = qualityTestHelper.createGenerator(singletonList(organisation1));
QualityGenerator generator2 = qualityTestHelper.createGenerator(Arrays.asList(organisation2, organisation1));
- QualityGenerator generatorSub = qualityTestHelper.createGenerator(singletonList(subOrganisation));
QualityGenerator otherGenerator = qualityTestHelper.createGenerator(singletonList(otherOrganisation));
dbInstance.commitAndCloseSession();
@@ -195,8 +191,8 @@ public class QualityGeneratorDAOTest extends OlatTestCase {
List<QualityGeneratorView> generators = sut.load(searchParams);
assertThat(generators).extracting(QualityGeneratorRef::getKey)
- .containsExactlyInAnyOrder(generator1.getKey(), generator2.getKey(), generatorSub.getKey())
- .doesNotContain(generatorSuper.getKey(), otherGenerator.getKey());
+ .containsExactlyInAnyOrder(generator1.getKey(), generator2.getKey())
+ .doesNotContain(otherGenerator.getKey());
}
diff --git a/src/test/java/org/olat/modules/quality/manager/QualityDataCollectionDAOTest.java b/src/test/java/org/olat/modules/quality/manager/QualityDataCollectionDAOTest.java
index 7870f1380f0521bca43de9e5d9af575ceb62d903..298cdfe87e603d0d1b9c738dcd4c0a537e02adab 100644
--- a/src/test/java/org/olat/modules/quality/manager/QualityDataCollectionDAOTest.java
+++ b/src/test/java/org/olat/modules/quality/manager/QualityDataCollectionDAOTest.java
@@ -529,24 +529,20 @@ public class QualityDataCollectionDAOTest extends OlatTestCase {
@Test
public void shouldFilterDataCollectionsByOrganisations() {
- Organisation superOrganisation = qualityTestHelper.createOrganisation();
- Organisation organisation = qualityTestHelper.createOrganisation(superOrganisation);
- Organisation subOrganisation = qualityTestHelper.createOrganisation(organisation);
- QualityDataCollection dataCollectionSuper = qualityTestHelper.createDataCollection(superOrganisation);
+ Organisation organisation = qualityTestHelper.createOrganisation();
QualityDataCollection dataCollection1 = qualityTestHelper.createDataCollection(organisation);
QualityDataCollection dataCollection2 = qualityTestHelper.createDataCollection(organisation);
- QualityDataCollection dataCollectionSub = qualityTestHelper.createDataCollection(subOrganisation);
QualityDataCollection otherDataCollection = qualityTestHelper.createDataCollection();
dbInstance.commitAndCloseSession();
QualityDataCollectionViewSearchParams searchParams = new QualityDataCollectionViewSearchParams();
- searchParams.setOrganisationRefs(Collections.singletonList(organisation));
+ searchParams.setOrgansationRefs(Collections.singletonList(organisation));
List<QualityDataCollectionView> dataCollections = sut.loadDataCollections(TRANSLATOR, searchParams, 0, -1);
List<Long> loadedKeys = dataCollections.stream().map(QualityDataCollectionView::getKey).collect(toList());
assertThat(loadedKeys)
- .containsExactlyInAnyOrder(dataCollection1.getKey(), dataCollection2.getKey(), dataCollectionSub.getKey())
- .doesNotContain(otherDataCollection.getKey(), dataCollectionSuper.getKey());
+ .containsExactlyInAnyOrder(dataCollection1.getKey(), dataCollection2.getKey())
+ .doesNotContain(otherDataCollection.getKey());
}
@Test
@@ -621,7 +617,7 @@ public class QualityDataCollectionDAOTest extends OlatTestCase {
QualityDataCollectionViewSearchParams searchParams = new QualityDataCollectionViewSearchParams();
Organisation organisation = qualityTestHelper.createOrganisation();
- searchParams.setOrganisationRefs(Collections.singletonList(organisation));
+ searchParams.setOrgansationRefs(Collections.singletonList(organisation));
searchParams.setReportAccessIdentity(reportViewer);
List<QualityDataCollectionView> dataCollections = sut.loadDataCollections(TRANSLATOR, searchParams, 0, -1);
diff --git a/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java b/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java
index 072808dae0cb40bf095431939abb579720cd2331..eb8e10aaf5d80f54e355fbbae5980328249010f8 100644
--- a/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java
+++ b/src/test/java/org/olat/modules/quality/manager/QualityTestHelper.java
@@ -234,10 +234,6 @@ public class QualityTestHelper {
return organisationService.createOrganisation(UUID.randomUUID().toString(), UUID.randomUUID().toString(), null, null, null);
}
- public Organisation createOrganisation(Organisation parent) {
- return organisationService.createOrganisation(UUID.randomUUID().toString(), UUID.randomUUID().toString(), null, parent, null);
- }
-
public Curriculum createCurriculum() {
return createCurriculum(createOrganisation());
}