#45 исправил получение данных пользователя. Также сделал это на payments чтобы…

#45 исправил получение данных пользователя. Также сделал это на payments чтобы имя инициатора отображалось корректно

api/app/calendarEvents.js

@@ -31,16 +31,17 @@ router.post('/', auth, upload.single('file'), async (req, res) => {
             event.file = req.file.filename;
         };
 
+        event.user = req.user
         await event.save()
-        const user = await User.findById(req.body.user)
-        try{
-            event.user = user
-            if (process.env.NODE_ENV !== 'test') { 
-                axios.post(config.baseUrlForTelegram + ':8001/telegram/calendarEvents', event);
+
+        try {
+            if (process.env.NODE_ENV !== 'test') {
+                await axios.post(config.baseUrlForTelegram + ':8001/telegram/calendarEvents', event);
             }
         } catch (err) {
             console.log(err)
         }
+
         res.send(event)
     } catch (err) {
         logger.error('POST /calendarEvents '+err);
@@ -83,7 +84,7 @@ router.get('/:room/:date/daily', auth, async (req, res) => {
             room: req.params.room,
             date: req.params.date
         }
-        const events = await CalendarEvent.find(filter)
+        const events = await CalendarEvent.find(filter).populate('user')
         res.send(events)
     } catch (err) {
         logger.error('GET /calendarEvents/:room/:date/daily '+err);

api/app/payments.js

@@ -59,12 +59,17 @@ const createRouter = () => {
             const momentObj = moment(payment.dateOfPayment, 'YYYY-MM-DD')
             payment.dateOfNotification = momentObj.subtract(payment.noticePeriod, 'days').format('YYYY-MM-DD')
 
-            payment.user = req.user._id;
+            payment.user = req.user
             if (payment.repeatability) payment.repeatabilityId = payment._id;
             await payment.save();
-            if (process.env.NODE_ENV !== 'test') { 
-                axios.post(config.baseUrlForTelegram + ':8001/telegram', payment);
+            try {
+                if (process.env.NODE_ENV !== 'test') {
+                    await axios.post(config.baseUrlForTelegram + ':8001/telegram', payment);
+                }
+            } catch (err) {
+                console.log(err)
             }
+
             res.send(payment);
         } catch (err) {
             logger.error('POST /payments '+err);
@@ -99,9 +104,14 @@ const createRouter = () => {
         payment.approved = true;
         try {
             await payment.save();
-            if (process.env.NODE_ENV !== 'test') { 
-                axios.post(config.baseUrlForTelegram + `:8001/telegram/${payment.user._id}/approved`, payment);
+            try {
+                if (process.env.NODE_ENV !== 'test') {
+                    await axios.post(config.baseUrlForTelegram + `:8001/telegram/${payment.user._id}/approved`, payment);
+                }
+            } catch (err) {
+                console.log(err)
             }
+
             res.send(payment);
         } catch (e) {
             logger.error('GET /payments/:id/approved '+e);
@@ -118,9 +128,14 @@ const createRouter = () => {
         };
         try {
             await payment.save();
-            if (process.env.NODE_ENV !== 'test') { 
-                axios.post(config.baseUrlForTelegram + `:8001/telegram/${payment.user._id}/approved/cancel`, payment);
+            try {
+                if (process.env.NODE_ENV !== 'test') {
+                    await axios.post(config.baseUrlForTelegram + `:8001/telegram/${payment.user._id}/approved/cancel`, payment);
+                }
+            } catch (err) {
+                console.log(err)
             }
+
             res.send(payment);
         } catch (e) {
             logger.error('GET /payments/:id/approved/cancel '+e);
@@ -134,12 +149,17 @@ const createRouter = () => {
             payment.paided = true;
         } else {
             return res.status(403).send({ 'message': 'Требуется одобрение директора' })
-        };
+        }
         try {
             await payment.save();
-            if (process.env.NODE_ENV !== 'test') { 
-                axios.post(config.baseUrlForTelegram + `:8001/telegram/${payment.user._id}/paid`, payment);
+            try {
+                if (process.env.NODE_ENV !== 'test') {
+                    await axios.post(config.baseUrlForTelegram + `:8001/telegram/${payment.user._id}/paid`, payment);
+                }
+            } catch (err) {
+                console.log(err)
             }
+
             res.send(payment);
         } catch (e) {
             logger.error('GET /payments/:id/paid '+e);
@@ -284,7 +304,11 @@ const createRouter = () => {
             const payment = await Payment.findById(req.params.id)
             payment.approved = 'true'
             await payment.save();
-            await axios.post(config.baseUrlForTelegram + `:8001/telegram/${payment.user._id}/approved`, payment);
+            try {
+                await axios.post(config.baseUrlForTelegram + `:8001/telegram/${payment.user._id}/approved`, payment);
+            } catch (err) {
+                console.log(err)
+            }
             res.send({ message: "Платеж одобрен, оплатить!", payment });
         } catch (error) {
             logger.error('GET /payments/telegram/:id/approved '+error);
@@ -299,7 +323,11 @@ const createRouter = () => {
             const tomorrow = momentObj.add(1, 'days').format('YYYY-MM-DD')
             payment.dateOfPayment = tomorrow
             await payment.save();
-            await axios.post(config.baseUrlForTelegram + `:8001/telegram/${payment.user._id}/date`, payment);
+            try {
+                await axios.post(config.baseUrlForTelegram + `:8001/telegram/${payment.user._id}/date`, payment);
+            } catch (err) {
+                console.log(err)
+            }
             res.send({ message: "Платеж пeренесен на завтра", payment });
         } catch (error) {
             logger.error('GET /payments/telegram/:id/date '+error);

front/src/components/UI/Modal/Modal.css

 .Modal {
-    width: 100%;
+    max-width: 1200px;
     padding: 10px;
     z-index: 500;
     border: 1px solid #ccc;
@@ -19,26 +19,17 @@
     margin: 10px;
 }
 .Modal__img {
-    width: 100%;
+    height: 60vh;
     display: block;
 }
 
 @media screen and (min-width: 600px){
-    .Modal, .Modal__img {
-        max-width: 90%;
-    }
     .filter {
         left: 51%;
         top: 30%;
     }
 }
 @media screen and (min-width: 1200px){
-    .Modal {
-        width: 75%;
-    }
-    .Modal__img {
-        width: 90%;
-    }
     .filter {
         left: 51%;
         top: 30%;

front/src/containers/Payments/Payments.css

@@ -108,6 +108,14 @@
 .Payments__filter-control {
     margin: 20px 0 10px;
 }
+.button {
+    display: inline-block;
+    padding: 5px;
+    border-radius: 10px;
+    background: lightgreen;
+    margin:2px 0 4px 0;
+    cursor: pointer;
+}
 
 @media screen and (min-width:600px) {
     .Payments {

front/src/store/actions/calendarAction.js

@@ -15,6 +15,7 @@ export const getAllEvents = (room, fullDate) => {
         try {
             const response = await axios.get(`/calendarEvents/${room}/${fullDate}/daily`)
             dispatch(getAllEventsSuccess(response.data))
+            console.log("WAITING FUCKING USER ************** ",response.data)
         } catch(err) {
             console.log(err)
         }