Skip to content

Commit b812c76

Browse files
committed
fix: return controller role
1 parent 1cee844 commit b812c76

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

src/controllers/Role/controller.ts

+18-9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Request, Response } from 'express'
33
import routes from 'routes/public'
44
import asyncHandler from 'helpers/asyncHandler'
55
import Authorization from 'middlewares/Authorization'
6+
import ResponseSuccess from 'modules/Response/ResponseSuccess'
67
import RoleService from './service'
78

89
const { APP_KEY_REDIS } = process.env
@@ -12,18 +13,22 @@ const keyGetAll = `${APP_KEY_REDIS}_role:getAll`
1213
routes.get(
1314
'/role',
1415
asyncHandler(async function getAll(req: Request, res: Response) {
15-
const { data, total } = await RoleService.getAll(req)
16-
return res.status(200).json({ data, total })
16+
const { message, data, total } = await RoleService.getAll(req)
17+
const buildResponse = ResponseSuccess.get(message)
18+
19+
return res.status(200).json({ ...buildResponse, data, total })
1720
})
1821
)
1922

2023
routes.get(
2124
'/role/:id',
2225
asyncHandler(async function getOne(req: Request, res: Response) {
2326
const { id } = req.getParams()
27+
2428
const data = await RoleService.getOne(id)
29+
const buildResponse = ResponseSuccess.get()
2530

26-
return res.status(200).json({ data })
31+
return res.status(200).json({ ...buildResponse, data })
2732
})
2833
)
2934

@@ -32,9 +37,11 @@ routes.post(
3237
Authorization,
3338
asyncHandler(async function createData(req: Request, res: Response) {
3439
const formData = req.getBody()
35-
const { message, data } = await RoleService.create(formData)
3640

37-
return res.status(201).json({ message, data })
41+
const data = await RoleService.create(formData)
42+
const buildResponse = ResponseSuccess.created()
43+
44+
return res.status(201).json({ ...buildResponse, data })
3845
})
3946
)
4047

@@ -44,9 +51,11 @@ routes.put(
4451
asyncHandler(async function updateData(req: Request, res: Response) {
4552
const { id } = req.getParams()
4653
const formData = req.getBody()
47-
const { message, data } = await RoleService.update(id, formData)
4854

49-
return res.status(200).json({ message, data })
55+
const data = await RoleService.update(id, formData)
56+
const buildResponse = ResponseSuccess.updated()
57+
58+
return res.status(200).json({ ...buildResponse, data })
5059
})
5160
)
5261

@@ -55,8 +64,8 @@ routes.delete(
5564
Authorization,
5665
asyncHandler(async function deleteData(req: Request, res: Response) {
5766
const { id } = req.getParams()
58-
const { message } = await RoleService.delete(id)
67+
const { code, message } = await RoleService.delete(id)
5968

60-
return res.status(200).json({ message })
69+
return res.status(200).json({ code, message })
6170
})
6271
)

0 commit comments

Comments
 (0)