@@ -3,6 +3,7 @@ import { Request, Response } from 'express'
3
3
import routes from 'routes/public'
4
4
import asyncHandler from 'helpers/asyncHandler'
5
5
import Authorization from 'middlewares/Authorization'
6
+ import ResponseSuccess from 'modules/Response/ResponseSuccess'
6
7
import RoleService from './service'
7
8
8
9
const { APP_KEY_REDIS } = process . env
@@ -12,18 +13,22 @@ const keyGetAll = `${APP_KEY_REDIS}_role:getAll`
12
13
routes . get (
13
14
'/role' ,
14
15
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 } )
17
20
} )
18
21
)
19
22
20
23
routes . get (
21
24
'/role/:id' ,
22
25
asyncHandler ( async function getOne ( req : Request , res : Response ) {
23
26
const { id } = req . getParams ( )
27
+
24
28
const data = await RoleService . getOne ( id )
29
+ const buildResponse = ResponseSuccess . get ( )
25
30
26
- return res . status ( 200 ) . json ( { data } )
31
+ return res . status ( 200 ) . json ( { ... buildResponse , data } )
27
32
} )
28
33
)
29
34
@@ -32,9 +37,11 @@ routes.post(
32
37
Authorization ,
33
38
asyncHandler ( async function createData ( req : Request , res : Response ) {
34
39
const formData = req . getBody ( )
35
- const { message, data } = await RoleService . create ( formData )
36
40
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 } )
38
45
} )
39
46
)
40
47
@@ -44,9 +51,11 @@ routes.put(
44
51
asyncHandler ( async function updateData ( req : Request , res : Response ) {
45
52
const { id } = req . getParams ( )
46
53
const formData = req . getBody ( )
47
- const { message, data } = await RoleService . update ( id , formData )
48
54
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 } )
50
59
} )
51
60
)
52
61
@@ -55,8 +64,8 @@ routes.delete(
55
64
Authorization ,
56
65
asyncHandler ( async function deleteData ( req : Request , res : Response ) {
57
66
const { id } = req . getParams ( )
58
- const { message } = await RoleService . delete ( id )
67
+ const { code , message } = await RoleService . delete ( id )
59
68
60
- return res . status ( 200 ) . json ( { message } )
69
+ return res . status ( 200 ) . json ( { code , message } )
61
70
} )
62
71
)
0 commit comments