Skip to content

Commit 4438b7b

Browse files
committed
add updated_by to user and metadata table
1 parent 64b740e commit 4438b7b

4 files changed

Lines changed: 19 additions & 6 deletions

File tree

app/middleware/acl.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,16 @@ module.exports = async (req, res, next) => {
117117
try {
118118
// Update last time the user logged in, limit to once a day
119119
const currentDate = new Date().toDateString();
120-
let userMetadata = await db.models.userMetadata.findOrCreate({where: {userId: req.user.id}});
120+
let userMetadata = await db.models.userMetadata.findOrCreate({
121+
where: {userId: req.user.id},
122+
defaults: {updatedBy: req.user.id},
123+
});
121124
userMetadata = userMetadata[0];
122125
const userLastLogin = userMetadata.lastLoginAt
123126
? new Date(userMetadata.lastLoginAt).toDateString()
124127
: '';
125128
if (userLastLogin !== currentDate) {
126-
await userMetadata.update({lastLoginAt: new Date()});
129+
await userMetadata.update({lastLoginAt: new Date(), updatedBy: req.user.id});
127130
}
128131

129132
try {

app/routes/user/settings.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ router.route('/')
2121
})
2222
.put(async (req, res) => {
2323
try {
24-
await db.models.userMetadata.update({settings: req.body}, {
24+
await db.models.userMetadata.update({
25+
settings: req.body,
26+
updatedBy: req.user.id,
27+
}, {
2528
where: {
2629
user_id: req.user.id,
2730
},
28-
fields: ['settings'],
31+
fields: ['settings', 'updatedBy'],
2932
hooks: false,
3033
limit: 1,
3134
});

app/routes/user/user.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,15 @@ router.route('/')
260260
// Create transaction
261261
transaction = await db.transaction();
262262
// Create user
263-
const createdUser = await db.models.user.create(req.body, {transaction});
263+
const createdUser = await db.models.user.create({
264+
...req.body,
265+
updatedBy: req.user.id,
266+
}, {transaction});
264267
// Create user metadata
265-
await db.models.userMetadata.create({userId: createdUser.id}, {transaction});
268+
await db.models.userMetadata.create({
269+
userId: createdUser.id,
270+
updatedBy: req.user.id,
271+
}, {transaction});
266272
// Commit changes
267273
await transaction.commit();
268274
// Return new user

test/routes/user/settings.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ describe('/user/settings', () => {
6868
where: {userId: testUser.id},
6969
});
7070
expect(results.length).toBe(1);
71+
expect(results[0].updatedBy).toBe(testUser.id);
7172
});
7273
});
7374
});

0 commit comments

Comments
 (0)