db,migrate:Simplify state code in analysis

jhf · jhf · commit 25ebdd602285 · 2025-08-19T16:36:33.000+02:00
diff --git a/migrations/20250429100000_import_job_procedures_for_external_idents.up.sql b/migrations/20250429100000_import_job_procedures_for_external_idents.up.sql
@@ -476,7 +476,7 @@ BEGIN
 
     -- Step 3: Single-pass Batch Update for All Rows with dynamically constructed SET clause
     v_set_clause := format($$
-        state = CASE WHEN ru.error_jsonb IS NOT NULL AND ru.error_jsonb != '{}'::jsonb THEN 'error'::public.import_data_state ELSE (CASE WHEN dt.state = 'error' THEN 'error'::public.import_data_state ELSE 'analysing'::public.import_data_state END) END,
+        state = CASE WHEN ru.error_jsonb IS NOT NULL AND ru.error_jsonb != '{}'::jsonb THEN 'error'::public.import_data_state ELSE 'analysing'::public.import_data_state END,
         error = CASE WHEN ru.error_jsonb IS NOT NULL AND ru.error_jsonb != '{}'::jsonb THEN COALESCE(dt.error, '{}'::jsonb) || ru.error_jsonb ELSE (CASE WHEN (dt.error - %1$L::TEXT[]) = '{}'::jsonb THEN NULL ELSE (dt.error - %1$L::TEXT[]) END) END,
         action = ru.action,
         operation = ru.operation,
diff --git a/migrations/20250429102000_import_job_procedures_for_edit_info.up.sql b/migrations/20250429102000_import_job_procedures_for_edit_info.up.sql
@@ -32,10 +32,7 @@ BEGIN
             edit_at = statement_timestamp(),
             edit_comment = %3$L, -- Set edit_comment from job's default
             last_completed_priority = %4$L,
-            state = CASE
-                        WHEN dt.action = 'skip' THEN dt.state -- Keep existing state if skipped
-                        ELSE 'analysing'::public.import_data_state -- Set to analysing for non-skipped
-                    END
+            state = 'analysing'::public.import_data_state
         WHERE dt.row_id = ANY($1);
     $$, v_data_table_name /* %1$I */, v_job.user_id /* %2$L */, v_job.edit_comment /* %3$L */, v_step.priority /* %4$L */);
     RAISE DEBUG '[Job %] analyse_edit_info: Updating all rows in batch: %', p_job_id, v_sql;
diff --git a/migrations/20250429103000_import_job_procedures_for_status.up.sql b/migrations/20250429103000_import_job_procedures_for_status.up.sql
@@ -57,11 +57,7 @@ BEGIN
                         WHEN (NULLIF(dt.status_code, '') IS NOT NULL AND sl.resolved_status_id_by_code IS NULL AND %2$L::INTEGER IS NULL) OR
                              ((NULLIF(dt.status_code, '') IS NULL OR NULLIF(dt.status_code, '') = '') AND %2$L::INTEGER IS NULL)
                         THEN 'error'::public.import_data_state
-                        ELSE
-                            CASE
-                                WHEN dt.state = 'error'::public.import_data_state THEN 'error'::public.import_data_state
-                                ELSE 'analysing'::public.import_data_state
-                            END
+                        ELSE 'analysing'::public.import_data_state
                     END,
             error = CASE
                         WHEN NULLIF(dt.status_code, '') IS NOT NULL AND sl.resolved_status_id_by_code IS NULL AND %2$L::INTEGER IS NULL THEN
diff --git a/migrations/20250429110000_import_job_procedures_for_legal_unit.up.sql b/migrations/20250429110000_import_job_procedures_for_legal_unit.up.sql
@@ -68,11 +68,7 @@ BEGIN
             state = CASE
                         WHEN dt.name IS NULL OR trim(dt.name) = '' THEN 'error'::public.import_data_state
                         WHEN dt.status_id IS NULL THEN 'error'::public.import_data_state
-                        ELSE
-                           CASE
-                               WHEN dt.state = 'error'::public.import_data_state THEN 'error'::public.import_data_state
-                               ELSE 'analysing'::public.import_data_state
-                           END
+                        ELSE 'analysing'::public.import_data_state
                     END,
             action = CASE
                         WHEN dt.name IS NULL OR trim(dt.name) = '' THEN 'skip'::public.import_row_action_type
diff --git a/migrations/20250429120000_import_job_procedures_for_link_establishment_to_legal_unit.up.sql b/migrations/20250429120000_import_job_procedures_for_link_establishment_to_legal_unit.up.sql
@@ -240,7 +240,7 @@ BEGIN
                 )
                 ELSE dt.primary_for_legal_unit
             END,
