@autofleet/sheilta 1.3.2-7 → 1.3.2-9

package/lib/formatter/index.d.ts

@@ -4,6 +4,7 @@ declare type SequelizeOrder = string | OrderItem[];
 export declare type FormatPayloadOptions = {
     includeRawPayload?: boolean;
     literalAttributes?: Attribute[];
+    DBFormatter?: any;
 };
 declare const formatPayload: ({ order, page, perPage, include, query, attributes, searchTerm, }: {
     order?: any[];

package/lib/formatter/index.js

@@ -8,18 +8,16 @@ const common_types_1 = require("@autofleet/common-types");
 const utils_1 = require("../utils");
 const DEFAULT_ORDER = 'id';
 const DESCENDING_KEY = 'DESC';
-/* const ASCENDING_KEY = 'ASC'; */
 const CUSTOM_FIELDS_QUERY_PREFIX = 'customFields.';
 const { CUSTOM_FIELDS_FILTER_SCOPE } = common_types_1.customFields;
-const getAttributeFromOrder = (order, literalAttributes) => {
+const getAttributeFromOrder = (order, options = {}) => {
+    const { literalAttributes = [], DBFormatter = undefined } = options;
     const [formattedOrder, attributes] = order.reduce((acc, o) => {
-        const [item] = Array.isArray(o) ? o : [o];
+        const [item, orderStyle = 'ASC'] = Array.isArray(o) ? o : [o];
         const found = literalAttributes === null || literalAttributes === void 0 ? void 0 : literalAttributes.find(obj => obj.attribute === item);
         if (found) {
-            /*       const [literal, name = found.attribute] =
-              Array.isArray(found.literal) ? found.literal : [found.literal];
-            console.log({ found, itemOrder }); */
             acc[1].push(found.literal);
+            acc[0].push([DBFormatter ? DBFormatter(`"${found.attribute}" ${orderStyle}`) : `${found.attribute} ${orderStyle}`]);
         }
         else {
             acc[0].push(o);
@@ -92,7 +90,7 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
         order: [...order, DEFAULT_ORDER],
         associationModels,
     });
-    const [filteredFormattedOrder, filteredLiteralAttributes] = getAttributeFromOrder(formattedOrder, options === null || options === void 0 ? void 0 : options.literalAttributes);
+    const [filteredFormattedOrder, filteredLiteralAttributes] = getAttributeFromOrder(formattedOrder, options);
     const allAttributes = [...filteredLiteralAttributes, ...(attributes || [])];
     const formattedAttribute = allAttributes.length ? { include: allAttributes } : null;
     const formattedInclude = formatInclude(include, model === null || model === void 0 ? void 0 : model.associations);

package/lib/formatter/index.test.js

@@ -200,7 +200,7 @@ describe('formatting test', () => {
             }, {
                 literalAttributes: [literalAttribute],
             });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['id']]));
+            expect(JSON.stringify(order)).toBe(JSON.stringify([[`${literalAttribute.attribute} ASC`], ['id']]));
             console.log({ attributes });
             expect(JSON.stringify(attributes))
                 .toBe(JSON.stringify({ include: [literalAttribute.literal] }));
@@ -216,9 +216,11 @@ describe('formatting test', () => {
             }, {
                 literalAttributes: [literalAttribute],
             });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['currencySymbol'], ['id']]));
+            expect(JSON.stringify(order)).toBe(JSON.stringify([[`${literalAttribute.attribute} DESC`], ['currencySymbol'], ['id']]));
             expect(JSON.stringify(attributes))
-                .toBe(JSON.stringify({ include: [[literalAttribute.literal[0], literalAttribute.literal[1]]] }));
+                .toBe(JSON.stringify({
+                include: [[literalAttribute.literal[0], literalAttribute.literal[1]]],
+            }));
         });
         it('by literal field - not found', () => {
             const literalAttribute = { attribute: 'genericField', literal: 'void' };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.3.2-7",
+  "version": "1.3.2-9",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -49,4 +49,4 @@
   "files": [
     "lib/**/*"
   ]
-}
+}