diff --git a/notification-service/notification/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java index bfd2acc6b..ee27b9b0f 100644 --- a/notification-service/notification/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java +++ b/notification-service/notification/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java @@ -12,7 +12,7 @@ import java.util.UUID; @Entity @Table(name = "\"UserContactInfo\"") -public class UserContactInfoEntity extends TenantScopedBaseEntity { +public class UserContactInfoEntity { @Id @Column(name = "id", columnDefinition = "uuid", updatable = false, nullable = false) diff --git a/notification-service/notification/src/main/java/gr/cite/notification/data/UserCredentialEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/UserCredentialEntity.java index 51470a896..bfd867001 100644 --- a/notification-service/notification/src/main/java/gr/cite/notification/data/UserCredentialEntity.java +++ b/notification-service/notification/src/main/java/gr/cite/notification/data/UserCredentialEntity.java @@ -10,7 +10,7 @@ import java.util.UUID; @Entity @Table(name = "\"UserCredential\"") -public class UserCredentialEntity extends TenantScopedBaseEntity { +public class UserCredentialEntity { @Id @Column(name = "id", columnDefinition = "uuid", updatable = false, nullable = false) diff --git a/notification-service/notification/src/main/java/gr/cite/notification/model/UserContactInfo.java b/notification-service/notification/src/main/java/gr/cite/notification/model/UserContactInfo.java index b7aabedd4..cf899e095 100644 --- a/notification-service/notification/src/main/java/gr/cite/notification/model/UserContactInfo.java +++ b/notification-service/notification/src/main/java/gr/cite/notification/model/UserContactInfo.java @@ -28,10 +28,6 @@ public class UserContactInfo { public static final String _ordinal = "ordinal"; - private Tenant tenant; - - public static final String _tenant = "tenant"; - private Instant createdAt; public static final String _createdAt = "createdAt"; @@ -84,14 +80,6 @@ public class UserContactInfo { this.value = value; } - public Tenant getTenant() { - return tenant; - } - - public void setTenant(Tenant tenant) { - this.tenant = tenant; - } - public Instant getCreatedAt() { return createdAt; } diff --git a/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserContactInfoBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserContactInfoBuilder.java index 4a5d948e2..45e8e22f9 100644 --- a/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserContactInfoBuilder.java +++ b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserContactInfoBuilder.java @@ -53,9 +53,6 @@ public class UserContactInfoBuilder extends BaseBuilder userMap = this.collectUsers(userFields, data); - FieldSet tenantFields = fields.extractPrefixed(this.asPrefix(UserContactInfo._tenant)); - Map tenantMap = this.collectTenants(tenantFields, data); - List models = new ArrayList<>(); for (UserContactInfoEntity d : data) { @@ -66,7 +63,6 @@ public class UserContactInfoBuilder extends BaseBuilder collectTenants(FieldSet fields, List data) throws MyApplicationException { - if (fields.isEmpty() || data.isEmpty()) return null; - this.logger.debug("checking related - {}", Tenant.class.getSimpleName()); - - Map itemMap; - if (!fields.hasOtherField(this.asIndexer(Tenant._id))) { - itemMap = this.asEmpty( - data.stream().map(TenantScopedBaseEntity::getTenantId).distinct().collect(Collectors.toList()), - x -> { - Tenant item = new Tenant(); - item.setId(x); - return item; - }, - Tenant::getId); - } else { - FieldSet clone = new BaseFieldSet(fields.getFields()).ensure(Tenant._id); - TenantQuery q = this.queryFactory.query(TenantQuery.class).authorize(this.authorize).ids(data.stream().map(TenantScopedBaseEntity::getTenantId).distinct().collect(Collectors.toList())); - itemMap = this.builderFactory.builder(TenantBuilder.class).authorize(this.authorize).asForeignKey(q, clone, Tenant::getId); - } - if (!fields.hasField(Tenant._id)) { - itemMap = itemMap.values().stream().filter(Objects::nonNull).peek(x -> x.setId(null)).collect(Collectors.toMap(Tenant::getId, Function.identity())); - } - - return itemMap; - } - } diff --git a/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserContactInfoCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserContactInfoCensor.java index 046d69608..0a009d8f7 100644 --- a/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserContactInfoCensor.java +++ b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserContactInfoCensor.java @@ -43,8 +43,6 @@ public class UserContactInfoCensor extends BaseCensor { logger.debug(new DataLogEntry("censoring fields", fields)); if (this.isEmpty(fields)) return; this.authService.authorizeAtLeastOneForce(userId != null ? List.of(new OwnedResource(userId)) : null, Permission.BrowseUserContactInfo); - FieldSet tenantFields = fields.extractPrefixed(this.asIndexerPrefix(UserContactInfo._tenant)); - this.censorFactory.censor(TenantCensor.class).censor(tenantFields); FieldSet userFields = fields.extractPrefixed(this.asIndexerPrefix(UserContactInfo._user)); this.censorFactory.censor(UserCensor.class).censor(userFields, userId); } diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java index ada21a0ce..f49e1a630 100644 --- a/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java +++ b/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java @@ -32,8 +32,6 @@ public class UserContactInfoQuery extends QueryBase { private Collection excludedUserIds; - private Collection tenantIds; - private Collection isActives; private Collection type; @@ -101,21 +99,6 @@ public class UserContactInfoQuery extends QueryBase { return this; } - public UserContactInfoQuery tenantIds(UUID value) { - this.tenantIds = List.of(value); - return this; - } - - public UserContactInfoQuery tenantIds(UUID... value) { - this.tenantIds = Arrays.asList(value); - return this; - } - - public UserContactInfoQuery tenantIds(Collection values) { - this.tenantIds = values; - return this; - } - public UserContactInfoQuery isActive(IsActive value) { this.isActives = List.of(value); return this; @@ -173,7 +156,7 @@ public class UserContactInfoQuery extends QueryBase { @Override protected Boolean isFalseQuery() { - return this.isEmpty(this.userIds) || this.isEmpty(this.excludedUserIds) || this.isEmpty(this.tenantIds) || this.isEmpty(this.isActives) + return this.isEmpty(this.userIds) || this.isEmpty(this.excludedUserIds) || this.isEmpty(this.isActives) || this.isEmpty(this.type) || this.isEmpty(this.excludedUserIds) || this.isFalseQuery(this.userQuery); } @@ -222,12 +205,6 @@ public class UserContactInfoQuery extends QueryBase { notInClause.value(item); predicates.add(notInClause.not()); } - if (this.tenantIds != null) { - CriteriaBuilder.In inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(UserContactInfoEntity._tenantId)); - for (UUID item : this.tenantIds) - inClause.value(item); - predicates.add(inClause); - } if (this.type != null) { CriteriaBuilder.In inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(UserContactInfoEntity._type)); for (ContactInfoType item : this.type) @@ -257,8 +234,6 @@ public class UserContactInfoQuery extends QueryBase { protected String fieldNameOf(FieldResolver item) { if (item.match(UserContactInfo._id)) return UserContactInfoEntity._id; - else if (item.prefix(UserContactInfo._tenant)) - return UserContactInfoEntity._tenantId; else if (item.match(UserContactInfo._type)) return UserContactInfoEntity._type; else if (item.match(UserContactInfo._value)) @@ -287,7 +262,6 @@ public class UserContactInfoQuery extends QueryBase { item.setValue(QueryBase.convertSafe(tuple, columns, UserContactInfoEntity._value, String.class)); item.setOrdinal(QueryBase.convertSafe(tuple, columns, UserContactInfoEntity._ordinal, Integer.class)); item.setUserId(QueryBase.convertSafe(tuple, columns, UserContactInfoEntity._userId, UUID.class)); - item.setTenantId(QueryBase.convertSafe(tuple, columns, UserContactInfoEntity._tenantId, UUID.class)); item.setCreatedAt(QueryBase.convertSafe(tuple, columns, UserContactInfoEntity._createdAt, Instant.class)); item.setUpdatedAt(QueryBase.convertSafe(tuple, columns, UserContactInfoEntity._updatedAt, Instant.class)); item.setIsActive(QueryBase.convertSafe(tuple, columns, UserContactInfoEntity._isActive, IsActive.class)); diff --git a/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserContactInfoLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserContactInfoLookup.java index 308cbcd46..abe7d14f0 100644 --- a/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserContactInfoLookup.java +++ b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserContactInfoLookup.java @@ -12,10 +12,6 @@ public class UserContactInfoLookup extends Lookup { private List isActive; private List userIds; - private List tenantIds; - - private UserLookup userSubQuery; - public List getIsActive() { return isActive; } @@ -32,21 +28,11 @@ public class UserContactInfoLookup extends Lookup { this.userIds = userIds; } - public List getTenantIds() { - return tenantIds; - } - - public void setTenantIds(List tenantIds) { - this.tenantIds = tenantIds; - } public UserContactInfoQuery enrich(QueryFactory queryFactory) { UserContactInfoQuery query = queryFactory.query(UserContactInfoQuery.class); if (this.isActive != null) query.isActive(this.isActive); if (this.userIds != null) query.userIds(this.userIds); - if (this.tenantIds != null) query.tenantIds(this.tenantIds); - if (this.userSubQuery != null) query.userSubQuery(this.userSubQuery.enrich(queryFactory)); - this.enrichCommon(query); return query;