From b0c41dfa5b5a97c013f48e182864ec8fb3cb5cfc Mon Sep 17 00:00:00 2001
From: Ruslan <r.gaztdinov@micord.ru>
Date: Thu, 16 Oct 2025 14:28:50 +0500
Subject: [PATCH] fix

---
 .../parallel/border_crossing_flow.hpl         | 150 +++++++-----------
 1 file changed, 55 insertions(+), 95 deletions(-)

diff --git a/mappings/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow.hpl b/mappings/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow.hpl
index 83a5ee7..53b2f3d 100644
--- a/mappings/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow.hpl
+++ b/mappings/info_recruits/citizen_tables/border_crossing/parallel/border_crossing_flow.hpl
@@ -79,31 +79,11 @@
       <to>Change job status on error</to>
       <enabled>Y</enabled>
     </hop>
-    <hop>
-      <from>Group by</from>
-      <to>Identify last row in a stream</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>Identify last row in a stream</from>
-      <to>User defined Java expression</to>
-      <enabled>Y</enabled>
-    </hop>
-    <hop>
-      <from>User defined Java expression</from>
-      <to>Update</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Table input</from>
       <to>Table output</to>
       <enabled>Y</enabled>
     </hop>
-    <hop>
-      <from>Table output</from>
-      <to>Group by</to>
-      <enabled>Y</enabled>
-    </hop>
     <hop>
       <from>Update</from>
       <to>Change job status on error</to>
@@ -119,6 +99,16 @@
       <to>Filter rows</to>
       <enabled>Y</enabled>
     </hop>
+    <hop>
+      <from>Table output</from>
+      <to>sort_by_recruit_id</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>sort_by_recruit_id</from>
+      <to>Update</to>
+      <enabled>Y</enabled>
+    </hop>
   </order>
   <transform>
     <name>Abort</name>
@@ -290,59 +280,6 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
       <yloc>304</yloc>
     </GUI>
   </transform>
-  <transform>
-    <name>Group by</name>
-    <type>GroupBy</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <add_linenr>N</add_linenr>
-    <all_rows>N</all_rows>
-    <directory>${java.io.tmpdir}</directory>
-    <fields>
-      <field>
-        <aggregate>border_crossed_raw</aggregate>
-        <subject>is_border_crossed</subject>
-        <type>MAX</type>
-      </field>
-    </fields>
-    <give_back_row>N</give_back_row>
-    <group>
-      <field>
-        <name>recruit_id</name>
-      </field>
-    </group>
-    <ignore_aggregate>N</ignore_aggregate>
-    <prefix>grp</prefix>
-    <attributes/>
-    <GUI>
-      <xloc>688</xloc>
-      <yloc>176</yloc>
-    </GUI>
-  </transform>
-  <transform>
-    <name>Identify last row in a stream</name>
-    <type>DetectLastRow</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <resultfieldname>last_row</resultfieldname>
-    <attributes/>
-    <GUI>
-      <xloc>880</xloc>
-      <yloc>176</yloc>
-    </GUI>
-  </transform>
   <transform>
     <name>Table input</name>
     <type>TableInput</type>
@@ -356,20 +293,34 @@ VALUES (DEFAULT, '${JOB_NAME}', 'PROCESSING', DEFAULT, null, '${IDM_ID}');
     </partitioning>
     <connection>ervu-dashboard</connection>
     <execute_each_row>N</execute_each_row>
-    <limit/>
     <sql>SELECT
     ri.recruit_id,
-    (string_agg(elem->>'dataVyezd', ', '))::date as date_crossing,
-    (string_agg(elem->>'dataVozvrashh', ', '))::date as return_date,
-  1 as is_border_crossed
+    CASE 
+        WHEN elem->>'dataVyezd' ~ '^\d{4}-\d{2}-\d{2}$' THEN (elem->>'dataVyezd')::date 
+        ELSE NULL 
+    END as date_crossing,
+    CASE 
+        WHEN elem->>'dataVozvrashh' ~ '^\d{4}-\d{2}-\d{2}$' THEN (elem->>'dataVozvrashh')::date 
+        ELSE NULL 
+    END as return_date,
+  true as is_border_crossed
 FROM ervu_dashboard.recruits_info ri
