From 2f9f1c7e7e2bdd47b05cb3c202982b86583d5701 Mon Sep 17 00:00:00 2001
From: Maksim Tereshin <mtereshin@provectus.com>
Date: Tue, 10 Dec 2024 09:50:21 +0100
Subject: [PATCH 1/2] Change call list  config

---
 config/cde-xml/removeFromCallList.xml | 52 +++++++++++----------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/config/cde-xml/removeFromCallList.xml b/config/cde-xml/removeFromCallList.xml
index 404f7fb..de2fe8f 100644
--- a/config/cde-xml/removeFromCallList.xml
+++ b/config/cde-xml/removeFromCallList.xml
@@ -3,39 +3,26 @@
         <RequestURL>
             <![CDATA[
             DO
-            $$
-                BEGIN
-                    DELETE FROM summoned_list where recruit_id in ${endpointArguments};
-                    DELETE FROM recruit_active_list where recruit_id in ${endpointArguments};
-                    DELETE FROM documents where recruit_id in ${endpointArguments};
-                    DELETE FROM subpoena where recruit_id in ${endpointArguments};
-                END
-            $$;
-            ]]>
-        </RequestURL>
-        <SqlConnectionParams>
-            <JdbcHost>10.10.31.118</JdbcHost>
-            <JdbcPort>5432</JdbcPort>
-            <JdbcUsername>ervu</JdbcUsername>
-            <JdbcPassword>ervu</JdbcPassword>
-            <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
-            <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>50</JdbcXaDataSourcePoolSize>
-            <JdbcDatabase>summon-list-registry</JdbcDatabase>
-        </SqlConnectionParams>
-    </SqlRequest>
+$$
+DECLARE
+t varchar(100);
+begin
+select pg_sleep(60) into t;
+--delete from recruits where 1=2;
+
+update recruits
+set system_pgs_status=null, extra_info = jsonb_set(coalesce(extra_info,'{}'::jsonb), '{blocked}',
+	('{"cur":'|| coalesce('"'||current_recruitment_id::text||'"','null')||
+	     ',"trg":'|| coalesce('"'||target_recruitment_id::text||'"','null')||
+	     ',"dio":'|| coalesce('"'||department_id_old::text||'"','null')||
+	     ',"st":'|| coalesce('"'||system_pgs_status::text||'"','null')||'}')::jsonb
+	)
+where id IN ${endpointArguments};
+
+end
+$$;
+
 
-    <SqlRequest>
-        <RequestURL>
-            <![CDATA[
-            update recruits
-            set current_recruitment_id  = jsonb_extract_path_text(extra_info,'blocked','cur')::uuid
-                ,target_recruitment_id = jsonb_extract_path_text(extra_info,'blocked','trg')::uuid
-                ,department_id_old = jsonb_extract_path_text(extra_info,'blocked','dio')::uuid
-                ,system_pgs_status = '1.2'
-                ,conscription = null
-                ,extra_info = extra_info - ('blocked')
-            where id in ${endpointArguments};
             ]]>
         </RequestURL>
         <SqlConnectionParams>
@@ -49,4 +36,5 @@
             <JdbcDatabase>person_registry</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
+
 </Requests>
\ No newline at end of file

From dcd965eb637e102b82fd7cafa6556408f478d258 Mon Sep 17 00:00:00 2001
From: Maksim Tereshin <mtereshin@provectus.com>
Date: Tue, 10 Dec 2024 11:15:59 +0100
Subject: [PATCH 2/2] Change transactional timeout

---
 .../src/main/java/org/micord/service/RequestService.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config-data-executor/src/main/java/org/micord/service/RequestService.java b/config-data-executor/src/main/java/org/micord/service/RequestService.java
index be88d57..10e20f8 100644
--- a/config-data-executor/src/main/java/org/micord/service/RequestService.java
+++ b/config-data-executor/src/main/java/org/micord/service/RequestService.java
@@ -137,7 +137,7 @@ public class RequestService {
     }
   }
 
-  @Transactional
+  @Transactional(timeout = 300000)
   public void processSqlAndAqlRequests(Requests config, List<String> ids) {
     logger.debug("Starting transactional processing of requests");
     if (config.getSqlRequests() != null) {