MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

fix microservice annotation notification tables

This commit is contained in:
Efstratios Giannopoulos 2024-06-03 13:57:44 +03:00
parent 1ae6d6a20a
commit 39abb725bc
13 changed files with 24 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
annotation-service/annotation/src/main/java/gr/cite/annotation/data/UserCredentialEntity.java
View File

@ -40,12 +40,6 @@ public class UserCredentialEntity {
public static final String _updatedAt = "updatedAt";
@Column(name = "\"is_active\"", nullable = false)
@Convert(converter = IsActiveConverter.class)
private IsActive isActive;
public static final String _isActive = "isActive";
public UUID getId() {
return id;
}
@ -86,12 +80,4 @@ public class UserCredentialEntity {
this.updatedAt = updatedAt;
}
public IsActive getIsActive() {
return isActive;
}
public void setIsActive(IsActive isActive) {
this.isActive = isActive;
}
}

12
annotation-service/annotation/src/main/java/gr/cite/annotation/model/UserCredential.java
View File

@ -27,10 +27,6 @@ public class UserCredential {
public static final String _updatedAt = "updatedAt";
private IsActive isActive;
public static final String _isActive = "isActive";
public UUID getId() {
return id;
}
@ -70,12 +66,4 @@ public class UserCredential {
public void setUpdatedAt(Instant updatedAt) {
this.updatedAt = updatedAt;
}
public IsActive getIsActive() {
return isActive;
}
public void setIsActive(IsActive isActive) {
this.isActive = isActive;
}
}

10
annotation-service/annotation/src/main/java/gr/cite/annotation/model/deleter/UserCredentialDeleter.java
View File

@ -62,12 +62,10 @@ public class UserCredentialDeleter implements Deleter {
Instant now = Instant.now();
for (UserCredentialEntity item : data) {
logger.trace("deleting item {}", item);
item.setIsActive(IsActive.Inactive);
item.setUpdatedAt(now);
logger.trace("updating item");
this.entityManager.merge(item);
logger.trace("updated item");
logger.trace("deleting item {}", item.getId());
logger.trace("deleting item");
this.entityManager.remove(item);
logger.trace("deleted item");
}
}

6
annotation-service/annotation/src/main/java/gr/cite/annotation/query/UserCredentialQuery.java
View File

@ -182,9 +182,6 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
inClause.value(item);
predicates.add(inClause);
}
if (this.isActives != null) {
predicates.add(queryContext.Root.get(UserCredentialEntity._isActive).in(isActives));
}
if (this.userIds != null) {
CriteriaBuilder.In<UUID> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(UserCredentialEntity._userId));
for (UUID item : this.userIds)
@ -225,8 +222,6 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
return UserCredentialEntity._createdAt;
else if (item.match(UserCredential._updatedAt))
return UserCredentialEntity._updatedAt;
else if (item.match(UserCredential._isActive))
return UserCredentialEntity._isActive;
else
return null;
}
@ -239,7 +234,6 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
item.setUserId(QueryBase.convertSafe(tuple, columns, UserCredentialEntity._userId, UUID.class));
item.setCreatedAt(QueryBase.convertSafe(tuple, columns, UserCredentialEntity._createdAt, Instant.class));
item.setUpdatedAt(QueryBase.convertSafe(tuple, columns, UserCredentialEntity._updatedAt, Instant.class));
item.setIsActive(QueryBase.convertSafe(tuple, columns, UserCredentialEntity._createdAt, IsActive.class));
return item;
}

1
annotation-service/annotation/src/main/java/gr/cite/annotation/service/user/UserServiceImpl.java
View File

@ -153,7 +153,6 @@ public class UserServiceImpl implements UserService {
data.setExternalId(model.getSubjectId());
data.setCreatedAt(Instant.now());
data.setUpdatedAt(Instant.now());
data.setIsActive(IsActive.Active);
entityManager.persist(data);
}
updatedCreatedIds.add(data.getId());

1
dmp-db-scema/updates/00.01.034_Add_ntf_User_Credential.sql
View File

