@izara_project/izara-core-library-service-schemas 1.0.80 → 1.0.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-library-service-schemas",
-  "version": "1.0.80",
+  "version": "1.0.82",
   "description": "Schemas for the service and objects it controls",
   "main": "index.js",
   "scripts": {
@@ -14,22 +14,22 @@
   "license": "AGPL-3.0-or-later",
   "homepage": "https://bitbucket.org/izara-core-libraries/izara-core-library-service-schemas/src/master/README.md",
   "devDependencies": {
-    "jest": "^30.0.4"
+    "jest": "^30.0.5"
   },
   "jest": {
     "testEnvironment": "node"
   },
   "dependencies": {
     "@aws-sdk/client-api-gateway": "^3.848.0",
-    "@aws-sdk/client-lambda": "^3.848.0",
-    "@aws-sdk/client-s3": "^3.848.0",
+    "@aws-sdk/client-lambda": "^3.851.0",
+    "@aws-sdk/client-s3": "^3.850.0",
     "@aws-sdk/crc64-nvme-crt": "^3.848.0",
     "@izara_project/izara-core-library-core": "^1.0.19",
     "@izara_project/izara-core-library-external-request": "^1.0.20",
     "@izara_project/izara-core-library-lambda": "^1.0.4",
     "@izara_project/izara-core-library-logger": "^1.0.7",
     "@izara_project/izara-shared-core": "^1.0.2",
-    "@izara_project/izara-shared-service-schemas": "^1.0.23",
+    "@izara_project/izara-shared-service-schemas": "^1.0.25",
     "glob": "^11.0.3",
     "lodash": "^4.17.21",
     "object-hash": "^3.0.0",

package/src/SharedUtils.js

@@ -475,7 +475,7 @@ async function _processObjectLinksGroup(_izContext, relationshipTag, objectLinks
               storageResourceTags,
               objectRelationships,
               relationshipSchema,
-              bucketName
+              process.env.iz_serviceSchemaBucketName
             );
             results.push(...firstNodeResults);
           } catch (error) {

package/src/UploadObjSchema.js

@@ -422,12 +422,12 @@ async function uploadObjectSchemaByUseCase(_izContext, bucketName) {
       }
     }
 
-    let serviceTag = objectSchema.extendObjType ? objectSchema.extendObjType.serviceTag : process.env.iz_serviceTag;
+    // let serviceTag = objectSchema.extendObjType ? objectSchema.extendObjType.serviceTag : process.env.iz_serviceTag;
     if (graphServerTags.size) {
       createdBys.push({
         objType: {
           objectType: objectSchema.objectType,
-          serviceTag: serviceTag
+          serviceTag: process.env.iz_serviceTag
         },
         graphServerTags: [...graphServerTags]
       })

package/src/ValidatorSchema.js

@@ -466,7 +466,7 @@ async function generateValidatorSchemaForCreate(_izContext, objType, settings =
   // ------- create return validatorSchema -------
   let validatorSchemaForCreate = {
     type: "object",
-    required: ["fieldNames"],
+    required: ["fieldNames", "objectType"],
     properties: {
       fieldNames: {
         additionalProperties: false,
@@ -476,6 +476,10 @@ async function generateValidatorSchemaForCreate(_izContext, objType, settings =
           ...allValidatorSchemaFieldNames
         }
       },
+      objectType: {
+        type: "string",
+        pattern: "^[a-zA-Z0-9_-]+$"
+      },
       additionalParams: {
         type: "object"
       }
@@ -489,6 +493,7 @@ async function generateValidatorSchemaForCreate(_izContext, objType, settings =
   //   Object.assign(validatorSchemaForCreate.properties, { relationships: relationshipValidatorSchemas })
   // }
 
+  _izContext.logger.debug("validatorSchema-create::", validatorSchemaForCreate);
   return validatorSchemaForCreate;
 }
 
@@ -517,18 +522,24 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, settings =
   let identifiersFieldNames = getUsedFieldNamesOfIdentifiers(_izContext, objectSchemas.identifiers, usedIdentifierTypes);
 
   let canUpdateFieldNames = [];
+  let canUpdateProperties = {};
   let usedFieldNames = identifiersFieldNames;
   let versionedDataFieldNames = [];
   // collect canUpdate fieldName (all fieldName have CanUpdate setting = true)
   for (let [fieldName, fieldNameSetting] of Object.entries(objectSchemas.fieldNames)) {
     if (fieldNameSetting.canUpdate === true || fieldNameSetting.canUpdate === undefined) {
       canUpdateFieldNames.push(fieldName);
+      canUpdateProperties[fieldName] = {
+        type: fieldNameSetting.type,
+      }
       if (fieldNameSetting.hasOwnProperty("versionedDataLabel")) {
         versionedDataFieldNames.push(fieldName)
       }
     }
   }
 
+  _izContext.logger.debug("canUpdate::::", { canUpdateFieldNames, canUpdateProperties });
+
   // collect usedFieldNames
   if (settings?.specificFieldNames) {
     if (settings.specificFieldNames.length) {
@@ -555,8 +566,12 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, settings =
 
   let initialValidatorSchemaForUpdate = {
     type: "object",
-    required: ["objInstanceFull"],
+    required: ["objInstanceFull", "objectType"],
     properties: {
+      objectType: {
+        type: "string",
+        pattern: "^[a-zA-Z0-9_-]+$"
+      },
       objInstanceFull: {
         type: "object",
         required: ["identifiers", "fields"],
@@ -605,11 +620,30 @@ async function generateValidatorSchemaForUpdate(_izContext, objType, settings =
   }
 
 
-  Object.assign(initialValidatorSchemaForUpdate.properties.objInstanceFull.properties.fields, await filteredFieldNamesOfValidatorSchema(_izContext, objType, [], defaultFieldNames, settings.bucketName))
-  Object.assign(initialValidatorSchemaForUpdate.properties.objInstanceFull.properties.fields.properties, versionedDataReturnInFieldsObjInstanceFull);
+  console.debug("initialValidatorSchemaForUpdate:::3::", initialValidatorSchemaForUpdate);
+  Object.assign(
+    initialValidatorSchemaForUpdate.properties.objInstanceFull.properties.fields,
+    await filteredFieldNamesOfValidatorSchema(
+      _izContext,
+      objType,
+      [],
+      defaultFieldNames,
+      settings.bucketName
+    )
+  );
 
-  _izContext.logger.debug("validatorSchema", initialValidatorSchemaForUpdate)
-  return initialValidatorSchemaForUpdate
+  console.debug("versionedDataReturnInFieldsObjInstanceFull::::", versionedDataReturnInFieldsObjInstanceFull);
+  console.debug("initialValidatorSchemaForUpdate:::4::", initialValidatorSchemaForUpdate);
+  Object.assign(
+    initialValidatorSchemaForUpdate.properties.objInstanceFull.properties.fields.properties,
+    {
+      ...versionedDataReturnInFieldsObjInstanceFull,
+      ...canUpdateProperties
+    }
+  );
+
+  _izContext.logger.debug("validatorSchema-update::", initialValidatorSchemaForUpdate);
+  return initialValidatorSchemaForUpdate;
 }
 
 
@@ -640,8 +674,12 @@ async function generateValidatorSchemaForIdentifier(_izContext, objType, setting
 
   return {
     type: "object",
-    required: ["identifiers"],
+    required: ["identifiers", "objectType"],
     properties: {
+      objectType: {
+        type: "string",
+        pattern: "^[a-zA-Z0-9_-]+$"
+      },
       identifiers: {
         type: "object",
         required: Object.keys(generatedIdentifiersValidatorSchema),

package/src/libs/DeliminatorTree.js

@@ -43,11 +43,10 @@ async function generateDeliminatorTreePerFieldName(_izContext, fieldName, fieldN
     [fieldName]: {},
   };
 
-  if (Object.keys(objType).length) {
+  if (objType) {
     Object.assign(deliminatorTree[fieldName], objType);
   }
 
-
   // ------- create tree first -------
 
   if (fieldNameSetting.fromServiceNameTag && fieldNameSetting.fromObjectType) {

package/src/libs/ExplodedReqParams.js

@@ -122,8 +122,9 @@ function explodeDataField(
  * @param {Object} requestParams
  * @param {Object} objType
  */
-async function explodedDataForCreate(_izContext, requestParams, objectSchema) {
-
+async function explodedDataForCreate(_izContext, requestParams, objectSchema, settings) {
+  _izContext.logger.debug("explodedDataForCreate::", { requestParams, objectSchema });
+  _izContext.logger.debug("settings: ", settings);
   // ------- validate requestParams -------
   let errors = [];
 
@@ -225,10 +226,9 @@ async function explodedDataForCreate(_izContext, requestParams, objectSchema) {
  * @param {Object} requestParams
  * @param {Object} objType
  */
-async function explodedDataForIdentifiers(_izContext, requestParams, objectSchema) {
-  _izContext.logger.debug("explodedDataForIdentifiers: ",
-    { requestParams, objectSchema }
-  );
+async function explodedDataForIdentifiers(_izContext, requestParams, objectSchema, settings) {
+  _izContext.logger.debug("explodedDataForIdentifiers::", { requestParams, objectSchema });
+  _izContext.logger.debug("settings: ", settings);
 
   // ------- manual validate requestParams -------
   let errors = [];
@@ -339,13 +339,10 @@ async function explodedDataForIdentifiers(_izContext, requestParams, objectSchem
   return explodedReqParams;
 }
 
-async function explodedDataForUpdate(_izContext, requestParams, objectSchema) {
+async function explodedDataForUpdate(_izContext, requestParams, objectSchema, settings) {
   //validate requestParams
-  _izContext.logger.debug("explodedDataForUpdate::",
-    {
-      requestParams, objectSchema, settings
-    }
-  )
+  _izContext.logger.debug("explodedDataForUpdate::", { requestParams, objectSchema });
+  _izContext.logger.debug("settings: ", settings);
   let errorsFound = [];
 
   const propertiesTypeForUpdate = {
@@ -465,6 +462,15 @@ async function explodedDataForUpdate(_izContext, requestParams, objectSchema) {
       )
     )
   }
+
+  for (let reqKey in requestParams) {
+    if (reqKey === "fieldNames") {
+      continue;
+    }
+    Object.assign(explodedReqParams, { [reqKey]: requestParams[reqKey] });
+  }
+
+  console.debug("explodedReqParams-update", JSON.stringify(explodedReqParams, null, 2));
   return explodedReqParams
 }