pull/1/head
Aji Kamaludin 3 years ago
parent d0e0a595b5
commit 803a282823
No known key found for this signature in database
GPG Key ID: 670E1F26AD5A8099

@ -59,12 +59,12 @@ class UsersHandler {
const { companyId } = request.auth.credentials; const { companyId } = request.auth.credentials;
const { id: userId } = request.params; const { id: userId } = request.params;
const users = await this._service.getUserById({ userId, companyId }); const user = await this._service.getUserById({ userId, companyId });
return { return {
status: 'success', status: 'success',
data: { data: {
users, user,
}, },
}; };
} catch (error) { } catch (error) {

@ -79,7 +79,7 @@ class UsersService {
const query = { const query = {
text: ` text: `
SELECT name, email, role FROM users WHERE company_id = $1 SELECT id, name, email, role FROM users WHERE company_id = $1
${q !== null ? `AND name ILIKE '%${q}%'` : ''} ${q !== null ? `AND name ILIKE '%${q}%'` : ''}
ORDER BY created_at DESC ORDER BY created_at DESC
LIMIT $2 OFFSET $3`, LIMIT $2 OFFSET $3`,
@ -102,7 +102,7 @@ class UsersService {
validateUuid(userId); validateUuid(userId);
const query = { const query = {
text: 'SELECT name, email, role FROM users WHERE id = $1 AND company_id = $2', text: 'SELECT id, name, email, role FROM users WHERE id = $1 AND company_id = $2',
values: [userId, companyId], values: [userId, companyId],
}; };
@ -120,7 +120,7 @@ class UsersService {
const query = { const query = {
text: `SELECT text: `SELECT
users.name, role, users.email, offices.id as officeId, companies.id as companyId users.id, users.name, role, users.email, offices.id as officeId, companies.id as companyId
FROM users FROM users
LEFT JOIN companies ON companies.id = users.company_id LEFT JOIN companies ON companies.id = users.company_id
LEFT JOIN offices ON companies.id = offices.company_id LEFT JOIN offices ON companies.id = offices.company_id

Loading…
Cancel
Save