From f8360ebf7730383111d9c972b99addc53c07e5ad Mon Sep 17 00:00:00 2001
From: "adel.kalimullin" <a.kalimullin@micord.ru>
Date: Mon, 9 Jun 2025 15:06:03 +0300
Subject: [PATCH] SUPPORT-9212: fix

---
 .../main/java/ervu_business_metrics/dao/AbstractDataDao.java  | 4 ++--
 .../main/java/ervu_business_metrics/dao/AccountDataDao.java   | 2 +-
 .../java/ervu_business_metrics/dao/AccountRoleDataDao.java    | 2 +-
 .../service/processor/impl/AccountDataProcessor.java          | 2 +-
 .../service/processor/impl/AccountRoleDataProcessor.java      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/ervu_business_metrics/dao/AbstractDataDao.java b/backend/src/main/java/ervu_business_metrics/dao/AbstractDataDao.java
index 9e41f37..9637020 100644
--- a/backend/src/main/java/ervu_business_metrics/dao/AbstractDataDao.java
+++ b/backend/src/main/java/ervu_business_metrics/dao/AbstractDataDao.java
@@ -55,12 +55,12 @@ public abstract class AbstractDataDao<T extends UpdatableRecord<T>> {
         .execute();
   }
 
-  protected <S, F> Set<S> getValuesByField(Field<S> selectField, Field<F> filterField,
+  protected <S, F> List<S> getValuesByField(Field<S> selectField, Field<F> filterField,
       F filterValue) {
     return dsl.select(selectField)
         .from(getTable())
         .where(filterField.eq(filterValue))
-        .fetchSet(selectField);
+        .fetch(selectField);
   }
 
   public void setActiveStatus(String id, boolean isActive) {
diff --git a/backend/src/main/java/ervu_business_metrics/dao/AccountDataDao.java b/backend/src/main/java/ervu_business_metrics/dao/AccountDataDao.java
index a28269b..dc69b88 100644
--- a/backend/src/main/java/ervu_business_metrics/dao/AccountDataDao.java
+++ b/backend/src/main/java/ervu_business_metrics/dao/AccountDataDao.java
@@ -20,7 +20,7 @@ public class AccountDataDao extends AbstractDataDao<AccountRecord> {
     super(dsl);
   }
 
-  public Set<String> getAccountIdsByPersonId(String personId) {
+  public List<String> getAccountIdsByPersonId(String personId) {
     return getValuesByField(Tables.ACCOUNT.ID, Tables.ACCOUNT.PERSON_ID, personId);
   }
 
diff --git a/backend/src/main/java/ervu_business_metrics/dao/AccountRoleDataDao.java b/backend/src/main/java/ervu_business_metrics/dao/AccountRoleDataDao.java
index 80db8b3..bc19cc6 100644
--- a/backend/src/main/java/ervu_business_metrics/dao/AccountRoleDataDao.java
+++ b/backend/src/main/java/ervu_business_metrics/dao/AccountRoleDataDao.java
@@ -23,7 +23,7 @@ public class AccountRoleDataDao extends AbstractDataDao<AccountRoleRecord> {
     super(dsl);
   }
 
-  public Set<String> getRoleIdsByAccountId(String accountId) {
+  public List<String> getRoleIdsByAccountId(String accountId) {
     return getValuesByField(Tables.ACCOUNT_ROLE.ROLE_ID, Tables.ACCOUNT_ROLE.ACCOUNT_ID, accountId);
   }
 
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 4574143..5d2a8cd 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
@@ -84,7 +84,7 @@ public class AccountDataProcessor implements DataProcessor<AccountData, AccountR
   }
 
   private void deleteAbsentAccounts(String personId, Set<String> incomingAccountIds) {
-    Set<String> existingAccountIds = dao.getAccountIdsByPersonId(personId);
+    List<String> existingAccountIds = dao.getAccountIdsByPersonId(personId);
 
     List<String> toDelete = existingAccountIds.stream()
         .filter(id -> !incomingAccountIds.contains(id))
diff --git a/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountRoleDataProcessor.java b/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountRoleDataProcessor.java
index 296be67..f24e05a 100644
--- a/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountRoleDataProcessor.java
+++ b/backend/src/main/java/ervu_business_metrics/service/processor/impl/AccountRoleDataProcessor.java
@@ -53,7 +53,7 @@ public class AccountRoleDataProcessor implements LinkDataProcessor<AccountRoleDa
 
     for (AccountData account : accounts) {
       String accountId = account.getId();
-      Set<String> existingRoleIds = dao.getRoleIdsByAccountId(accountId);
+      List<String> existingRoleIds = dao.getRoleIdsByAccountId(accountId);
       Set<String> incomingRoleIds = account.getRoles() == null
                                     ? Set.of()
                                     : account.getRoles()