From 57fe1628ded5f5ce378e18d112b2710aed69fe5e Mon Sep 17 00:00:00 2001
From: "adel.ka" <rikardofik@gmail.com>
Date: Wed, 23 Apr 2025 10:19:06 +0300
Subject: [PATCH] SUPPORT-9122:fix

---
 .../service/processor/impl/AccountDataProcessor.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountDataProcessor.java b/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountDataProcessor.java
index dc079d3..31183f6 100644
--- a/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountDataProcessor.java
+++ b/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountDataProcessor.java
@@ -88,11 +88,15 @@ public class AccountDataProcessor implements DataProcessor<AccountData> {
   }
 
   private void addRolesForAccount(AccountData data, List<AccountRoleRecord> accountRoleRecords) {
+    Set<String> existingRoleIds = idmDirectoriesDaoService.getRoleIds();
+
     for (String roleId : data.getRoles()) {
-      AccountRoleRecord accountRoleRecord = idmDirectoriesDaoService.getAccountRoleRecord();
-      accountRoleRecord.setAccountId(data.getId());
-      accountRoleRecord.setRoleId(roleId);
-      accountRoleRecords.add(accountRoleRecord);
+      if (existingRoleIds.contains(roleId)) {
+        AccountRoleRecord accountRoleRecord = idmDirectoriesDaoService.getAccountRoleRecord();
+        accountRoleRecord.setAccountId(data.getId());
+        accountRoleRecord.setRoleId(roleId);
+        accountRoleRecords.add(accountRoleRecord);
+      }
     }
   }
 }