Skip to content

Commit 94fcbb8

Browse files
committed
fix: return controller user
1 parent 51d7eab commit 94fcbb8

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/controllers/User/controller.ts

+16-16
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 UserService from './service'
78

89
const { APP_KEY_REDIS } = process.env
@@ -13,8 +14,10 @@ routes.get(
1314
'/user',
1415
Authorization,
1516
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 })
1821
})
1922
)
2023

@@ -23,9 +26,11 @@ routes.get(
2326
Authorization,
2427
asyncHandler(async function getOne(req: Request, res: Response) {
2528
const { id } = req.getParams()
29+
2630
const data = await UserService.getOne(id)
31+
const buildResponse = ResponseSuccess.get()
2732

28-
return res.status(200).json({ data })
33+
return res.status(200).json({ ...buildResponse, data })
2934
})
3035
)
3136

@@ -36,13 +41,11 @@ routes.post(
3641
const txn = await req.getTransaction()
3742
const formData = req.getBody()
3843

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()
4346

4447
await txn.commit()
45-
return res.status(201).json({ message, data, dataUserRole })
48+
return res.status(201).json({ ...buildResponse, data })
4649
})
4750
)
4851

@@ -54,14 +57,11 @@ routes.put(
5457
const formData = req.getBody()
5558
const { id } = req.getParams()
5659

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()
6262

6363
await txn.commit()
64-
return res.status(200).json({ message, data, dataUserRole })
64+
return res.status(200).json({ ...buildResponse, data })
6565
})
6666
)
6767

@@ -70,8 +70,8 @@ routes.delete(
7070
Authorization,
7171
asyncHandler(async function deleteData(req: Request, res: Response) {
7272
const { id } = req.getParams()
73-
const { message } = await UserService.delete(id)
73+
const { code, message } = await UserService.delete(id)
7474

75-
return res.status(200).json({ message })
75+
return res.status(200).json({ code, message })
7676
})
7777
)

0 commit comments

Comments
 (0)