feat: handle Delete_Layer tasks flow (MAPCO-10814)

README.md

@@ -6,6 +6,7 @@ Services notifies Job Tracker on completed tasks, and Job Tracker handles the re
 
 ## API
 Check out the OpenAPI spec [here](/openapi3.yaml)
+
 #### Get all items
 
 ```http
@@ -61,7 +62,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_TILES_DELETION`|Task name.                                                                |tiles-deletion               |
 |`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                            |

config/custom-environment-variables.json

@@ -68,18 +68,20 @@
       "update": "JOB_DEFINITIONS_JOB_UPDATE",
       "swapUpdate": "JOB_DEFINITIONS_JOB_SWAP_UPDATE",
       "export": "JOB_DEFINITIONS_JOB_EXPORT",
-      "seed": "JOB_DEFINITIONS_JOB_SEED"
+      "seed": "JOB_DEFINITIONS_JOB_SEED",
+      "deleteLayer": "JOB_DEFINITIONS_JOB_DELETE_LAYER"
     },
     "tasks": {
       "validation": "JOB_DEFINITIONS_TASK_VALIDATION",
       "init": "JOB_DEFINITIONS_TASK_INIT",
       "createTasks": "JOB_DEFINITIONS_TASK_CREATE_TASKS",
       "merge": "JOB_DEFINITIONS_TASK_MERGE",
-      "tilesDeletion": "JOB_DEFINITIONS_TASK_DELETION",
+      "tilesDeletion": "JOB_DEFINITIONS_TASK_TILES_DELETION",
       "polygonParts": "JOB_DEFINITIONS_TASK_POLYGON_PARTS",
       "export": "JOB_DEFINITIONS_TASK_EXPORT",
       "finalize": "JOB_DEFINITIONS_TASK_FINALIZE",
-      "seed": "JOB_DEFINITIONS_TASK_SEED"
+      "seed": "JOB_DEFINITIONS_TASK_SEED",
+      "delete": "JOB_DEFINITIONS_TASK_DELETE"
     },
     "suspendingTaskTypes": {
       "__name": "JOB_DEFINITIONS_SUSPENDING_TASKS",
@@ -98,6 +100,10 @@
     "seedTasksFlow": {
       "__name": "SEED_TASKS_FLOW",
       "__format": "json"
+    },
+    "deleteLayerTasksFlow": {
+      "__name": "DELETE_LAYER_TASKS_FLOW",
+      "__format": "json"
     }
   }
 }

config/default.json

@@ -53,7 +53,8 @@
       "update": "Ingestion_Update",
       "swapUpdate": "Ingestion_Swap_Update",
       "export": "Export",
-      "seed": "TilesSeeding"
+      "seed": "TilesSeeding",
+      "deleteLayer": "Delete_Layer"
     },
     "tasks": {
       "validation": "validation",
@@ -63,13 +64,16 @@
       "createTasks": "create-tasks",
       "export": "tilesExporting",
       "finalize": "finalize",
-      "seed": "TilesSeeding"
+      "seed": "TilesSeeding",
+      "tilesDeletion": "tiles-deletion",
+      "delete": "delete"
     },
     "suspendingTaskTypes": ["polygon-parts"]
   },
   "taskFlowManager": {
     "ingestionTasksFlow": ["validation", "create-merge-tasks", "tilesMerging", "finalize"],
     "exportTasksFlow": ["init", "tilesExporting", "polygon-parts", "finalize"],
-    "seedTasksFlow": ["TilesSeeding"]
+    "seedTasksFlow": ["TilesSeeding"],
+    "deleteLayerTasksFlow": ["delete", "tiles-deletion"]
   }
 }

helm/templates/configmap.yaml

@@ -33,19 +33,22 @@ data:
   JOB_DEFINITIONS_JOB_SWAP_UPDATE: {{ $jobDefinitions.jobs.swapUpdate.type | quote }}
   JOB_DEFINITIONS_JOB_EXPORT: {{ $jobDefinitions.jobs.export.type | quote }}
   JOB_DEFINITIONS_JOB_SEED: {{ $jobDefinitions.jobs.seed.type | quote }}
+  JOB_DEFINITIONS_JOB_DELETE_LAYER: {{ $jobDefinitions.jobs.deleteLayer.type | quote }}
   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.tilesDeletion.type | quote }}
+  JOB_DEFINITIONS_TASK_TILES_DELETION: {{ $jobDefinitions.tasks.tilesDeletion.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 }}
   JOB_DEFINITIONS_TASK_FINALIZE: {{ $jobDefinitions.tasks.finalize.type | quote }}
   JOB_DEFINITIONS_TASK_SEED: {{ $jobDefinitions.tasks.seed.type | quote }}
+  JOB_DEFINITIONS_TASK_DELETE: {{ $jobDefinitions.tasks.delete.type | quote }}
   JOB_DEFINITIONS_SUSPENDING_TASKS: {{ $suspendingTaskTypes | quote }}
   INGESTION_TASKS_FLOW: {{ .Values.taskFlowManager.ingestionTasksFlow | toJson | quote }}
   EXPORT_TASKS_FLOW: {{ .Values.taskFlowManager.exportTasksFlow | toJson | quote }}
   SEED_TASKS_FLOW: {{ .Values.taskFlowManager.seedTasksFlow | toJson | quote }}
+  DELETE_LAYER_TASKS_FLOW: {{ .Values.taskFlowManager.deleteLayerTasksFlow | toJson | quote }}
   {{- with .Values.configManagement }}
   CONFIG_NAME: {{ .name | quote }}
   CONFIG_VERSION: {{ .version | quote }}

helm/values.yaml

@@ -95,6 +95,8 @@ jobDefinitions:
       type: ''
     seed:
       type: ''
+    deleteLayer:
+      type: ''
   tasks:
     validation:
       type: ''
@@ -115,6 +117,8 @@ jobDefinitions:
       type: ''
     seed:
       type: ''
+    delete:
+      type: ''
 
 taskFlowManager:
   ingestionTasksFlow:
@@ -130,6 +134,9 @@ taskFlowManager:
   - finalize
   seedTasksFlow:
   - TilesSeeding
+  deleteLayerTasksFlow:
+  - delete
+  - tiles-deletion
 env:
   port: 80
   targetPort: 8080