-JOIN ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id AND '${IDM_ID}' != ''  -- Проверка на пустую строку
-    AND (ri.current_recruitment_id = '${IDM_ID}' or (ri.current_recruitment_id is null and ri.target_recruitment_id = '${IDM_ID}'))
-    AND '${M_R_CR_DATE}'::timestamp >= ri.created_at,
-LATERAL jsonb_array_elements(info->'svedFL'->'extend'->'svedPeresechGran') as elem
-WHERE jsonb_typeof(info->'svedFL'->'extend'->'svedPeresechGran') = 'array'
-  AND (elem->>'dataVyezd' IS NOT NULL OR elem->>'dataVozvrashh' IS NOT NULL)
-GROUP BY ri.recruit_id;</sql>
+JOIN ervu_dashboard.citizen r ON r.recruit_id = ri.recruit_id 
+  AND '${IDM_ID}' != ''  -- Проверка на пустую строку
+  AND (ri.current_recruitment_id = '${IDM_ID}' or (ri.current_recruitment_id is null and ri.target_recruitment_id = '${IDM_ID}'))
+  --AND '${M_R_CR_DATE}'::timestamp >= ri.created_at
+JOIN LATERAL (
+  SELECT elem
+  FROM jsonb_array_elements(
+    CASE 
+      WHEN jsonb_typeof(ri.info->'svedFL'->'extend'->'svedPeresechGran') = 'array'
+      THEN ri.info->'svedFL'->'extend'->'svedPeresechGran'
+      ELSE '[]'::jsonb
+    END
+  ) as elem
+  WHERE (elem->>'dataVyezd' IS NOT NULL AND elem->>'dataVyezd' ~ '^\d{4}-\d{2}-\d{2}$') 
+    OR (elem->>'dataVozvrashh' IS NOT NULL AND elem->>'dataVozvrashh' ~ '^\d{4}-\d{2}-\d{2}$')
+) AS filtered_elems ON true</sql>
     <variables_active>Y</variables_active>
     <attributes/>
     <GUI>
@@ -437,11 +388,13 @@ GROUP BY ri.recruit_id;</sql>
     <commit>10000</commit>
     <connection>ervu-dashboard</connection>
     <error_ignored>Y</error_ignored>
+    <ignore_flag_field/>
     <lookup>
       <key>
         <condition>=</condition>
         <field>recruit_id</field>
         <name>recruit_id</name>
+        <name2/>
       </key>
       <schema>ervu_dashboard</schema>
       <table>citizen</table>
@@ -459,8 +412,8 @@ GROUP BY ri.recruit_id;</sql>
     </GUI>
   </transform>
   <transform>
-    <name>User defined Java expression</name>
-    <type>Janino</type>
+    <name>sort_by_recruit_id</name>
+    <type>SortRows</type>
     <description/>
     <distribute>Y</distribute>
     <custom_distribution/>
@@ -469,17 +422,24 @@ GROUP BY ri.recruit_id;</sql>
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <formula>
-      <field_name>border_crossed</field_name>
-      <formula_string>border_crossed_raw == 1</formula_string>
-      <value_type>Boolean</value_type>
-      <value_length>-1</value_length>
-      <value_precision>-1</value_precision>
-      <replace_field/>
-    </formula>
+    <compress>N</compress>
+    <directory>${java.io.tmpdir}</directory>
+    <fields>
+      <field>
+        <ascending>Y</ascending>
+        <case_sensitive>N</case_sensitive>
+        <collator_enabled>N</collator_enabled>
+        <collator_strength>0</collator_strength>
+        <name>recruit_id</name>
+        <presorted>N</presorted>
+      </field>
+    </fields>
+    <sort_prefix>srt</sort_prefix>
+    <sort_size>1000000</sort_size>
+    <unique_rows>Y</unique_rows>
     <attributes/>
     <GUI>
-      <xloc>1104</xloc>
+      <xloc>688</xloc>
       <yloc>176</yloc>
     </GUI>
   </transform>