From 6f2e4985eb883a293a15e6e4e84d752d0e94dbbe Mon Sep 17 00:00:00 2001
From: pawan-dot <71133473+pawan-dot@users.noreply.github.com>
Date: Thu, 3 Nov 2022 16:00:35 +0530
Subject: [PATCH] modify

---
 controllers/directoryController.js | 46 ++++++++++++++++++------------
 routes/directoryRoute.js           |  7 +++--
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/controllers/directoryController.js b/controllers/directoryController.js
index ff900a9..1f4de05 100644
--- a/controllers/directoryController.js
+++ b/controllers/directoryController.js
@@ -57,7 +57,7 @@ export const createDirectory = async (req, res) => {
             data,
         });
     } catch (error) {
-        console.log(error)
+        // console.log(error)
         res.status(500).json({
             success: false,
             msg: "Failled to create !!"
@@ -65,31 +65,39 @@ export const createDirectory = async (req, res) => {
     }
 
 };
-
-//get All Product
-export const getAllDirectory = async (req, res) => {
+//get All Directory(User)
+export const getAllDirectoryUser = async (req, res) => {
 
     try {
-        console.log("hi")
-
-        if (req.user && req.user.role === "admin") {
-            const directory = await directoryModel.find();
-            // console.log(category)
-            return res.status(200).json({
-                success: true,
-                msg: " fetch  Successfully!!",
-                directory,
-            });
-        }
         const directory = await directoryModel.find({ status: true });
         res.status(200).json({
             success: true,
             msg: " fetch  Successfully!!",
             directory,
         });
+    }
+    catch (error) {
+        res.status(500).json({
+            success: false,
+            msg: "Failled to fetch !!"
+        });
+    }
 
+};
+
+//get All Directory(admin)
+export const getAllDirectory = async (req, res) => {
+
+    try {
+
+        const directory = await directoryModel.find();
+
+        res.status(200).json({
+            success: true,
+            msg: " fetch  Successfully!!",
+            directory,
+        });
     } catch (error) {
-        console.log(error)
         res.status(500).json({
             success: false,
             msg: "Failled to fetch !!"
@@ -102,7 +110,7 @@ export const getOneDirectory = async (req, res) => {
 
     try {
         const directory = await directoryModel.findById(req.params.id);
-        console.log(directory.status)
+        // console.log(directory.status)
         // console.log(category)
         res.status(200).json({
             success: true,
@@ -147,7 +155,7 @@ export const updateDirectory = async (req, res) => {
         });
 
     } catch (error) {
-        console.log(error)
+        // console.log(error)
         res.status(500).json({
             success: false,
             msg: "Failled to UpDate !!"
@@ -232,7 +240,7 @@ export const setStatus = async (req, res) => {
         // console.log(directory)
         res.status(200).json(directory);
     } catch (error) {
-        console.log(error);
+        // console.log(error);
         res.status(500).json({
             message: error.message
         });
diff --git a/routes/directoryRoute.js b/routes/directoryRoute.js
index d85dc11..bf5b2b3 100644
--- a/routes/directoryRoute.js
+++ b/routes/directoryRoute.js
@@ -6,7 +6,8 @@ import {
     deleteOneDirectory,
     getOneDirectory,
     getSelfDirectory,
-    setStatus
+    setStatus,
+    getAllDirectoryUser
 
 } from "../controllers/directoryController.js"
 const router = express.Router();
@@ -27,7 +28,9 @@ const uploaderImage = multer({
     }
 });
 router.route("/directory/create/").post(isAuthenticatedUser, createDirectory)
-router.route("/directory/getAll/").get(getAllDirectory)
+
+router.route("/directory/user/getAll/").get(getAllDirectoryUser)
+router.route("/directory/getAll/").get(isAuthenticatedUser, authorizeRoles('admin'), getAllDirectory)
 router.route("/directory/getOne/:id").get(getOneDirectory)
 router.route("/directory/update/:id").put(isAuthenticatedUser, updateDirectory);
 router.route("/directory/delete/:id").delete(isAuthenticatedUser, deleteOneDirectory);