From 6bc8a1c3e70d856bbfb5eaf12d9eadbcc752a51a Mon Sep 17 00:00:00 2001 From: NatalieShaked Date: Sun, 4 Jan 2026 18:15:25 +0200 Subject: [PATCH 1/2] feat: updated schema --- devScripts/index.ts | 4 ++-- package-lock.json | 14 +++++++------- package.json | 2 +- src/common/config.ts | 6 +++--- src/common/elastic/interfaces.ts | 4 ++-- src/common/redis/interfaces.ts | 4 ++-- src/common/s3/interfaces.ts | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/devScripts/index.ts b/devScripts/index.ts index e81b536..9ef8c60 100644 --- a/devScripts/index.ts +++ b/devScripts/index.ts @@ -1,12 +1,12 @@ import { config } from '@map-colonies/config'; -import { vectorGeocodingV1 } from '@map-colonies/schemas'; +import { vectorGeocodingV2 } from '@map-colonies/schemas'; import importDataToElastic from './importDataToElastic'; import importDataToS3 from './importDataToS3'; import { ConfigType } from '../src/common/config'; async function main() { const configInstance: ConfigType = await config({ - schema: vectorGeocodingV1, + schema: vectorGeocodingV2, offlineMode: true, }); diff --git a/package-lock.json b/package-lock.json index 662a530..55fb8fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "@map-colonies/js-logger": "^2.0.0", "@map-colonies/openapi-express-viewer": "^4.0.0", "@map-colonies/read-pkg": "^1.0.0", - "@map-colonies/schemas": "^1.14.0", + "@map-colonies/schemas": "^1.15.1", "@map-colonies/telemetry": "^10.0.1", "@opentelemetry/api": "^1.9.0", "@smithy/node-http-handler": "^3.1.4", @@ -4258,9 +4258,9 @@ } }, "node_modules/@map-colonies/schemas": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/@map-colonies/schemas/-/schemas-1.14.0.tgz", - "integrity": "sha512-EBR36xOnIrRrXc+HG1MnGUKe/epXF5HAyEZc5jwV0RQzvn66Buo70+/jW9A/yb/mtrroSqHn2bdlLuH5kml6iQ==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@map-colonies/schemas/-/schemas-1.15.1.tgz", + "integrity": "sha512-t4s8XuT5wn3qenzlJHy3I4y70wz8ClUY8H8lSwbIWWZGBDnRXOOa3XovQ+pu3CFdJa7G6n/0/2ml7CZTTsBxoA==", "license": "MIT" }, "node_modules/@map-colonies/standard-version-update-helm-version": { @@ -27511,9 +27511,9 @@ } }, "@map-colonies/schemas": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/@map-colonies/schemas/-/schemas-1.14.0.tgz", - "integrity": "sha512-EBR36xOnIrRrXc+HG1MnGUKe/epXF5HAyEZc5jwV0RQzvn66Buo70+/jW9A/yb/mtrroSqHn2bdlLuH5kml6iQ==" + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@map-colonies/schemas/-/schemas-1.15.1.tgz", + "integrity": "sha512-t4s8XuT5wn3qenzlJHy3I4y70wz8ClUY8H8lSwbIWWZGBDnRXOOa3XovQ+pu3CFdJa7G6n/0/2ml7CZTTsBxoA==" }, "@map-colonies/standard-version-update-helm-version": { "version": "2.0.1", diff --git a/package.json b/package.json index 09e3f59..39376a6 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@map-colonies/js-logger": "^2.0.0", "@map-colonies/openapi-express-viewer": "^4.0.0", "@map-colonies/read-pkg": "^1.0.0", - "@map-colonies/schemas": "^1.14.0", + "@map-colonies/schemas": "^1.15.1", "@map-colonies/telemetry": "^10.0.1", "@opentelemetry/api": "^1.9.0", "@smithy/node-http-handler": "^3.1.4", diff --git a/src/common/config.ts b/src/common/config.ts index a1c8c4b..fe5db1d 100644 --- a/src/common/config.ts +++ b/src/common/config.ts @@ -1,8 +1,8 @@ import { type ConfigInstance, config } from '@map-colonies/config'; -import { vectorGeocodingV1, type vectorGeocodingV1Type } from '@map-colonies/schemas'; +import { vectorGeocodingV2, type vectorGeocodingV2Type } from '@map-colonies/schemas'; // Choose here the type of the config instance and import this type from the entire application -type ConfigType = ConfigInstance; +type ConfigType = ConfigInstance; let configInstance: ConfigType | undefined; @@ -13,7 +13,7 @@ let configInstance: ConfigType | undefined; */ async function initConfig(offlineMode?: boolean): Promise { configInstance = await config({ - schema: vectorGeocodingV1, + schema: vectorGeocodingV2, offlineMode, }); } diff --git a/src/common/elastic/interfaces.ts b/src/common/elastic/interfaces.ts index aca7a46..ce5a5a9 100644 --- a/src/common/elastic/interfaces.ts +++ b/src/common/elastic/interfaces.ts @@ -1,7 +1,7 @@ import { ClientOptions } from '@elastic/elasticsearch'; -import { type vectorGeocodingV1Type } from '@map-colonies/schemas'; +import { type vectorGeocodingV2Type } from '@map-colonies/schemas'; -export type ElasticDbClientsConfig = vectorGeocodingV1Type['db']['elastic']; +export type ElasticDbClientsConfig = vectorGeocodingV2Type['db']['elastic']; export type ElasticControlClientConfig = ElasticDbClientsConfig['control'] & ClientOptions; diff --git a/src/common/redis/interfaces.ts b/src/common/redis/interfaces.ts index 7d692c0..2035c10 100644 --- a/src/common/redis/interfaces.ts +++ b/src/common/redis/interfaces.ts @@ -1,6 +1,6 @@ import { RedisClientOptions } from 'redis'; -import { type vectorGeocodingV1Type } from '@map-colonies/schemas'; +import { type vectorGeocodingV2Type } from '@map-colonies/schemas'; -export type BaseRedisConfig = vectorGeocodingV1Type['db']['redis']; +export type BaseRedisConfig = vectorGeocodingV2Type['db']['redis']; export type RedisConfig = BaseRedisConfig & RedisClientOptions; diff --git a/src/common/s3/interfaces.ts b/src/common/s3/interfaces.ts index bf1aad8..5d70d34 100644 --- a/src/common/s3/interfaces.ts +++ b/src/common/s3/interfaces.ts @@ -1,6 +1,6 @@ import { S3ClientConfig } from '@aws-sdk/client-s3'; -import { type vectorGeocodingV1Type } from '@map-colonies/schemas'; +import { type vectorGeocodingV2Type } from '@map-colonies/schemas'; -export type BaseS3Config = vectorGeocodingV1Type['db']['s3']; +export type BaseS3Config = vectorGeocodingV2Type['db']['s3']; export type S3Config = BaseS3Config & S3ClientConfig; From ab4bf546349a0e52dea3a1f66ab4032d6c42148d Mon Sep 17 00:00:00 2001 From: NatalieShaked Date: Mon, 5 Jan 2026 10:14:59 +0200 Subject: [PATCH 2/2] fix: eslint errors --- devScripts/importDataToElastic.ts | 4 ++-- src/control/utils.ts | 2 +- tests/unit/control/utils.spec.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devScripts/importDataToElastic.ts b/devScripts/importDataToElastic.ts index 29272fa..63544c4 100644 --- a/devScripts/importDataToElastic.ts +++ b/devScripts/importDataToElastic.ts @@ -38,7 +38,7 @@ const main = async (config: ConfigType): Promise => { for (const { client, index, key } of [ { client: controlClient, - index: controlElasticConfig.index as string, + index: controlElasticConfig.index, key: 'geometry', }, { @@ -68,7 +68,7 @@ const main = async (config: ConfigType): Promise => { for (const item of controlData) { await controlClient.index({ - index: controlElasticConfig.index as string, + index: controlElasticConfig.index, id: crypto.randomUUID(), body: item._source, }); diff --git a/src/control/utils.ts b/src/control/utils.ts index 4c54edd..ef700c9 100644 --- a/src/control/utils.ts +++ b/src/control/utils.ts @@ -105,7 +105,7 @@ export const formatResponse = ( export const additionalControlSearchProperties = (config: ConfigType, size: number): Pick => ({ size, - index: config.get(`${elasticConfigPath}.control`).index as string, + index: config.get(`${elasticConfigPath}.control`).index, _source: CONTROL_FIELDS, }); diff --git a/tests/unit/control/utils.spec.ts b/tests/unit/control/utils.spec.ts index 5ffe7a6..45322c9 100644 --- a/tests/unit/control/utils.spec.ts +++ b/tests/unit/control/utils.spec.ts @@ -30,7 +30,7 @@ describe('#additionalControlSearchProperties', () => { expect(searchProperties).toEqual>({ size, - index: config.get(`${elasticConfigPath}.control`).index as string, + index: config.get(`${elasticConfigPath}.control`).index, _source: CONTROL_FIELDS, }); });