@restorecommerce/resource-base-interface 0.0.9 → 0.2.1

package/lib/core/ServiceBase.js

@@ -14,6 +14,18 @@ const _ = require("lodash");
 const chassis = require("@restorecommerce/chassis-srv");
 const index_1 = require("../index");
 const errors = chassis.errors;
+// Mapping of arangodb error codes to standard HTTP error codes
+const arangoHttpErrCodeMap = new Map([
+    [1210, 409],
+    [1200, 409],
+    [1201, 400],
+    [1202, 404],
+    [1203, 404],
+    [1204, 400],
+    [1205, 400],
+    [1207, 409],
+    [1228, 404], // ERROR_ARANGO_DATABASE_NOT_FOUND
+]);
 /**
  * A microservice chassis ready class which provides endpoints for
  * CRUD resource operations.
@@ -33,6 +45,7 @@ class ServiceBase {
             entity: entityEvents
         };
         this.resourceapi = resourceapi;
+        this.resourceapi.logger = logger;
         this.isEventsEnabled = isEventsEnabled;
     }
     /**
@@ -43,8 +56,13 @@ class ServiceBase {
      */
     read(call, context) {
         return __awaiter(this, void 0, void 0, function* () {
+            let docs = {};
             if (!_.isEmpty(call.request.search)) {
-                throw new errors.Unimplemented('Full-text search is not implemented');
+                docs.operation_status = {
+                    code: 404,
+                    message: 'Full-text search is not implemented'
+                };
+                return docs;
             }
             try {
                 let objectEntities = [];
@@ -74,12 +92,17 @@ class ServiceBase {
                 }
                 const offset = call.request.offset;
                 let filter = {};
-                if (!_.isEmpty(call.request.filter)) {
-                    if (call.request.filter.list_value) {
-                        filter = index_1.toObject(call.request.filter, true);
+                // convert the filter from proto structure (field, operation, value and operand) to {field: value } mapping
+                if (!_.isEmpty(call.request.filters)) {
+                    if (_.isArray(call.request.filters)) {
+                        for (let eachFilter of call.request.filters) {
+                            let prevFilter = filter;
+                            filter = (0, index_1.toObject)(eachFilter);
+                            Object.assign(filter, prevFilter);
+                        }
                     }
                     else {
-                        filter = index_1.toObject(call.request.filter);
+                        filter = (0, index_1.toObject)(call.request.filters);
                     }
                 }
                 const field = {};
@@ -93,22 +116,130 @@ class ServiceBase {
                 const customQueries = call.request.custom_queries;
                 const customArgs = call.request.custom_arguments || {};
                 objectEntities = (yield this.resourceapi.read(filter, limit, offset, sort, field, customQueries, customArgs)) || [];
-                return {
-                    items: objectEntities,
+                let readResponseWithStatus = [];
+                for (let object of objectEntities) {
+                    readResponseWithStatus.push({
+                        payload: object,
+                        status: {
+                            code: 200,
+                            message: 'success'
+                        }
+                    });
+                }
+                docs = {
+                    items: readResponseWithStatus,
                     total_count: objectEntities.length,
+                    operation_status: {
+                        code: 200,
+                        message: 'success'
+                    }
                 };
+                return docs;
             }
             catch (e) {
-                const { code, message, details } = e;
+                const { code, message } = e;
                 this.logger.error('Error caught while processing read request', { code, message });
-                if (details) {
-                    throw { code, message: `${message} - ${details}` };
+                if (!docs.status) {
+                    docs.status = {};
+                }
+                docs.status = {
+                    id: '',
+                    code: e.code,
+                    message: e.details ? e.details : e.message
+                };
+                return docs;
+            }
+        });
+    }
+    generateStatusResponse(responseItems, inputItems, deleteIds) {
+        let statusArray = [];
+        if (!_.isArray(responseItems)) {
+            responseItems = [responseItems];
+        }
+        if (!_.isArray(inputItems)) {
+            inputItems = [inputItems];
+        }
+        for (let i = 0; i < responseItems.length; i++) {
+            const item = responseItems[i];
+            if (item.error) {
+                let code;
+                let id;
+                if (!deleteIds) {
+                    id = inputItems[i].id;
+                }
+                else {
+                    id = inputItems[i]; // for delete operation ids is a string and not object
+                }
+                // map arango error code to http error code
+                arangoHttpErrCodeMap.forEach((value, key) => {
+                    if (key === item.errorNum) {
+                        code = value;
+                    }
+                });
+                statusArray.push({
+                    id,
+                    code: code ? code : item.errorNum,
+                    message: item.errorMessage
+                });
+            }
+            else {
+                statusArray.push({
+                    id: item.id,
+                    code: 200,
+                    message: 'success'
+                });
+            }
+        }
+        return statusArray;
+    }
+    generateResponseWithStatus(responseItems, inputItems, deleteIds) {
+        let statusArray = [];
+        let responseItemsWithStatus = [];
+        if (!_.isArray(responseItems)) {
+            responseItems = [responseItems];
+        }
+        if (!_.isArray(inputItems)) {
+            inputItems = [inputItems];
+        }
+        for (let i = 0; i < responseItems.length; i++) {
+            const item = responseItems[i];
+            if (item.error) {
+                let code;
+                let id;
+                if (!deleteIds) {
+                    id = inputItems[i].id;
                 }
                 else {
-                    throw { code, message };
+                    id = inputItems[i]; // for delete operation ids is a string and not object
                 }
+                // map arango error code to http error code
+                arangoHttpErrCodeMap.forEach((value, key) => {
+                    if (key === item.errorNum) {
+                        code = value;
+                    }
+                });
+                responseItemsWithStatus.push({
+                    payload: undefined,
+                    status: {
+                        id,
+                        code: code ? code : item.errorNum,
+                        message: item.errorMessage
+                    }
+                });
+                statusArray.push();
             }
-        });
+            else {
+                responseItemsWithStatus.push({
+                    payload: item,
+                    status: {
+                        id: item.id,
+                        code: 200,
+                        message: 'success'
+                    }
+                });
+            }
+        }
+        return responseItemsWithStatus;
     }
     /**
      * Endpoint create.
@@ -118,28 +249,37 @@ class ServiceBase {
      */
     create(call, context) {
         return __awaiter(this, void 0, void 0, function* () {
+            let docs = {};
             try {
-                yield this.resourceapi.create(call.request.items);
+                const createDocs = _.cloneDeep(call.request.items);
+                let createResponse = yield this.resourceapi.create(createDocs);
                 const dispatch = [];
                 const events = this.events.entity;
-                this.logger.info(this.name + ' created', { items: call.request.items });
                 if (this.isEventsEnabled) {
-                    _.forEach(call.request.items, (item) => {
-                        dispatch.push(events.emit(`${this.name}Created`, item));
+                    _.forEach(createResponse, (item) => {
+                        if (!item.error) {
+                            dispatch.push(events.emit(`${this.name}Created`, item));
+                        }
                     });
                     yield dispatch;
                 }
-                return { items: call.request.items, total_count: call.request.items.length, };
+                let createResponseWithStatus = this.generateResponseWithStatus(createResponse, createDocs);
+                const operation_status = {
+                    code: 200,
+                    message: 'success'
+                };
+                docs = { items: createResponseWithStatus, total_count: createResponseWithStatus.length, operation_status };
+                this.logger.info(this.name + ' create response', docs);
+                return docs;
             }
             catch (e) {
-                const { code, message, details } = e;
+                const { code, message } = e;
                 this.logger.error('Error caught while processing create request', { code, message });
-                if (details) {
-                    throw { code, message: `${message} - ${details}` };
-                }
-                else {
-                    throw { code, message };
-                }
+                docs.operation_status = {
+                    code: e.code,
+                    message: e.details ? e.details : e.message
+                };
+                return docs;
             }
         });
     }
@@ -151,6 +291,7 @@ class ServiceBase {
      */
     delete(call, context) {
         return __awaiter(this, void 0, void 0, function* () {
+            let deleteResponse = { status: [], operation_status: {} };
             try {
                 const events = this.events.entity;
                 let docs;
@@ -159,8 +300,17 @@ class ServiceBase {
                     this.logger.info(`${this.name} deleted`);
                 }
                 else {
-                    yield this.resourceapi.delete(call.request.ids);
-                    docs = call.request.ids;
+                    docs = yield this.resourceapi.delete(call.request.ids);
+                }
+                // sanitize delete response for docs
+                for (let doc of docs) {
+                    if (doc._id && doc._key && doc._rev) {
+                        delete doc._id;
+                        const id = doc._key;
+                        doc.id = id;
+                        delete doc._key;
+                        delete doc._rev;
+                    }
                 }
                 if (this.isEventsEnabled) {
                     const dispatch = [];
@@ -168,21 +318,35 @@ class ServiceBase {
                         if (typeof id == 'string') {
                             id = { id };
                         }
-                        dispatch.push(events.emit(`${this.name}Deleted`, id));
+                        if (!id.error) {
+                            dispatch.push(events.emit(`${this.name}Deleted`, id));
+                        }
                     });
                     yield dispatch;
                 }
-                return {};
+                // if complete collection is dropped then there are no input ids provided,
+                // iterate docs and put ids to call.request.ids
+                if (call.request.collection && (_.isNil(call.request.ids) || _.isEmpty(call.request.ids))) {
+                    call.request.ids = [];
+                    for (let doc of docs) {
+                        call.request.ids.push(doc.id);
+                    }
+                }
+                let statusArray = this.generateStatusResponse(docs, call.request.ids, true);
+                const operation_status = {
+                    code: 200,
+                    message: 'success'
+                };
+                return { status: statusArray, operation_status };
             }
             catch (e) {
-                const { code, message, details } = e;
+                const { code, message } = e;
                 this.logger.error('Error caught while processing delete request', { code, message });
-                if (details) {
-                    throw { code, message: `${message} - ${details}` };
-                }
-                else {
-                    throw { code, message };
-                }
+                deleteResponse.operation_status = {
+                    code: e.code,
+                    message: e.details ? e.details : e.message
+                };
+                return deleteResponse;
             }
         });
     }
@@ -194,28 +358,37 @@ class ServiceBase {
      */
     update(call, context) {
         return __awaiter(this, void 0, void 0, function* () {
+            let docs = {};
             try {
-                const updateResult = yield this.resourceapi.update(call.request.items);
-                this.logger.info(this.name + ' updated', { items: updateResult });
+                let updateDocs = _.cloneDeep(call.request.items);
+                let updateResponse = yield this.resourceapi.update(updateDocs);
                 if (this.isEventsEnabled) {
                     const dispatch = [];
                     const events = this.events.entity;
-                    _.forEach(updateResult, (update) => {
-                        dispatch.push(events.emit(`${this.name}Modified`, update));
+                    _.forEach(updateResponse, (update) => {
+                        if (!update.error) {
+                            dispatch.push(events.emit(`${this.name}Modified`, update));
+                        }
                     });
                     yield dispatch;
                 }
-                return { items: updateResult, total_count: updateResult.length };
+                let responseWithStatus = this.generateResponseWithStatus(updateResponse, updateDocs);
+                const operation_status = {
+                    code: 200,
+                    message: 'success'
+                };
+                docs = { items: responseWithStatus, total_count: responseWithStatus.length, operation_status };
+                this.logger.info(this.name + ' update response', docs);
+                return docs;
             }
             catch (e) {
-                const { code, message, details } = e;
+                const { code, message } = e;
                 this.logger.error('Error caught while processing update request', { code, message });
-                if (details) {
-                    throw { code, message: `${message} - ${details}` };
-                }
-                else {
-                    throw { code, message };
-                }
+                docs.operation_status = {
+                    code: e.code,
+                    message: e.details ? e.details : e.message
+                };
+                return docs;
             }
         });
     }
@@ -227,22 +400,30 @@ class ServiceBase {
      */
     upsert(call, context) {
         return __awaiter(this, void 0, void 0, function* () {
+            let docs = {};
             try {
-                const result = yield this.resourceapi.upsert(call.request.items, this.events.entity, this.name);
-                this.logger.info(`${this.name} upserted`, { items: result });
-                return { items: result, total_count: result.length };
+                let upsertDocs = _.cloneDeep(call.request.items);
+                let upsertResponse = yield this.resourceapi.upsert(upsertDocs, this.events.entity, this.name);
+                let responseWithStatus = this.generateResponseWithStatus(upsertResponse, upsertDocs);
+                const operation_status = {
+                    code: 200,
+                    message: 'success'
+                };
+                docs = { items: responseWithStatus, total_count: responseWithStatus.length, operation_status };
+                this.logger.info(`${this.name} upsert response`, { items: upsertResponse });
+                return docs;
             }
             catch (e) {
-                const { code, message, details } = e;
+                const { code, message } = e;
                 this.logger.error('Error caught while processing upsert request', { code, message });
-                if (details) {
-                    throw { code, message: `${message} - ${details}` };
-                }
-                else {
-                    throw { code, message };
-                }
+                docs.operation_status = {
+                    code: e.code,
+                    message: e.details ? e.details : e.message
+                };
+                return docs;
             }
         });
     }
 }
 exports.ServiceBase = ServiceBase;
+//# sourceMappingURL=ServiceBase.js.map

package/lib/core/ServiceBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ServiceBase.js","sourceRoot":"","sources":["../../src/core/ServiceBase.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA4B;AAC5B,wDAAwD;AACxD,oCAAoC;AAMpC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;AAE9B,+DAA+D;AAC/D,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC;IACnC,CAAC,IAAI,EAAE,GAAG,CAAC;IACX,CAAC,IAAI,EAAE,GAAG,CAAC;IACX,CAAC,IAAI,EAAE,GAAG,CAAC;IACX,CAAC,IAAI,EAAE,GAAG,CAAC;IACX,CAAC,IAAI,EAAE,GAAG,CAAC;IACX,CAAC,IAAI,EAAE,GAAG,CAAC;IACX,CAAC,IAAI,EAAE,GAAG,CAAC;IACX,CAAC,IAAI,EAAE,GAAG,CAAC;IACX,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,kCAAkC;CAChD,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAa,WAAW;IAMtB;;;;;;OAMG;IACH,YAAY,UAAkB,EAAE,YAAiB,EAAE,MAAc,EAC/D,WAA6B,EAAE,eAAyB;QACxD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG;YACZ,MAAM,EAAE,YAAY;SACrB,CAAC;QACF,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;QACjC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACG,IAAI,CAAC,IAA8B,EAAE,OAAa;;YACtD,IAAI,IAAI,GAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBACnC,IAAI,CAAC,gBAAgB,GAAG;oBACtB,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,qCAAqC;iBAC/C,CAAC;gBACF,OAAO,IAAI,CAAC;aACb;YAED,IAAI;gBACF,IAAI,cAAc,GAAG,EAAE,CAAC;gBACxB,IAAI,IAAI,CAAC;gBACT,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBACjC,IAAI,GAAG,EAAE,CAAC;oBACV,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;wBACjC,QAAQ,CAAC,CAAC,KAAK,EAAE;4BACf,KAAK,WAAW,CAAC;4BACjB,KAAK,CAAC;gCACJ,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;gCACtB,MAAM;4BACR,KAAK,CAAC,CAAC;4BACP,KAAK,YAAY;gCACf,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;gCACvB,MAAM;4BACR,KAAK,UAAU,CAAC;4BAChB,KAAK,CAAC,CAAC;4BACP;gCACE,MAAM;yBACT;oBACH,CAAC,CAAC,CAAC;iBACJ;gBAED,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;gBAC/B,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,EAAE;oBAC3B,KAAK,GAAG,IAAI,CAAC;iBACd;gBACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;gBACnC,IAAI,MAAM,GAAG,EAAE,CAAC;gBAChB,2GAA2G;gBAC3G,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBACpC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;wBACnC,KAAK,IAAI,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;4BAC3C,IAAI,UAAU,GAAG,MAAM,CAAC;4BACxB,MAAM,GAAG,IAAA,gBAAQ,EAAC,UAAU,CAAC,CAAC;4BAC9B,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;yBACnC;qBACF;yBAAM;wBACL,MAAM,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;qBACzC;iBACF;gBACD,MAAM,KAAK,GAAG,EAAE,CAAC;gBACjB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE;oBAClC,IAAI,CAAC,CAAC,OAAO,EAAE;wBACb,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBAClB,OAAO;qBACR;oBACD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;gBAClD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,EAAE,CAAC;gBAEvD,cAAc,GAAG,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAC3C,MAAM,EACN,KAAK,EACL,MAAM,EACN,IAAI,EACJ,KAAK,EACL,aAAa,EACb,UAAU,CACX,CAAC,IAAI,EAAE,CAAC;gBAET,IAAI,sBAAsB,GAAG,EAAE,CAAC;gBAChC,KAAK,IAAI,MAAM,IAAI,cAAc,EAAE;oBACjC,sBAAsB,CAAC,IAAI,CAAC;wBAC1B,OAAO,EAAE,MAAM;wBACf,MAAM,EAAE;4BACN,IAAI,EAAE,GAAG;4BACT,OAAO,EAAE,SAAS;yBACnB;qBACF,CAAC,CAAC;iBACJ;gBACD,IAAI,GAAG;oBACL,KAAK,EAAE,sBAAsB;oBAC7B,WAAW,EAAE,cAAc,CAAC,MAAM;oBAClC,gBAAgB,EAAE;wBAChB,IAAI,EAAE,GAAG;wBACT,OAAO,EAAE,SAAS;qBACnB;iBACF,CAAC;gBACF,OAAO,IAAI,CAAC;aACb;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBACnF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;oBAChB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;iBAClB;gBACD,IAAI,CAAC,MAAM,GAAG;oBACZ,EAAE,EAAE,EAAE;oBACN,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;iBAC3C,CAAC;gBACF,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;IAEO,sBAAsB,CAAC,aAAoB,EAAE,UAAiB,EAAE,SAAmB;QACzF,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAC7B,aAAa,GAAG,CAAC,aAAa,CAAC,CAAC;SACjC;QACD,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC1B,UAAU,GAAG,CAAC,UAAU,CAAC,CAAC;SAC3B;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7C,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,IAAI,IAAI,CAAC;gBACT,IAAI,EAAE,CAAC;gBACP,IAAI,CAAC,SAAS,EAAE;oBACd,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;iBACvB;qBAAM;oBACL,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,sDAAsD;iBAC3E;gBACD,2CAA2C;gBAC3C,oBAAoB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;oBAC1C,IAAI,GAAG,KAAK,IAAI,CAAC,QAAQ,EAAE;wBACzB,IAAI,GAAG,KAAK,CAAC;qBACd;gBACH,CAAC,CAAC,CAAC;gBACH,WAAW,CAAC,IAAI,CAAC;oBACf,EAAE;oBACF,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ;oBACjC,OAAO,EAAE,IAAI,CAAC,YAAY;iBAC3B,CAAC,CAAC;aACJ;iBAAM;gBACL,WAAW,CAAC,IAAI,CAAC;oBACf,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,SAAS;iBACnB,CAAC,CAAC;aACJ;SACF;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,0BAA0B,CAAC,aAAoB,EAAE,UAAiB,EAAE,SAAmB;QAC7F,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,uBAAuB,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAC7B,aAAa,GAAG,CAAC,aAAa,CAAC,CAAC;SACjC;QACD,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC1B,UAAU,GAAG,CAAC,UAAU,CAAC,CAAC;SAC3B;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7C,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,IAAI,IAAI,CAAC;gBACT,IAAI,EAAE,CAAC;gBACP,IAAI,CAAC,SAAS,EAAE;oBACd,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;iBACvB;qBAAM;oBACL,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,sDAAsD;iBAC3E;gBACD,2CAA2C;gBAC3C,oBAAoB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;oBAC1C,IAAI,GAAG,KAAK,IAAI,CAAC,QAAQ,EAAE;wBACzB,IAAI,GAAG,KAAK,CAAC;qBACd;gBACH,CAAC,CAAC,CAAC;gBACH,uBAAuB,CAAC,IAAI,CAAC;oBAC3B,OAAO,EAAE,SAAS;oBAClB,MAAM,EAAE;wBACN,EAAE;wBACF,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ;wBACjC,OAAO,EAAE,IAAI,CAAC,YAAY;qBAC3B;iBACF,CAAC,CAAC;gBACH,WAAW,CAAC,IAAI,EAAE,CAAC;aACpB;iBAAM;gBACL,uBAAuB,CAAC,IAAI,CAAC;oBAC3B,OAAO,EAAE,IAAI;oBACb,MAAM,EACN;wBACE,EAAE,EAAE,IAAI,CAAC,EAAE;wBACX,IAAI,EAAE,GAAG;wBACT,OAAO,EAAE,SAAS;qBACnB;iBACF,CAAC,CAAC;aACJ;SACF;QACD,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACG,MAAM,CAAC,IAAgC,EAAE,OAAa;;YAC1D,IAAI,IAAI,GAAQ,EAAE,CAAC;YACnB,IAAI;gBACF,MAAM,UAAU,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACnD,IAAI,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC/D,MAAM,QAAQ,GAAG,EAAE,CAAC;gBACpB,MAAM,MAAM,GAAU,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;gBACzC,IAAI,IAAI,CAAC,eAAe,EAAE;oBACxB,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;wBACjC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;4BACf,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;yBACzD;oBACH,CAAC,CAAC,CAAC;oBACH,MAAM,QAAQ,CAAC;iBAChB;gBACD,IAAI,wBAAwB,GAAG,IAAI,CAAC,0BAA0B,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;gBAC3F,MAAM,gBAAgB,GAAG;oBACvB,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,SAAS;iBACnB,CAAC;gBACF,IAAI,GAAG,EAAE,KAAK,EAAE,wBAAwB,EAAE,WAAW,EAAE,wBAAwB,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC;gBAC3G,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,kBAAkB,EAAE,IAAI,CAAC,CAAC;gBACvD,OAAO,IAAI,CAAC;aACb;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBACrF,IAAI,CAAC,gBAAgB,GAAG;oBACtB,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;iBAC3C,CAAC;gBACF,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;IACD;;;;;OAKG;IACG,MAAM,CAAC,IAAgC,EAAE,OAAa;;YAC1D,IAAI,cAAc,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;YAC1D,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;gBAClC,IAAI,IAAS,CAAC;gBACd,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;oBAC3B,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;oBACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,UAAU,CAAC,CAAC;iBAC1C;qBAAM;oBACL,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;iBACxD;gBAED,oCAAoC;gBACpC,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;oBACpB,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,EAAE;wBACnC,OAAO,GAAG,CAAC,GAAG,CAAC;wBACf,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;wBACpB,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;wBACZ,OAAO,GAAG,CAAC,IAAI,CAAC;wBAChB,OAAO,GAAG,CAAC,IAAI,CAAC;qBACjB;iBACF;gBAED,IAAI,IAAI,CAAC,eAAe,EAAE;oBACxB,MAAM,QAAQ,GAAG,EAAE,CAAC;oBACpB,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE;wBACrB,IAAI,OAAO,EAAE,IAAI,QAAQ,EAAE;4BACzB,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;yBACb;wBACD,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE;4BACb,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;yBACvD;oBACH,CAAC,CAAC,CAAC;oBACH,MAAM,QAAQ,CAAC;iBAChB;gBAED,0EAA0E;gBAC1E,+CAA+C;gBAC/C,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;oBACzF,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;oBACtB,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;wBACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBAC/B;iBACF;gBACD,IAAI,WAAW,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC5E,MAAM,gBAAgB,GAAG;oBACvB,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,SAAS;iBACnB,CAAC;gBACF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;aAClD;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBACrF,cAAc,CAAC,gBAAgB,GAAG;oBAChC,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;iBAC3C,CAAC;gBACF,OAAO,cAAc,CAAC;aACvB;QACH,CAAC;KAAA;IAED;;;;;OAKG;IACG,MAAM,CAAC,IAAgC,EAAE,OAAa;;YAC1D,IAAI,IAAI,GAAQ,EAAE,CAAC;YACnB,IAAI;gBACF,IAAI,UAAU,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACjD,IAAI,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC/D,IAAI,IAAI,CAAC,eAAe,EAAE;oBACxB,MAAM,QAAQ,GAAG,EAAE,CAAC;oBACpB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;oBAClC,CAAC,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE;wBACnC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;4BACjB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;yBAC5D;oBACH,CAAC,CAAC,CAAC;oBACH,MAAM,QAAQ,CAAC;iBAChB;gBACD,IAAI,kBAAkB,GAAG,IAAI,CAAC,0BAA0B,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;gBACrF,MAAM,gBAAgB,GAAG;oBACvB,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,SAAS;iBACnB,CAAC;gBACF,IAAI,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC;gBAC/F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,kBAAkB,EAAE,IAAI,CAAC,CAAC;gBACvD,OAAO,IAAI,CAAC;aACb;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBACrF,IAAI,CAAC,gBAAgB,GAAG;oBACtB,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;iBAC3C,CAAC;gBACF,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;IAED;;;;;OAKG;IACG,MAAM,CAAC,IAAgC,EAAE,OAAa;;YAC1D,IAAI,IAAI,GAAQ,EAAE,CAAC;YACnB,IAAI;gBACF,IAAI,UAAU,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACjD,IAAI,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,EAC3D,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,kBAAkB,GAAG,IAAI,CAAC,0BAA0B,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;gBACrF,MAAM,gBAAgB,GAAG;oBACvB,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,SAAS;iBACnB,CAAC;gBACF,IAAI,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,EAAE,CAAC;gBAC/F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,kBAAkB,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;gBAC5E,OAAO,IAAI,CAAC;aACb;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;gBACrF,IAAI,CAAC,gBAAgB,GAAG;oBACtB,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;iBAC3C,CAAC;gBACF,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;CACF;AAlZD,kCAkZC"}

package/lib/core/interfaces.d.ts

@@ -3,6 +3,39 @@ export interface ServiceCall<TRequest> {
     request: TRequest;
 }
 export declare type SortType = 'ASCENDING' | 'DESCENDING' | 'UNSORTED' | 2 | 1 | 0;
+export declare enum FilterOperation {
+    eq = 0,
+    lt = 1,
+    lte = 2,
+    gt = 3,
+    gte = 4,
+    isEmpty = 5,
+    iLike = 6,
+    in = 7,
+    neq = 8
+}
+export declare enum FilterValueType {
+    STRING = 0,
+    NUMBER = 1,
+    BOOLEAN = 2,
+    DATE = 3,
+    ARRAY = 4
+}
+export declare enum OperatorType {
+    and = 0,
+    or = 1
+}
+export interface Filter {
+    field: string;
+    operation: FilterOperation;
+    value: string;
+    type?: FilterValueType;
+    filters?: FilterOp[];
+}
+export interface FilterOp {
+    filter?: Filter[];
+    operator?: OperatorType;
+}
 export interface ReadRequest {
     search?: string;
     sort?: {
@@ -15,7 +48,7 @@ export interface ReadRequest {
         name: string;
         include: boolean;
     }[];
-    filter?: any;
+    filters?: FilterOp[];
     custom_queries?: string[];
     custom_arguments?: any;
 }

package/lib/core/interfaces.js

@@ -1,2 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.OperatorType = exports.FilterValueType = exports.FilterOperation = void 0;
+var FilterOperation;
+(function (FilterOperation) {
+    FilterOperation[FilterOperation["eq"] = 0] = "eq";
+    FilterOperation[FilterOperation["lt"] = 1] = "lt";
+    FilterOperation[FilterOperation["lte"] = 2] = "lte";
+    FilterOperation[FilterOperation["gt"] = 3] = "gt";
+    FilterOperation[FilterOperation["gte"] = 4] = "gte";
+    FilterOperation[FilterOperation["isEmpty"] = 5] = "isEmpty";
+    FilterOperation[FilterOperation["iLike"] = 6] = "iLike";
+    FilterOperation[FilterOperation["in"] = 7] = "in";
+    FilterOperation[FilterOperation["neq"] = 8] = "neq";
+})(FilterOperation = exports.FilterOperation || (exports.FilterOperation = {}));
+;
+var FilterValueType;
+(function (FilterValueType) {
+    FilterValueType[FilterValueType["STRING"] = 0] = "STRING";
+    FilterValueType[FilterValueType["NUMBER"] = 1] = "NUMBER";
+    FilterValueType[FilterValueType["BOOLEAN"] = 2] = "BOOLEAN";
+    FilterValueType[FilterValueType["DATE"] = 3] = "DATE";
+    FilterValueType[FilterValueType["ARRAY"] = 4] = "ARRAY";
+})(FilterValueType = exports.FilterValueType || (exports.FilterValueType = {}));
+;
+var OperatorType;
+(function (OperatorType) {
+    OperatorType[OperatorType["and"] = 0] = "and";
+    OperatorType[OperatorType["or"] = 1] = "or";
+})(OperatorType = exports.OperatorType || (exports.OperatorType = {}));
+;
+//# sourceMappingURL=interfaces.js.map

package/lib/core/interfaces.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/core/interfaces.ts"],"names":[],"mappings":";;;AAOA,IAAY,eAUX;AAVD,WAAY,eAAe;IACzB,iDAAM,CAAA;IACN,iDAAM,CAAA;IACN,mDAAO,CAAA;IACP,iDAAM,CAAA;IACN,mDAAO,CAAA;IACP,2DAAW,CAAA;IACX,uDAAS,CAAA;IACT,iDAAM,CAAA;IACN,mDAAO,CAAA;AACT,CAAC,EAVW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAU1B;AAAA,CAAC;AAEF,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,yDAAU,CAAA;IACV,yDAAU,CAAA;IACV,2DAAW,CAAA;IACX,qDAAQ,CAAA;IACR,uDAAS,CAAA;AACX,CAAC,EANW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAM1B;AAAA,CAAC;AAEF,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,6CAAO,CAAA;IACP,2CAAM,CAAA;AACR,CAAC,EAHW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAGvB;AAAA,CAAC"}

package/lib/index.d.ts

@@ -1,8 +1,15 @@
-export declare const toStruct: (obj: any, fromArray?: Boolean) => any;
-export declare const toObject: (struct: any, fromArray?: any) => Object;
+/**
+ * toObject takes input contained in the proto structure defined in resource_base proto
+ * and converts it into Object understandable by the underlying DB implementation in chassis-srv
+ * @param {*} input Original filter input object
+ * @param {*} obj converted filter objected passed recursively
+ * @param {*} operatorList operatorlist updated and passed recursively
+ */
+export declare const toObject: (input: any, obj?: any, operatorList?: string[]) => any;
 import { ResourcesAPIBase } from './core/ResourcesAPI';
 export { ResourcesAPIBase };
 import { ServiceBase } from './core/ServiceBase';
 export { ServiceBase };
 import { GraphResourcesServiceBase } from './core/GraphResourcesServiceBase';
 export { GraphResourcesServiceBase };
+export { Filter, FilterOp, FilterOperation, FilterValueType, OperatorType } from './core/interfaces';