@autofleet/sadot 0.6.6 → 0.6.7

package/dist/scopes/filter.js

@@ -75,19 +75,16 @@ const customFieldsSortScope = (name) => (sort) => {
     }
     const includes = Object.entries(sort).map(([key]) => ([
         sequelize_typescript_1.Sequelize.literal(`(
-        SELECT custom_fields->>'${key}'
-        FROM (
-          SELECT
-            cv.model_id,
-            jsonb_object_agg(cd.name, cv.value) AS custom_fields
-          FROM custom_field_values AS cv
-          INNER JOIN custom_field_definitions AS cd
-          ON cv.custom_field_definition_id = cd.id
-          AND cd.model_type = '${name}'
-          WHERE cv.model_id = "${name}"."id"
-          GROUP BY cv.model_id
-        ) AS CustomFieldAggregation
-      )`),
+            SELECT value
+            FROM (SELECT cv.model_id, cv.value
+                  FROM custom_field_values AS cv INNER JOIN custom_field_definitions AS cd
+                    ON cv.custom_field_definition_id = cd.id
+                    AND cd.model_type = '${name}'
+                    WHERE cv.model_id = "${name}"."id"
+                          AND cd.name = '${key}'
+                          ) AS CustomFieldAggregation
+            )
+          `),
         `customFields_${key}`,
     ]));
     const orders = Object.entries(sort).map(([key, value]) => sequelize_typescript_1.Sequelize.literal(`"customFields_${key}" ${value}`));

package/dist/utils/constants/index.d.ts

@@ -11,7 +11,8 @@ export declare enum CustomFieldDefinitionType {
     TEXT = "text",
     IMAGE = "image",
     SELECT = "select",
-    STATUS = "status"
+    STATUS = "status",
+    FILE = "file"
 }
 export { 
 /** @deprecated Use the value from `@autofleet/common-types` instead */

package/dist/utils/constants/index.js

@@ -18,4 +18,5 @@ var CustomFieldDefinitionType;
     CustomFieldDefinitionType["IMAGE"] = "image";
     CustomFieldDefinitionType["SELECT"] = "select";
     CustomFieldDefinitionType["STATUS"] = "status";
+    CustomFieldDefinitionType["FILE"] = "file";
 })(CustomFieldDefinitionType || (exports.CustomFieldDefinitionType = CustomFieldDefinitionType = {}));

package/dist/utils/validations/validators/index.js

@@ -30,4 +30,11 @@ exports.validators = {
     [constants_1.CustomFieldDefinitionType.IMAGE]: (value) => (!joi_1.default.array().min(1).unique()
         .items(joi_1.default.string().uri())
         .validate(value).error),
+    [constants_1.CustomFieldDefinitionType.FILE]: (value) => (!joi_1.default.array().min(1).unique().items(joi_1.default.object({
+        name: joi_1.default.string().required(),
+        type: joi_1.default.string(),
+        size: joi_1.default.string(),
+        addedBy: joi_1.default.string().uuid(),
+    }))
+        .validate(value).error),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sadot",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -60,4 +60,4 @@
   },
   "author": "Autofleet",
   "license": "ISC"
-}
+}

package/src/scopes/filter.ts

@@ -104,19 +104,16 @@ export const customFieldsSortScope = (
   const includes = Object.entries(sort).map(([key]) =>
     ([
       Sequelize.literal(`(
-        SELECT custom_fields->>'${key}'
-        FROM (
-          SELECT
-            cv.model_id,
-            jsonb_object_agg(cd.name, cv.value) AS custom_fields
-          FROM custom_field_values AS cv
-          INNER JOIN custom_field_definitions AS cd
-          ON cv.custom_field_definition_id = cd.id
-          AND cd.model_type = '${name}'
-          WHERE cv.model_id = "${name}"."id"
-          GROUP BY cv.model_id
-        ) AS CustomFieldAggregation
-      )`),
+            SELECT value
+            FROM (SELECT cv.model_id, cv.value
+                  FROM custom_field_values AS cv INNER JOIN custom_field_definitions AS cd
+                    ON cv.custom_field_definition_id = cd.id
+                    AND cd.model_type = '${name}'
+                    WHERE cv.model_id = "${name}"."id"
+                          AND cd.name = '${key}'
+                          ) AS CustomFieldAggregation
+            )
+          `),
       `customFields_${key}`,
     ]));
 

package/src/utils/constants/index.ts

@@ -16,6 +16,7 @@ export enum CustomFieldDefinitionType {
   IMAGE = 'image',
   SELECT = 'select',
   STATUS = 'status',
+  FILE = 'file',
 }
 
 export {

package/src/utils/validations/validators/index.ts

@@ -28,4 +28,11 @@ export const validators: Validators = {
   [CustomFieldDefinitionType.IMAGE]: (value) => (!Joi.array().min(1).unique()
     .items(Joi.string().uri())
     .validate(value).error),
+  [CustomFieldDefinitionType.FILE]: (value) => (!Joi.array().min(1).unique().items(Joi.object({
+    name: Joi.string().required(),
+    type: Joi.string(),
+    size: Joi.string(),
+    addedBy: Joi.string().uuid(),
+  }))
+    .validate(value).error),
 };