feat: updated schema (#89)

* feat: updated schema

Author: NatalieShaked

devScripts/importDataToElastic.ts

@@ -38,7 +38,7 @@ const main = async (config: ConfigType): Promise<void> => {
   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<void> => {
 
   for (const item of controlData) {
     await controlClient.index({
-      index: controlElasticConfig.index as string,
+      index: controlElasticConfig.index,
       id: crypto.randomUUID(),
       body: item._source,
     });

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,
   });
 

package-lock.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",

package.json

@@ -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<vectorGeocodingV1Type>;
+type ConfigType = ConfigInstance<vectorGeocodingV2Type>;
 
 let configInstance: ConfigType | undefined;
 
@@ -13,7 +13,7 @@ let configInstance: ConfigType | undefined;
  */
 async function initConfig(offlineMode?: boolean): Promise<void> {
   configInstance = await config({
-    schema: vectorGeocodingV1,
+    schema: vectorGeocodingV2,
     offlineMode,
   });
 }

src/common/config.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;
 

src/common/elastic/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;

src/common/redis/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;

src/common/s3/interfaces.ts

@@ -105,7 +105,7 @@ export const formatResponse = <T extends Tile | Item | Route>(
 
 export const additionalControlSearchProperties = (config: ConfigType, size: number): Pick<estypes.SearchRequest, 'size' | 'index' | '_source'> => ({
   size,
-  index: config.get(`${elasticConfigPath}.control`).index as string,
+  index: config.get(`${elasticConfigPath}.control`).index,
 
   _source: CONTROL_FIELDS,
 });

src/control/utils.ts

@@ -30,7 +30,7 @@ describe('#additionalControlSearchProperties', () => {
 
     expect(searchProperties).toEqual<Pick<estypes.SearchRequest, 'size' | 'index' | '_source'>>({
       size,
-      index: config.get(`${elasticConfigPath}.control`).index as string,
+      index: config.get(`${elasticConfigPath}.control`).index,
       _source: CONTROL_FIELDS,
     });
   });