@@ -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 UserService from './service'
7
8
8
9
const { APP_KEY_REDIS } = process . env
@@ -13,8 +14,10 @@ routes.get(
13
14
'/user' ,
14
15
Authorization ,
15
16
asyncHandler ( async function getAll ( req : Request , res : Response ) {
16
- const { data, total } = await UserService . getAll ( req )
17
- return res . status ( 200 ) . json ( { data, total } )
17
+ const { message, data, total } = await UserService . getAll ( req )
18
+ const buildResponse = ResponseSuccess . get ( message )
19
+
20
+ return res . status ( 200 ) . json ( { ...buildResponse , data, total } )
18
21
} )
19
22
)
20
23
@@ -23,9 +26,11 @@ routes.get(
23
26
Authorization ,
24
27
asyncHandler ( async function getOne ( req : Request , res : Response ) {
25
28
const { id } = req . getParams ( )
29
+
26
30
const data = await UserService . getOne ( id )
31
+ const buildResponse = ResponseSuccess . get ( )
27
32
28
- return res . status ( 200 ) . json ( { data } )
33
+ return res . status ( 200 ) . json ( { ... buildResponse , data } )
29
34
} )
30
35
)
31
36
@@ -36,13 +41,11 @@ routes.post(
36
41
const txn = await req . getTransaction ( )
37
42
const formData = req . getBody ( )
38
43
39
- const { message, data, dataUserRole } = await UserService . create (
40
- formData ,
41
- txn
42
- )
44
+ const data = await UserService . create ( formData , txn )
45
+ const buildResponse = ResponseSuccess . created ( )
43
46
44
47
await txn . commit ( )
45
- return res . status ( 201 ) . json ( { message , data, dataUserRole } )
48
+ return res . status ( 201 ) . json ( { ... buildResponse , data } )
46
49
} )
47
50
)
48
51
@@ -54,14 +57,11 @@ routes.put(
54
57
const formData = req . getBody ( )
55
58
const { id } = req . getParams ( )
56
59
57
- const { message, data, dataUserRole } = await UserService . update (
58
- id ,
59
- formData ,
60
- txn
61
- )
60
+ const data = await UserService . update ( id , formData , txn )
61
+ const buildResponse = ResponseSuccess . updated ( )
62
62
63
63
await txn . commit ( )
64
- return res . status ( 200 ) . json ( { message , data, dataUserRole } )
64
+ return res . status ( 200 ) . json ( { ... buildResponse , data } )
65
65
} )
66
66
)
67
67
@@ -70,8 +70,8 @@ routes.delete(
70
70
Authorization ,
71
71
asyncHandler ( async function deleteData ( req : Request , res : Response ) {
72
72
const { id } = req . getParams ( )
73
- const { message } = await UserService . delete ( id )
73
+ const { code , message } = await UserService . delete ( id )
74
74
75
- return res . status ( 200 ) . json ( { message } )
75
+ return res . status ( 200 ) . json ( { code , message } )
76
76
} )
77
77
)
0 commit comments