feat: apply "links" to validation parameters

src/schemas/core/callback.schema.ts

@@ -2,16 +2,6 @@ import z from 'zod';
 import { OperationStatus } from '@map-colonies/mc-priority-queue';
 import { rasterProductTypeSchema, resourceIdSchema, versionSchema } from './job.schema';
 
-export const callbackUrlSchema = z.string().url();
-
-export const callbackUrlsArraySchema = z.array(callbackUrlSchema);
-
-export const fileMetadataSchema = z.object({
-  fileName: z.string().min(1),
-  fileSize: z.number().nonnegative(),
-  url: callbackUrlSchema,
-});
-
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 export const createCallbackResponseSchema = <T>(dataSchema?: z.ZodType<T>) => {
   return z.object({

src/schemas/core/file.schema.ts

@@ -0,0 +1,8 @@
+import z from 'zod';
+import { urlSchema } from './link.schema';
+
+export const fileMetadataSchema = z.object({
+  fileName: z.string().min(1),
+  fileSize: z.number().nonnegative().int().describe('File size in bytes'),
+  url: urlSchema,
+});

src/schemas/core/index.ts

@@ -4,3 +4,5 @@ export * from './task.schema';
 export * from './mime.schema';
 export * from './aggregation.schema';
 export * from './callback.schema';
+export * from './link.schema';
+export * from './file.schema';

src/schemas/core/link.schema.ts

@@ -0,0 +1,6 @@
+import z from 'zod';
+import { CORE_VALIDATIONS } from '../../constants';
+
+export const urlSchema = z.string().regex(new RegExp(CORE_VALIDATIONS.url.pattern));
+
+export const urlsArraySchema = z.array(urlSchema);

src/schemas/export/job.schema.ts

@@ -1,13 +1,13 @@
 import { z } from 'zod';
 import { CORE_VALIDATIONS, TileFormatStrategy, TileOutputFormat } from '../../constants';
 import { polygonPartsEntityNameSchema } from '../ingestion';
-import { callbackUrlsArraySchema } from '../core/callback.schema';
+import { urlsArraySchema } from '../core';
 import { callbackExportResponseSchema, cleanupDataSchema, roiFeatureCollectionSchema, fileNamesTemplatesSchema } from './export.schema';
 
 export const exportInputParamsSchema = z.object({
   crs: z.string(z.literal('EPSG:4326')),
   roi: roiFeatureCollectionSchema,
-  callbackUrls: callbackUrlsArraySchema.optional(),
+  callbackUrls: urlsArraySchema.optional(),
 });
 
 export const exportAdditionalParamsSchema = z

src/schemas/ingestion/job.schema.ts

@@ -1,6 +1,6 @@
 import z from 'zod';
 import { CORE_VALIDATIONS } from '../../constants';
-import { callbackUrlsArraySchema } from '../core/callback.schema';
+import { urlsArraySchema } from '../core';
 import { newAdditionalParamsSchema, swapUpdateAdditionalParamsSchema, updateAdditionalParamsSchema } from './additionalParams.schema';
 import { inputFilesSchema } from './inputFiles.schema';
 import { newRasterLayerMetadataSchema, updateRasterLayerMetadataSchema } from './metadata.schema';
@@ -18,7 +18,7 @@ export const ingestionBaseJobParamsSchema = z
   .object({
     inputFiles: inputFilesSchema,
     ingestionResolution: ingestionResolutionSchema,
-    callbackUrls: callbackUrlsArraySchema.optional(),
+    callbackUrls: urlsArraySchema.optional(),
   })
   .describe('ingestionBaseJobParamsSchema');
 

src/schemas/ingestion/task.schema.ts

@@ -1,4 +1,5 @@
 import z from 'zod';
+import { fileMetadataSchema } from '../core';
 
 export const ingestionNewFinalizeTaskParamsSchema = z
   .object({
@@ -22,6 +23,7 @@ export const ingestionSwapUpdateTaskParamsSchema = ingestionUpdateFinalizeTaskPa
 
 export const ingestionValidationTaskParamsSchema = z
   .object({
+    link: fileMetadataSchema.optional(),
     isValid: z.boolean(),
   })
   .describe('ingestionValidationTaskParamsSchema');

src/types/core/index.ts

@@ -3,3 +3,4 @@ export * from './task.type';
 export * from './metadata.type';
 export * from './layer.type';
 export * from './part.type';
+export * from './link.type';

src/types/core/link.type.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+import { fileMetadataSchema, urlsArraySchema, urlSchema } from '../../schemas';
+
+export type FileMetadata = z.infer<typeof fileMetadataSchema>;
+
+export type CallbackUrl = z.infer<typeof urlSchema>;
+export type CallbackUrlsTargetArray = z.infer<typeof urlsArraySchema>;

src/types/export/export.type.ts

@@ -10,14 +10,11 @@ import {
   linksSchema,
   roiPropertiesSchema,
 } from '../../schemas/export/export.schema';
-import { callbackUrlsArraySchema, callbackUrlSchema } from '../../schemas/core/callback.schema';
 
 export type RoiProperties = z.infer<typeof roiPropertiesSchema>;
 export type RoiFeature = Feature<Polygon | MultiPolygon, RoiProperties>;
 export type RoiFeatureCollection = FeatureCollection<Polygon | MultiPolygon, RoiProperties>;
 
-export type CallbackUrl = z.infer<typeof callbackUrlSchema>;
-export type CallbackUrlsTargetArray = z.infer<typeof callbackUrlsArraySchema>;
 export type CallbackExportResponse = z.infer<typeof callbackExportResponseSchema>;
 export type CallbacksStatus = z.infer<typeof callbacksStatus>;