fix(test): fix test configs

Author: Gerald Baulig

cfg/config.json

@@ -26,7 +26,7 @@
         "unit_codes",
         "templates",
         "settings",
-        "currencys"
+        "currencies"
       ],
       "customQueries": [
         {
@@ -309,28 +309,92 @@
       "resourcesServiceNamePrefix": "io.restorecommerce.",
       "resourcesServiceConfigPrefix": "restore-",
       "resourcesDeletedMessage": "io.restorecommerce.resourcebase.Deleted",
-      "resources": {
-        "unit_code": "unit_codes",
-        "command": "commands",
-        "customer": "customers",
-        "address": "addresss",
-        "contact_point_type": "contact_point_types",
-        "country": "countrys",
-        "contact_point": "contact_points",
-        "credential": "credentials",
-        "locale": "locales",
-        "location": "locations",
-        "notification": "notifications",
-        "notification_channel": "notification_channels",
-        "organization": "organizations",
-        "shop": "shops",
-        "tax": "taxs",
-        "tax_type": "tax_types",
-        "timezone": "timezones",
-        "template": "templates",
-        "setting": "settings",
-        "currency": "currencys"
-      }
+      "resources": [
+        {
+          "resourceName": "address",
+          "collectionName": "addresss"
+        },
+        {
+          "resourceName": "command",
+          "collectionName": "commands"
+        },
+        {
+          "resourceName": "contact_point",
+          "collectionName": "contact_points"
+        },
+        {
+          "resourceName": "contact_point_type",
+          "collectionName": "contact_point_types"
+        },
+        {
+          "resourceName": "country",
+          "collectionName": "countrys"
+        },
+        {
+          "resourceName": "credential",
+          "collectionName": "credentials"
+        },
+        {
+          "resourceName": "currency",
+          "collectionName": "currencies"
+        },
+        {
+          "resourceName": "customer",
+          "collectionName": "customers"
+        },
+        {
+          "resourceName": "local",
+          "collectionName": "locals"
+        },
+        {
+          "resourceName": "location",
+          "collectionName": "locations"
+        },
+        {
+          "resourceName": "notification",
+          "collectionName": "notifications"
+        },
+        {
+          "resourceName": "notification_channel",
+          "collectionName": "notification_channels"
+        },
+        {
+          "resourceName": "organization",
+          "collectionName": "organizations"
+        },
+        {
+          "resourceName": "shop",
+          "collectionName": "shops"
+        },
+        {
+          "resourceName": "tax",
+          "collectionName": "taxs"
+        },
+        {
+          "resourceName": "tax_type",
+          "collectionName": "tax_types"
+        },
+        {
+          "resourceName": "tax_type",
+          "collectionName": "tax_types"
+        },
+        {
+          "resourceName": "template",
+          "collectionName": "templates"
+        },
+        {
+          "resourceName": "timezone",
+          "collectionName": "timezones"
+        },
+        {
+          "resourceName": "setting",
+          "collectionName": "settings"
+        },
+        {
+          "resourceName": "unit_code",
+          "collectionName": "unit_codes"
+        }
+      ]
     }
   },
   "command-interface": {

cfg/config_test.json

@@ -2,7 +2,7 @@
   "logger": {
     "console": {
       "handleExceptions": false,
-      "level": "crit",
+      "level": "error",
       "colorize": true,
       "prettyPrint": true
     }
@@ -15,9 +15,9 @@
       "database": "restore-resource-srv-test",
       "autoCreate": true,
       "collections": [
-        "command",
-        "organization",
-        "contact_point"
+        "commands",
+        "organizations",
+        "contact_points"
       ],
       "customQueries": [
         {
@@ -47,9 +47,18 @@
       "resourcesServiceNamePrefix": "io.restorecommerce.",
       "resourcesServiceConfigPrefix": "restore-",
       "resources": [
-        "command",
-        "organization",
-        "contact_point"
+        {
+          "resourceName": "command",
+          "collectionName": "commands"
+        },
+        {
+          "resourceName": "contact_point",
+          "collectionName": "contact_points"
+        },
+        {
+          "resourceName": "organization",
+          "collectionName": "organizations"
+        }
       ]
     }
   },

src/service.ts

@@ -1,5 +1,4 @@
 import * as _ from 'lodash-es';
-import { RawServiceImplementation } from 'nice-grpc';
 import { Logger } from '@restorecommerce/logger';
 import { ResourcesAPIBase, ServiceBase } from '@restorecommerce/resource-base-interface';
 import { Operation, PolicySetRQResponse, ResolvedSubject } from '@restorecommerce/acs-client';

src/worker.ts

@@ -204,33 +204,33 @@ export class Worker {
     if (!resources) {
       throw new Error('config field resources does not exist');
     }
-    
+
     // Generate a config for each resource
     const kafkaCfg = cfg.get('events:kafka');
     // const grpcConfig = cfg.get('server:transports:0');
     const eventTypes = ['Created', 'Read', 'Modified', 'Deleted'];
-    for (let resourceCfg of Object.values<any>(resources)) {
+    for (const resourceCfg of Object.values<any>(resources)) {
       const resourcesDeletedMessage = resourceCfg.resourcesDeletedMessage;
       const resourcesServiceNamePrefix = resourceCfg.resourcesServiceNamePrefix;
-      for (let [resource, collection] of Object.entries<string>(resourceCfg.resources)) {
-        const resourceObjectName = resource.split('_').map(
+      for (const { resourceName, collectionName } of resourceCfg.resources) {
+        const resourceObjectName = resourceName.split('_').map(
           (name: string) => name.charAt(0).toUpperCase() + name.slice(1)
         ).join('');
 
         for (let event of eventTypes) {
           if (event?.toLocaleLowerCase() === 'deleted') {
-            kafkaCfg[`${resource}${event}`] = {
+            kafkaCfg[`${resourceName}${event}`] = {
               messageObject: resourcesDeletedMessage
             };
           }
           else {
-            kafkaCfg[`${resource}${event}`] = {
-              messageObject: `${resourcesServiceNamePrefix}${resource}.${resourceObjectName}`
+            kafkaCfg[`${resourceName}${event}`] = {
+              messageObject: `${resourcesServiceNamePrefix}${resourceName}.${resourceObjectName}`
             };
           }
 
-          const topicName = `${resourcesServiceNamePrefix}${collection}.resource`;
-          const topicLabel = `${resource}.resource`;
+          const topicName = `${resourcesServiceNamePrefix}${collectionName}.resource`;
+          const topicLabel = `${resourceName}.resource`;
           kafkaCfg.topics[topicLabel] = {
             topic: topicName,
           };
@@ -279,33 +279,37 @@ export class Worker {
     const redisClientSubject: RedisClientType = createClient(redisConfig);
     await redisClientSubject.on('error', (err) => logger.error('Redis Client Error', err));
     await redisClientSubject.connect();
-    for (let resourceCfg of Object.values<any>(resources)) {
+    for (const resourceCfg of Object.values<any>(resources)) {
       const resourcesServiceConfigPrefix = resourceCfg.resourcesServiceConfigPrefix;
       const resourcesServiceNamePrefix = resourceCfg.resourcesServiceNamePrefix;
+      const collectionNames = cfg.get('database:arango:collections') as string[];
 
-      for (let [resourceName, collectionName] of Object.entries<string>(resourceCfg.resources)) {
-        let resourceFieldConfig: any = {};
+      for (const { resourceName, collectionName } of resourceCfg.resources) {
+        if (!collectionNames?.includes(collectionName)) {
+          logger.warn('No collection initialized for resourse', { resourceName, collectionName });
+        }
+        const resourceFieldConfig: any = {};
         if (fieldGeneratorConfig && (resourceName in fieldGeneratorConfig)) {
-          resourceFieldConfig['strategies'] = fieldGeneratorConfig[resourceName];
+          resourceFieldConfig.strategies = fieldGeneratorConfig[resourceName];
           logger.info('Setting up field generators on Redis...');
-          resourceFieldConfig['redisClient'] = redisClient;
+          resourceFieldConfig.redisClient = redisClient;
         }
         // bufferFields handler
         if (bufferHandlerConfig && (collectionName in bufferHandlerConfig)) {
-          resourceFieldConfig['bufferFields'] = bufferHandlerConfig[collectionName];
+          resourceFieldConfig.bufferFields = bufferHandlerConfig[collectionName];
         }
         // dateTimeStampFields handler
         if (cfg.get('fieldHandlers:timeStampFields')) {
-          resourceFieldConfig['timeStampFields'] = [];
+          resourceFieldConfig.timeStampFields = [];
           for (let timeStampFiledConfig of cfg.get('fieldHandlers:timeStampFields')) {
             if (timeStampFiledConfig.entities.includes(collectionName)) {
-              resourceFieldConfig['timeStampFields'].push(...timeStampFiledConfig.fields);
+              resourceFieldConfig.timeStampFields.push(...timeStampFiledConfig.fields);
             }
           }
         }
         // requiredFields handler
         if (requiredFieldsConfig && (collectionName in requiredFieldsConfig)) {
-          resourceFieldConfig['requiredFields'] = requiredFieldsConfig;
+          resourceFieldConfig.requiredFields = requiredFieldsConfig;
         }
         logger.info(`Setting up ${resourceName} resource service`);
 

test/resource_srv.spec.ts

@@ -66,23 +66,22 @@ const listOfOrganizations = [
 
 // get client connection object
 async function getClientResourceServices() {
-  const options: any = { microservice: {} };
-  options.microservice = {
-    service: {},
-    mapClients: new Map()
+  const options: any = {
+    microservice: {
+      service: {},
+      mapClients: new Map()
+    }
   };
   const resources = cfg.get('resources');
   const clientConfig = cfg.get('client');
-  for (let resource in resources) {
-    const resourceCfg = resources[resource];
-    const resourceNames = resourceCfg.resources;
+  for (const resourceCfg of Object.values<any>(resources)) {
     // const protosPrefix = resourceCfg.resourcesProtoPathPrefix;
     const servicePrefix = resourceCfg.resourcesServiceNamePrefix;
 
-    logger.silly('microservice clients', resourceNames);
+    logger.silly('microservice clients', resourceCfg.resources);
 
-    for (let resource of resourceNames) {
-      if (resource === 'command') {
+    for (const { resourceName, collectionName } of resourceCfg.resources) {
+      if (resourceName === 'command') {
         // if resource is command create a commandInterface client
         const serviceName = 'io.restorecommerce.commandinterface.Service';
         const cisConfig = cfg.get('client:commandinterface');
@@ -93,20 +92,27 @@ async function getClientResourceServices() {
         );
         // const client = new GrpcClient(cfg.get('client:commandinterface'), logger);
         options.microservice.service[serviceName] = client;
-        options.microservice.mapClients.set(resource, serviceName);
+        options.microservice.mapClients.set(resourceName, serviceName);
         continue;
       }
-      const serviceName = `${servicePrefix}${resource}.Service`;
+      const serviceName = `${servicePrefix}${resourceName}-srv`;
       const defaultConfig = clientConfig['default-resource-srv'];
       try {
-        let serviceDefinition = ServiceDefinitionList.filter((obj) => obj.fullName.split('.')[2] === resource)[0];
-        const client = createClient({ ...defaultConfig, logger }, serviceDefinition, createChannel(defaultConfig.address));
+        let serviceDefinition = ServiceDefinitionList.filter((obj) => obj.fullName.split('.')[2] === resourceName)[0];
+        const client = createClient(
+          { ...defaultConfig, logger },
+          serviceDefinition,
+          createChannel(defaultConfig.address)
+        );
         options.microservice.service[serviceName] = client;
-        options.microservice.mapClients.set(resource, serviceName);
+        options.microservice.mapClients.set(resourceName, serviceName);
         logger.verbose('connected to microservice', serviceName);
       } catch (err) {
-        logger.error('microservice connecting to service',
-          serviceName, err);
+        logger.error(
+          'microservice connecting to service',
+          serviceName,
+          err
+        );
       }
     }
   }
@@ -142,10 +148,10 @@ describe('resource-srv testing', () => {
     // List of serviceMappedValues
     const serviceMapping = await getClientResourceServices();
     // get the Organization service
-    let orgMapValue = serviceMapping.microservice.mapClients.get('organization');
+    const orgMapValue = serviceMapping.microservice.mapClients.get('organization');
     organizationService = serviceMapping.microservice.service[orgMapValue];
     // get contact_point service
-    let contacPointMapValue = serviceMapping.microservice.mapClients.get('contact_point');
+    const contacPointMapValue = serviceMapping.microservice.mapClients.get('contact_point');
     contactPointsService = serviceMapping.microservice.service[contacPointMapValue];
 
     // create events for restoring