From d9a4b92404c53d97233f40c6f8fd13475e1203a6 Mon Sep 17 00:00:00 2001 From: Fabrice Date: Tue, 20 Feb 2024 08:10:10 -0500 Subject: [PATCH 1/4] fix issue with duplicated ids --- .../java/io/gaiaid/registry/svc/GaiaService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java b/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java index d1b8122..29f1cf6 100644 --- a/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java +++ b/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java @@ -1155,9 +1155,17 @@ private boolean identityAlreadyExists(Session session) { query.orderBy(builder.desc(root.get("id"))); Query q = em.createQuery(query); - Identity res = (Identity) q.getResultList().stream().findFirst().orElse(null); + List founds = q.getResultList(); + if (debug) { + try { + logger.info("identityAlreadyExists: found: " + JsonUtil.serialize(founds, false)); + } catch (JsonProcessingException e) { + logger.error("", e); + } + } + - return (res!=null); + return (founds.size()>0); } From de2c96dda83ebb7276b7540e93b0e0ed17ba7714 Mon Sep 17 00:00:00 2001 From: Fabrice Date: Tue, 20 Feb 2024 08:12:33 -0500 Subject: [PATCH 2/4] updated CI --- .github/workflows/ci-biometric-authenticator.yml | 5 ----- .github/workflows/ci-citizen-registry.yml | 5 ----- .github/workflows/ci-email-verification-service.yml | 5 ----- .github/workflows/ci-hello-world.yml | 5 ----- .github/workflows/ci-registry-avatar.yml | 5 ----- .github/workflows/ci-registry-gaia.yml | 5 ----- 6 files changed, 30 deletions(-) diff --git a/.github/workflows/ci-biometric-authenticator.yml b/.github/workflows/ci-biometric-authenticator.yml index 7cc2785..29997df 100644 --- a/.github/workflows/ci-biometric-authenticator.yml +++ b/.github/workflows/ci-biometric-authenticator.yml @@ -8,11 +8,6 @@ on: paths: - 'biometric-authenticator/**' - '.github/workflows/ci-biometric-authenticator.yml' - pull_request_target: - branches: [ main, dev ] - paths: - - 'biometric-authenticator/**' - - '.github/workflows/ci-biometric-authenticator.yml' workflow_dispatch: env: diff --git a/.github/workflows/ci-citizen-registry.yml b/.github/workflows/ci-citizen-registry.yml index 001036b..663a45f 100644 --- a/.github/workflows/ci-citizen-registry.yml +++ b/.github/workflows/ci-citizen-registry.yml @@ -8,11 +8,6 @@ on: paths: - 'citizen-registry/**' - '.github/workflows/ci-citizen-registry.yml' - pull_request_target: - branches: [ main, dev ] - paths: - - 'citizen-registry/**' - - '.github/workflows/ci-citizen-registry.yml' workflow_dispatch: env: diff --git a/.github/workflows/ci-email-verification-service.yml b/.github/workflows/ci-email-verification-service.yml index 539729e..935a54e 100644 --- a/.github/workflows/ci-email-verification-service.yml +++ b/.github/workflows/ci-email-verification-service.yml @@ -8,11 +8,6 @@ on: paths: - 'email-verification-service/**' - '.github/workflows/ci-email-verification-service.yml' - pull_request_target: - branches: [ main, dev ] - paths: - - 'email-verification-service/**' - - '.github/workflows/ci-email-verification-service.yml' workflow_dispatch: env: diff --git a/.github/workflows/ci-hello-world.yml b/.github/workflows/ci-hello-world.yml index aa876c2..3257389 100644 --- a/.github/workflows/ci-hello-world.yml +++ b/.github/workflows/ci-hello-world.yml @@ -8,11 +8,6 @@ on: paths: - 'hello-world/**' - '.github/workflows/ci-hello-world.yml' - pull_request_target: - branches: [ main, dev ] - paths: - - 'containers/hello-world/**' - - '.github/workflows/ci-hello-world.yml' workflow_dispatch: env: diff --git a/.github/workflows/ci-registry-avatar.yml b/.github/workflows/ci-registry-avatar.yml index 66384f2..ef83dd0 100644 --- a/.github/workflows/ci-registry-avatar.yml +++ b/.github/workflows/ci-registry-avatar.yml @@ -8,11 +8,6 @@ on: paths: - 'citizen-registry/kubernetes/registry-avatar/**' - '.github/workflows/ci-registry-avatar.yml' - pull_request_target: - branches: [ main, dev ] - paths: - - 'citizen-registry/kubernetes/registry-avatar/**' - - '.github/workflows/ci-registry-avatar.yml' workflow_dispatch: env: diff --git a/.github/workflows/ci-registry-gaia.yml b/.github/workflows/ci-registry-gaia.yml index bf38b8c..5b7d3c1 100644 --- a/.github/workflows/ci-registry-gaia.yml +++ b/.github/workflows/ci-registry-gaia.yml @@ -8,11 +8,6 @@ on: paths: - 'citizen-registry/kubernetes/registry-gaia/**' - '.github/workflows/ci-registry-gaia.yml' - pull_request_target: - branches: [ main, dev ] - paths: - - 'citizen-registry/kubernetes/registry-gaia/**' - - '.github/workflows/ci-registry-gaia.yml' workflow_dispatch: env: From 5a6db2d2003f9b62210a78c33d9674c36f2e4471 Mon Sep 17 00:00:00 2001 From: Fabrice Date: Tue, 20 Feb 2024 08:25:00 -0500 Subject: [PATCH 3/4] updates --- .../main/java/io/gaiaid/registry/svc/GaiaService.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java b/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java index 29f1cf6..874d4e0 100644 --- a/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java +++ b/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java @@ -1126,28 +1126,35 @@ private boolean identityAlreadyExists(Session session) { if (restoreCitizenidClaim) { Predicate predicate = builder.equal(root.get("citizenId"), session.getCitizenId()); allPredicates.add(predicate); + if (debug) logger.info("identityAlreadyExists: citizenId: " + session.getCitizenId()); } if (restoreFirstnameClaim) { Predicate predicate = builder.equal(root.get("firstname"), session.getFirstname()); allPredicates.add(predicate); + + if (debug) logger.info("identityAlreadyExists: firstname: " + session.getFirstname()); } if (restoreLastnameClaim) { Predicate predicate = builder.equal(root.get("lastname"), session.getLastname()); allPredicates.add(predicate); + if (debug) logger.info("identityAlreadyExists: lastname: " + session.getLastname()); } if (restoreAvatarnameClaim) { Predicate predicate = builder.equal(root.get("avatarname"), session.getAvatarname()); allPredicates.add(predicate); + if (debug) logger.info("identityAlreadyExists: avatarname: " + session.getAvatarname()); } if (restoreBirthdateClaim) { Predicate predicate = builder.equal(root.get("birthdate"), session.getBirthdate()); allPredicates.add(predicate); + if (debug) logger.info("identityAlreadyExists: birthdate: " + session.getBirthdate()); } if (restoreBirthdateClaim) { Predicate predicate = builder.equal(root.get("placeOfBirth"), session.getPlaceOfBirth()); allPredicates.add(predicate); + if (debug) logger.info("identityAlreadyExists: placeOfBirth: " + session.getPlaceOfBirth()); } query.where(builder.and(allPredicates.toArray(new Predicate[allPredicates.size()]))); @@ -1465,7 +1472,7 @@ private void createEntryPoint(UUID connectionId, UUID threadId, Session session, birthDate = LocalDate.from(df.parse(content)); session.setBirthdate(birthDate); session.setCreateStep(getNextCreateStep(session.getCreateStep())); - + session = em.merge(session); } catch (Exception e) { logger.error("", e); mtProducer.sendMessage(TextMessage.build(connectionId, threadId, getMessage("BIRTHDATE_ERROR"))); From 681130e161fa3c4c73ff74f407220b228e4fc15a Mon Sep 17 00:00:00 2001 From: Fabrice Date: Tue, 20 Feb 2024 08:31:47 -0500 Subject: [PATCH 4/4] fixed copy/paste error --- .../src/main/java/io/gaiaid/registry/svc/GaiaService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java b/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java index 874d4e0..6527a19 100644 --- a/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java +++ b/citizen-registry/src/main/java/io/gaiaid/registry/svc/GaiaService.java @@ -974,7 +974,7 @@ private void restoreEntryPoint(UUID connectionId, UUID threadId, Session session Predicate predicate = builder.equal(root.get("birthdate"), session.getBirthdate()); allPredicates.add(predicate); } - if (restoreBirthdateClaim) { + if (restoreBirthplaceClaim) { Predicate predicate = builder.equal(root.get("placeOfBirth"), session.getPlaceOfBirth()); allPredicates.add(predicate); } @@ -1151,7 +1151,7 @@ private boolean identityAlreadyExists(Session session) { allPredicates.add(predicate); if (debug) logger.info("identityAlreadyExists: birthdate: " + session.getBirthdate()); } - if (restoreBirthdateClaim) { + if (restoreBirthplaceClaim) { Predicate predicate = builder.equal(root.get("placeOfBirth"), session.getPlaceOfBirth()); allPredicates.add(predicate); if (debug) logger.info("identityAlreadyExists: placeOfBirth: " + session.getPlaceOfBirth());