Merge pull request #791 from Chia-Network/develop

release: 1.2.22
Chia-Network · Jan 11, 2023 · d50a78b · d50a78b
2 parents ceaf14d + 0d4c7f1
commit d50a78b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "climate-warehouse",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "private": true,
   "bin": "build/server.js",
   "type": "module",

diff --git a/src/controllers/units.controller.js b/src/controllers/units.controller.js
@@ -484,6 +484,10 @@ export const split = async (req, res) => {
           newRecord.unitOwner = record.unitOwner;
         }
 
+        if (record.unitStatus) {
+          newRecord.unitStatus = record.unitStatus;
+        }
+
         if (record.countryJurisdictionOfOwner) {
           newRecord.countryJurisdictionOfOwner =
             record.countryJurisdictionOfOwner;

diff --git a/src/utils/string-utils.js b/src/utils/string-utils.js
@@ -3,6 +3,6 @@ export function isPluralized(name) {
   return name.endsWith('s');
 }
 
-export const genericFilterRegex = /(\w+):(.+):(in|eq|not|lt|gt|lte|gte)/;
+export const genericFilterRegex = /(\w+):(.+):(in|eq|not|lt|gt|lte|gte|like)/;
 export const isArrayRegex = /\[.+\]/;
 export const genericSortColumnRegex = /(\w+):(ASC|DESC)/;
diff --git a/src/validations/units.validations.js b/src/validations/units.validations.js
@@ -92,6 +92,9 @@ export const unitsSplitSchema = Joi.object({
         unitBlockStart: Joi.string().required(),
         unitBlockEnd: Joi.string().required(),
         unitOwner: Joi.string().optional(),
+        unitStatus: Joi.string()
+          .custom(pickListValidation('unitStatus'))
+          .optional(),
         countryJurisdictionOfOwner: Joi.string()
           .custom(pickListValidation('countries', 'countryJurisdictionOfOwner'))
           .optional(),