Update - Sync with pre-STAG

backend/modules/project_score/controller.js

@@ -2,31 +2,44 @@ const _ = require('lodash')
 const Event = require('../event/model')
 const Project = require('../project/model')
 const { ProjectScore } = require('./model')
-const { NotFoundError } = require('../../common/errors/errors')
+const {
+    NotFoundError,
+    AlreadyExistsError,
+} = require('../../common/errors/errors')
 
 const controller = {}
 
-controller.addProjectScore = async score => {
-    await Project.findById(score.project).orFail(
+controller.addProjectScore = async (projectId, projectScoreByReviewer) => {
+    const projectScoreFound = await ProjectScore.findOne({ project: projectId })
+    if (projectScoreFound) {
+        return controller.updateProjectScoreWithReviewers(
+            projectScoreFound._id,
+            projectScoreByReviewer,
+        )
+    }
+    const projectData = await Project.findById(projectId).orFail(
         new NotFoundError('The given project does not exist.'),
     )
-    await Event.findById(score.event).orFail(
-        new NotFoundError('The given event does not exist.'),
-    )
-    const projectScore = new ProjectScore({ ...score })
-    projectScore.averageScore = projectScore.score
+    const projectScore = new ProjectScore({
+        reviewers: [projectScoreByReviewer],
+        project: projectId,
+        event: projectData.event,
+    })
 
     if (projectScore.reviewers && projectScore.reviewers.length > 0) {
         const averageScore = averageScoreCalculation(
             projectScore.reviewers,
             projectScore.score,
         )
         if (!averageScore) {
-            throw new Error('Score average calculation failed')
+            throw new Error(
+                'Score average calculation failed, make sure all criteria are filled in',
+            )
         }
         projectScore.averageScore = averageScore
     }
-    return projectScore.save()
+    projectScore.save()
+    return projectScore
 }
 
 controller.updateProjectScore = async (id, updatedProjectScore) => {
@@ -112,7 +125,9 @@ const limitDecimals = (number, decimalPlaces) => {
 
 const averageScoreCalculation = (reviewers, globalScore) => {
     const allScores = reviewers.map(review => review.score)
-    allScores.push(globalScore)
+    if (globalScore) {
+        allScores.push(globalScore)
+    }
     let scoreCount = allScores.length
 
     const scoreSum = allScores.reduce((acc, current) => {
@@ -132,17 +147,27 @@ const averageScoreCalculation = (reviewers, globalScore) => {
 }
 
 controller.updateProjectScoreWithReviewers = async (
-    id,
+    projectScoreId,
     updatedProjectScore,
 ) => {
-    const projectScore = await ProjectScore.findById(id).orFail(
-        new NotFoundError('The given ProjectScore does not exist.'),
+    const projectScore = await ProjectScore.findById(projectScoreId).orFail(
+        new NotFoundError(
+            'The given ProjectScore does not exist, refresh and try again.',
+        ),
     )
-    projectScore.status = updatedProjectScore.status
-    projectScore.track = updatedProjectScore.track
-    projectScore.challenge = updatedProjectScore.challenge
-    projectScore.reviewers = updatedProjectScore.reviewers
-
+    const reviewerFoundIndex = _.findIndex(projectScore.reviewers, {
+        userId: updatedProjectScore.userId,
+    })
+    if (reviewerFoundIndex !== -1) {
+        projectScore.reviewers[reviewerFoundIndex].score =
+            updatedProjectScore.score
+        projectScore.reviewers[reviewerFoundIndex].scoreCriteria =
+            updatedProjectScore.scoreCriteria
+        projectScore.reviewers[reviewerFoundIndex].message =
+            updatedProjectScore.message
+    } else {
+        projectScore.reviewers.push(updatedProjectScore)
+    }
     projectScore.averageScore = projectScore.score
 
     if (projectScore.reviewers && projectScore.reviewers.length > 0) {
@@ -151,15 +176,12 @@ controller.updateProjectScoreWithReviewers = async (
             projectScore.score,
         )
         if (!averageScore) {
-            throw new Error('Score average calculation failed')
+            throw new Error(
+                'Score average calculation failed, make sure all criteria are filled in',
+            )
         }
         projectScore.averageScore = averageScore
     }
-
-    //scores from reviewers + scores from global, divide by total count of scores
-
-    // projectScore.averageScore = projectScore.score +
-
     await projectScore.save()
     return projectScore
 }

backend/modules/project_score/routes.js

@@ -16,18 +16,20 @@ const {
 } = require('../../common/middleware/events')
 
 const addProjectScore = asyncHandler(async (req, res) => {
-    console.log('addProjectScore is running')
+    const { projectId } = req.params
     try {
-        if (req.params.track) {
-            req.body.track = req.params.track._id
-        }
-        if (req.params.challenge) {
-            req.body.challenge = req.params.challenge._id
-        }
-        const score = await ProjectScoreController.addProjectScore(req.body)
+        // if (req.params.track) {
+        //     req.body.track = req.params.track._id
+        // }
+        // if (req.params.challenge) {
+        //     req.body.challenge = req.params.challenge._id
+        // }
+        const score = await ProjectScoreController.addProjectScore(
+            projectId,
+            req.body,
+        )
         return res.status(200).json(score)
     } catch (e) {
-        console.error(e)
         return res.status(500).json({
             message:
                 'Add project score encountered an unknown error. Please check your request and try again.',
@@ -86,20 +88,20 @@ const getPublicScores = asyncHandler(async (req, res) => {
 })
 
 const updateProjectScoreWithReviewers = asyncHandler(async (req, res) => {
-    console.log('Received on bcknd')
+    const { slug, projectScoreId } = req.params
     try {
-        if (req.params.track) {
-            req.body.track = req.params.track._id
-        }
-        if (req.params.challenge) {
-            req.body.challenge = req.params.challenge._id
-        }
-        const score =
+        // if (req.params.track) {
+        //     req.body.track = req.params.track._id
+        // }
+        // if (req.params.challenge) {
+        //     req.body.challenge = req.params.challenge._id
+        // }
+        const projectScore =
             await ProjectScoreController.updateProjectScoreWithReviewers(
-                req.params.id,
+                projectScoreId,
                 req.body,
             )
-        return res.status(200).json(score)
+        return res.status(200).json(projectScore)
     } catch (e) {
         return res.status(500).json({
             message:
@@ -122,7 +124,6 @@ router.get(
     '/event/:slug/project/:projectId',
     hasToken,
     isOrganiserOrCanSubmitProject,
-    //isEventOrganiser,
     getScoreByProjectId,
 )
 
@@ -160,15 +161,14 @@ router.get(
 )
 
 router.post(
-    '/review/event/:slug/:id',
+    '/review/event/:slug/:projectId',
     hasToken,
     isEventPartner,
-    // getEventFromParams,
     addProjectScore,
 )
 
 router.put(
-    '/review/event/:slug/:id',
+    '/review/event/:slug/:projectScoreId',
     hasToken,
     isEventPartner,
     updateProjectScoreWithReviewers,

frontend/src/components/layouts/MaterialTabsLayout/index.js

@@ -106,7 +106,6 @@ export default ({ tabs, location, baseRoute, transparent = false }) => {
             <Box mt={3} p={2}>
                 <Switch>
                     {tabs.map(({ key, path, component }, index) => {
-
                         return (
                             <Route
                                 key={key}
@@ -116,7 +115,6 @@ export default ({ tabs, location, baseRoute, transparent = false }) => {
                             />
                         )
                     })}
-
                 </Switch>
             </Box>
         </div>