Merge pull request #1 from Vividh25/feat/userBadges

Vividh25 · web-flow · commit 5cb74a066f72 · 2021-07-27T00:34:58.000+05:30
resolved merge conflicts
diff --git a/controllers/tasks.js b/controllers/tasks.js
@@ -123,10 +123,33 @@ const updateTask = async (req, res) => {
   }
 }
 
+/**
+ * Updates self task status
+ * @param req {Object} - Express request object
+ * @param res {Object} - Express response object
+ */
+const updateTaskStatus = async (req, res) => {
+  try {
+    const taskId = req.params.id
+    const { id: userId } = req.userData
+    const task = await tasks.fetchSelfTask(taskId, userId)
+
+    if (task.taskNotFound) return res.boom.notFound('Task doesn\'t exist')
+    if (task.notAssignedToYou) return res.boom.forbidden('This task is not assigned to you')
+
+    await tasks.updateTask(req.body, taskId)
+    return res.json({ message: 'Task updated successfully!' })
+  } catch (err) {
+    logger.error(`Error while updating task status : ${err}`)
+    return res.boom.badImplementation('An internal server error occured')
+  }
+}
+
 module.exports = {
   addNewTask,
   fetchTasks,
   updateTask,
   getSelfTasks,
-  getUserTasks
+  getUserTasks,
+  updateTaskStatus
 }
diff --git a/firebase.json b/firebase.json
@@ -8,4 +8,4 @@
       "port": 4000
     }
   }
