diff --git a/src/controllers/service.ts b/src/controllers/service.ts index 8c57286..78cc768 100644 --- a/src/controllers/service.ts +++ b/src/controllers/service.ts @@ -27,8 +27,8 @@ export class ServiceController { #swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' } #swagger.parameters['page'] = { in: 'query', required: true, type: 'number' } #swagger.parameters['with_deleted'] = { in: 'query', required: true, type: 'boolean' } - #swagger.parameters['order_field'] = { in: 'query', required: true, type: 'string' } - #swagger.parameters['order_direction'] = { in: 'query', required: true, schema: { '@enum': ['ASC', 'DESC'] } } + #swagger.parameters['order_field'] = { in: 'query', required: false, type: 'string', default: 'created_at' } + #swagger.parameters['order_direction'] = { in: 'query', required: false, schema: { '@enum': ['ASC', 'DESC'], default: 'DESC' } } */ try { const schema = Joi.object().keys({ @@ -36,8 +36,8 @@ export class ServiceController { page: Joi.number().required().min(1).label("Page"), limit: Joi.number().required().min(1).label("Limit"), with_deleted: Joi.bool().required().label("With Deleted"), - order_field: Joi.string().required().label("Order Field"), - order_direction: Joi.string().allow("asc", "desc").required().label("Order Direction"), + order_field: Joi.string().optional().default("created_at").label("Order Field"), + order_direction: Joi.string().allow("asc", "desc").optional().default("desc").label("Order Direction"), }); let param: Paging = await schema.validateAsync(req.query); @@ -98,8 +98,8 @@ export class ServiceController { service.name = param.name; service.serviceType = serviceType; service.status = param.status; - service.created_by = req.auth.data.name; - service.updated_by = req.auth.data.name; + service.created_by = req.auth?.data.name; + service.updated_by = req.auth?.data.name; await queryRunner.manager.save(service); await queryRunner.commitTransaction(); @@ -181,7 +181,7 @@ export class ServiceController { service.name = param.name; service.serviceType = serviceType; service.status = param.status; - service.updated_by = req.auth.data.name; + service.updated_by = req.auth?.data.name; await queryRunner.manager.save(service); await queryRunner.commitTransaction(); @@ -268,7 +268,7 @@ export class ServiceController { if (!service) throw { message: "Service " + Language.lang.failed_not_found }; - service.deleted_by = req.auth.data.name; + service.deleted_by = req.auth?.data.name; service.deleted_at = moment().toDate(); await OrmHelper.DB.manager.save(service); affected = 1;