Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 46 additions & 16 deletions src/controllers/taskController.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,24 @@ const followUp = require('../models/followUp');
const logger = require('../startup/logger');

const taskController = function (Task) {
const getTasks = (req, res) => {
const canSeeTaskExtensionCount = async (requestor) =>
(await hasPermission(requestor, 'seeNumberOfTimesTimeAdded')) ||
(await hasPermission(requestor, 'viewTaskExtensionCount'));
Comment on lines +17 to +18
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(await hasPermission(requestor, 'seeNumberOfTimesTimeAdded')) ||
(await hasPermission(requestor, 'viewTaskExtensionCount'));
(await hasPermission(requestor, 'seeNumberOfTimesTimeAdded'));

Is viewTaskExtensionCount implemented as something else or a different name for what ended up as seeNumberOfTimesTimeAdded? I don't see it used anywhere.


const removeTaskExtensionCounts = (value) => {
if (Array.isArray(value)) {
value.forEach(removeTaskExtensionCounts);
return value;
}
if (value && typeof value === 'object') {
if (Object.prototype.hasOwnProperty.call(value, 'deadlineCount')) {
delete value.deadlineCount;
}
Object.values(value).forEach(removeTaskExtensionCounts);
}
return value;
};
const getTasks = async (req, res) => {
const { level } = req.params;

let query = {
Expand All @@ -32,19 +49,25 @@ const taskController = function (Task) {
};
}

Task.find(query)
.populate('createdBy', 'firstName lastName email') // <-- added
.lean()
.then((results) => {
const withCreator = results.map((t) => ({
...t,
creatorName: t.createdBy
? [t.createdBy.firstName, t.createdBy.lastName].filter(Boolean).join(' ').trim()
: undefined,
}));
return res.status(200).send(withCreator);
})
.catch((error) => res.status(404).send(error));
try {
const results = await Task.find(query)
.populate('createdBy', 'firstName lastName email')
.lean();

const withCreator = results.map((t) => ({
...t,
creatorName: t.createdBy
? [t.createdBy.firstName, t.createdBy.lastName].filter(Boolean).join(' ').trim()
: undefined,
}));

const canSeeCount = await canSeeTaskExtensionCount(req.body.requestor);
return res
.status(200)
.send(canSeeCount ? withCreator : removeTaskExtensionCounts(withCreator));
} catch (error) {
return res.status(404).send(error);
}
};

const getWBSId = (req, res) => {
Expand Down Expand Up @@ -1071,6 +1094,9 @@ const taskController = function (Task) {
resource.name = resourceNames[index] !== ' ' ? resourceNames[index] : resource.name;
});

const canSeeCount = await canSeeTaskExtensionCount(req.body.requestor);
if (!canSeeCount) removeTaskExtensionCounts(task);

return res.status(200).send(task);
} catch (error) {
return res.status(500).send({ error: 'Internal Server Error', details: error.message });
Expand Down Expand Up @@ -1267,12 +1293,16 @@ const taskController = function (Task) {

if (teamsData && teamsData.length > 0) {
await attachCreatorNames(teamsData);
return res.status(200).send(teamsData);
const canSeeCount = await canSeeTaskExtensionCount(req.body.requestor);
return res.status(200).send(canSeeCount ? teamsData : removeTaskExtensionCounts(teamsData));
}

const singleUserData = await taskHelper.getTasksForSingleUser(userId).exec();
await attachCreatorNames(singleUserData);
return res.status(200).send(singleUserData);
const canSeeCount = await canSeeTaskExtensionCount(req.body.requestor);
return res
.status(200)
.send(canSeeCount ? singleUserData : removeTaskExtensionCounts(singleUserData));
} catch (error) {
console.log(error);
return res.status(400).send({ error });
Expand Down
16 changes: 16 additions & 0 deletions src/controllers/taskController.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,22 @@ describe('Unit Tests for taskController.js', () => {
expect(taskFindSpy).toHaveBeenCalled();
expect(taskFindSpy).toHaveBeenCalledTimes(1);
});

test('Hides deadlineCount when the user lacks task extension count permission', async () => {
const { getTasks } = makeSut();
const mockData = [{ _id: '1', taskName: 'A', deadlineCount: 5, createdBy: null }];
const chain = makeFindChain({ data: mockData });
jest.spyOn(Task, 'find').mockReturnValueOnce(chain);
hasPermission.mockResolvedValue(false);

const response = await getTasks(mockReq, mockRes);
await flushPromises();

const expected = mockData.map((t) => ({ ...t, creatorName: undefined }));
delete expected[0].deadlineCount;
assertResMock(200, expected, response, mockRes);
expect(chain.populate).toHaveBeenCalled();
});
});

describe('getWBSId function', () => {
Expand Down
2 changes: 2 additions & 0 deletions src/test/createTestPermissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const permissionsRoles = [
'swapTask',
'deleteTask',
'viewTaskExtensionCount', // to view task extension count
'seeNumberOfTimesTimeAdded',
'updateNum',
// Teams
'postTeam',
Expand Down Expand Up @@ -189,6 +190,7 @@ const permissionsRoles = [
'importTask',
'postTask',
'viewTaskExtensionCount', // to view task extension count
'seeNumberOfTimesTimeAdded',
'updateNum',
'updateTask',
'swapTask',
Expand Down
2 changes: 2 additions & 0 deletions src/utilities/createInitialPermissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const permissionsRoles = [
'swapTask',
'deleteTask',
'viewTaskExtensionCount', // to view task extension count
'seeNumberOfTimesTimeAdded',
'updateNum',
// Teams
'postTeam',
Expand Down Expand Up @@ -225,6 +226,7 @@ const permissionsRoles = [
'importTask',
'postTask',
'viewTaskExtensionCount', // to view task extension count
'seeNumberOfTimesTimeAdded',
'updateNum',
'updateTask',
'swapTask',
Expand Down
Loading