From 9e6891bba6ef8ceced316a1ac8ce93169bf9be45 Mon Sep 17 00:00:00 2001
From: firdaous elhalafi <firdaous1elhalafi@gmail.com>
Date: Sat, 7 Oct 2023 16:26:43 +0200
Subject: [PATCH] afficher que les annonces d'utilisateurs en cours si il est
 agent

---
 routes/announcement.js  | 13 ++++++++++++-
 views/announcements.pug | 18 ++++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/routes/announcement.js b/routes/announcement.js
index 2c7e548..6300c14 100644
--- a/routes/announcement.js
+++ b/routes/announcement.js
@@ -13,7 +13,14 @@ const isConsultant = routes.isConsultant;
 // Route pour récupérer toutes les annonces
 router.get('/', async (req, res) => {
     try {
-        const announcements = await Announcement.find();
+        const user = req.user;
+        let announcements;
+        if (user && user.isAgent){
+            announcements = await Announcement.find({ userName: user.username });
+        }
+        else {
+            announcements = await Announcement.find({ publicationStatus: 'Publiée' });
+        }
         let isAuthenticated = false;
         if (req.isAuthenticated()) {
             isAuthenticated = true;
@@ -56,6 +63,10 @@ router.post('/:id/ask', isAuthenticated, isConsultant, async (req, res) => {
             return res.status(404).json({ message: 'Annonce non trouvée' });
         }
 
+        if (announcement.propertyStatus !== 'Disponible') {
+            return res.status(403).json({ message: 'Vous ne pouvez poser une question que sur les annonces non disponibles.' });
+        }
+
         announcement.questions.push({
             user: user.username,
             question
diff --git a/views/announcements.pug b/views/announcements.pug
index d0f5935..ece16f1 100644
--- a/views/announcements.pug
+++ b/views/announcements.pug
@@ -13,19 +13,17 @@ block content
       .row
         if user && user.isAgent
             each announcement in announcements
-              if announcement.userName == user.username
-                  .col-md-4.mb-4
-                    .card
-                      img.card-img-top(src=`/uploads/${announcement.photos[0]}`, alt=announcement.title)
-                      .card-body
-                        h5.card-title= announcement.title
-                        p.card-text= announcement.propertyType
-                        p.card-text= announcement.price + '€'
-                        a.btn.btn-primary(href=`/announcements/${announcement._id}`) Voir les détails
+              .col-md-4.mb-4
+                .card
+                  img.card-img-top(src=`/uploads/${announcement.photos[0]}`, alt=announcement.title)
+                  .card-body
+                    h5.card-title= announcement.title
+                    p.card-text= announcement.propertyType
+                    p.card-text= announcement.price + '€'
+                    a.btn.btn-primary(href=`/announcements/${announcement._id}`) Voir les détails
 
         else
             each announcement in announcements
-              if announcement.publicationStatus == 'Publiée'
                   .col-md-4.mb-4
                     .card
                       img.card-img-top(src=`/uploads/${announcement.photos[0]}`, alt=announcement.title)
-- 
GitLab