@@ -201,7 +232,7 @@ export const NewAnnotationForm = ({
filterName='subjectFilter'
fieldName='subject'
value={newAnnotation.subject}
- onValueChangeHandler={onObjectChange}
+ onValueChangeHandler={onSubjectChange}
isSubject={true}
valueDisplayHandler={(item, setAutocompleteSelectedItem, op, query) =>
}
@@ -272,7 +303,7 @@ export const NewAnnotationForm = ({
fieldName='singleReference'
isReference={true}
value={newAnnotation.singleReference}
- onValueChangeHandler={onObjectChange}
+ onValueChangeHandler={onSingleReferenceChange}
classNames={classNames({'p-invalid': submitted && errorMessages.singleReference})}
valueDisplayHandler={(item, setAutocompleteSelectedItem, op, query) =>
}
@@ -344,14 +375,29 @@ export const NewAnnotationForm = ({
-
+
+
+
+
+
+
diff --git a/src/main/cliapp/src/containers/diseaseAnnotationsPage/useNewAnnotaionReducer.js b/src/main/cliapp/src/containers/diseaseAnnotationsPage/useNewAnnotaionReducer.js
index b8c8b4704..62f912cc2 100644
--- a/src/main/cliapp/src/containers/diseaseAnnotationsPage/useNewAnnotaionReducer.js
+++ b/src/main/cliapp/src/containers/diseaseAnnotationsPage/useNewAnnotaionReducer.js
@@ -18,7 +18,7 @@ const initialNewAnnotationState = {
evidenceCodes: [],
with: [],
relatedNotes: [],
- conditionRelations: [],
+ conditionRelations: []
},
errorMessages: {},
relatedNotesErrorMessages: [],
@@ -37,6 +37,13 @@ const newAnnotationReducer = (draft, action) => {
case 'EDIT':
draft.newAnnotation[action.field] = action.value;
break;
+ case 'EDIT_EXPERIMENT':
+ if (typeof action.value === "object") {
+ draft.newAnnotation.conditionRelations[0] = action.value;
+ } else {
+ draft.newAnnotation.conditionRelations[0].handle = action.value;
+ }
+ break;
case 'UPDATE_ERROR_MESSAGES':
draft[action.errorType]= action.errorMessages;
draft.isValid = false;
diff --git a/src/main/cliapp/src/containers/experimentalConditionsPage/ExperimentalConditionsTable.js b/src/main/cliapp/src/containers/experimentalConditionsPage/ExperimentalConditionsTable.js
index 2a380ccb1..05dbd80f3 100644
--- a/src/main/cliapp/src/containers/experimentalConditionsPage/ExperimentalConditionsTable.js
+++ b/src/main/cliapp/src/containers/experimentalConditionsPage/ExperimentalConditionsTable.js
@@ -168,7 +168,6 @@ export const ExperimentalConditionsTable = () => {
autocompleteFields={autocomplete}
rowProps={props}
searchService={searchService}
- fieldname='conditionClass'
endpoint='zecoterm'
filterName='conditionClassEditorFilter'
fieldName='conditionClass'
@@ -200,10 +199,9 @@ export const ExperimentalConditionsTable = () => {
autocompleteFields={autocomplete}
rowProps={props}
searchService={searchService}
- fieldname={fieldname}
+ fieldName={fieldname}
endpoint={endpoint}
filterName='singleOntologyFilter'
- fieldName={fieldname}
otherFilters={{
obsoleteFilter: {
"obsolete": {
diff --git a/src/main/cliapp/src/containers/layout/SiteLayout.js b/src/main/cliapp/src/containers/layout/SiteLayout.js
index acbdf63a4..a4f00d295 100644
--- a/src/main/cliapp/src/containers/layout/SiteLayout.js
+++ b/src/main/cliapp/src/containers/layout/SiteLayout.js
@@ -223,7 +223,7 @@ export const SiteLayout = (props) => {
{ label: 'Affected Genomic Models', icon: 'pi pi-fw pi-home', to: '/agms' },
{ label: 'Disease Annotations', icon: 'pi pi-fw pi-home', to: '/diseaseAnnotations' },
{ label: 'Experimental Conditions', icon: 'pi pi-fw pi-home', to: '/experimentalConditions' },
- { label: 'Condition Relations', icon: 'pi pi-fw pi-home', to: '/conditionRelations' },
+ { label: 'Experiments', icon: 'pi pi-fw pi-home', to: '/conditionRelations' },
{ label: 'Molecules', icon: 'pi pi-fw pi-home', to: '/molecules' },
{ label: 'Literature References', icon: 'pi pi-fw pi-home', to: '/references' }
]
diff --git a/src/main/cliapp/src/containers/profilePage/ProfileComponent.js b/src/main/cliapp/src/containers/profilePage/ProfileComponent.js
index 37809e71e..d16e146a6 100644
--- a/src/main/cliapp/src/containers/profilePage/ProfileComponent.js
+++ b/src/main/cliapp/src/containers/profilePage/ProfileComponent.js
@@ -24,7 +24,7 @@ const initialThemeState = {
export const ProfileComponent = () => {
- const { settings: themeState, mutate: setThemeState } = useGetUserSettings( "themeSettings", initialThemeState);
+ const { settings: themeState, mutate: setThemeState } = useGetUserSettings("themeSettings", initialThemeState);
const [localUserInfo, setLocalUserInfo] = useState({});
const [oktaToken] = useState(JSON.parse(localStorage.getItem('okta-token-storage')));
@@ -35,7 +35,7 @@ export const ProfileComponent = () => {
const personSettingsService = new PersonSettingsService();
const globalResetHandler = () =>{
- for(let setting of localUserInfo.settings){
+ for(let setting of localUserInfo.settings) {
localStorage.removeItem(setting.settingsKey);
personSettingsService.deleteUserSettings(setting.settingsKey);
}
@@ -68,9 +68,7 @@ export const ProfileComponent = () => {
}, [authState, oktaAuth, setLocalUserInfo]); // eslint-disable-line react-hooks/exhaustive-deps
const valueTemplate = (props) => {
- //console.log(props.template());
return props.template(props);
- //return props.template;
};
const textTemplate = (props) => {
diff --git a/src/main/cliapp/src/routes.js b/src/main/cliapp/src/routes.js
index 82512ae91..5d8afb5bb 100644
--- a/src/main/cliapp/src/routes.js
+++ b/src/main/cliapp/src/routes.js
@@ -61,17 +61,17 @@ export default (
} />
} />
} />
- } />
- } />
- } />
- } />
- } />
- } />
- } />
- } />
- } />
- } />
- } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
} />
} />
diff --git a/src/main/cliapp/src/service/AlleleService.js b/src/main/cliapp/src/service/AlleleService.js
new file mode 100644
index 000000000..f8c489ee0
--- /dev/null
+++ b/src/main/cliapp/src/service/AlleleService.js
@@ -0,0 +1,18 @@
+import { BaseAuthService } from './BaseAuthService';
+import { DeletionService } from './DeletionService';
+
+export class AlleleService extends BaseAuthService {
+ saveAllele(updatedAllele) {
+ return this.api.put(`/allele`, updatedAllele);
+ }
+
+ createAllele(newAllele) {
+ return this.api.post(`/allele`, newAllele);
+ }
+
+ async deleteAllele(allele) {
+ const deletionService = new DeletionService();
+ return await deletionService.delete(`allele`, allele.id);
+ }
+}
+
diff --git a/src/main/cliapp/src/service/useGetUserSettings.js b/src/main/cliapp/src/service/useGetUserSettings.js
index 2c84785dd..bd54c5939 100644
--- a/src/main/cliapp/src/service/useGetUserSettings.js
+++ b/src/main/cliapp/src/service/useGetUserSettings.js
@@ -20,13 +20,10 @@ export const useGetUserSettings = (key, defaultValue) => {
});
const { mutate } = useMutation(updatedSettings => {
+ setSettings(updatedSettings);
+ localStorage.setItem(key, JSON.stringify(updatedSettings));
return personSettingsService.saveUserSettings(key, updatedSettings);
- },{
- onSuccess: (data) => {
- localStorage.setItem(key, JSON.stringify(data.entity.settingsMap));
- setSettings(data.entity.settingsMap);
- }
- } );
+ });
return {settings, mutate}
}
diff --git a/src/main/java/org/alliancegenome/curation_api/controllers/MatiTemporalController.java b/src/main/java/org/alliancegenome/curation_api/controllers/MatiTemporalController.java
new file mode 100644
index 000000000..916dfd219
--- /dev/null
+++ b/src/main/java/org/alliancegenome/curation_api/controllers/MatiTemporalController.java
@@ -0,0 +1,32 @@
+package org.alliancegenome.curation_api.controllers;
+
+import org.alliancegenome.curation_api.model.mati.Identifier;
+import org.alliancegenome.curation_api.model.mati.IdentifiersRange;
+import org.alliancegenome.curation_api.services.mati.MaTIService;
+import org.eclipse.microprofile.openapi.annotations.tags.Tag;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+
+@Path("/mati")
+@Tag(name = "Mati Test")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+@RequestScoped
+public class MatiTemporalController {
+ @Inject
+ MaTIService maTIService;
+
+ @PUT
+ public Identifier testMatiService(@HeaderParam("subdomain") String subdomain) throws IOException {
+ return maTIService.mintIdentifier(subdomain);
+ }
+
+ @POST
+ public IdentifiersRange testMatiServiceMany(@HeaderParam("subdomain") String subdomain, @HeaderParam("value") String value) throws IOException {
+ return maTIService.mintIdentifierRange(subdomain, value);
+ }
+}
diff --git a/src/main/java/org/alliancegenome/curation_api/controllers/crud/DiseaseAnnotationCrudController.java b/src/main/java/org/alliancegenome/curation_api/controllers/crud/DiseaseAnnotationCrudController.java
index a5b100836..61a264e17 100644
--- a/src/main/java/org/alliancegenome/curation_api/controllers/crud/DiseaseAnnotationCrudController.java
+++ b/src/main/java/org/alliancegenome/curation_api/controllers/crud/DiseaseAnnotationCrudController.java
@@ -1,5 +1,9 @@
package org.alliancegenome.curation_api.controllers.crud;
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
import org.alliancegenome.curation_api.controllers.base.BaseEntityCrudController;
import org.alliancegenome.curation_api.dao.DiseaseAnnotationDAO;
import org.alliancegenome.curation_api.interfaces.crud.DiseaseAnnotationCrudInterface;
@@ -8,10 +12,6 @@
import org.alliancegenome.curation_api.response.SearchResponse;
import org.alliancegenome.curation_api.services.DiseaseAnnotationService;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-
@RequestScoped
public class DiseaseAnnotationCrudController extends BaseEntityCrudController implements DiseaseAnnotationCrudInterface {
diff --git a/src/main/java/org/alliancegenome/curation_api/controllers/crud/VocabularyTermCrudController.java b/src/main/java/org/alliancegenome/curation_api/controllers/crud/VocabularyTermCrudController.java
index 30e06b91b..1e6dcdc89 100644
--- a/src/main/java/org/alliancegenome/curation_api/controllers/crud/VocabularyTermCrudController.java
+++ b/src/main/java/org/alliancegenome/curation_api/controllers/crud/VocabularyTermCrudController.java
@@ -19,8 +19,6 @@ public class VocabularyTermCrudController extends BaseEntityCrudController getTermInVocabulary(String name, String vocabulary) {
- VocabularyTerm term = vocabularyTermDAO.getTermInVocabulary(name, vocabulary);
- ObjectResponse response = new ObjectResponse();
- response.setEntity(term);
- return response;
- }
-
@Override
public ObjectResponse delete(Long id) {
ObjectResponse ret;
@@ -55,4 +45,9 @@ public ObjectResponse delete(Long id) {
return ret;
}
+ @Override
+ public ObjectResponse getTermInVocabulary(String vocabularyName, String termName) {
+ return vocabularyTermService.getTermInVocabulary(vocabularyName, termName);
+ }
+
}
diff --git a/src/main/java/org/alliancegenome/curation_api/dao/AffectedGenomicModelDAO.java b/src/main/java/org/alliancegenome/curation_api/dao/AffectedGenomicModelDAO.java
index 459719b94..1f2b57332 100644
--- a/src/main/java/org/alliancegenome/curation_api/dao/AffectedGenomicModelDAO.java
+++ b/src/main/java/org/alliancegenome/curation_api/dao/AffectedGenomicModelDAO.java
@@ -23,13 +23,13 @@ public List findAllCuriesByTaxon(String taxonId) {
}
@Transactional
- public void deleteReferencingDiseaseAnnotations(List agmCuries) {
- Query jpqlQuery = entityManager.createQuery("SELECT da.id FROM DiseaseAnnotation da WHERE da.diseaseGeneticModifier.curie IN (:agmCuries)");
- jpqlQuery.setParameter("agmCuries", agmCuries);
+ public void deleteAgmAndReferencingDiseaseAnnotations(String agmCurie) {
+ Query jpqlQuery = entityManager.createQuery("SELECT da.id FROM DiseaseAnnotation da WHERE da.diseaseGeneticModifier.curie = :agmCurie");
+ jpqlQuery.setParameter("agmCurie", agmCurie);
List results = (List)jpqlQuery.getResultList();
- jpqlQuery = entityManager.createQuery("SELECT ada.id FROM AGMDiseaseAnnotation ada WHERE ada.subject.curie IN (:agmCuries)");
- jpqlQuery.setParameter("agmCuries", agmCuries);
+ jpqlQuery = entityManager.createQuery("SELECT ada.id FROM AGMDiseaseAnnotation ada WHERE ada.subject.curie = :agmCurie");
+ jpqlQuery.setParameter("agmCurie", agmCurie);
results.addAll((List) jpqlQuery.getResultList());
jpqlQuery = entityManager.createNativeQuery("DELETE FROM diseaseannotation_conditionrelation WHERE diseaseannotation_id IN (:ids)");
@@ -47,6 +47,8 @@ public void deleteReferencingDiseaseAnnotations(List agmCuries) {
jpqlQuery = entityManager.createNativeQuery("DELETE FROM diseaseannotation_vocabularyterm WHERE diseaseannotation_id IN (:ids)");
jpqlQuery.setParameter("ids", results);
jpqlQuery.executeUpdate();
+
+ remove(agmCurie);
}
}
diff --git a/src/main/java/org/alliancegenome/curation_api/dao/AlleleDAO.java b/src/main/java/org/alliancegenome/curation_api/dao/AlleleDAO.java
index c21393c0b..75c66a43d 100644
--- a/src/main/java/org/alliancegenome/curation_api/dao/AlleleDAO.java
+++ b/src/main/java/org/alliancegenome/curation_api/dao/AlleleDAO.java
@@ -23,13 +23,13 @@ public List findAllCuriesByTaxon(String taxonId) {
}
@Transactional
- public void deleteReferencingDiseaseAnnotations(List alleleCuries) {
- Query jpqlQuery = entityManager.createQuery("SELECT da.id FROM DiseaseAnnotation da WHERE da.diseaseGeneticModifier.curie IN (:alleleCuries)");
- jpqlQuery.setParameter("alleleCuries", alleleCuries);
+ public void deleteAlleleAndReferencingDiseaseAnnotations(String alleleCurie) {
+ Query jpqlQuery = entityManager.createQuery("SELECT da.id FROM DiseaseAnnotation da WHERE da.diseaseGeneticModifier.curie = :alleleCurie");
+ jpqlQuery.setParameter("alleleCurie", alleleCurie);
List results = (List)jpqlQuery.getResultList();
- jpqlQuery = entityManager.createQuery("SELECT ada.id FROM AlleleDiseaseAnnotation ada WHERE ada.subject.curie IN (:alleleCuries)");
- jpqlQuery.setParameter("alleleCuries", alleleCuries);
+ jpqlQuery = entityManager.createQuery("SELECT ada.id FROM AlleleDiseaseAnnotation ada WHERE ada.subject.curie = :alleleCurie");
+ jpqlQuery.setParameter("alleleCurie", alleleCurie);
results.addAll((List) jpqlQuery.getResultList());
jpqlQuery = entityManager.createNativeQuery("DELETE FROM diseaseannotation_conditionrelation WHERE diseaseannotation_id IN (:ids)");
@@ -47,6 +47,8 @@ public void deleteReferencingDiseaseAnnotations(List alleleCuries) {
jpqlQuery = entityManager.createNativeQuery("DELETE FROM diseaseannotation_vocabularyterm WHERE diseaseannotation_id IN (:ids)");
jpqlQuery.setParameter("ids", results);
jpqlQuery.executeUpdate();
+
+ remove(alleleCurie);
}
}
diff --git a/src/main/java/org/alliancegenome/curation_api/dao/GeneDAO.java b/src/main/java/org/alliancegenome/curation_api/dao/GeneDAO.java
index b11448e77..668e35aa8 100644
--- a/src/main/java/org/alliancegenome/curation_api/dao/GeneDAO.java
+++ b/src/main/java/org/alliancegenome/curation_api/dao/GeneDAO.java
@@ -27,17 +27,17 @@ public List findAllCuriesByTaxon(String taxonId) {
}
@Transactional
- public void deleteReferencingDiseaseAnnotations(List geneCuries) {
- Query jpqlQuery = entityManager.createQuery("SELECT da.id FROM DiseaseAnnotation da WHERE da.diseaseGeneticModifier.curie IN (:geneCuries)");
- jpqlQuery.setParameter("geneCuries", geneCuries);
+ public void deleteGeneAndReferencingDiseaseAnnotations(String geneCurie) {
+ Query jpqlQuery = entityManager.createQuery("SELECT da.id FROM DiseaseAnnotation da WHERE da.diseaseGeneticModifier.curie = :geneCurie");
+ jpqlQuery.setParameter("geneCurie", geneCurie);
List results = (List)jpqlQuery.getResultList();
- jpqlQuery = entityManager.createQuery("SELECT gda.id FROM GeneDiseaseAnnotation gda WHERE gda.subject.curie IN (:geneCuries)");
- jpqlQuery.setParameter("geneCuries", geneCuries);
+ jpqlQuery = entityManager.createQuery("SELECT gda.id FROM GeneDiseaseAnnotation gda WHERE gda.subject.curie = :geneCurie");
+ jpqlQuery.setParameter("geneCurie", geneCurie);
results.addAll((List) jpqlQuery.getResultList());
- jpqlQuery = entityManager.createNativeQuery("SELECT diseaseannotation_id FROM diseaseannotation_gene gda WHERE with_curie IN (:geneCuries)");
- jpqlQuery.setParameter("geneCuries", geneCuries);
+ jpqlQuery = entityManager.createNativeQuery("SELECT diseaseannotation_id FROM diseaseannotation_gene gda WHERE with_curie = :geneCurie");
+ jpqlQuery.setParameter("geneCurie", geneCurie);
results.addAll((List) jpqlQuery.getResultList());
jpqlQuery = entityManager.createNativeQuery("DELETE FROM diseaseannotation_conditionrelation WHERE diseaseannotation_id IN (:ids)");
@@ -59,6 +59,8 @@ public void deleteReferencingDiseaseAnnotations(List geneCuries) {
jpqlQuery = entityManager.createNativeQuery("DELETE FROM diseaseannotation_vocabularyterm WHERE diseaseannotation_id IN (:ids)");
jpqlQuery.setParameter("ids", results);
jpqlQuery.executeUpdate();
+
+ remove(geneCurie);
}
diff --git a/src/main/java/org/alliancegenome/curation_api/dao/ReferenceDAO.java b/src/main/java/org/alliancegenome/curation_api/dao/ReferenceDAO.java
index ea127ea50..acf793c54 100644
--- a/src/main/java/org/alliancegenome/curation_api/dao/ReferenceDAO.java
+++ b/src/main/java/org/alliancegenome/curation_api/dao/ReferenceDAO.java
@@ -19,6 +19,7 @@ public void updateReferenceForeignKeys(String originalCurie, String newCurie) {
updateReferenceForeignKey("conditionrelation", "singlereference_curie", originalCurie, newCurie);
updateReferenceForeignKey("note_reference", "references_curie", originalCurie, newCurie);
updateReferenceForeignKey("paperhandle", "reference_curie", originalCurie, newCurie);
+ updateReferenceForeignKey("allele_reference", "references_curie", originalCurie, newCurie);
deleteReferenceForeignKey("reference_crossreference", "reference_curie", originalCurie);
}
diff --git a/src/main/java/org/alliancegenome/curation_api/dao/VocabularyTermDAO.java b/src/main/java/org/alliancegenome/curation_api/dao/VocabularyTermDAO.java
index 2e5fb3bcf..ec6a45048 100644
--- a/src/main/java/org/alliancegenome/curation_api/dao/VocabularyTermDAO.java
+++ b/src/main/java/org/alliancegenome/curation_api/dao/VocabularyTermDAO.java
@@ -1,40 +1,29 @@
package org.alliancegenome.curation_api.dao;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
import org.alliancegenome.curation_api.dao.base.BaseSQLDAO;
-import org.alliancegenome.curation_api.model.entities.*;
+import org.alliancegenome.curation_api.model.entities.VocabularyTerm;
import org.alliancegenome.curation_api.response.SearchResponse;
-import lombok.extern.jbosslog.JBossLog;
-
-@JBossLog
@ApplicationScoped
public class VocabularyTermDAO extends BaseSQLDAO {
-
- @Inject
- VocabularyDAO vocabularyDAO;
- @Inject
- VocabularyTermDAO vocabularyTermDAO;
protected VocabularyTermDAO() {
super(VocabularyTerm.class);
}
- public VocabularyTerm getTermInVocabulary (String termName, String vocabularyName) {
-
- Vocabulary vocabulary;
- SearchResponse vocabularySearchResponse = vocabularyDAO.findByField("name", vocabularyName);
- if (vocabularySearchResponse == null || vocabularySearchResponse.getSingleResult() == null) {
- return null;
- }
- vocabulary = vocabularySearchResponse.getSingleResult();
-
- VocabularyTerm term = vocabulary.getMemberTerms().stream().filter(
- vocabularyTerm -> termName.equals(vocabularyTerm.getName())
- ).findAny().orElse(null);
-
- return term;
+ public VocabularyTerm getTermInVocabulary(String vocabularyName, String termName) {
+
+ Map params = new HashMap();
+ params.put("name", termName);
+ params.put("vocabulary.name", vocabularyName);
+
+ SearchResponse resp = findByParams(null, params);
+ return resp.getSingleResult();
+
}
}
diff --git a/src/main/java/org/alliancegenome/curation_api/dao/base/BaseSQLDAO.java b/src/main/java/org/alliancegenome/curation_api/dao/base/BaseSQLDAO.java
index 9f51b099b..cb0da6d72 100644
--- a/src/main/java/org/alliancegenome/curation_api/dao/base/BaseSQLDAO.java
+++ b/src/main/java/org/alliancegenome/curation_api/dao/base/BaseSQLDAO.java
@@ -427,19 +427,28 @@ public SearchResponse searchByParams(Pagination pagination, Map= 1 ? value : 1)
- );
+ String queryType = (String) searchFilters.get(filterName).get(field).get("queryType");
+ if(queryType != null && queryType.equals("matchQuery")) {
+ q.should(
+ p.match()
+ .field(queryField)
+ .matching(searchFilters.get(filterName).get(field).get("queryString").toString())
+ .boost(value >= 1 ? value : 1)
+ );
+ } else { // assume simple query
+ q.should(
+ p.simpleQueryString()
+ .fields(queryField)
+ .matching(searchFilters.get(filterName).get(field).get("queryString").toString())
+ .defaultOperator(booleanOperator)
+ .boost(value >= 1 ? value : 1)
+ );
+ }
boost++;
}
})
@@ -544,8 +553,11 @@ public SearchResponse findByParams(Pagination pagination, Map
public SearchResponse findByParams(Pagination pagination, Map params, String orderByField) {
if (orderByField != null) {
- log.debug("Search By Params: " + params + " Order by: " + orderByField);
+ log.debug("Search By Params: " + params + " Order by: " + orderByField + " for class: " + myClass);
+ } else {
+ log.debug("Search By Params: " + params + " for class: " + myClass);
}
+
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
CriteriaQuery query = builder.createQuery(myClass);
CriteriaQuery countQuery = builder.createQuery(Long.class);
@@ -555,7 +567,8 @@ public SearchResponse findByParams(Pagination pagination, Map
//System.out.println("Root: " + root);
List restrictions = new ArrayList<>();
List countRestrictions = new ArrayList<>();
- log.debug(params);
+
+
for (String key : params.keySet()) {
Path