@autofleet/sheilta 1.2.8 → 1.2.9

package/lib/formatter/index.d.ts

@@ -4,7 +4,7 @@ export declare type FormatPayloadOptions = {
     includeRawPayload?: boolean;
 };
 declare const formatPayload: ({ order, page, perPage, include, query, attributes, searchTerm, }: {
-    order: any;
+    order?: any[];
     page?: number;
     perPage?: number;
     include?: any[];

package/lib/formatter/index.js

@@ -5,22 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../utils");
+const DEFAULT_ORDER = 'id';
 const DESCENDING_KEY = 'DESC';
-const formatOrder = ({ order = [], associationModels = [], }) => (order.length === 0 ? undefined :
-    order.map((o) => {
-        const formattedOrder = [utils_1.extractAttributeNameFromOrder(o, associationModels)];
-        const isOrderDescOrder = utils_1.isOrderDesc(o);
-        const isOrderAssociation = utils_1.isAttributeByAssociation(isOrderDescOrder
-            ? o.split(utils_1.ORDER_PREFIX)[1]
-            : o, associationModels);
-        if (isOrderAssociation) {
-            formattedOrder.push(utils_1.extractAssociatedAttributeNameFromOrder(o));
-        }
-        if (isOrderDescOrder) {
-            formattedOrder.push(DESCENDING_KEY);
-        }
-        return formattedOrder;
-    }));
+const formatOrder = ({ order, associationModels = [], }) => order.map((o) => {
+    const formattedOrder = [utils_1.extractAttributeNameFromOrder(o, associationModels)];
+    const isOrderDescOrder = utils_1.isOrderDesc(o);
+    const isOrderAssociation = utils_1.isAttributeByAssociation(isOrderDescOrder
+        ? o.split(utils_1.ORDER_PREFIX)[1]
+        : o, associationModels);
+    if (isOrderAssociation) {
+        formattedOrder.push(utils_1.extractAssociatedAttributeNameFromOrder(o));
+    }
+    if (isOrderDescOrder) {
+        formattedOrder.push(DESCENDING_KEY);
+    }
+    return formattedOrder;
+});
 const formatPage = page => page || utils_1.PAGE_DEFAULT;
 const formatPerPage = perPage => perPage || utils_1.PER_PAGE_DEFAULT;
 const formatInclude = (include, associationsMap = {}) => {
@@ -39,10 +39,10 @@ const formatSearchTerm = (searchTerm, attributesToSend, rawAttributes) => ({
         })),
     })),
 });
-const formatPayload = ({ order, page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, include = [], query = {}, attributes = null, searchTerm = null, }, model) => {
+const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, include = [], query = {}, attributes = null, searchTerm = null, }, model) => {
     const associationModels = Object.keys((model === null || model === void 0 ? void 0 : model.associations) || {});
     const formattedOrder = formatOrder({
-        order,
+        order: [...order, DEFAULT_ORDER],
         associationModels,
     });
     const formattedInclude = formatInclude(include, model === null || model === void 0 ? void 0 : model.associations);

package/lib/formatter/index.test.js

@@ -135,13 +135,13 @@ describe('formatting test', () => {
             const { order } = _1.default({
                 order: ['startTime', '-endTime'],
             });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['startTime'], ['endTime', 'DESC']]));
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['startTime'], ['endTime', 'DESC'], ['id']]));
         });
         it('simple check asc', () => {
             const { order } = _1.default({
                 order: ['startTime', 'endTime'],
             });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['startTime'], ['endTime']]));
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['startTime'], ['endTime'], ['id']]));
         });
         it('by included model', () => {
             const { order } = _1.default({
@@ -154,7 +154,7 @@ describe('formatting test', () => {
                     status: {},
                 },
             });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['status', 'name']]));
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['status', 'name'], ['id']]));
         });
         it('by included model descending', () => {
             const { order } = _1.default({
@@ -167,7 +167,7 @@ describe('formatting test', () => {
                     status: {},
                 },
             });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['status', 'name', 'DESC']]));
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['status', 'name', 'DESC'], ['id']]));
         });
         it('by json field', () => {
             const { order } = _1.default({
@@ -177,7 +177,7 @@ describe('formatting test', () => {
                     startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', json: '',
                 },
             });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['status.name']]));
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['status.name'], ['id']]));
         });
         it('by json field descending', () => {
             const { order } = _1.default({
@@ -187,7 +187,7 @@ describe('formatting test', () => {
                     startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', json: '',
                 },
             });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['status.name', 'DESC']]));
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['status.name', 'DESC'], ['id']]));
         });
     });
     describe('include formatting', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",