Merge branch 'develop' into authorization

Author: ankurnarkhede

constants/users.js

@@ -0,0 +1,2 @@
+const userStatusEnum = ['ooo', 'idle', 'active']
+module.exports = userStatusEnum

controllers/pullRequests.js

@@ -37,7 +37,8 @@ const getUserPRs = async (req, res) => {
  */
 const getStalePRs = async (req, res) => {
   try {
-    const { data } = await githubService.fetchStalePRs()
+    const { size, page } = req.query
+    const { data } = await githubService.fetchStalePRs(size, page)
 
     if (data.total_count) {
       const allPRs = githubService.extractPRdetails(data)
@@ -65,7 +66,8 @@ const getStalePRs = async (req, res) => {
  */
 const getOpenPRs = async (req, res) => {
   try {
-    const { data } = await githubService.fetchOpenPRs((req.query.page) || 1)
+    const { size, page } = req.query
+    const { data } = await githubService.fetchOpenPRs(size, page)
 
     if (data.total_count) {
       const allPRs = githubService.extractPRdetails(data)

controllers/stocks.js

@@ -29,16 +29,36 @@ const fetchStocks = async (req, res) => {
   try {
     const allStock = await stocks.fetchStocks()
     return res.json({
-      message: 'Stocks returned successfully!',
+      message: allStock.length > 0 ? 'Stocks returned successfully!' : 'No stocks found',
       stock: allStock.length > 0 ? allStock : []
     })
   } catch (err) {
     logger.error(`Error while fetching stocks ${err}`)
     return res.boom.badImplementation('An internal server error occurred')
   }
 }
+/**
+ * Fetches all the stocks of the user
+ *
+ * @param req {Object} - Express request object
+ * @param res {Object} - Express response object
+ */
+const getSelfStocks = async (req, res) => {
+  try {
+    const { id: userId } = req.userData
+    const userStocks = await stocks.fetchUserStocks(userId)
+    return res.json({
+      message: userStocks.length > 0 ? 'User stocks returned successfully!' : 'No stocks found',
+      userStocks
+    })
+  } catch (err) {
+    logger.error(`Error while getting user stocks ${err}`)
+    return res.boom.badImplementation('An internal server error occurred')
+  }
+}
 
 module.exports = {
   addNewStock,
-  fetchStocks
+  fetchStocks,
+  getSelfStocks
 }

controllers/trading.js

@@ -1,4 +1,4 @@
-const tradeModel = require('../models/trading')
+const tradeService = require('../services/tradingService')
 /**
  * New Trading Request
  *
@@ -13,15 +13,15 @@ const trade = async (req, res) => {
       username,
       userId
     }
-    const { canUserTrade, errorMessage, userBalance } = await tradeModel.trade(tradeStockData)
+    const { canUserTrade, errorMessage, userBalance } = await tradeService.trade(tradeStockData)
 
     if (!canUserTrade) {
       return res.boom.forbidden(errorMessage)
     }
 
     return res.json({ userBalance })
   } catch (err) {
-    logger.error(`Error while updating task: ${err}`)
+    logger.error(`Error during trading: ${err}`)
     return res.boom.badImplementation('An internal server error occurred')
   }
 }

docs/swaggerDefinition.js

@@ -445,6 +445,9 @@ const swaggerOptions = {
             },
             tokens: {
               type: 'object'
+            },
+            status: {
+              type: 'string'
             }
           }
         },
@@ -521,6 +524,29 @@ const swaggerOptions = {
             }
           }
         },
+        userStocks: {
+          type: 'object',
+          properties: {
+            userId: {
+              type: 'string'
+            },
+            stockId: {
+              type: 'string'
+            },
+            stockName: {
+              type: 'string'
+            },
+            quantity: {
+              type: 'number'
+            },
+            orderValue: {
+              type: 'number'
+            },
+            initialStockValue: {
+              type: 'number'
+            }
+          }
+        },
         auctions: {
           type: 'object',
           properties: {

middlewares/validators/user.js

@@ -1,4 +1,5 @@
 const joi = require('joi')
+const userStatusEnum = require('../../constants/users')
 
 const updateUser = async (req, res, next) => {
   const schema = joi.object().keys({
@@ -14,7 +15,8 @@ const updateUser = async (req, res, next) => {
     linkedin_id: joi.string().optional(),
     twitter_id: joi.string().optional(),
     instagram_id: joi.string().optional(),
-    website: joi.string().optional()
+    website: joi.string().optional(),
+    status: joi.any().valid(...userStatusEnum).optional()
   })
 
   try {

models/stocks.js

@@ -1,5 +1,7 @@
 const firestore = require('../utils/firestore')
 const stocksModel = firestore.collection('stocks')
+const userStocksModel = firestore.collection('user-stocks')
+
 /**
  * Adds Stocks
  *
@@ -38,7 +40,65 @@ const fetchStocks = async () => {
   }
 }
 
+/**
+ * Fetches the user stocks
+ * @return {Promise<userStocks|object>}
+ */
+const fetchUserStocks = async (userId, stockId = null) => {
+  try {
+    let userStocksRef = ''
+    const query = userStocksModel.where('userId', '==', userId)
+    if (stockId) {
+      userStocksRef = await query.where('stockId', '==', stockId).get()
+      const [userStocks] = userStocksRef.docs
+      if (userStocks) {
+        return { id: userStocks.id, ...userStocks.data() }
+      }
+      return {}
+    }
+
+    userStocksRef = await query.get()
+    const userStocks = []
+    userStocksRef.forEach((stock) => {
+      userStocks.push({
+        id: stock.id,
+        ...stock.data()
+      })
+    })
+    return userStocks
+  } catch (err) {
+    logger.error('Error retrieving user stocks', err)
+    throw err
+  }
+}
+
+/**
+ * Update Users Stocks
+ * @return {Promise<userStocks|object>}
+ */
+const updateUserStocks = async (userId, stockData) => {
+  try {
+    const userStocks = await fetchUserStocks(userId, stockData.stockId)
+    if (!userStocks.id) {
+      await userStocksModel.add({
+        userId,
+        ...stockData
+      })
+      return true
+    }
+
+    const userStocksRef = userStocksModel.doc(userStocks.id)
+    const res = await userStocksRef.update(stockData)
+    return !!res
+  } catch (err) {
+    logger.error('Error updating users stocks', err)
+    throw err
+  }
+}
+
 module.exports = {
   addStock,
-  fetchStocks
+  fetchStocks,
+  fetchUserStocks,
+  updateUserStocks
 }

public/apiSchema.json

@@ -85,7 +85,7 @@ router.get('/', auction.fetchAvailableAuctions)
  *     security:
  *       - bearerAuth: []
  *     responses:
- *       204:
+ *       201:
  *         description: New bid
  *         content:
  *           application/json:
@@ -134,7 +134,7 @@ router.post('/bid/:id', authenticate, auctionValidator.placeBid, auction.makeNew
  *     security:
  *       - bearerAuth: []
  *     responses:
- *       204:
+ *       201:
  *         description: New auction
  *         content:
  *           application/json:

routes/auctions.js

@@ -9,6 +9,17 @@ const pullRequest = require('../controllers/pullRequests')
  *     summary: Latest 10 Pull Requests in Real Dev Squad
  *     tags:
  *       - Pull Requests
+ *     parameters:
+ *        - in: query
+ *          name: size
+ *          schema:
+ *             type: integer
+ *          description: Number of pull requests to be returned
+ *        - in: query
+ *          name: page
+ *          schema:
+ *            type: integer
+ *          description: Page number for pagination
  *     responses:
  *       200:
  *         description: Pull Requests
@@ -40,6 +51,17 @@ router.get('/open', pullRequest.getOpenPRs)
  *     summary: All open Pull Requests in Real Dev Squad
  *     tags:
  *       - Pull Requests
+ *     parameters:
+ *        - in: query
+ *          name: size
+ *          schema:
+ *             type: integer
+ *          description: Number of pull requests to be returned
+ *        - in: query
+ *          name: page
+ *          schema:
+ *            type: integer
+ *          description: Page number for pagination
  *     responses:
  *       200:
  *         description: Pull Requests