Skip to content

Commit 0456157

Browse files
committed
use userId in userMetadata update variable; add test
1 parent 4438b7b commit 0456157

2 files changed

Lines changed: 25 additions & 1 deletion

File tree

app/middleware/acl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ module.exports = async (req, res, next) => {
126126
? new Date(userMetadata.lastLoginAt).toDateString()
127127
: '';
128128
if (userLastLogin !== currentDate) {
129-
await userMetadata.update({lastLoginAt: new Date(), updatedBy: req.user.id});
129+
await userMetadata.update({lastLoginAt: new Date()}, {userId: req.user.id});
130130
}
131131

132132
try {

test/routes/user/user.test.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,17 @@ beforeAll(async () => {
4646
// Tests for user related endpoints
4747
describe('/user', () => {
4848
let testUser;
49+
let managerUser;
4950
let adminGroup;
5051

5152
beforeAll(async () => {
5253
// get test user
5354
testUser = await db.models.user.findOne({
5455
where: {username},
5556
});
57+
managerUser = await db.models.user.findOne({
58+
where: {username: managerUsername},
59+
});
5660
adminGroup = await db.models.userGroup.findOne({
5761
where: {name: 'admin'},
5862
});
@@ -162,6 +166,16 @@ describe('/user', () => {
162166
})
163167
.expect(HTTP_STATUS.CREATED);
164168

169+
const createdUser = await db.models.user.findOne({
170+
where: {ident: res.body.ident},
171+
});
172+
const createdMetadata = await db.models.userMetadata.findOne({
173+
where: {userId: createdUser.id},
174+
});
175+
176+
expect(createdUser.updatedBy).toBe(testUser.id);
177+
expect(createdMetadata.updatedBy).toBe(testUser.id);
178+
165179
// Remove test user from db
166180
await db.models.user.destroy({where: {ident: res.body.ident}, force: true});
167181
});
@@ -180,6 +194,16 @@ describe('/user', () => {
180194
})
181195
.expect(HTTP_STATUS.CREATED);
182196

197+
const createdUser = await db.models.user.findOne({
198+
where: {ident: res.body.ident},
199+
});
200+
const createdMetadata = await db.models.userMetadata.findOne({
201+
where: {userId: createdUser.id},
202+
});
203+
204+
expect(createdUser.updatedBy).toBe(managerUser.id);
205+
expect(createdMetadata.updatedBy).toBe(managerUser.id);
206+
183207
// Remove test user from db
184208
await db.models.user.destroy({where: {ident: res.body.ident}, force: true});
185209
});

0 commit comments

Comments
 (0)