Merge pull request #394 from Real-Dev-Squad/develop

develop to main sync

Author: sumitd94

CONTRIBUTING.md

@@ -1,4 +1,3 @@
-
 # Contributing to Real Dev Squad API
 
 - [Getting Started](#getting-started)
@@ -25,19 +24,22 @@ The script associated with `npm run test` will run all tests that ensures that y
 repository. This will run the lint, integration and unit tests.
 
 ##### `npm run lint`
+
 Runs the lint checks in the project.
 
 ##### `npm run generate-api-schema`
+
 Generates the API schema in the file `public/apiSchema.json`.
 
 ##### `npm run validate-setup`
-Runs the test for checking local development setup is working properly or not.
 
+Runs the test for checking local development setup is working properly or not.
 
 ## Project Structure
+
 The following project structure should be followed:
 
-``` shell script
+```shell script
 |-- website-backend
     |-- config
     |   |-- custom-environment-variables.js
@@ -89,6 +91,7 @@ The following project structure should be followed:
 ```
 
 ## Generating Authentication Token
+
 - Run the project locally, make sure the server is listening to requests
 - Navigate to `https://github.com/login/oauth/authorize?client_id=<GITHUB_CLIENT_ID>`
 - Authorize the application
@@ -97,8 +100,8 @@ The following project structure should be followed:
 - For non-production environments, authentication is also supported with the `Authorization` header.
 - Authorization header: `Authorization: Bearer <token>`
 
-
 ## Testing Guidelines
+
 - Libraries used in testing in the project:
   - [mocha](https://mochajs.org/): Test framework
   - [chai](https://www.chaijs.com/): Assertion library
@@ -110,6 +113,7 @@ The following project structure should be followed:
   - Java version 1.8 or higher.
 
 ## Using Firebase Emulator Locally
+
 - [Firebase Local Emulator Suite](https://firebase.google.com/docs/emulator-suite) can be used locally as the DB for the project
 - Pre-requisites:
   - Node.js version 8.0 or higher.
@@ -119,15 +123,18 @@ The following project structure should be followed:
 - [Future] You can view the emulator UI at: `http://localhost:4000`
 
 ## Running test scripts on Windows
+
 - Git Bash is recommended for running test scripts on Windows.
 - Run `npm run test-integration` for running integration tests.
 - Run `npm run test-unit` for running unit tests.
-- Make sure to close the emulator window after running the tests in order to avoid the blocking of the port for the next tests to run. 
+- Make sure the server is not running.
+- Make sure to close the emulator window after running the tests in order to avoid the blocking of the port for the next tests to run.
 - For e.g - After running the integration tests, close the emulator window and then run the command for unit tests.
 
 ## Pull request guidelines
+
 - Ensure that the tests pass locally before raising a PR.
 - All pull requests should have base as the develop branch.
 - Every pull request should have associated issue(s) on our [issue tracker](https://github.com/Real-Dev-Squad/website-backend/issues).
 - For any non-trivial fixes and features, unit and integration tests must be added. The PR reviewer should not approve/merge PR(s) that lack these.
-- The PR(s) should be merged only after the CI passes.
+- The PR(s) should be merged only after the CI passes.

constants/tasks.js

@@ -8,7 +8,8 @@ const TASK_STATUS = {
   ACTIVE: 'active',
   ASSIGNED: 'assigned',
   BLOCKED: 'blocked',
-  COMPLETED: 'completed'
+  COMPLETED: 'completed',
+  UNASSIGNED: 'unAssigned'
 }
 
 module.exports = { TASK_TYPE, TASK_STATUS }

controllers/tasks.js

@@ -1,4 +1,5 @@
 const tasks = require('../models/tasks')
+const { TASK_STATUS } = require('../constants/tasks')
 /**
  * Creates new task
  *
@@ -52,8 +53,15 @@ const fetchTasks = async (req, res) => {
  */
 const getUserTasks = async (req, res) => {
   try {
+    const { status } = req.query
     const { username } = req.params
-    const allTasks = await tasks.fetchUserTasks(username)
+    let allTasks = []
+
+    if (!Object.values(TASK_STATUS).includes(status)) {
+      return res.boom.notFound('Status not found!')
+    }
+
+    allTasks = await tasks.fetchUserTasks(username, status ? [status] : [])
 
     if (allTasks.userNotFound) {
       return res.boom.notFound('User doesn\'t exist')

package-lock.json

@@ -173,7 +173,7 @@ describe('Tasks', function () {
         title: 'Assigned task',
         purpose: 'To Test mocha',
         featureUrl: '<testUrl>',
-        type: 'Dev | Group',
+        type: 'group',
         links: [
           'test1'
         ],
@@ -185,11 +185,10 @@ describe('Tasks', function () {
           'd12',
           'd23'
         ],
-        participants: [appOwner.username],
+        participants: ['user1'],
         completionAward: { [DINERO]: 3, [NEELAM]: 300 },
         lossRate: { [DINERO]: 1 },
-        isNoteworthy: true,
-        assignee: 'user1'
+        isNoteworthy: true
       }
       const { taskId } = await tasks.updateTask(assignedTask)
       const res = await chai
@@ -261,7 +260,7 @@ describe('Tasks', function () {
     it('Should return 200 when username is valid', function (done) {
       chai
         .request(app)
-        .get(`/tasks/${appOwner.username}`)
+        .get(`/tasks/${appOwner.username}?status=active`)
         .end((err, res) => {
           if (err) { return done(err) }
           expect(res).to.have.status(200)
@@ -284,7 +283,7 @@ describe('Tasks', function () {
     it('Should return 404 when username is invalid', function (done) {
       chai
         .request(app)
-        .get('/tasks/dummyUser')
+        .get('/tasks/dummyUser?status=active')
         .end((err, res) => {
           if (err) { return done(err) }
           expect(res).to.have.status(404)

test/integration/tasks.test.js

@@ -1,19 +1,23 @@
 
 const { getUsername, getUserId, getParticipantUsernames, getParticipantUserIds } = require('./users')
+const { TASK_TYPE } = require('../constants/tasks')
 
 const fromFirestoreData = async (task) => {
   if (!task) {
     return task
   }
-  let { createdBy, assignee, participants } = task
+
+  let { createdBy, assignee, participants, type } = task
+
   if (createdBy) {
     createdBy = await getUsername(createdBy)
   }
+
   if (assignee) {
     assignee = await getUsername(assignee)
   }
 
-  if (Array.isArray(participants)) {
+  if (type === TASK_TYPE.GROUP) {
     participants = await getParticipantUsernames(participants)
   }