Merge pull request #11 from lbratkovskaya/task/implement-backend

fix: updte rates on the very first review
lbratkovskaya · Mar 16, 2021 · dfdacbc · dfdacbc
2 parents f2ef1ca + ec35494
commit dfdacbc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/handlers/rateCounter.ts b/src/handlers/rateCounter.ts
@@ -17,4 +17,3 @@ function rateCounter(sightId: string) {
 }
 
 export default rateCounter;
-
diff --git a/src/routes/reviews.ts b/src/routes/reviews.ts
@@ -37,6 +37,8 @@ reviewsRouter.post(
           user: user,
           sightId: sightId,
           rate: +rate,
+        }).then(() => {
+          rateCounter(sightId);
         });
       } else {
         Reviews.findOneAndUpdate(
@@ -45,10 +47,10 @@ reviewsRouter.post(
             rate: +rate,
           },
           {},
-          () => {
-            rateCounter(sightId);
-          },
-        );
+          () => {},
+        ).then(() => {
+          rateCounter(sightId);
+        });
       }
       res.status(200);
       res.json({ result: 'Rate was updated' });
@@ -76,25 +78,26 @@ reviewsRouter.post(
       };
       const reviews: Array<IReview> = await Reviews.find(filter);
       if (!reviews.length) {
-        Reviews.insertMany({
+        await Reviews.insertMany({
           user: user,
           sightId: sightId,
           rate: +rate,
           review: review,
+        }).then(() => {
+          rateCounter(sightId);
         });
       } else {
-        console.log('updating');
-        Reviews.findOneAndUpdate(
+        await Reviews.findOneAndUpdate(
           filter,
           {
             rate: +rate,
             review: review,
           },
           {},
-          () => {
-            rateCounter(sightId);
-          },
-        );
+          () => {},
+        ).then(() => {
+          rateCounter(sightId);
+        });
       }
       res.status(200);
       res.json({ result: 'Review was updated' });

diff --git a/src/routes/sights.ts b/src/routes/sights.ts
@@ -9,6 +9,8 @@ sightsRouter.get(
     let filter = {};
     if (req.query.countryId) {
       filter = { countryId: req.query.countryId };
+    } else if (req.query.sightId) {
+      filter = { _id: req.query.sightId };
     }
     const sights = await Sights.find(filter);
     res.json(sights);