Skip to content

Commit

Permalink
Merge pull request #26 from Trazi-Ventures/feature-#73-user-domain-au…
Browse files Browse the repository at this point in the history 
…dits

Add domains to audit logs
  • Loading branch information
@Phara0h
Phara0h committed Dec 15, 2022
2 parents 2357637 + 8d46ede commit 7da358b
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/routes/v1/functions/audit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ async function getAudits(opts) {
if (opts.req.query.resolve) {
// Audit base query joins users to retrieve first and last names
query =
'select audits.id, audits.created_on, audits.action, audits.subaction, audits.by_user_id, audits.of_user_id, audits.prop, audits.old_val, audits.new_val, users1.firstName as by_user_firstname, users1.lastname as by_user_lastname, users2.firstName as of_user_firstname, users2.lastname as of_user_lastname from audits join users as users1 on users1.id = audits.by_user_id join users as users2 on users2.id = audits.of_user_id ';
'select audits.id, audits.created_on, audits.action, audits.subaction, audits.by_user_id, audits.of_user_id, audits.prop, audits.old_val, audits.new_val, users1.firstName as by_user_firstname, users1.lastname as by_user_lastname, users1.domain as by_user_domain, users2.firstName as of_user_firstname, users2.lastname as of_user_lastname, users2.domain as of_user_domain from audits join users as users1 on users1.id = audits.by_user_id join users as users2 on users2.id = audits.of_user_id ';
}

// Strip filter white space
Expand Down
53 changes: 50 additions & 3 deletions tests/endpoints/audit.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const config = require('../../include/utils/config');
const User = require('../../include/database/models/user');
const Audit = require('../../include/database/models/audit');
const { Travelling } = require('../../sdk/node')('http://127.0.0.1:6969/' + config.serviceName, {
resolveWithFullResponse: true
});
Expand Down Expand Up @@ -38,8 +37,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0]).toHaveProperty('old_val');
expect(res.body[0]).toHaveProperty('new_val');
expect(res.body[0].subaction).not.toBeNull();
Expand Down Expand Up @@ -70,8 +71,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].by_user_id).toEqual(testUser1[0].id);
});

Expand All @@ -95,8 +98,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].by_user_id).toEqual(testUser1[0].id);
});

Expand All @@ -121,8 +126,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].by_user_id).toEqual(testUser1[0].id);
});

Expand Down Expand Up @@ -163,8 +170,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].by_user_id).toEqual(testUser1[0].id);
});

Expand Down Expand Up @@ -221,8 +230,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].by_user_id).toEqual(testUser1[0].id);
});

Expand Down Expand Up @@ -275,8 +286,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].of_user_id).toEqual(testUser1[0].id);
});

Expand All @@ -300,8 +313,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].of_user_id).toEqual(testUser1[0].id);
});

Expand All @@ -325,8 +340,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].of_user_id).toEqual(testUser1[0].id);
});

Expand All @@ -351,8 +368,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].of_user_id).toEqual(testUser1[0].id);
});

Expand Down Expand Up @@ -401,8 +420,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].of_user_id).toEqual(testUser1[0].id);

// Test with exculding self ID
Expand All @@ -426,8 +447,10 @@ module.exports = () => {
expect(exclusionRes.body[0].subaction).not.toBeNull();
expect(exclusionRes.body[0]).toHaveProperty('by_user_firstname');
expect(exclusionRes.body[0]).toHaveProperty('by_user_lastname');
expect(exclusionRes.body[0]).toHaveProperty('by_user_domain');
expect(exclusionRes.body[0]).toHaveProperty('of_user_firstname');
expect(exclusionRes.body[0]).toHaveProperty('of_user_lastname');
expect(exclusionRes.body[0]).toHaveProperty('of_user_domain');
expect(exclusionRes.body[0].of_user_id).toEqual(testUser1[0].id);
});

Expand All @@ -451,8 +474,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].of_user_id).toEqual(testUser1[0].id);
});

Expand Down Expand Up @@ -482,8 +507,10 @@ module.exports = () => {
expect(res.body[0].subaction).not.toBeNull();
expect(res.body[0]).toHaveProperty('by_user_firstname');
expect(res.body[0]).toHaveProperty('by_user_lastname');
expect(res.body[0]).toHaveProperty('by_user_domain');
expect(res.body[0]).toHaveProperty('of_user_firstname');
expect(res.body[0]).toHaveProperty('of_user_lastname');
expect(res.body[0]).toHaveProperty('of_user_domain');
expect(res.body[0].of_user_id).toEqual(testUser1[0].id);
});

Expand Down Expand Up @@ -630,15 +657,35 @@ module.exports = () => {
});

test('Get Audit ByUser - Missing User ID', async () => {
const res = await Travelling.Audit.User.byuserId('', null, null, null, null, null, true, null, userContainer.user1Token);
const res = await Travelling.Audit.User.byuserId(
'',
null,
null,
null,
null,
null,
true,
null,
userContainer.user1Token
);

expect(res.statusCode).toEqual(400);
expect(res.body).toHaveProperty('msg', 'Please provide a valid uuid.');
expect(res.body).toHaveProperty('type', 'validation-error');
});

test('Get Audit OfUser - Missing User Id', async () => {
const res = await Travelling.Audit.User.ofuserId('', null, null, null, null, null, true, null, userContainer.user1Token);
const res = await Travelling.Audit.User.ofuserId(
'',
null,
null,
null,
null,
null,
true,
null,
userContainer.user1Token
);

expect(res.statusCode).toEqual(400);
expect(res.body).toHaveProperty('msg', 'Please provide a valid uuid.');
Expand Down

0 comments on commit 7da358b

Please sign in to comment.