-            state = CASE WHEN err.error_jsonb IS NOT NULL THEN 'error'::public.import_data_state ELSE (CASE WHEN dt.state = 'error' THEN 'error'::public.import_data_state ELSE 'analysing'::public.import_data_state END) END,
+            state = CASE WHEN err.error_jsonb IS NOT NULL THEN 'error'::public.import_data_state ELSE 'analysing'::public.import_data_state END,
             action = CASE WHEN err.error_jsonb IS NOT NULL THEN 'skip'::public.import_row_action_type ELSE dt.action END,
             error = CASE WHEN err.error_jsonb IS NOT NULL THEN COALESCE(dt.error, '{}'::jsonb) || err.error_jsonb ELSE (CASE WHEN (dt.error - %2$L::TEXT[]) = '{}'::jsonb THEN NULL ELSE (dt.error - %2$L::TEXT[]) END) END,
             last_completed_priority = %3$L
diff --git a/migrations/20250429123000_import_job_procedures_for_establishment.up.sql b/migrations/20250429123000_import_job_procedures_for_establishment.up.sql
@@ -60,11 +60,7 @@ BEGIN
             state = CASE
                         WHEN dt.name IS NULL OR trim(dt.name) = '' THEN 'error'::public.import_data_state
                         WHEN dt.status_id IS NULL THEN 'error'::public.import_data_state
-                        ELSE
-                           CASE
-                               WHEN dt.state = 'error'::public.import_data_state THEN 'error'::public.import_data_state
-                               ELSE 'analysing'::public.import_data_state
-                           END
+                        ELSE 'analysing'::public.import_data_state
                     END,
             action = CASE -- Added action update
                         WHEN dt.name IS NULL OR trim(dt.name) = '' THEN 'skip'::public.import_row_action_type
diff --git a/migrations/20250429130000_import_job_procedures_for_location.up.sql b/migrations/20250429130000_import_job_procedures_for_location.up.sql
@@ -265,11 +265,7 @@ BEGIN
                      END,
             state = CASE
                         WHEN (%6$s) OR (%10$s) THEN 'error'::public.import_data_state -- Fatal country error OR any coordinate error