@ -11,7 +11,6 @@ CREATE TABLE IF NOT EXISTS public."ntf_UserCredential"
"external_id" character varying(512) COLLATE pg_catalog."default" NOT NULL,
"created_at" timestamp without time zone NOT NULL,
"updated_at" timestamp without time zone NOT NULL,
"is_active" smallint NOT NULL DEFAULT 1,
"data" character varying COLLATE pg_catalog."default",
CONSTRAINT "ntf_UserCredential_pkey" PRIMARY KEY (id),
CONSTRAINT "ntf_UserCredential_user_fkey" FOREIGN KEY ("user")

1
dmp-db-scema/updates/00.01.052_Add_ant_User_Credential.sql
View File

@ -11,7 +11,6 @@ CREATE TABLE IF NOT EXISTS public."ant_UserCredential"
"external_id" character varying(512) COLLATE pg_catalog."default" NOT NULL,
"created_at" timestamp without time zone NOT NULL,
"updated_at" timestamp without time zone NOT NULL,
"is_active" smallint NOT NULL DEFAULT 1,
"data" character varying COLLATE pg_catalog."default",
CONSTRAINT "ant_UserCredential_pkey" PRIMARY KEY (id),
CONSTRAINT "ant_UserCredential_user_fkey" FOREIGN KEY ("user")

32
dmp-db-scema/updates/00.01.058_Add_ant_UserContactInfo_table.sql
View File

@ -4,22 +4,22 @@ BEGIN
PERFORM * FROM "DBVersion" WHERE version = this_version;
IF FOUND THEN RETURN; END IF;
CREATE TABLE IF NOT EXISTS public."ant_UserContactInfo"
(
"id" uuid NOT NULL,
"user" uuid NOT NULL,
"ordinal" integer NOT NULL DEFAULT 0,
"type" smallint NOT NULL,
"value" character varying(512) COLLATE pg_catalog."default" NOT NULL,
"created_at" timestamp without time zone NOT NULL,
"updated_at" timestamp without time zone NOT NULL,
"is_active" smallint NOT NULL DEFAULT 1,
CONSTRAINT "ant_UserContactInfo_pkey" PRIMARY KEY (id),
CONSTRAINT "ant_UserContactInfo_user_fkey" FOREIGN KEY ("user")
REFERENCES public."ant_User" (id) MATCH SIMPLE
ON UPDATE NO ACTION
ON DELETE NO ACTION
);
-- CREATE TABLE IF NOT EXISTS public."ant_UserContactInfo"
-- (
-- "id" uuid NOT NULL,
-- "user" uuid NOT NULL,
-- "ordinal" integer NOT NULL DEFAULT 0,
-- "type" smallint NOT NULL,
-- "value" character varying(512) COLLATE pg_catalog."default" NOT NULL,
-- "created_at" timestamp without time zone NOT NULL,
-- "updated_at" timestamp without time zone NOT NULL,
-- "is_active" smallint NOT NULL DEFAULT 1,
-- CONSTRAINT "ant_UserContactInfo_pkey" PRIMARY KEY (id),
-- CONSTRAINT "ant_UserContactInfo_user_fkey" FOREIGN KEY ("user")
-- REFERENCES public."ant_User" (id) MATCH SIMPLE
-- ON UPDATE NO ACTION
-- ON DELETE NO ACTION
-- );
INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.01.058', '2024-02-28 12:00:00.000000+02', now(), 'Add table ant_UserContactInfo.');

15
notification-service/notification/src/main/java/gr/cite/notification/data/UserCredentialEntity.java
View File

