@autofleet/sheilta 1.2.3 → 1.2.5-beta

package/lib/formatter/index.d.ts

@@ -1,11 +1,13 @@
 declare type OrderItem = string | [string, string];
 declare type SequelizeOrder = string | OrderItem[];
-declare const formatPayload: ({ order, page, perPage, include, query, }: {
+declare const formatPayload: ({ order, page, perPage, include, query, attributes, searchTerm, }: {
     order: any;
     page?: number;
     perPage?: number;
     include?: any[];
     query?: {};
+    attributes?: any;
+    searchTerm?: any;
 }, model?: any) => {
     query: {};
     order: SequelizeOrder[];

package/lib/formatter/index.js

@@ -24,13 +24,20 @@ const formatOrder = ({ order = [], associationModels = [], }) => (order.length =
 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 => (Object.assign(Object.assign(Object.assign({}, i), { association: associationsMap[i.association || i.model], required: i.required !== 'false' }), (include.order && { order: formatOrder(include.order) }))));
     formattedInclude = formattedInclude.map(i => lodash_1.default.omit(i, ['model']));
     return formattedInclude;
 };
 const formatQuery = (query, associationModels) => Object.keys(query).reduce((acc, queryItemKey) => (Object.assign(Object.assign({}, acc), { [utils_1.isAttributeByAssociation(queryItemKey, associationModels)
         ? utils_1.wrapAttributeWithOperator(queryItemKey) : queryItemKey]: query[queryItemKey] })), {});
-const formatPayload = ({ order, page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, include = [], query = {}, }, model) => {
+const formatSearchTerm = (searchTerm, attributesToSend, rawAttributes) => ({
+    $or: attributesToSend.filter(attrKey => rawAttributes[attrKey].type.key === 'STRING').map(attr => ({
+        [attr]: {
+            $iLike: `%${searchTerm}%`,
+        },
+    })),
+});
+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,
@@ -39,7 +46,17 @@ const formatPayload = ({ order, page = utils_1.PAGE_DEFAULT, perPage = utils_1.P
     const formattedInclude = formatInclude(include, model === null || model === void 0 ? void 0 : model.associations);
     const formattedPage = formatPage(page);
     const formattedPerPage = formatPerPage(perPage);
-    const formattedQuery = formatQuery(query, associationModels);
+    let formattedQuery = formatQuery(query, associationModels);
+    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 : {
+            $and: [
+                formattedQuery,
+                queryWithSearchTerm,
+            ],
+        };
+    }
     return {
         query: formattedQuery,
         order: formattedOrder,

package/lib/formatter/index.test.js

@@ -39,6 +39,42 @@ describe('formatting test', () => {
             });
             expect(JSON.stringify(query)).toBe(JSON.stringify({ '$status.field$': { $gt: 4 } }));
         });
+        it('query with searchTerm', () => {
+            const searchTerm = 'aviv';
+            const { query } = _1.default({
+                order: [],
+                query: {
+                    'json.field': {
+                        $gt: 4,
+                    },
+                },
+                searchTerm,
+            }, {
+                rawAttributes: {
+                    startTime: {
+                        type: {
+                            key: 'STRING',
+                        },
+                    },
+                    endTime: {
+                        type: {
+                            key: 'NUMBER',
+                        },
+                    },
+                },
+            });
+            expect(JSON.stringify(query)).toBe(JSON.stringify({
+                $and: [{ 'json.field': { $gt: 4 } }, {
+                        $or: [
+                            {
+                                startTime: {
+                                    $iLike: `%${searchTerm}%`,
+                                },
+                            },
+                        ],
+                    }],
+            }));
+        });
     });
     describe('order formatting', () => {
         it('simple check', () => {

package/lib/middleware/index.js

@@ -42,13 +42,15 @@ exports.newQueryValidationMiddleware = (inner = 'body') => model => (req, res, n
     }
 });
 exports.newQueryFormatMiddleware = (inner = 'body') => model => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    const { order, page, perPage, include, query, } = req[inner];
+    const { order, page, perPage, include, query, attributes, searchTerm, } = req[inner];
     const { query: formattedQuery, order: formattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, } = formatter_1.default({
         query,
         order,
         page,
         perPage,
         include,
+        attributes,
+        searchTerm,
     }, model);
     req[inner].query = formattedQuery;
     req[inner].order = formattedOrder;

package/lib/operators/index.js

@@ -13,6 +13,7 @@ exports.OPERATORS = [
     'notIn',
     'is',
     'like',
+    'iLike',
     'notLike',
     'between',
     'and',

package/package.json

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