-                        ELSE
-                            CASE
-                                WHEN dt.state = 'error'::public.import_data_state THEN 'error'::public.import_data_state
-                                ELSE 'analysing'::public.import_data_state
-                            END
+                        ELSE 'analysing'::public.import_data_state
                     END,
             error = jsonb_strip_nulls(
                         COALESCE(dt.error, '{}'::jsonb) -- Start with existing errors
diff --git a/migrations/20250429140000_import_job_procedures_for_activity.up.sql b/migrations/20250429140000_import_job_procedures_for_activity.up.sql
@@ -92,7 +92,7 @@ BEGIN
                                                  WHEN %2$L = 'secondary_activity' THEN l.resolved_secondary_activity_category_id
                                                  ELSE dt.secondary_activity_category_id -- Keep existing if not this step's target
                                              END,
-            state = CASE WHEN dt.state = 'error'::public.import_data_state THEN 'error'::public.import_data_state ELSE 'analysing'::public.import_data_state END, -- Preserve error state, otherwise it's analysing
+            state = 'analysing'::public.import_data_state, -- Activity lookup issues are non-fatal, state remains analysing
             error = CASE WHEN (dt.error - %3$L::TEXT[]) = '{}'::jsonb THEN NULL ELSE (dt.error - %3$L::TEXT[]) END, -- Always clear this step's error key
             invalid_codes = CASE
                                 WHEN (%4$s) THEN -- Lookup failed for the current activity type
diff --git a/migrations/20250429150000_import_job_procedures_for_contact.up.sql b/migrations/20250429150000_import_job_procedures_for_contact.up.sql
@@ -31,10 +31,7 @@ BEGIN
     v_sql := format($$
         UPDATE public.%1$I dt SET
             last_completed_priority = %2$L,
-            state = CASE
-                        WHEN dt.state = 'error'::public.import_data_state THEN 'error'::public.import_data_state -- Preserve existing error state
-                        ELSE 'analysing'::public.import_data_state -- Otherwise, it's analysing
-                    END
+            state = 'analysing'::public.import_data_state
             -- No error column modification as this step doesn't generate errors
         WHERE dt.row_id = ANY($1);
     $$, v_data_table_name /* %1$I */, v_step.priority /* %2$L */);
diff --git a/migrations/20250429170000_import_job_procedures_for_statistical_variables.up.sql b/migrations/20250429170000_import_job_procedures_for_statistical_variables.up.sql
@@ -143,11 +143,7 @@ BEGIN
             -- Determine state first
             state = CASE
                         WHEN %2$s THEN 'error'::public.import_data_state -- Error condition for this step
-                        ELSE
-                            CASE
-                                WHEN dt.state = 'error'::public.import_data_state THEN 'error'::public.import_data_state
-                                ELSE 'analysing'::public.import_data_state
-                            END
+                        ELSE 'analysing'::public.import_data_state -- No error from this step
                     END,
             -- Then determine action based on the new state or existing action
             action = CASE
diff --git a/migrations/20250429180000_import_job_procedures_for_tag.up.sql b/migrations/20250429180000_import_job_procedures_for_tag.up.sql
@@ -56,11 +56,7 @@ BEGIN
             state = CASE
                         WHEN dt.tag_path IS NOT NULL AND rt.ltree_error_msg IS NOT NULL THEN 'error'::public.import_data_state
                         WHEN dt.tag_path IS NOT NULL AND rt.ltree_error_msg IS NULL AND rt.resolved_tag_id IS NULL THEN 'error'::public.import_data_state
-                        ELSE
-                            CASE
-                                WHEN dt.state = 'error'::public.import_data_state THEN 'error'::public.import_data_state
-                                ELSE 'analysing'::public.import_data_state
-                            END
+                        ELSE 'analysing'::public.import_data_state
                     END,
             -- Then determine action based on the new state or existing action
             action = CASE
diff --git a/migrations/20250505100000_import_job_procedures_for_enterprise_link_for_legal_unit.up.sql b/migrations/20250505100000_import_job_procedures_for_enterprise_link_for_legal_unit.up.sql
@@ -141,8 +141,8 @@ BEGIN
         v_sql := format($$
             UPDATE public.%1$I dt SET
                 last_completed_priority = %2$L,
-                state = CASE WHEN dt.state != 'error' THEN 'analysing'::public.import_data_state ELSE dt.state END, -- Keep error state if already set
-                error = CASE WHEN dt.state != 'error' THEN (CASE WHEN (dt.error - %3$L::TEXT[]) = '{}'::jsonb THEN NULL ELSE (dt.error - %4$L::TEXT[]) END) ELSE dt.error END -- Clear this step's error if not an error from this step
+                state = 'analysing'::public.import_data_state,
+                error = CASE WHEN (dt.error - %3$L::TEXT[]) = '{}'::jsonb THEN NULL ELSE (dt.error - %4$L::TEXT[]) END -- Clear this step's error if not an error from this step
             WHERE dt.row_id = ANY($1)
               AND NOT EXISTS (SELECT 1 FROM temp_enterprise_analysis_results tear WHERE tear.row_id = dt.row_id);
         $$,
diff --git a/migrations/20250505110000_import_job_procedures_for_enterprise_link_for_establishment.up.sql b/migrations/20250505110000_import_job_procedures_for_enterprise_link_for_establishment.up.sql
@@ -112,8 +112,8 @@ BEGIN
         v_sql := format($$
             UPDATE public.%1$I dt SET -- v_data_table_name
                 last_completed_priority = %2$s, -- v_step.priority
-                state = CASE WHEN dt.state != 'error' THEN 'analysing'::public.import_data_state ELSE dt.state END,
-                error = CASE WHEN dt.state != 'error' THEN (CASE WHEN (dt.error - %3$L::TEXT[]) = '{}'::jsonb THEN NULL ELSE (dt.error - %3$L::TEXT[]) END) ELSE dt.error END -- v_error_keys_to_clear_arr
+                state = 'analysing'::public.import_data_state,
+                error = CASE WHEN (dt.error - %3$L::TEXT[]) = '{}'::jsonb THEN NULL ELSE (dt.error - %3$L::TEXT[]) END -- v_error_keys_to_clear_arr
             WHERE dt.row_id = ANY($1) -- p_batch_row_ids
               AND (dt.action = 'insert' OR dt.action = 'skip' OR (dt.action = 'replace' AND dt.last_completed_priority < %2$s)); -- v_step.priority
         $$,

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ BEGIN`
`240`	`240`	`)`
`241`	`241`	`ELSE dt.primary_for_legal_unit`
`242`	`242`	`END,`
`243`		`- state = CASE WHEN err.error_jsonb IS NOT NULL THEN 'error'::public.import_data_state ELSE (CASE WHEN dt.state = 'error' THEN 'error'::public.import_data_state ELSE 'analysing'::public.import_data_state END) END,`
	`243`	`+ state = CASE WHEN err.error_jsonb IS NOT NULL THEN 'error'::public.import_data_state ELSE 'analysing'::public.import_data_state END,`
`244`	`244`	`action = CASE WHEN err.error_jsonb IS NOT NULL THEN 'skip'::public.import_row_action_type ELSE dt.action END,`
`245`	`245`	`error = CASE WHEN err.error_jsonb IS NOT NULL THEN COALESCE(dt.error, '{}'::jsonb) \|\| err.error_jsonb ELSE (CASE WHEN (dt.error - %2$L::TEXT[]) = '{}'::jsonb THEN NULL ELSE (dt.error - %2$L::TEXT[]) END) END,`
`246`	`246`	`last_completed_priority = %3$L`