feat: API changes for integration + helm improvement (MAPCO-2931)

helm/templates/deployment.yaml

@@ -60,6 +60,7 @@ spec:
             - name: http
               containerPort: {{ .Values.env.targetPort }}
               protocol: TCP
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           livenessProbe:
             initialDelaySeconds: {{ .Values.initialDelaySeconds }}
             httpGet:

helm/values.yaml

@@ -35,6 +35,7 @@ replicaCount: 1
 initialDelaySeconds: 60
 nodePort: 30030 #for minikube deployment only
 resetOnConfigChange: true
+imagePullPolicy: Always
 
 cloudProvider:
   dockerRegistryUrl: my-registry-url.io

openapi3.yaml

@@ -87,7 +87,7 @@ paths:
             application/json:
               schema:
                 oneOf:
-                  - $ref: '#/components/schemas/createGpkgJobResponse'
+                  - $ref: '#/components/schemas/createRoiGpkgJobResponse'
                   - $ref: '#/components/schemas/exportNaiveCacheJobResponse'
                 discriminator:
                   propertyName: response
@@ -258,9 +258,11 @@ components:
           description: The priority of the record. Maximum priority = most urgent.
           minimum: 0
           maximum: 999999999
+        description:
+          type: string
+          description: free test to describe the requested export
       required:
         - dbId
-        - callbackURLs
       example:
         dbId: ef03ca54-c68e-4ca8-8432-50ae5ad7a7f8
         roi:
@@ -287,6 +289,7 @@ components:
           - http://example.getmap.com/callback2
         crs: EPSG:4326
         priority: 0
+        description: This is roi exporting example
     createGpkgJobResponse:
       allOf:
         - $ref: '#/components/schemas/CommonResponse'
@@ -303,6 +306,22 @@ components:
       required:
         - id
         - taskIds
+    createRoiGpkgJobResponse:
+      allOf:
+        - $ref: '#/components/schemas/CommonResponse'
+      type: object
+      properties:
+        jobId:
+          type: string
+          format: uuid
+        taskIds:
+          type: array
+          items:
+            type: string
+            format: uuid
+      required:
+        - jobId
+        - taskIds
     naiveCacheJobResponse:
       allOf:
         - $ref: '#/components/schemas/CommonResponse'
@@ -361,9 +380,11 @@ components:
         recordCatalogId:
           type: string
           format: uuid
+        description:
+          type: string
         roi:
           $ref: '#/components/schemas/FeatureCollection'
-        requestJobId:
+        jobId:
           type: string
           format: uuid
       required:
@@ -372,7 +393,7 @@ components:
         - fileSize
         - recordCatalogId
         - roi
-        - requestJobId
+        - jobId
         - status
     error:
       type: object

src/clients/jobManagerWrapper.ts

@@ -11,6 +11,7 @@ import {
   CreateJobBody,
   ExportVersion,
   ICreateJobResponse,
+  ICreateExportJobResponse,
   IJobExportParameters,
   IJobParameters,
   ITaskParameters,
@@ -93,7 +94,7 @@ export class JobManagerWrapper extends JobManagerClient {
     };
   }
 
