Spaces:
Runtime error
Runtime error
Commit ·
1056391
1
Parent(s): a135c7b
incluede role data in user list
Browse files
src/controllers/user.controller.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { UserInterface } from '../shared/interfaces/user.interface';
|
|
| 4 |
import { hashPassword } from '../utils/passwordUtils';
|
| 5 |
import { FindOptions, Op } from 'sequelize';
|
| 6 |
import { logger } from '../utils/logger';
|
|
|
|
| 7 |
|
| 8 |
const createUser = async (req: Request, res: Response) => {
|
| 9 |
|
|
@@ -144,7 +145,8 @@ const getAllUsers = async (req: Request, res: Response) => {
|
|
| 144 |
}
|
| 145 |
|
| 146 |
const [users, totalUsers] = await Promise.all([
|
| 147 |
-
User.findAll(options
|
|
|
|
| 148 |
User.count({ where: whereClause }),
|
| 149 |
]);
|
| 150 |
|
|
|
|
| 4 |
import { hashPassword } from '../utils/passwordUtils';
|
| 5 |
import { FindOptions, Op } from 'sequelize';
|
| 6 |
import { logger } from '../utils/logger';
|
| 7 |
+
import Role from '../models/roles';
|
| 8 |
|
| 9 |
const createUser = async (req: Request, res: Response) => {
|
| 10 |
|
|
|
|
| 145 |
}
|
| 146 |
|
| 147 |
const [users, totalUsers] = await Promise.all([
|
| 148 |
+
User.findAll({...options, include: [{ model: Role, as: 'role'}
|
| 149 |
+
]}),
|
| 150 |
User.count({ where: whereClause }),
|
| 151 |
]);
|
| 152 |
|
src/models/users.ts
CHANGED
|
@@ -72,6 +72,6 @@ User.init(
|
|
| 72 |
}
|
| 73 |
);
|
| 74 |
|
| 75 |
-
User.belongsTo(Role, { foreignKey: 'role_id' });
|
| 76 |
|
| 77 |
export default User;
|
|
|
|
| 72 |
}
|
| 73 |
);
|
| 74 |
|
| 75 |
+
User.belongsTo(Role, { foreignKey: 'role_id', as : 'role' });
|
| 76 |
|
| 77 |
export default User;
|