From 27c43a9eba618c41bdf11667295a1c04c27641a1 Mon Sep 17 00:00:00 2001
From: ilyin <ilyin@micord.ru>
Date: Fri, 27 Sep 2024 15:47:00 +0300
Subject: [PATCH] config_change

---
 .../config-examples/block.xml                 | 36 ++++++++++---------
 .../config-examples/removeFromCallList.xml    | 15 +++-----
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/config-data-executor/config-examples/block.xml b/config-data-executor/config-examples/block.xml
index e5f4c02..8a01038 100644
--- a/config-data-executor/config-examples/block.xml
+++ b/config-data-executor/config-examples/block.xml
@@ -12,11 +12,11 @@
                 ,system_pgs_status = '13'
                 ,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
+                    ',"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} ${extraConditions};
+            where id in ${endpointArguments};
             end
             $$;
             ]]>
@@ -39,23 +39,23 @@
             DO
             $$
                 BEGIN
-                    DELETE FROM subpoena_history where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments} ${extraConditions};
-                    DELETE FROM subpoena_appearance where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments} ${extraConditions}));
-                    DELETE FROM subpoena_send_info where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments} ${extraConditions}));
+                    DELETE FROM subpoena_history where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments};
+                    DELETE FROM subpoena_appearance where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments}));
+                    DELETE FROM subpoena_send_info where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments}));
                 
                 DELETE FROM notification_item where restriction_document_item_id in (
                 select id from restriction_document_item where restriction_document_create_id  in (
-                select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments} ${extraConditions}))));
+                select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments}))));
                 DELETE FROM notification_item where restriction_document_item_id in (
                     select id from restriction_document_item where restriction_document_cancel_id  in (
-                    select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments} ${extraConditions}))));    
+                    select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments}))));    
                 
                     DELETE FROM restriction_document_item where restriction_document_create_id  in (
-                select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments} ${extraConditions})));
+                select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments})));
                     DELETE FROM restriction_document_item where restriction_document_cancel_id  in (
-                        select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments} ${extraConditions})));
-                    DELETE FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments} ${extraConditions}));
-                    DELETE FROM subpoena where recruit_id in ${endpointArguments} ${extraConditions};
+                        select id FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments})));
+                    DELETE FROM restriction_document where subpoena_id in (select id FROM subpoena where recruit_id in ${endpointArguments}));
+                    DELETE FROM subpoena where recruit_id in ${endpointArguments};
                 END
             $$;
             ]]>
@@ -80,8 +80,8 @@
                 BEGIN
                     DELETE
                     FROM incident_history
-                    where incident_id in (select id from incident where recruit_id in ${endpointArguments} ${extraConditions}));
-                    DELETE FROM incident where recruit_id in ${endpointArguments} ${extraConditions};
+                    where incident_id in (select id from incident where recruit_id in ${endpointArguments}));
+                    DELETE FROM incident where recruit_id in ${endpointArguments};
                 END
             $$;
             ]]>
@@ -103,8 +103,12 @@
             <![CDATA[
             DO
             $$
+                DECLARE
+                    var1 uuid[] := '{
+            ${endpointArguments}
+            }';
                 BEGIN
-                    DELETE FROM notifications where recruit_id in ${endpointArguments} ${extraConditions};
+                    DELETE FROM notifications where recruit_id = any (var1);
                 END
             $$;
             ]]>
diff --git a/config-data-executor/config-examples/removeFromCallList.xml b/config-data-executor/config-examples/removeFromCallList.xml
index 673af80..50ba061 100644
--- a/config-data-executor/config-examples/removeFromCallList.xml
+++ b/config-data-executor/config-examples/removeFromCallList.xml
@@ -5,10 +5,10 @@
             DO
             $$
                 BEGIN
-                    DELETE FROM summoned_list where recruit_id in ${endpointArguments} ${extraConditions};
-                    DELETE FROM recruit_active_list where recruit_id in ${endpointArguments} ${extraConditions};
-                    DELETE FROM documents where recruit_id in ${endpointArguments} ${extraConditions};
-                    DELETE FROM subpoena where recruit_id in ${endpointArguments} ${extraConditions};
+                    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
             $$;
             ]]>
@@ -28,9 +28,6 @@
     <SqlRequest>
         <RequestURL>
             <![CDATA[
-            DO
-            $$
-            begin
             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
@@ -38,9 +35,7 @@
                 ,system_pgs_status = '1.2'
                 ,conscription = null
                 ,extra_info = extra_info - ('blocked')
-            where id in ${endpointArguments} ${extraConditions};
-            end
-            $$;
+            where id in ${endpointArguments};
             ]]>
         </RequestURL>
         <SqlConnectionParams>