@autofleet/sheilta 1.3.4-hilat-1 → 1.3.4

package/lib/formatter/index.d.ts

@@ -15,7 +15,9 @@ declare const formatPayload: ({ order, page, perPage, include, query, attributes
     attributes?: any;
     searchTerm?: any;
 }, model?: any, options?: any) => {
-    attributes: any[];
+    attributes: {
+        include: any[];
+    };
     query: {};
     order: SequelizeOrder[];
     page: any;

package/lib/formatter/index.js

@@ -97,10 +97,8 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
         associationModels,
     });
     const [filteredFormattedOrder, filteredLiteralAttributes] = getAttributeFromOrder(formattedOrder, options);
-    // here
-    console.log({ attributes });
     const allAttributes = [...filteredLiteralAttributes, ...(attributes || [])];
-    // const formattedAttribute = allAttributes.length ? { include: allAttributes } : null;
+    const formattedAttribute = allAttributes.length ? { include: allAttributes } : null;
     const formattedInclude = formatInclude(include, model === null || model === void 0 ? void 0 : model.associations);
     const formattedPage = formatPage(page);
     const formattedPerPage = formatPerPage(perPage);
@@ -116,8 +114,6 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
             ],
         };
     }
-    // console.log({ ...(formattedAttribute && { attributes: formattedAttribute }) });
-    console.log({ attributes });
-    return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: result.formattedScopes }, (allAttributes && { attributes: allAttributes }));
+    return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: result.formattedScopes }, (formattedAttribute && { attributes: formattedAttribute }));
 };
 exports.default = formatPayload;

package/lib/formatter/index.test.js

@@ -208,7 +208,6 @@ describe('formatting test', () => {
             const literalAttribute = { attribute: 'genericField', literal: ['void', 'field'] };
             const { order, attributes } = _1.default({
                 order: [`-${literalAttribute.attribute}`, 'currencySymbol'],
-                attributes: ['endTime'],
             }, {
                 rawAttributes: {
                     startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
@@ -216,11 +215,10 @@ describe('formatting test', () => {
             }, {
                 literalAttributes: [literalAttribute],
             });
-            console.log({ attributes });
             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]], 'endTime'],
+                include: [[literalAttribute.literal[0], literalAttribute.literal[1]]],
             }));
         });
         it('by literal field - not found', () => {

package/package.json

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