diff --git a/annotation-service/annotation-web/src/main/resources/config/queue.yml b/annotation-service/annotation-web/src/main/resources/config/queue.yml index 50e85a269..11cb67ea1 100644 --- a/annotation-service/annotation-web/src/main/resources/config/queue.yml +++ b/annotation-service/annotation-web/src/main/resources/config/queue.yml @@ -27,7 +27,7 @@ queue: exchange: null rabbitmq: enable: false - interval-seconds: 30 + interval-seconds: 3 options: retry-threashold: 100 retry-delay-step-seconds: 300 @@ -46,7 +46,7 @@ queue: annotation-entities-removal-topic: annotation.entities.remove rabbitmq: enable: false - interval-seconds: 30 + interval-seconds: 3 options: retry-threashold: 100 retry-delay-step-seconds: 300 diff --git a/backend/core/src/main/java/org/opencdmp/data/tenant/TenantListener.java b/backend/core/src/main/java/org/opencdmp/data/tenant/TenantListener.java index 60d78ff47..64570e67f 100644 --- a/backend/core/src/main/java/org/opencdmp/data/tenant/TenantListener.java +++ b/backend/core/src/main/java/org/opencdmp/data/tenant/TenantListener.java @@ -5,7 +5,6 @@ import org.opencdmp.commons.scope.tenant.TenantScope; import org.opencdmp.commons.scope.tenant.TenantScoped; import org.opencdmp.errorcode.ErrorThesaurusProperties; import gr.cite.tools.exception.MyForbiddenException; -import gr.cite.tools.exception.MyValidationException; import gr.cite.tools.logging.LoggerService; import jakarta.persistence.PrePersist; import jakarta.persistence.PreRemove; diff --git a/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java b/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java index 7833aec63..3fed9080c 100644 --- a/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java +++ b/backend/core/src/main/java/org/opencdmp/query/ReferenceQuery.java @@ -1,5 +1,12 @@ package org.opencdmp.query; +import gr.cite.commons.web.authz.service.AuthorizationService; +import gr.cite.tools.data.query.FieldResolver; +import gr.cite.tools.data.query.QueryBase; +import gr.cite.tools.data.query.QueryContext; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Predicate; import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.Permission; import org.opencdmp.commons.enums.IsActive; @@ -9,18 +16,10 @@ import org.opencdmp.data.DescriptionReferenceEntity; import org.opencdmp.data.DmpEntity; import org.opencdmp.data.DmpReferenceEntity; import org.opencdmp.data.ReferenceEntity; -import org.opencdmp.model.DescriptionReference; import org.opencdmp.model.PublicReference; import org.opencdmp.model.Reference; import org.opencdmp.query.utils.BuildSubQueryInput; import org.opencdmp.query.utils.QueryUtilsService; -import gr.cite.commons.web.authz.service.AuthorizationService; -import gr.cite.tools.data.query.FieldResolver; -import gr.cite.tools.data.query.QueryBase; -import gr.cite.tools.data.query.QueryContext; -import jakarta.persistence.Tuple; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.Predicate; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; @@ -29,7 +28,7 @@ import java.time.Instant; import java.util.*; @Component -@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) +@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE) public class ReferenceQuery extends QueryBase { private String like; @@ -219,20 +218,20 @@ public class ReferenceQuery extends QueryBase { if (userId != null || usePublic) { predicates.add(queryContext.CriteriaBuilder.or( userId != null ? queryContext.CriteriaBuilder.equal(queryContext.Root.get(ReferenceEntity._createdById), userId) : queryContext.CriteriaBuilder.or(), //Creates a false query - queryContext.CriteriaBuilder.in(queryContext.Root.get(ReferenceEntity._id)).value(queryUtilsService.buildSubQuery(new BuildSubQueryInput<>(new BuildSubQueryInput.Builder<>(DmpReferenceEntity.class, UUID.class) + queryContext.CriteriaBuilder.in(queryContext.Root.get(ReferenceEntity._id)).value(this.queryUtilsService.buildSubQuery(new BuildSubQueryInput<>(new BuildSubQueryInput.Builder<>(DmpReferenceEntity.class, UUID.class) .query(queryContext.Query) .criteriaBuilder(queryContext.CriteriaBuilder) .keyPathFunc((subQueryRoot) -> subQueryRoot.get(DmpReferenceEntity._referenceId)) .filterFunc((subQueryRoot, cb) -> - cb.in(subQueryRoot.get(DmpReferenceEntity._dmpId)).value(queryUtilsService.buildDmpAuthZSubQuery(queryContext.Query, queryContext.CriteriaBuilder, userId, usePublic)) + cb.in(subQueryRoot.get(DmpReferenceEntity._dmpId)).value(this.queryUtilsService.buildDmpAuthZSubQuery(queryContext.Query, queryContext.CriteriaBuilder, userId, usePublic)) ) ))), - queryContext.CriteriaBuilder.in(queryContext.Root.get(ReferenceEntity._id)).value(queryUtilsService.buildSubQuery(new BuildSubQueryInput<>(new BuildSubQueryInput.Builder<>(DescriptionReferenceEntity.class, UUID.class) + queryContext.CriteriaBuilder.in(queryContext.Root.get(ReferenceEntity._id)).value(this.queryUtilsService.buildSubQuery(new BuildSubQueryInput<>(new BuildSubQueryInput.Builder<>(DescriptionReferenceEntity.class, UUID.class) .query(queryContext.Query) .criteriaBuilder(queryContext.CriteriaBuilder) .keyPathFunc((subQueryRoot) -> subQueryRoot.get(DescriptionReferenceEntity._referenceId)) .filterFunc((subQueryRoot, cb) -> - cb.in(subQueryRoot.get(DescriptionReferenceEntity._descriptionId)).value(queryUtilsService.buildDescriptionAuthZSubQuery(queryContext.Query, queryContext.CriteriaBuilder, userId, usePublic)) + cb.in(subQueryRoot.get(DescriptionReferenceEntity._descriptionId)).value(this.queryUtilsService.buildDescriptionAuthZSubQuery(queryContext.Query, queryContext.CriteriaBuilder, userId, usePublic)) ) ))) )); @@ -255,9 +254,9 @@ public class ReferenceQuery extends QueryBase { predicates.add(inClause); } if (this.like != null && !this.like.isEmpty()) { - predicates.add(queryContext.CriteriaBuilder.or(queryUtilsService.ilike(queryContext.CriteriaBuilder, queryContext.Root.get(ReferenceEntity._label), this.like), - queryUtilsService.ilike(queryContext.CriteriaBuilder, queryContext.Root.get(ReferenceEntity._description), this.like), - queryUtilsService.ilike(queryContext.CriteriaBuilder, queryContext.Root.get(ReferenceEntity._reference), this.like) + predicates.add(queryContext.CriteriaBuilder.or(this.queryUtilsService.ilike(queryContext.CriteriaBuilder, queryContext.Root.get(ReferenceEntity._label), this.like), + this.queryUtilsService.ilike(queryContext.CriteriaBuilder, queryContext.Root.get(ReferenceEntity._description), this.like), + this.queryUtilsService.ilike(queryContext.CriteriaBuilder, queryContext.Root.get(ReferenceEntity._reference), this.like) )); } if (this.isActives != null) { diff --git a/backend/core/src/main/java/org/opencdmp/service/dmpblueprint/DmpBlueprintServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/dmpblueprint/DmpBlueprintServiceImpl.java index 5981e3962..da6b9b497 100644 --- a/backend/core/src/main/java/org/opencdmp/service/dmpblueprint/DmpBlueprintServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/dmpblueprint/DmpBlueprintServiceImpl.java @@ -1,30 +1,6 @@ package org.opencdmp.service.dmpblueprint; import com.fasterxml.jackson.core.JsonProcessingException; -import org.opencdmp.authorization.AuthorizationFlags; -import org.opencdmp.authorization.Permission; -import org.opencdmp.commons.XmlHandlingService; -import org.opencdmp.commons.enums.*; -import org.opencdmp.commons.scope.tenant.TenantScope; -import org.opencdmp.commons.types.dmpblueprint.*; -import org.opencdmp.commons.types.dmpblueprint.importexport.*; -import org.opencdmp.convention.ConventionService; -import org.opencdmp.data.DmpBlueprintEntity; -import org.opencdmp.data.DmpEntity; -import org.opencdmp.data.TenantEntityManager; -import org.opencdmp.errorcode.ErrorThesaurusProperties; -import org.opencdmp.model.DmpBlueprint; -import org.opencdmp.model.builder.DmpBlueprintBuilder; -import org.opencdmp.model.deleter.DmpBlueprintDeleter; -import org.opencdmp.model.dmpblueprintdefinition.Definition; -import org.opencdmp.model.dmpblueprintdefinition.Field; -import org.opencdmp.model.dmpblueprintdefinition.Section; -import org.opencdmp.model.persist.DmpBlueprintPersist; -import org.opencdmp.model.persist.NewVersionDmpBlueprintPersist; -import org.opencdmp.model.persist.dmpblueprintdefinition.*; -import org.opencdmp.query.DmpBlueprintQuery; -import org.opencdmp.query.DmpQuery; -import org.opencdmp.service.responseutils.ResponseUtilsService; import gr.cite.commons.web.authz.service.AuthorizationService; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.data.deleter.DeleterFactory; @@ -40,6 +16,28 @@ import gr.cite.tools.logging.MapLogEntry; import gr.cite.tools.validation.ValidatorFactory; import jakarta.xml.bind.JAXBException; import org.jetbrains.annotations.NotNull; +import org.opencdmp.authorization.AuthorizationFlags; +import org.opencdmp.authorization.Permission; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.*; +import org.opencdmp.commons.scope.tenant.TenantScope; +import org.opencdmp.commons.types.dmpblueprint.*; +import org.opencdmp.commons.types.dmpblueprint.importexport.*; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.DmpBlueprintEntity; +import org.opencdmp.data.TenantEntityManager; +import org.opencdmp.errorcode.ErrorThesaurusProperties; +import org.opencdmp.model.DmpBlueprint; +import org.opencdmp.model.builder.DmpBlueprintBuilder; +import org.opencdmp.model.deleter.DmpBlueprintDeleter; +import org.opencdmp.model.dmpblueprintdefinition.Definition; +import org.opencdmp.model.dmpblueprintdefinition.Field; +import org.opencdmp.model.dmpblueprintdefinition.Section; +import org.opencdmp.model.persist.DmpBlueprintPersist; +import org.opencdmp.model.persist.NewVersionDmpBlueprintPersist; +import org.opencdmp.model.persist.dmpblueprintdefinition.*; +import org.opencdmp.query.DmpBlueprintQuery; +import org.opencdmp.service.responseutils.ResponseUtilsService; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.MessageSource; diff --git a/backend/core/src/main/java/org/opencdmp/service/visibility/Field.java b/backend/core/src/main/java/org/opencdmp/service/visibility/Field.java index 2d286443d..e5379d2fe 100644 --- a/backend/core/src/main/java/org/opencdmp/service/visibility/Field.java +++ b/backend/core/src/main/java/org/opencdmp/service/visibility/Field.java @@ -18,22 +18,22 @@ public class Field { private final ExternalIdentifier externalIdentifier; public String getTextValue() { - return textValue; + return this.textValue; } public List getTextListValue() { - return textListValue; + return this.textListValue; } public Instant getDateValue() { - return dateValue; + return this.dateValue; } public ExternalIdentifier getExternalIdentifier() { - return externalIdentifier; + return this.externalIdentifier; } diff --git a/backend/core/src/main/java/org/opencdmp/service/visibility/VisibilityServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/visibility/VisibilityServiceImpl.java index f053a7b3a..bda109caf 100644 --- a/backend/core/src/main/java/org/opencdmp/service/visibility/VisibilityServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/visibility/VisibilityServiceImpl.java @@ -27,13 +27,13 @@ public class VisibilityServiceImpl implements VisibilityService { private void initRules(){ if (this.rulesBySources != null) return; - rulesBySources = new HashMap<>(); + this.rulesBySources = new HashMap<>(); for (FieldEntity fieldEntity : this.definition.getAllField()){ if (fieldEntity.getVisibilityRules() != null && !fieldEntity.getVisibilityRules().isEmpty()) { for (RuleEntity rule : fieldEntity.getVisibilityRules()){ - if (!rulesBySources.containsKey(fieldEntity.getId())) rulesBySources.put(fieldEntity.getId(), new ArrayList<>()); + if (!this.rulesBySources.containsKey(fieldEntity.getId())) this.rulesBySources.put(fieldEntity.getId(), new ArrayList<>()); RuleWithTarget ruleWithTarget = new RuleWithTarget(fieldEntity.getId(), rule, fieldEntity); - rulesBySources.get(fieldEntity.getId()).add(ruleWithTarget); + this.rulesBySources.get(fieldEntity.getId()).add(ruleWithTarget); } } } @@ -49,11 +49,11 @@ public class VisibilityServiceImpl implements VisibilityService { @Override public Map getVisibilityStates() { this.calculateVisibility(); - return visibility; + return this.visibility; } private void calculateVisibility(){ - if (visibility != null) return; + if (this.visibility != null) return; this.initRules(); this.buildTargetVisibility(); @@ -63,11 +63,11 @@ public class VisibilityServiceImpl implements VisibilityService { } private void buildTargetVisibility(){ - visibility = new HashMap<>(); - for (Map.Entry> ruleForSource : rulesBySources.entrySet()){ + this.visibility = new HashMap<>(); + for (Map.Entry> ruleForSource : this.rulesBySources.entrySet()){ for (RuleWithTarget rule : ruleForSource.getValue()){ - if (propertyDefinition.getFieldSets() != null && !propertyDefinition.getFieldSets().isEmpty()){ - for (PropertyDefinitionFieldSet propertyDefinitionFieldSet: propertyDefinition.getFieldSets().values()) { + if (this.propertyDefinition.getFieldSets() != null && !this.propertyDefinition.getFieldSets().isEmpty()){ + for (PropertyDefinitionFieldSet propertyDefinitionFieldSet: this.propertyDefinition.getFieldSets().values()) { if (propertyDefinitionFieldSet.getItems() != null && !propertyDefinitionFieldSet.getItems().isEmpty()) { for (PropertyDefinitionFieldSetItem definitionFieldSetItem : propertyDefinitionFieldSet.getItems()) { if (definitionFieldSetItem.getFields() != null && !definitionFieldSetItem.getFields().isEmpty()) { @@ -78,18 +78,18 @@ public class VisibilityServiceImpl implements VisibilityService { if (definitionFieldSetItem.getFields().containsKey(rule.getTarget())){ //Rule applies only for current multiple item FieldKey fieldKey = new FieldKey(rule.getTarget(), definitionFieldSetItem.getOrdinal()); boolean currentState = this.visibility.getOrDefault(fieldKey, false); - this.visibility.put(fieldKey, currentState || ruleIsTrue(rule, field)); + this.visibility.put(fieldKey, currentState || this.ruleIsTrue(rule, field)); } else if (!this.definition.getFieldById(rule.getTarget()).isEmpty() || !this.definition.getFieldSetById(rule.getTarget()).isEmpty()) { //Rule applies to different fieldset, so we apply for all multiple items List ordinals = this.getKeyOrdinals(rule.getTarget()); for (Integer ordinal : ordinals){ FieldKey fieldKey = new FieldKey(rule.getTarget(), ordinal); boolean currentState = this.visibility.getOrDefault(fieldKey, false); - this.visibility.put(fieldKey, currentState || ruleIsTrue(rule, field)); + this.visibility.put(fieldKey, currentState || this.ruleIsTrue(rule, field)); } } else { FieldKey fieldKey = new FieldKey(rule.getTarget(), null); //Ordinal is null if target not on field boolean currentState = this.visibility.getOrDefault(fieldKey, false); - this.visibility.put(fieldKey, currentState || ruleIsTrue(rule, field)); + this.visibility.put(fieldKey, currentState || this.ruleIsTrue(rule, field)); } } } @@ -103,8 +103,8 @@ public class VisibilityServiceImpl implements VisibilityService { } private List getKeyOrdinals(String key){ - if (propertyDefinition.getFieldSets() != null && !propertyDefinition.getFieldSets().isEmpty()){ - for (Map.Entry propertyDefinitionFieldSet: propertyDefinition.getFieldSets().entrySet()) { + if (this.propertyDefinition.getFieldSets() != null && !this.propertyDefinition.getFieldSets().isEmpty()){ + for (Map.Entry propertyDefinitionFieldSet: this.propertyDefinition.getFieldSets().entrySet()) { if (propertyDefinitionFieldSet.getKey().equals(key)) return propertyDefinitionFieldSet.getValue().getItems().stream().map(PropertyDefinitionFieldSetItem::getOrdinal).toList(); if (propertyDefinitionFieldSet.getValue() != null && propertyDefinitionFieldSet.getValue().getItems() != null && !propertyDefinitionFieldSet.getValue().getItems().isEmpty()) { @@ -168,8 +168,8 @@ public class VisibilityServiceImpl implements VisibilityService { } if (sectionEntity.getFieldSets() != null) { for (FieldSetEntity fieldSetEntity : sectionEntity.getFieldSets()) { - if (propertyDefinition.getFieldSets() != null && !propertyDefinition.getFieldSets().isEmpty()){ - PropertyDefinitionFieldSet propertyDefinitionFieldSet = propertyDefinition.getFieldSets().getOrDefault(fieldSetEntity.getId(), null); + if (this.propertyDefinition.getFieldSets() != null && !this.propertyDefinition.getFieldSets().isEmpty()){ + PropertyDefinitionFieldSet propertyDefinitionFieldSet = this.propertyDefinition.getFieldSets().getOrDefault(fieldSetEntity.getId(), null); if (propertyDefinitionFieldSet != null && propertyDefinitionFieldSet.getItems() != null && !propertyDefinitionFieldSet.getItems().isEmpty()) { for (PropertyDefinitionFieldSetItem definitionFieldSetItem : propertyDefinitionFieldSet.getItems()) { FieldKey fieldKey = new FieldKey(fieldSetEntity.getId(), definitionFieldSetItem.getOrdinal()); @@ -244,8 +244,8 @@ public class VisibilityServiceImpl implements VisibilityService { } if (sectionEntity.getFieldSets() != null) { for (FieldSetEntity fieldSetEntity : sectionEntity.getFieldSets()) { - if (propertyDefinition.getFieldSets() != null && !propertyDefinition.getFieldSets().isEmpty()){ - PropertyDefinitionFieldSet propertyDefinitionFieldSet = propertyDefinition.getFieldSets().getOrDefault(fieldSetEntity.getId(), null); + if (this.propertyDefinition.getFieldSets() != null && !this.propertyDefinition.getFieldSets().isEmpty()){ + PropertyDefinitionFieldSet propertyDefinitionFieldSet = this.propertyDefinition.getFieldSets().getOrDefault(fieldSetEntity.getId(), null); if (propertyDefinitionFieldSet != null && propertyDefinitionFieldSet.getItems() != null && !propertyDefinitionFieldSet.getItems().isEmpty()) { for (PropertyDefinitionFieldSetItem definitionFieldSetItem : propertyDefinitionFieldSet.getItems()) { FieldKey fieldKey = new FieldKey(fieldSetEntity.getId(), definitionFieldSetItem.getOrdinal()); @@ -313,8 +313,8 @@ public class VisibilityServiceImpl implements VisibilityService { } if (sectionEntity.getFieldSets() != null) { for (FieldSetEntity fieldSetEntity : sectionEntity.getFieldSets()) { - if (propertyDefinition.getFieldSets() != null && !propertyDefinition.getFieldSets().isEmpty()){ - PropertyDefinitionFieldSet propertyDefinitionFieldSet = propertyDefinition.getFieldSets().getOrDefault(fieldSetEntity.getId(), null); + if (this.propertyDefinition.getFieldSets() != null && !this.propertyDefinition.getFieldSets().isEmpty()){ + PropertyDefinitionFieldSet propertyDefinitionFieldSet = this.propertyDefinition.getFieldSets().getOrDefault(fieldSetEntity.getId(), null); if (propertyDefinitionFieldSet != null && propertyDefinitionFieldSet.getItems() != null && !propertyDefinitionFieldSet.getItems().isEmpty()) { for (PropertyDefinitionFieldSetItem definitionFieldSetItem : propertyDefinitionFieldSet.getItems()) { FieldKey fieldKey = new FieldKey(fieldSetEntity.getId(), definitionFieldSetItem.getOrdinal()); diff --git a/backend/web/src/main/resources/config/queue.yml b/backend/web/src/main/resources/config/queue.yml index c58d9a681..444ac0507 100644 --- a/backend/web/src/main/resources/config/queue.yml +++ b/backend/web/src/main/resources/config/queue.yml @@ -43,7 +43,7 @@ queue: generate-file-topic: generate.file rabbitmq: enable: true - interval-seconds: 30 + interval-seconds: 3 options: retry-threashold: 100 retry-delay-step-seconds: 300 @@ -56,7 +56,7 @@ queue: exchange: null rabbitmq: enable: true - interval-seconds: 30 + interval-seconds: 3 options: retry-threashold: 100 retry-delay-step-seconds: 300 diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/EuDatApplication.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/EuDatApplication.java index 00ae9d5da..5f0c36714 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/EuDatApplication.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/EuDatApplication.java @@ -17,7 +17,7 @@ import org.springframework.scheduling.annotation.EnableAsync; import java.util.ArrayList; -@SpringBootApplication(scanBasePackages = {"org.opencdmp" ,"eu.old.eudat", "eu.old.eudat.depositinterface", "gr.cite"}) +@SpringBootApplication(scanBasePackages = {"org.opencdmp" ,"org.opencdmp.data.tenant" ,"eu.old.eudat", "eu.old.eudat.depositinterface", "gr.cite"}) @Configuration @EnableAsync public class EuDatApplication extends SpringBootServletInitializer {