fix comment images

Author: rmg007

Diff for: app.js

@@ -21,7 +21,7 @@ if (process.env.NODE_ENV === "production") {
 }
 
 mongoose
-  .connect(db, { useNewUrlParser: true })
+  .connect(db, { useNewUrlParser: true, useUnifiedTopology: true })
   .then(() => console.log("Connected to mongoDB"))
   .catch(err => console.log(error));
 

Diff for: frontend/src/components/businesses/business_show_item.jsx

@@ -11,7 +11,6 @@ const BusinessShowItem = ({ review, user, removeReview, currentUser}) => {
       });
     }
   }
-
   let deleteButton;
   if (review.author === currentUser.id) {
     deleteButton = (
@@ -27,7 +26,6 @@ const BusinessShowItem = ({ review, user, removeReview, currentUser}) => {
   user.reviews.forEach(review => {
     review.photos.forEach(() => photoCount += 1)
   })
-
   return (
     <li>
       <div className="review-item">

Diff for: frontend/src/components/reviews/review_form.jsx

@@ -89,13 +89,10 @@ class ReviewForm extends React.Component{
   render(){
     let placeHolder = 'Your review helps others learn about great local businesses.\n\n Please don’t review this business if you received a freebie for writing this review, or if you’re connected in any way to the owner or employees.'
     return(
-    
       <div>
         <div className="search-nav">
           <SearchNav />
         </div>
-
-      
       <form encType="multipart/form-data" className="review-form" onSubmit={this.handleSubmit}>
         <ul className="form-wrapper">
         <h3 className="form-header">Business Name</h3>

Diff for: frontend/src/reducers/businesses_reducer.js

@@ -9,8 +9,6 @@ const businessesReducer = (oldState = {}, action) => {
       imageURLs = action.payload.imgUrls;
       let business = action.payload.business;
       let img = imageURLs.filter(item => item.includes(business._id));
-      debugger
-
       business.imgURL = img;
       return Object.assign({}, oldState, { [business._id]: business });
     case RECEIVE_BUSINESSES: 

Diff for: frontend/src/reducers/reviews_reducer.js

@@ -7,7 +7,7 @@ const ReviewsReducer = (state = {}, action) => {
   switch (action.type) {
     case RECEIVE_BUSINESS:
       return action.payload.reviews;
-    case RECEIVE_REVIEW:
+      case RECEIVE_REVIEW:
       return Object.assign({}, state, {[action.review.data.review._id]: action.review.data.review});
     case REMOVE_REVIEW:
       newState = Object.assign({}, state);

Diff for: models/Images.js

@@ -131,7 +131,6 @@ function getImages(prefix) {
       }
   });
    })
-   
 }
 
 module.exports = {

Diff for: routes/.DS_Store

@@ -48,45 +48,60 @@ router.get('/user/:user_id', (req, res) => {
     );
 });
 
-// get buisiness details
-router.get('/:id', (req, res) => {
-  Business.findById(req.params.id)
-    .then(business => Review.find({ business: business.id })
-      .then(reviews => {
-        getImages('businesses')
-        .then(imgUrls => {
-          const reviewsObj = {};
-          reviews.forEach(review => reviewsObj[review.id] = review);
-          res.send({ business: business, reviews: reviewsObj, imgUrls:imgUrls })
-        }
-      )})
-    )
-    .catch(err =>
-      res.status(404).json({ nobusinessfound: 'No business found with that ID' })
-    );
-});
+// get business details
+// router.get('/:id', (req, res) => {
+//   Business.findById(req.params.id)
+//     .then(business => Review.find({ business: business.id })
+//       .then(reviews => {
+//         getImages('businesses').
+//         then(imgUrls => {
+//           const reviewsObj = {};
+//           reviews.forEach(review => reviewsObj[review.id] = review);
+//           res.send({ business: business, reviews: reviewsObj, imgUrls:imgUrls })
+//         }
+//       )})
+//     )
+//     .catch(err =>
+//       res.status(404).json({ nobusinessfound: 'No business found with that ID' })
+//     );
+// });
+
+router.get('/:id', async (req, res) => {
+  let business = await Business.findById(req.params.id);
+  let reviews = await Review.find({ business: business.id });
+  let imgUrls = await getImages('businesses');
+  const reviewsObj = {};
+  const reviewsImages = {};
+  for (let index = 0; index < reviews.length; index++) {
+    const review = reviews[index]
+    const images = await getImages(review.id);
+    review.photos = images;
+    reviewsImages[review.id] = images;
+    reviewsObj[review.id] = review;
+  }
+  res.send({ business: business, reviews: reviewsObj, imgUrls: imgUrls, reviewImgUrls: reviewsImages })
+})
 
 router.post('/:id/review', (req, res, next) => {
-   const token = req.headers.authorization;
+  const token = req.headers.authorization;
   const user = jwt_decode(token);
 
   if (user) {
-    const newReview = new Review ({
+    const newReview = new Review({
       rate: req.body.rate,
       comment: req.body.comment,
       business: req.body.businessId,
       author: user.id
     })
-      newReview.save().then(review => {
-
-        uploadMultiple(review._id, req, res)
-        .then(data => { 
+    newReview.save().then(review => {
+      uploadMultiple(review._id, req, res)
+        .then(data => {
           getImages(review.id)
-          .then((imgUrls)=>{ 
-            review.photos = imgUrls;
-            review.save();
-            res.send({review, images: imgUrls})});
-        }, (err)=> console.log(err))
+            .then((imgUrls) => {
+              review.save();
+              res.send({ review, images: imgUrls })
+            });
+        }, (err) => console.log(err))
     });
   }
 })