From 383b8a45ca03e3f05a228f328b0a8feb7278bfa7 Mon Sep 17 00:00:00 2001 From: razbroc Date: Sun, 17 May 2026 16:51:56 +0300 Subject: [PATCH 1/2] feat: add deletion task to job definitions and update related configurations Co-authored-by: Copilot --- README.md | 1 + config/custom-environment-variables.json | 1 + helm/templates/configmap.yaml | 1 + helm/values.yaml | 3 +++ src/common/interfaces.ts | 1 + src/tasks/handlers/ingestion/ingestionHandler.ts | 2 +- 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e83dcf5c..abe1eaec 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ Start the server |`JOB_DEFINITIONS_JOB_SWAP_UPDATE` |Job name. |Ingestion_Swap_Update | |`JOB_DEFINITIONS_TASK_INIT` |Task name. |init | |`JOB_DEFINITIONS_TASK_MERGE` |Task name. |merge | +|`JOB_DEFINITIONS_TASK_DELETION` |Task name. |merge | |`JOB_DEFINITIONS_TASK_POLYGON_PARTS`|Task name. |polygon-parts | |`JOB_DEFINITIONS_TASK_FINALIZE` |Task name. |finalize | |`HTTP_RETRY_ATTEMPTS` |How many retries should the service make if a request fails. |5 | diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json index 4bedd2d0..aae809d5 100644 --- a/config/custom-environment-variables.json +++ b/config/custom-environment-variables.json @@ -66,6 +66,7 @@ "init": "JOB_DEFINITIONS_TASK_INIT", "createTasks": "JOB_DEFINITIONS_TASK_CREATE_TASKS", "merge": "JOB_DEFINITIONS_TASK_MERGE", + "deletion": "JOB_DEFINITIONS_TASK_DELETION", "polygonParts": "JOB_DEFINITIONS_TASK_POLYGON_PARTS", "export": "JOB_DEFINITIONS_TASK_EXPORT", "finalize": "JOB_DEFINITIONS_TASK_FINALIZE", diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml index d9050346..c30b98e5 100644 --- a/helm/templates/configmap.yaml +++ b/helm/templates/configmap.yaml @@ -33,6 +33,7 @@ data: JOB_DEFINITIONS_TASK_INIT: {{ $jobDefinitions.tasks.init.type | quote }} JOB_DEFINITIONS_TASK_VALIDATION: {{ $jobDefinitions.tasks.validation.type | quote }} JOB_DEFINITIONS_TASK_MERGE: {{ $jobDefinitions.tasks.merge.type | quote }} + JOB_DEFINITIONS_TASK_DELETION: {{ $jobDefinitions.tasks.deletion.type | quote }} JOB_DEFINITIONS_TASK_POLYGON_PARTS: {{ $jobDefinitions.tasks.polygonParts.type | quote }} JOB_DEFINITIONS_TASK_CREATE_TASKS: {{ $jobDefinitions.tasks.createTasks.type | quote }} JOB_DEFINITIONS_TASK_EXPORT: {{ $jobDefinitions.tasks.export.type | quote }} diff --git a/helm/values.yaml b/helm/values.yaml index e6489037..934ddea5 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -105,6 +105,8 @@ jobDefinitions: type: '' merge: type: '' + deletion: + type: '' polygonParts: type: '' suspendJobOnFail: false @@ -120,6 +122,7 @@ taskFlowManager: - validation - create-merge-tasks - tilesMerging + - tiles-deletion - finalize exportTasksFlow: - init diff --git a/src/common/interfaces.ts b/src/common/interfaces.ts index a617a046..229cfdd1 100644 --- a/src/common/interfaces.ts +++ b/src/common/interfaces.ts @@ -43,6 +43,7 @@ export interface IJobDefinitionsConfig { init: string; export: string; seed: string; + deletion: string; }; suspendingTaskTypes: string[]; } diff --git a/src/tasks/handlers/ingestion/ingestionHandler.ts b/src/tasks/handlers/ingestion/ingestionHandler.ts index 72c174a3..42678bc8 100644 --- a/src/tasks/handlers/ingestion/ingestionHandler.ts +++ b/src/tasks/handlers/ingestion/ingestionHandler.ts @@ -33,7 +33,7 @@ export class IngestionJobHandler extends JobHandler { ) { super(logger, config, jobManagerClient, job, task); this.tasksFlow = this.config.get('taskFlowManager.ingestionTasksFlow'); - this.excludedTypes = [this.jobDefinitions.tasks.merge]; + this.excludedTypes = [this.jobDefinitions.tasks.merge, this.jobDefinitions.tasks.deletion]; this.blockedDuplicationTypes = [this.jobDefinitions.tasks.validation, this.jobDefinitions.tasks.createTasks, this.jobDefinitions.tasks.finalize]; this.initializeTaskOperations(); From c55c5c459c1a1a6269d615e2231def9412f5f1b4 Mon Sep 17 00:00:00 2001 From: razbroc Date: Mon, 18 May 2026 10:15:55 +0300 Subject: [PATCH 2/2] feat: rename deletion task to tilesDeletion in job definitions and related configurations --- config/custom-environment-variables.json | 2 +- helm/values.yaml | 2 +- src/common/interfaces.ts | 2 +- src/tasks/handlers/ingestion/ingestionHandler.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json index aae809d5..811990ea 100644 --- a/config/custom-environment-variables.json +++ b/config/custom-environment-variables.json @@ -66,7 +66,7 @@ "init": "JOB_DEFINITIONS_TASK_INIT", "createTasks": "JOB_DEFINITIONS_TASK_CREATE_TASKS", "merge": "JOB_DEFINITIONS_TASK_MERGE", - "deletion": "JOB_DEFINITIONS_TASK_DELETION", + "tilesDeletion": "JOB_DEFINITIONS_TASK_DELETION", "polygonParts": "JOB_DEFINITIONS_TASK_POLYGON_PARTS", "export": "JOB_DEFINITIONS_TASK_EXPORT", "finalize": "JOB_DEFINITIONS_TASK_FINALIZE", diff --git a/helm/values.yaml b/helm/values.yaml index 934ddea5..66eb5e23 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -105,7 +105,7 @@ jobDefinitions: type: '' merge: type: '' - deletion: + tilesDeletion: type: '' polygonParts: type: '' diff --git a/src/common/interfaces.ts b/src/common/interfaces.ts index 229cfdd1..7cabf729 100644 --- a/src/common/interfaces.ts +++ b/src/common/interfaces.ts @@ -43,7 +43,7 @@ export interface IJobDefinitionsConfig { init: string; export: string; seed: string; - deletion: string; + tilesDeletion: string; }; suspendingTaskTypes: string[]; } diff --git a/src/tasks/handlers/ingestion/ingestionHandler.ts b/src/tasks/handlers/ingestion/ingestionHandler.ts index 42678bc8..1b52454e 100644 --- a/src/tasks/handlers/ingestion/ingestionHandler.ts +++ b/src/tasks/handlers/ingestion/ingestionHandler.ts @@ -33,7 +33,7 @@ export class IngestionJobHandler extends JobHandler { ) { super(logger, config, jobManagerClient, job, task); this.tasksFlow = this.config.get('taskFlowManager.ingestionTasksFlow'); - this.excludedTypes = [this.jobDefinitions.tasks.merge, this.jobDefinitions.tasks.deletion]; + this.excludedTypes = [this.jobDefinitions.tasks.merge, this.jobDefinitions.tasks.tilesDeletion]; this.blockedDuplicationTypes = [this.jobDefinitions.tasks.validation, this.jobDefinitions.tasks.createTasks, this.jobDefinitions.tasks.finalize]; this.initializeTaskOperations();