-  public async createExport(data: IWorkerExportInput): Promise<ICreateJobResponse> {
+  public async createExport(data: IWorkerExportInput): Promise<ICreateExportJobResponse> {
     const expirationDate = new Date();
     expirationDate.setDate(expirationDate.getDate() + this.expirationDays);
 
@@ -117,6 +118,7 @@ export class JobManagerWrapper extends JobManagerClient {
       productType: data.productType,
       productName: data.cswProductId,
       priority: data.priority,
+      description: data.description,
       status: OperationStatus.IN_PROGRESS,
       additionalIdentifiers: data.relativeDirectoryPath,
       tasks: [
@@ -130,8 +132,8 @@ export class JobManagerWrapper extends JobManagerClient {
       ],
     };
     const res = await this.createJob<IJobExportParameters, ITaskParameters>(createJobRequest);
-    const createJobResponse: ICreateJobResponse = {
-      id: res.id,
+    const createJobResponse: ICreateExportJobResponse = {
+      jobId: res.id,
       taskIds: res.taskIds,
       status: OperationStatus.IN_PROGRESS,
     };

src/common/interfaces.ts

@@ -16,7 +16,6 @@ export interface OpenApiConfig {
 
 export interface IBaseCreatePackage {
   dbId: string;
-  callbackURLs: string[];
   crs?: string;
   priority?: number;
 }
@@ -32,10 +31,13 @@ export interface ICleanupData {
 export interface ICreatePackage extends IBaseCreatePackage {
   targetResolution?: number;
   bbox?: BBox | Polygon | MultiPolygon;
+  callbackURLs: string[];
 }
 
 export interface ICreatePackageRoi extends IBaseCreatePackage {
   roi?: FeatureCollection;
+  callbackURLs?: string[];
+  description?: string;
 }
 
 export interface ICallbackBase {
@@ -79,21 +81,31 @@ export interface IWorkerInput extends IWorkerInputBase {
 }
 
 export interface IWorkerExportInput extends IWorkerInputBase {
-  callbacks: ICallbackTargetExport[];
+  callbacks?: ICallbackTargetExport[];
   roi: FeatureCollection;
   fileNamesTemplates: ILinkDefinition;
+  description?: string;
 }
 
 export interface IBasicResponse {
   message: string;
 }
 
+/**
+ * @deprecated GetMap API - will be deprecated on future
+ */
 export interface ICreateJobResponse {
   id: string;
   taskIds: string[];
   status: OperationStatus.IN_PROGRESS | OperationStatus.COMPLETED;
 }
 
+export interface ICreateExportJobResponse {
+  jobId: string;
+  taskIds: string[];
+  status: OperationStatus.IN_PROGRESS | OperationStatus.COMPLETED;
+}
+
 /**
  * @deprecated GetMap API - will be deprecated on future
  */
@@ -114,8 +126,9 @@ export interface ICallbackDataExportBase {
   expirationTime: Date;
   fileSize: number;
   recordCatalogId: string;
-  requestJobId: string;
+  jobId: string;
   errorReason?: string;
+  description?: string;
 }
 
 /**
@@ -187,7 +200,7 @@ export interface IJobExportParameters {
   crs: string;
   exportVersion: ExportVersion;
   roi: FeatureCollection;
-  callbacks: ICallbackTargetExport[];
+  callbacks?: ICallbackTargetExport[];
   callbackParams?: ICallbackExportResponse;
   fileNamesTemplates: ILinkDefinition;
   gpkgEstimatedSize?: number;

src/createPackage/controllers/createPackageController.ts

@@ -12,11 +12,12 @@ import {
   ICallbackResposne,
   ICreatePackageRoi,
   ICallbackExportResponse,
+  ICreateExportJobResponse,
 } from '../../common/interfaces';
 
 type CreatePackageHandler = RequestHandler<
   undefined,
-  IBasicResponse | ICreateJobResponse | ICallbackResposne | ICallbackExportResponse,
+  IBasicResponse | ICreateJobResponse | ICreateExportJobResponse | ICallbackResposne | ICallbackExportResponse,
   ICreatePackage | ICreatePackageRoi
 >;
 
@@ -29,7 +30,7 @@ export class CreatePackageController {
   ) {}
 
   public create: CreatePackageHandler = async (req, res, next) => {
-    const userInput: ICreatePackage = req.body;
+    const userInput: ICreatePackage = req.body as ICreatePackage;
     try {
       this.logger.debug(userInput, `Creating package with user input`);
       const jobCreated = await this.manager.createPackage(userInput);

src/createPackage/models/createPackageManager.ts

@@ -35,6 +35,7 @@ import {
   ICallbackExportResponse,
   ICallbackTargetExport,
   IConfig,
+  ICreateExportJobResponse,
   ICreatePackageRoi,
   IGeometryRecord,
   IJobExportParameters,
@@ -206,8 +207,8 @@ export class CreatePackageManager {
     return jobCreated;
   }
 
-  public async createPackageRoi(userInput: ICreatePackageRoi): Promise<ICreateJobResponse | ICallbackExportResponse> {
-    const { dbId, crs, priority, callbackURLs } = userInput;
+  public async createPackageRoi(userInput: ICreatePackageRoi): Promise<ICreateExportJobResponse | ICallbackExportResponse> {
+    const { dbId, crs, priority, callbackURLs, description } = userInput;
     let roi = userInput.roi;
     const layer = await this.rasterCatalogManager.findLayer(userInput.dbId);
     const layerMetadata = layer.metadata;
@@ -267,20 +268,20 @@ export class CreatePackageManager {
       crs: crs ?? DEFAULT_CRS,
     };
 
-    const callbacks = callbackURLs.map((url) => <ICallbackTargetExport>{ url, roi });
+    const callbacks = callbackURLs ? callbackURLs.map((url) => <ICallbackTargetExport>{ url, roi }) : undefined;
     const duplicationExist = await this.checkForExportDuplicate(dupParams, callbacks);
     if (duplicationExist && duplicationExist.status === OperationStatus.COMPLETED) {
       const callbackParam = duplicationExist as ICallbackExportResponse;
       this.logger.info({
         jobStatus: callbackParam.status,
-        jobId: callbackParam.requestJobId,
+        jobId: callbackParam.jobId,
         catalogId: callbackParam.recordCatalogId,
         msg: `Found relevant cache for export request`,
       });
       return duplicationExist;
     } else if (duplicationExist) {
-      const jobResponse = duplicationExist as ICreateJobResponse;
-      this.logger.info({ jobId: jobResponse.id, status: jobResponse.status, msg: `Found exists relevant In-Progress job for export request` });
+      const jobResponse = duplicationExist as ICreateExportJobResponse;
+      this.logger.info({ jobId: jobResponse.jobId, status: jobResponse.status, msg: `Found exists relevant In-Progress job for export request` });
       return duplicationExist;
     }
 
@@ -358,6 +359,7 @@ export class CreatePackageManager {
       priority: priority ?? DEFAULT_PRIORITY,
       callbacks: callbacks,
       gpkgEstimatedSize: estimatesGpkgSize,
+      description,
     };
     const jobCreated = await this.jobManagerClient.createExport(workerInput);
     return jobCreated;
@@ -610,8 +612,8 @@ export class CreatePackageManager {
 
   private async checkForExportDuplicate(
     dupParams: JobExportDuplicationParams,
-    callbackUrls: ICallbackTargetExport[]
-  ): Promise<ICallbackExportResponse | ICreateJobResponse | undefined> {
+    callbackUrls?: ICallbackTargetExport[]
+  ): Promise<ICallbackExportResponse | ICreateExportJobResponse | undefined> {
     let completedExists = await this.checkForExportCompleted(dupParams);
     if (completedExists) {
       return completedExists;
@@ -675,16 +677,16 @@ export class CreatePackageManager {
 
   private async checkForExportProcessing(
     dupParams: JobExportDuplicationParams,
-    newCallbacks: ICallbackTargetExport[]
-  ): Promise<ICreateJobResponse | undefined> {
+    newCallbacks?: ICallbackTargetExport[]
+  ): Promise<ICreateExportJobResponse | undefined> {
     this.logger.info({ ...dupParams, roi: undefined, msg: `Checking for PROCESSING duplications with parameters` });
     const processingJob =
       (await this.jobManagerClient.findExportJob(OperationStatus.IN_PROGRESS, dupParams, true)) ??
       (await this.jobManagerClient.findExportJob(OperationStatus.PENDING, dupParams, true));
     if (processingJob) {
       await this.updateExportCallbackURLs(processingJob, newCallbacks);
       return {
-        id: processingJob.id,
+        jobId: processingJob.id,
         taskIds: (processingJob.tasks as unknown as IJobResponse<IJobExportParameters, ITaskParameters>[]).map((t) => t.id),
         status: OperationStatus.IN_PROGRESS,
       };
@@ -729,21 +731,29 @@ export class CreatePackageManager {
     });
   }
 
-  private async updateExportCallbackURLs(processingJob: JobExportResponse, newCallbacks: ICallbackTargetExport[]): Promise<void> {
-    const callbacks = processingJob.parameters.callbacks;
-    for (const newCallback of newCallbacks) {
-      const hasCallback = callbacks.findIndex((callback) => {
-        const exist = callback.url === newCallback.url;
-        if (!exist) {
-          return false;
-        }
+  private async updateExportCallbackURLs(processingJob: JobExportResponse, newCallbacks?: ICallbackTargetExport[]): Promise<void> {
+    if (!newCallbacks) {
+      return;
+    }
 
-        const sameROI = featureCollectionBooleanEqual(callback.roi, newCallback.roi);
-        return sameROI;
-      });
-      // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-      if (hasCallback === -1) {
-        callbacks.push(newCallback);
+    if (!processingJob.parameters.callbacks) {
+      processingJob.parameters.callbacks = newCallbacks;
+    } else {
+      const callbacks = processingJob.parameters.callbacks;
+      for (const newCallback of newCallbacks) {
+        const hasCallback = callbacks.findIndex((callback) => {
+          const exist = callback.url === newCallback.url;
+          if (!exist) {
+            return false;
+          }
+
+          const sameROI = featureCollectionBooleanEqual(callback.roi, newCallback.roi);
+          return sameROI;
+        });
+        // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+        if (hasCallback === -1) {
+          callbacks.push(newCallback);
+        }
       }
     }
     await this.jobManagerClient.updateJob<IJobExportParameters>(processingJob.id, {

src/tasks/models/tasksManager.ts

@@ -153,6 +153,9 @@ export class TasksManager {
     try {
       this.logger.info({ jobId: job.id, callbacks: job.parameters.callbacks, msg: `Sending callback for job: ${job.id}` });
       const targetCallbacks = job.parameters.callbacks;
+      if (!targetCallbacks) {
+        return;
+      }
       const callbackPromises: Promise<void>[] = [];
       for (const target of targetCallbacks) {
         const params: ICallbackExportData = { ...callbackParams, roi: job.parameters.roi };
@@ -338,8 +341,9 @@ export class TasksManager {
       expirationTime: expirationDate,
       fileSize,
       recordCatalogId: job.internalId as string,
-      requestJobId: job.id,
+      jobId: job.id,
       errorReason,
+      description: job.description,
     };
     this.logger.info({
       links: callbackParams.links,