@autofleet/sheilta 1.3.4-beta.2 → 1.3.4-hilat-1

package/lib/formatter/index.d.ts

@@ -5,7 +5,6 @@ export declare type FormatPayloadOptions = {
     includeRawPayload?: boolean;
     literalAttributes?: LiteralAttribute[];
     DBFormatter?: any;
-    skipSearchTermFormat?: boolean;
 };
 declare const formatPayload: ({ order, page, perPage, include, query, attributes, searchTerm, }: {
     order?: any[];
@@ -16,9 +15,7 @@ declare const formatPayload: ({ order, page, perPage, include, query, attributes
     attributes?: any;
     searchTerm?: any;
 }, model?: any, options?: any) => {
-    attributes: {
-        include: any[];
-    };
+    attributes: any[];
     query: {};
     order: SequelizeOrder[];
     page: any;

package/lib/formatter/index.js

@@ -43,7 +43,13 @@ const formatOrder = ({ order, associationModels = [], }) => order.map((o) => {
 const formatPage = page => page || utils_1.PAGE_DEFAULT;
 const formatPerPage = perPage => perPage || utils_1.PER_PAGE_DEFAULT;
 const formatInclude = (include, associationsMap = {}) => {
-    let formattedInclude = include.map(i => (Object.assign(Object.assign({}, i), { association: associationsMap[i.association || i.model], required: i.required !== false })));
+    let formattedInclude = include.map((i) => {
+        var _a;
+        const includedAssociation = associationsMap[i.association || i.model];
+        return Object.assign(Object.assign(Object.assign({}, i), { association: includedAssociation, required: i.required !== false }), (i.include && {
+            include: formatInclude(i.include, (_a = includedAssociation === null || includedAssociation === void 0 ? void 0 : includedAssociation.target) === null || _a === void 0 ? void 0 : _a.associations),
+        }));
+    });
     formattedInclude = formattedInclude.map(i => lodash_1.default.omit(i, ['model']));
     return formattedInclude;
 };
@@ -59,9 +65,9 @@ const formatQuery = (query, associationModels) => {
             formattedScopeMap.get(CUSTOM_FIELDS_FILTER_SCOPE)[scopeKey] = queryItemValue;
             return;
         }
-        const key = utils_1.isAttributeByAssociation(queryItemKey, associationModels)
-            ? utils_1.wrapAttributeWithOperator(queryItemKey)
-            : queryItemKey;
+        const key = utils_1.isAttributeByAssociation(queryItemKey, associationModels) ?
+            utils_1.wrapAttributeWithOperator(queryItemKey) :
+            queryItemKey;
         formattedQuery[key] = queryItemValue;
     });
     const formattedScopes = Array.from(formattedScopeMap.entries()).map(([scopeName, scopeValue]) => {
@@ -91,14 +97,16 @@ 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);
     const result = formatQuery(query, associationModels);
     let { formattedQuery } = result;
-    if (searchTerm && !(options === null || options === void 0 ? void 0 : options.skipSearchTermFormat)) {
+    if (searchTerm) {
         const attributesToSend = (attributes === null || attributes === void 0 ? void 0 : attributes.length) ? attributes : Object.keys(model.rawAttributes);
         const queryWithSearchTerm = formatSearchTerm(searchTerm, attributesToSend, model.rawAttributes);
         formattedQuery = lodash_1.default.isEmpty(formattedQuery) ? queryWithSearchTerm : {
@@ -108,6 +116,8 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
             ],
         };
     }
-    return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: result.formattedScopes }, (formattedAttribute && { attributes: formattedAttribute }));
+    // 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 }));
 };
 exports.default = formatPayload;

package/lib/formatter/index.test.js

@@ -208,6 +208,7 @@ 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: '',
@@ -215,10 +216,11 @@ 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]]],
+                include: [[literalAttribute.literal[0], literalAttribute.literal[1]], 'endTime'],
             }));
         });
         it('by literal field - not found', () => {

package/package.json

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