Merge branch 'master' of https://github.com/print-signs/printsigns-api

app.js

@@ -52,6 +52,7 @@ import PurposeRoute from "./resources/setting/Purpose/Purpose_routes.js";
 
 // category Route
 import categoryRoute from "./resources/Category/categoryRoutes.js";
+import bannerRoute from "./resources/Banner/BannerRouter.js";
 import ContentRoute from "./resources/Content/ContentRoutes.js";
 import UserAddressRoute from "./resources/userAddress/useAddressRoute.js";
 //business_Type
@@ -77,9 +78,11 @@ app.use("/api", ProductRouter);
 
 // Category
 app.use("/api/category", categoryRoute);
+app.use("/api/banner", bannerRoute);
 // Content
 app.use("/api/content", ContentRoute);
 // User Address
+app.use("/api/user-address", UserAddressRoute);
 app.use("/api/shipping/address", ShippingAddressRoute);
 //Order
 app.use("/api/order", orderRoute);

resources/Banner/BannerController.js

@@ -0,0 +1,151 @@
+import mongoose from "mongoose";
+
+import cloudinary from "../../Utils/cloudinary.js";
+import { BannerModel } from "./BannerModel.js";
+
+// Add new Category
+export const addBanner = async (req, res) => {
+  const { bannerName } = req.body;
+  const { bannerImage } = req.files;
+  // console.log(categoryName, categoryImage);
+
+  if (!req?.user) return res.status(400).json({ message: "please login !" });
+  try {
+    if (!mongoose.Types.ObjectId.isValid(req.user._id)) {
+      return res.status(400).json({ message: "please login again " });
+    }
+    const result = await cloudinary.v2.uploader.upload(
+      bannerImage.tempFilePath,
+      {
+        folder: "jatinMor/banner",
+      }
+    );
+
+    if (result) {
+      const banner = await BannerModel.create({
+        bannerName,
+        bannerImage: result,
+        addedBy: req.user._id,
+      });
+      if (banner) {
+        return res
+          .status(201)
+          .json({ success: true, banner, message: "banner Added" });
+      }
+    }
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went Wrong",
+    });
+  }
+};
+
+export const getBanner = async (req, res) => {
+  try {
+    // if (!req?.user) return res.status(400).json({ message: "please login !" });
+    const banners = await BannerModel.find().sort({
+      createdAt: -1,
+    });
+
+    if (!banners) {
+      return res.status(404).json({ message: "No categories found" });
+    }
+
+    res.status(200).json({ success: true, banners });
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went wrong",
+    });
+  }
+};
+
+export const updateBanner = async (req, res) => {
+  try {
+    if (!req?.user) return res.status(400).json({ message: "please login !" });
+    const { _id } = req.params;
+    const { bannerName } = req.body;
+    const olderImage = req.body?.olderImage;
+    const bannerImag = req.files?.bannerImage;
+
+    if (!mongoose.Types.ObjectId.isValid(_id)) {
+      return res.status(404).json({ error: "Can not find the document " });
+    }
+
+    // find the document with the id to delete the image from cloudinary
+    if (JSON.parse(olderImage).length == 0) {
+      const deletefromCloudinary = await BannerModel.findOne({ _id: _id });
+
+      const deleteresponse = await cloudinary.v2.uploader.destroy(
+        deletefromCloudinary.bannerImage.public_id
+      );
+      if (deleteresponse) {
+        const result = await cloudinary.v2.uploader.upload(
+          bannerImag.tempFilePath,
+          {
+            folder: "jatinMor/banner",
+          }
+        );
+        const update = await BannerModel.findOneAndUpdate(
+          { _id: _id },
+          { bannerName: bannerName, bannerImage: result }, // Provide the updated categoryName
+          { new: true } // To return the updated document
+        );
+        if (!update) {
+          return res
+            .status(404)
+            .json({ message: "Can not update document, something went wrong" });
+        } else {
+          return res.status(200).json({ success: true, update });
+        }
+      }
+    } else {
+      const update = await BannerModel.findOneAndUpdate(
+        { _id: _id },
+        { bannerName: bannerName, bannerImage: JSON.parse(olderImage) }, // Provide the updated categoryName
+        { new: true } // To return the updated document
+      );
+      if (update) {
+        return res.status(200).json({ success: true, update });
+      }
+    }
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went wrong",
+    });
+  }
+};
+
+export const deleteBanner = async (req, res) => {
+  try {
+    if (!req?.user) return res.status(400).json({ message: "please login !" });
+    const { _id } = req.params;
+    if (!mongoose.Types.ObjectId.isValid(_id)) {
+      return res.status(404).json({ error: "Can not find the document " });
+    }
+
+    const deletefromCloudinary = await BannerModel.findOne({ _id: _id });
+
+    const deleteresponse = await cloudinary.v2.uploader.destroy(
+      deletefromCloudinary.bannerImage.public_id
+    );
+    if (deleteresponse) {
+      const deleteBanner = await BannerModel.findOneAndDelete({ _id: _id });
+      if (!deleteBanner) {
+        return res.status(404).json({
+          error: "Can not find the document with the provided id to delete  ",
+        });
+      }
+      res.status(200).json({ success: true, deleteBanner });
+    } else {
+      return res.status(404).json({ error: "can not delete the banner " });
+    }
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went wrong",
+    });
+  }
+};

resources/Banner/BannerModel.js

@@ -0,0 +1,19 @@
+import mongoose from "mongoose";
+
+const BannerSchema = new mongoose.Schema(
+  {
+    bannerName: {
+      type: String,
+      required: [true, "Name of Banner required "],
+    },
+    bannerImage: {},
+    addedBy: {
+      type: mongoose.Schema.ObjectId,
+      ref: "User",
+      required: true,
+    },
+  },
+  { timestamps: true }
+);
+
+export const BannerModel = mongoose.model("BannerModel", BannerSchema);

