rez_core 2.1.129 → 2.1.130

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.129",
+  "version": "2.1.130",
   "description": "",
   "author": "",
   "private": false,

package/src/module/meta/service/entity-service-impl.service.ts

@@ -248,6 +248,21 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
       loggedInUser,
     );
 
+    const validationErrors =
+      await this.entityValidationService.validateEntityData(
+        entityData,
+        entityMaster,
+        loggedInUser,
+      );
+    console.log('Validation Errors For Update:', validationErrors); // Debug log
+    if (validationErrors && validationErrors.length > 0) {
+      return {
+        success: false,
+        message: 'Validation failed',
+        errors: validationErrors,
+      };
+    }
+
     const repoService = this.reflectionHelper.getRepoService(
       entityMaster.entity_data_class,
     );

package/src/module/meta/service/entity-validation.service.ts

@@ -52,6 +52,7 @@ export class EntityValidationService {
     loggedInUser: any,
   ): Promise<ValidationError[]> {
     const errors: ValidationError[] = [];
+    const currentId = entityData.id; // assuming 'id' is the primary key
 
     for (const attr of attributeData.filter((a) => a.is_unique)) {
       const value = entityData[attr.attribute_key];
@@ -63,7 +64,7 @@ export class EntityValidationService {
           .from(db_table_name, db_table_name)
           .where(`${db_table_name}.${attr.attribute_key} = :value`, { value });
 
-        // Add AND condition for organization_id if present
+        // Add AND condition for organization_id/level_type/level_id if present
         const orgId = loggedInUser.organization_id;
         const level_type = loggedInUser.level_type;
         const level_id = loggedInUser.level_id;
@@ -73,12 +74,17 @@ export class EntityValidationService {
             `${db_table_name}.organization_id = :organization_id AND ${db_table_name}.level_type = :level_type AND ${db_table_name}.level_id = :level_id`,
             {
               organization_id: orgId,
-              level_type: level_type,
-              level_id: level_id,
+              level_type,
+              level_id,
             },
           );
         }
 
+        // Skip the current record when checking for uniqueness during update
+        if (currentId) {
+          qb = qb.andWhere(`${db_table_name}.id != :id`, { id: currentId });
+        }
+
         const existing = await qb.limit(1).getRawOne();
 
         if (existing) {