@e22m4u/js-repository 0.8.4 → 0.8.6

package/src/definition/model/properties/property-uniqueness-validator.js

@@ -1,7 +1,5 @@
-import {DataType} from './data-type.js';
 import {Service} from '@e22m4u/js-service';
 import {isPlainObject} from '../../../utils/index.js';
-import {BlankValuesService} from '@e22m4u/js-empty-values';
 import {PropertyUniqueness} from './property-uniqueness.js';
 import {InvalidArgumentError} from '../../../errors/index.js';
 import {ModelDefinitionUtils} from '../model-definition-utils.js';
@@ -27,30 +25,34 @@ export class PropertyUniquenessValidator extends Service {
     modelData,
     modelId = undefined,
   ) {
-    if (typeof countMethod !== 'function')
+    if (typeof countMethod !== 'function') {
       throw new InvalidArgumentError(
         'The parameter "countMethod" of the PropertyUniquenessValidator ' +
           'must be a Function, but %v was given.',
         countMethod,
       );
-    if (!methodName || typeof methodName !== 'string')
+    }
+    if (!methodName || typeof methodName !== 'string') {
       throw new InvalidArgumentError(
         'The parameter "methodName" of the PropertyUniquenessValidator ' +
           'must be a non-empty String, but %v was given.',
         methodName,
       );
-    if (!modelName || typeof modelName !== 'string')
+    }
+    if (!modelName || typeof modelName !== 'string') {
       throw new InvalidArgumentError(
         'The parameter "modelName" of the PropertyUniquenessValidator ' +
           'must be a non-empty String, but %v was given.',
         modelName,
       );
-    if (!isPlainObject(modelData))
+    }
+    if (!isPlainObject(modelData)) {
       throw new InvalidArgumentError(
         'The data of the model %v should be an Object, but %v was given.',
         modelName,
         modelData,
       );
+    }
     const propDefs =
       this.getService(
         ModelDefinitionUtils,
@@ -70,7 +72,6 @@ export class PropertyUniquenessValidator extends Service {
         propValue,
       );
     let willBeReplaced = undefined;
-    const blankValuesService = this.getService(BlankValuesService);
     for (const propName of propNames) {
       const propDef = propDefs[propName];
       if (
@@ -81,17 +82,18 @@ export class PropertyUniquenessValidator extends Service {
       ) {
         continue;
       }
-      // sparse
+      // в режиме "sparse" проверка на уникальность
+      // должна игнорировать ложные значения
       const propValue = modelData[propName];
-      if (propDef.unique === PropertyUniqueness.SPARSE) {
-        const propType = propDef.type || DataType.ANY;
-        const isBlank = blankValuesService.isBlankOf(propType, propValue);
-        if (isBlank) continue;
+      if (propDef.unique === PropertyUniqueness.SPARSE && !propValue) {
+        continue;
       }
       // create
       if (methodName === 'create') {
         const count = await countMethod({[propName]: propValue});
-        if (count > 0) throw createError(propName, propValue);
+        if (count > 0) {
+          throw createError(propName, propValue);
+        }
       }
       // replaceById
       else if (methodName === 'replaceById') {
@@ -99,7 +101,9 @@ export class PropertyUniquenessValidator extends Service {
           [idProp]: {neq: modelId},
           [propName]: propValue,
         });
-        if (count > 0) throw createError(propName, propValue);
+        if (count > 0) {
+          throw createError(propName, propValue);
+        }
       }
       // replaceOrCreate
       else if (methodName === 'replaceOrCreate') {
@@ -114,18 +118,24 @@ export class PropertyUniquenessValidator extends Service {
             [idProp]: {neq: idFromData},
             [propName]: propValue,
           });
-          if (count > 0) throw createError(propName, propValue);
+          if (count > 0) {
+            throw createError(propName, propValue);
+          }
         }
         // create by replaceOrCreate
         else {
           const count = await countMethod({[propName]: propValue});
-          if (count > 0) throw createError(propName, propValue);
+          if (count > 0) {
+            throw createError(propName, propValue);
+          }
         }
       }
       // patch
       else if (methodName === 'patch') {
         const count = await countMethod({[propName]: propValue});
-        if (count > 0) throw createError(propName, propValue);
+        if (count > 0) {
+          throw createError(propName, propValue);
+        }
       }
       // patchById
       else if (methodName === 'patchById') {
@@ -133,7 +143,9 @@ export class PropertyUniquenessValidator extends Service {
           [idProp]: {neq: modelId},
           [propName]: propValue,
         });
-        if (count > 0) throw createError(propName, propValue);
+        if (count > 0) {
+          throw createError(propName, propValue);
+        }
       }
       // unsupported method
       else {