resources/Banner/BannerRouter.js

@@ -0,0 +1,23 @@
+import express from "express";
+import { isAuthenticatedUser, authorizeRoles } from "../../middlewares/auth.js";
+
+import {
+  addBanner,
+  deleteBanner,
+  getBanner,
+  updateBanner,
+} from "./BannerController.js";
+const router = express.Router();
+
+router
+  .route("/add")
+  .post(isAuthenticatedUser, authorizeRoles("admin"), addBanner);
+router.route("/getBanners").get(getBanner);
+router
+  .route("/update/:_id")
+  .patch(isAuthenticatedUser, authorizeRoles("admin"), updateBanner);
+router
+  .route("/delete/:_id")
+  .delete(isAuthenticatedUser, authorizeRoles("admin"), deleteBanner);
+
+export default router;

resources/ContactRequests/ContactRequestRoute.js

@@ -1,21 +1,15 @@
-
-
-
-import express from 'express'
+import express from "express";
 import { isAuthenticatedUser, authorizeRoles } from "../../middlewares/auth.js";
-import { AddNewContactRequest, FindAllContactRequest } from './ContactRequestsController.js';
-
-const router = express.Router()
-
-router.route("/new").post(isAuthenticatedUser, authorizeRoles("admin"), AddNewContactRequest)
-router.route("/getAll").get(isAuthenticatedUser, authorizeRoles("admin"), FindAllContactRequest)
-
-
-
+import {
+  AddNewContactRequest,
+  FindAllContactRequest,
+} from "./ContactRequestsController.js";
 
+const router = express.Router();
 
+router.route("/new").post(AddNewContactRequest);
+router.route("/getAll").get(FindAllContactRequest);
 
 // router.route("/product/getAll/").get(getAllProduct)
 
-export default router
-
+export default router;

resources/ContactRequests/ContactRequestsController.js

@@ -1,50 +1,46 @@
-
-import { ContactRequest } from './ContactRequestsModel.js'
+import { ContactRequest } from "./ContactRequestsModel.js";
 export const AddNewContactRequest = async (req, res) => {
-    try {
-        if (!req?.user) return res.status(400).json({ message: "please login !" });
+  try {
+    // if (!req?.user) return res.status(400).json({ message: "please login !" });
 
-        const contactRequest = await ContactRequest.create(req.body);
+    const contactRequest = await ContactRequest.create(req.body);
 
-        res.status(201).json({
-            success: true,
-            contactRequest,
-            message: 'ContactRequest Added',
-        });
-
-    } catch (error) {
-        res.status(500).json({
-            success: false,
-            message: error.message ? error.message : 'Something went Wrong',
-        });
-    }
-}
+    res.status(201).json({
+      success: true,
+      contactRequest,
+      message: "ContactRequest Added",
+    });
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went Wrong",
+    });
+  }
+};
 
 export const FindAllContactRequest = async (req, res) => {
-    try {
-        if (!req?.user) return res.status(400).json({ message: "please login !" });
-        // console.log(req?.user)
+  try {
+    // if (!req?.user) return res.status(400).json({ message: "please login !" });
+    // console.log(req?.user)
 
+    const contactRequest = await ContactRequest.find().sort({ createdAt: -1 });
+    if (contactRequest) {
+      return res.status(200).json({
+        success: true,
+        contactRequest,
+        message: "Fetched All ContactRequest",
+      });
+    } else {
+      return res.status(404).json({
+        success: true,
 
-        const contactRequest = await ContactRequest.find().sort({ createdAt: -1 });
-        if (contactRequest) {
-            return res.status(200).json({
-                success: true,
-                contactRequest,
-                message: 'Fetched All ContactRequest',
-            });
-        }
-        else {
-            return res.status(404).json({
-                success: true,
-
-                message: 'No ContactRequest till Now',
-            });
-        }
-    } catch (error) {
-        res.status(500).json({
-            success: false,
-            message: error.message ? error.message : 'Something went Wrong',
-        });
+        message: "No ContactRequest till Now",
+      });
     }
-}
+  } catch (error) {
+    res.status(500).json({
+      success: false,
+      message: error.message ? error.message : "Something went Wrong",
+    });
+  }
+};

resources/userAddress/useAddressRoute.js

@@ -13,12 +13,8 @@ const router = express.Router();
 router
   .route("/addAddress")
   .post(isAuthenticatedUser, authorizeRoles("admin"), addUserAddress);
-router
-  .route("/getAddressess")
-  .get(isAuthenticatedUser, authorizeRoles("admin"), getUserAddress);
-router
-  .route("/getOneAddress/:_id")
-  .get(isAuthenticatedUser, authorizeRoles("admin"), getOneAddress);
+router.route("/getAddressess").get(getUserAddress);
+router.route("/getOneAddress/:_id").get(getOneAddress);
 router
   .route("/updateAddress/:_id")
   .patch(isAuthenticatedUser, authorizeRoles("admin"), updateAddress);

resources/userAddress/userAddressController.js

@@ -37,9 +37,9 @@ export const addUserAddress = async (req, res) => {
 
 export const getUserAddress = async (req, res) => {
   try {
-    if (!req?.user) return res.status(400).json({ message: "please login !" });
+    // if (!req?.user) return res.status(400).json({ message: "please login !" });
     const userAddress = await UserAddressModel.find({
-      addedBy: req.user._id,
+      // addedBy: req.user._id,
     }).sort({
       createdAt: -1,
     });