@hvedinich/utils 0.0.40 → 0.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hvedinich/utils",
-  "version": "0.0.40",
+  "version": "0.0.44",
   "description": "utils module",
   "main": "index.js",
   "scripts": {
@@ -32,4 +32,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/constants/regExp.js

@@ -1,5 +1,6 @@
+const lettersAndSpaceRegExp = '^[ёЁА-Яа-яa-zA-Z]{2,20}(\\s)?([ёЁА-Яа-яa-zA-Z]{2,20})??$';
 const onlyLettersRegExp = '^[А-Яа-яёЁa-zA-Z]{2,30}$';
-const passwordRegExp = '^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[|{_`\\-=+}?№!@#\\$%\\^&\\*\\(\\)\\[\\]:;\'",\\.A-Za-z\\d]{8,30}$';
+const passwordRegExp = '^(?=.*[a-zа-яё])(?=.*[A-ZА-ЯЁ])(?=.*\\d)[|{_`\\-=+}?№!@#\\$%\\^&\\*\\(\\)\\[\\]:;\'",\\.A-Za-zа-яА-ЯёЁ\\d]{8,30}$';
 const descriptionRegExp = '^[А-Яа-яёЁa-zA-Z0-9_!@#№*&.,/?();:\'"=-\\s+]{2,1500}$';
 const enumRegExp = '^[А-Яа-яёЁa-zA-Z0-9_]{2,30}$';
 const numberLetterSymbolRegExp = '^[a-zA-ZА-Яа-яёЁ0-9_!.№,?():\'"-\\s+]{2,100}$';
@@ -9,6 +10,7 @@ const titleRegExp = '^[a-zA-ZА-Яа-яёЁ0-9_!.№,?():\'"-\\s+]{2,80}$';
 
 
 module.exports = {
+  lettersAndSpaceRegExp,
   onlyLettersRegExp,
   passwordRegExp,
   descriptionRegExp,

package/src/server/index.js

@@ -142,12 +142,15 @@ const waitServices = async (services = {}, logger = console) => {
   }
 };
 
-let healthy = true;
+let isHealthyQueue = true;
 
-const checkIsAlive = () => healthy;
+/**
+ * should return the general state of all health checks
+ */
+const checkIsAlive = () => isHealthyQueue;
 
 const setQueueHealthCheck = (value) => {
-  healthy = value;
+  isHealthyQueue = value;
 };
 
 module.exports = {

package/src/utils/mappers.js

@@ -19,6 +19,7 @@ const mergeWithPrevious = (curr, prev) => {
 const mapAddress = ({
   id,
   name,
+  street,
   location: {
     longitude,
     latitude,
@@ -26,6 +27,7 @@ const mapAddress = ({
 }) => ({
   id: id || `${longitude}-${latitude}`,
   name,
+  street,
   location: longitude && latitude ? {
     type: 'Point',
     coordinates: [longitude, latitude],

package/src/utils/queryUtils.js

@@ -8,7 +8,7 @@ const parseFilter = ({ ctx, criteria, allowed }) => {
       throw new ValidationError({ ctx, message: `criteria not found id: ${cur.id}`, sanitized: 'criteria not found' });
     }
     if (typeof field === 'function') {
-      const { key, value } = field(cur.values);
+      const { key, value } = field(cur.values, criteria);
       acc[key] = value;
     } else {
       // eslint-disable-next-line prefer-destructuring