Sanketika-Obsrv/issue-tracker#74: added sory to query and logging tem…

…plate read response

api-service/src/controllers/ListQueryTemplates/ListTemplateValidationSchema.json

@@ -41,38 +41,39 @@
                     },
                     "additionalProperties": false
                 },
-                "sortBy": {
+                "order": {
                     "type": "array",
                     "items": {
-                        "type": "object",
-                        "properties": {
-                            "field": {
+                        "type": "array",
+                        "minItems": 2,
+                        "maxItems": 2,
+                        "items": [
+                            {
                                 "type": "string",
                                 "enum": [
                                     "created_date",
                                     "updated_date"
                                 ]
                             },
-                            "order": {
+                            {
                                 "type": "string",
                                 "enum": [
-                                    "asc",
-                                    "desc"
+                                    "ASC",
+                                    "DESC"
                                 ]
                             }
-                        },
-                        "additionalProperties": false,
-                        "required": [
-                            "field",
-                            "order"
                         ]
                     }
                 },
                 "limit": {
-                    "type": "number"
+                    "type": "number",
+                    "minimum": 5,
+                    "maximum": 500
                 },
                 "offset": {
-                    "type": "number"
+                    "type": "number",
+                    "minimum": 0,
+                    "maximum": 10
                 }
             },
             "additionalProperties": false

api-service/src/controllers/ListQueryTemplates/ListTemplatesController.ts

@@ -35,12 +35,8 @@
 const getTemplateList = async (req: Record<string, any>) => {
     const limit: any = _.get(req, "limit");
     const offset: any = _.get(req, "offset");
+    const order: any = _.get(req, "order");
     const { filters = {}, sortBy = [] } = req || {};
-    const templates = await QueryTemplate.findAll({ limit: limit || 100, offset: offset || 0, ...(filters && { where: filters }) })
-    if (sortBy) {
-        const fieldValues = _.map(sortBy, field => _.get(field, "field"))
-        const orderValues = _.map(sortBy, field => _.get(field, "order"))
-        return _.orderBy(templates, fieldValues, orderValues)
-    }
+    const templates = await QueryTemplate.findAll({ limit: limit || 100, offset: offset || 0, order, ...(filters && { where: filters }) })
     return templates
 }

api-service/src/controllers/ReadQueryTemplate/ReadTemplateController.ts

@@ -15,7 +15,7 @@ export const readQueryTemplate = async (req: Request, res: Response) => {
             logger.error({ apiId, resmsgid, template_id, message: `Template ${template_id} does not exists`, code: "QUERY_TEMPLATE_NOT_EXISTS" })
             return ResponseHandler.errorResponse({ message: `Template ${template_id} does not exists`, statusCode: 404, errCode: "NOT_FOUND", code: "QUERY_TEMPLATE_NOT_EXISTS" }, req, res);
         }
-        logger.info({ apiId, resmsgid, template_id, message: `Template read successfully with id: ${template_id}` })
+        logger.info({ apiId, resmsgid, template_id, message: `Template read successfully with id: ${template_id}`, response: { status: 200, data: template?.dataValues } })
         return ResponseHandler.successResponse(req, res, { status: 200, data: template?.dataValues });
     }
     catch (error) {