-}
+}
diff --git a/middlewares/validators/auctions.js b/middlewares/validators/auctions.js
@@ -1,7 +1,7 @@
 const joi = require('joi')
 
 const createAuction = async (req, res, next) => {
-  const schema = joi.object().keys({
+  const schema = joi.object().strict().keys({
     item_type: joi.string().required(),
     quantity: joi.number().required(),
     initial_price: joi.number().required(),
@@ -17,7 +17,7 @@ const createAuction = async (req, res, next) => {
 }
 
 const placeBid = async (req, res, next) => {
-  const schema = joi.object().keys({
+  const schema = joi.object().strict().keys({
     bid: joi.number().required()
   })
   try {
diff --git a/middlewares/validators/featureFlags.js b/middlewares/validators/featureFlags.js
@@ -1,7 +1,7 @@
 const joi = require('joi')
 
 const validateFeatureFlag = async (req, res, next) => {
-  const schema = joi.object().keys({
+  const schema = joi.object().strict().keys({
     name: joi.string().required(),
     title: joi.string().required(),
     created_at: joi.number().optional(),
@@ -22,7 +22,7 @@ const validateFeatureFlag = async (req, res, next) => {
 }
 
 const updateFeatureFlags = async (req, res, next) => {
-  const schema = joi.object().keys({
+  const schema = joi.object().strict().keys({
     title: joi.string().optional(),
     config: joi.object({
       enabled: joi.boolean().required()
diff --git a/middlewares/validators/recruiter.js b/middlewares/validators/recruiter.js
@@ -1,7 +1,7 @@
 const joi = require('joi')
 
 const validateRecruiter = async (req, res, next) => {
-  const schema = joi.object().keys({
+  const schema = joi.object().strict().keys({
     company: joi.string().required(),
     first_name: joi.string().required(),
     last_name: joi.string().required(),
diff --git a/middlewares/validators/stocks.js b/middlewares/validators/stocks.js
@@ -1,7 +1,7 @@
 const joi = require('joi')
 
 const createStock = async (req, res, next) => {
-  const schema = joi.object().keys({
+  const schema = joi.object().strict().keys({
     name: joi.string().required(),
     quantity: joi.number().required(),
     price: joi.number().required()
diff --git a/middlewares/validators/tasks.js b/middlewares/validators/tasks.js
@@ -2,7 +2,7 @@ const joi = require('joi')
 const { DINERO, NEELAM } = require('../../constants/wallets')
 
 const createTask = async (req, res, next) => {
-  const schema = joi.object().keys({
+  const schema = joi.object().strict().keys({
     title: joi.string().required(),
     purpose: joi.string().optional(),
     featureUrl: joi.string().optional(),
@@ -36,7 +36,7 @@ const createTask = async (req, res, next) => {
 }
 
 const updateTask = async (req, res, next) => {
-  const schema = joi.object().keys({
+  const schema = joi.object().strict().keys({
     title: joi.string().optional(),
     purpose: joi.string().optional(),
     featureUrl: joi.string().optional(),
@@ -68,7 +68,22 @@ const updateTask = async (req, res, next) => {
   }
 }
 
+const updateSelfTask = async (req, res, next) => {
+  const schema = joi.object().strict().keys({
+    status: joi.string().optional(),
+    percentCompleted: joi.number().optional()
+  })
+  try {
+    await schema.validateAsync(req.body)
+    next()
+  } catch (error) {
+    logger.error(`Error validating updateSelfTask payload : ${error}`)
+    res.boom.badRequest(error.details[0].message)
+  }
+}
+
 module.exports = {
   createTask,
-  updateTask
+  updateTask,
+  updateSelfTask
 }
diff --git a/middlewares/validators/trading.js b/middlewares/validators/trading.js
@@ -1,7 +1,7 @@
 const joi = require('joi')
 
 const newTrade = async (req, res, next) => {
-  const schema = joi.object().keys({
+  const schema = joi.object().strict().keys({
     stockId: joi.string().required(),
     tradeType: joi.string().required(),
     stockName: joi.string().required(),
diff --git a/middlewares/validators/user.js b/middlewares/validators/user.js
@@ -2,7 +2,7 @@ const joi = require('joi')
 const { userStatusEnum } = require('../../constants/users')
 
 const updateUser = async (req, res, next) => {
-  const schema = joi.object().keys({
+  const schema = joi.object().strict().keys({
     phone: joi.string().optional(),
     email: joi.string().optional(),
     username: joi.string().optional(),
diff --git a/models/tasks.js b/models/tasks.js
@@ -30,7 +30,7 @@ const updateTask = async (taskData, taskId = null) => {
 
     return result
   } catch (err) {
-    logger.error('Error in creating task', err)
+    logger.error('Error in updating task', err)
     throw err
   }
 }
@@ -94,6 +94,25 @@ const fetchTask = async (taskId) => {
   }
 }
 
+/**
+ * Fetch assigned self task
+ * @param taskId { string }: taskId which will be used to fetch the task
+ * @param id { string }: id to check task is assigned to self or not
+ * @return {Promsie<taskData|Object>}
+ */
+const fetchSelfTask = async (taskId, userId) => {
+  try {
+    const task = await tasksModel.doc(taskId).get()
+    const taskData = task.data()
+    if (!taskData) return { taskNotFound: true }
+    if (userId !== taskData.assignee) return { notAssignedToYou: true }
+    return { taskData: await fromFirestoreData(taskData) }
+  } catch (err) {
+    logger.error('Error retrieving self task data', err)
+    throw err
+  }
+}
+
 /**
  * Fetch all the active and blocked tasks of the user
  *
@@ -165,5 +184,6 @@ module.exports = {
   fetchUserTasks,
   fetchUserActiveAndBlockedTasks,
   fetchUserCompletedTasks,
-  fetchActiveTaskMembers
+  fetchActiveTaskMembers,
+  fetchSelfTask
 }
diff --git a/package.json b/package.json
@@ -60,4 +60,4 @@
   "pre-commit": [
     "lint"
   ]
-}
+}
diff --git a/public/apiSchema.json b/public/apiSchema.json
diff --git a/routes/tasks.js b/routes/tasks.js
@@ -2,7 +2,7 @@ const express = require('express')
 const router = express.Router()
 const authenticate = require('../middlewares/authenticate')
 const tasks = require('../controllers/tasks')
-const { createTask, updateTask } = require('../middlewares/validators/tasks')
+const { createTask, updateTask, updateSelfTask } = require('../middlewares/validators/tasks')
 const { authorizeUser } = require('../middlewares/authorization')
 
 /**
@@ -155,4 +155,52 @@ router.patch('/:id', authenticate, authorizeUser('appOwner'), updateTask, tasks.
  */
 router.get('/:username', tasks.getUserTasks)
 
+/**
+ * @swagger
+ * /tasks/self/:id:
+ *  patch:
+ *   summary: used to update self task status
+ *   tags:
+ *     - Tasks
+ *   requestBody:
+ *     desciption: Task status
+ *     required: true
+ *     content:
+ *       application/json:
+ *         schema:
+ *           $ref: '#/components/schemas/tasks'
+ *   responses:
+ *     204:
+ *       description: Status of self task udpated
+ *       content:
+ *         application/json:
+ *           schma:
+ *             $ref: '#/components/schemas/tasks'
+ *     401:
+ *       description: unAuthorized
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/errors/unAuthorized'
+ *     403:
+ *       description: forbidden
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/errors/forbidden'
+ *     404:
+ *       description: notFound
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/errors/notFound'
+ *     500:
+ *       description: badImplementation
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/errors/badImplementation'
+ */
+router.patch('/self/:id', authenticate, updateSelfTask, tasks.updateTaskStatus)
+
 module.exports = router
diff --git a/server.js b/server.js
@@ -52,10 +52,14 @@ function onError (error) {
     case 'EACCES':
       logger.error(bind + ' requires elevated privileges')
       process.exit(1)
+      // eslint-disable-next-line no-unreachable
+      break
 
     case 'EADDRINUSE':
       logger.error(bind + ' is already in use')
       process.exit(1)
+      // eslint-disable-next-line no-unreachable
+      break
 
     default:
       throw error

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@`
`8`	`8`	`"port": 4000`
`9`	`9`	`}`
`10`	`10`	`}`
`11`		`-}`
	`11`	`+}`