@ -40,12 +40,6 @@ public class UserCredentialEntity {
public static final String _updatedAt = "updatedAt";
@Column(name = "\"is_active\"", nullable = false)
@Convert(converter = IsActiveConverter.class)
private IsActive isActive;
public static final String _isActive = "isActive";
public UUID getId() {
return id;
}
@ -85,13 +79,4 @@ public class UserCredentialEntity {
public void setUpdatedAt(Instant updatedAt) {
this.updatedAt = updatedAt;
}
public IsActive getIsActive() {
return isActive;
}
public void setIsActive(IsActive isActive) {
this.isActive = isActive;
}
}

12
notification-service/notification/src/main/java/gr/cite/notification/model/UserCredential.java
View File

@ -27,10 +27,6 @@ public class UserCredential {
public static final String _updatedAt = "updatedAt";
private IsActive isActive;
public static final String _isActive = "isActive";
public UUID getId() {
return id;
}
@ -70,12 +66,4 @@ public class UserCredential {
public void setUpdatedAt(Instant updatedAt) {
this.updatedAt = updatedAt;
}
public IsActive getIsActive() {
return isActive;
}
public void setIsActive(IsActive isActive) {
this.isActive = isActive;
}
}

10
notification-service/notification/src/main/java/gr/cite/notification/model/deleter/UserCredentialDeleter.java
View File

@ -62,12 +62,10 @@ public class UserCredentialDeleter implements Deleter {
Instant now = Instant.now();
for (UserCredentialEntity item : data) {
logger.trace("deleting item {}", item);
item.setIsActive(IsActive.Inactive);
item.setUpdatedAt(now);
logger.trace("updating item");
this.entityManager.merge(item);
logger.trace("updated item");
logger.trace("deleting item {}", item.getId());
logger.trace("deleting item");
this.entityManager.remove(item);
logger.trace("deleted item");
}
}

23
notification-service/notification/src/main/java/gr/cite/notification/query/UserCredentialQuery.java
View File

@ -28,8 +28,6 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
private Collection<UUID> excludedIds;
private Collection<IsActive> isActives;
private Collection<UUID> userIds;
private Collection<String> externalIds;
@ -75,21 +73,6 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
return this;
}
public UserCredentialQuery isActive(IsActive value) {
this.isActives = List.of(value);
return this;
}
public UserCredentialQuery isActive(IsActive... value) {
this.isActives = Arrays.asList(value);
return this;
}
public UserCredentialQuery isActive(Collection<IsActive> values) {
this.isActives = values;
return this;
}
public UserCredentialQuery userIds(UUID value) {
this.userIds = List.of(value);
return this;
@ -182,9 +165,6 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
inClause.value(item);
predicates.add(inClause);
}
if (this.isActives != null) {
predicates.add(queryContext.Root.get(UserCredentialEntity._isActive).in(isActives));
}
if (this.userIds != null) {
CriteriaBuilder.In<UUID> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(UserCredentialEntity._userId));
for (UUID item : this.userIds)
@ -225,8 +205,6 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
return UserCredentialEntity._createdAt;
else if (item.match(UserCredential._updatedAt))
return UserCredentialEntity._updatedAt;
else if (item.match(UserCredential._isActive))
return UserCredentialEntity._isActive;
else
return null;
}
@ -239,7 +217,6 @@ public class UserCredentialQuery extends QueryBase<UserCredentialEntity> {
item.setUserId(QueryBase.convertSafe(tuple, columns, UserCredentialEntity._userId, UUID.class));
item.setCreatedAt(QueryBase.convertSafe(tuple, columns, UserCredentialEntity._createdAt, Instant.class));
item.setUpdatedAt(QueryBase.convertSafe(tuple, columns, UserCredentialEntity._updatedAt, Instant.class));
item.setIsActive(QueryBase.convertSafe(tuple, columns, UserCredentialEntity._createdAt, IsActive.class));
return item;
}

2
notification-service/notification/src/main/java/gr/cite/notification/service/user/UserServiceImpl.java
View File

@ -183,7 +183,6 @@ public class UserServiceImpl implements UserService {
private void persistUserCredential(List<UserTouchedIntegrationEvent.UserCredential> models, UUID userId) throws InvalidApplicationException {
List<UserCredentialEntity> items = this.queryFactory.query(UserCredentialQuery.class)
.userIds(userId)
.isActive(IsActive.Active)
.collect();
List<UUID> updatedCreatedIds = new ArrayList<>();
if (models != null) {
@ -196,7 +195,6 @@ public class UserServiceImpl implements UserService {
data.setExternalId(model.getSubjectId());
data.setCreatedAt(Instant.now());
data.setUpdatedAt(Instant.now());
data.setIsActive(IsActive.Active);
entityManager.persist(data);
}
updatedCreatedIds.add(data.getId());