added find by url endpoints for models

backend/.env

@@ -17,4 +17,4 @@ TEST_DB_USERNAME=user123
 TEST_DB_PASSWORD=password123
 TEST_DB_NAME=onboarding_db
 TEST_DB_HOST=localhost
-TEST_DB_PORT=5432
+TEST_DB_PORT=5432

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22
+FROM node:22-alpine3.20
 
 WORKDIR /app
 

backend/config/settings.js

@@ -23,6 +23,8 @@ module.exports = {
       popups: [userRole.ADMIN],
       hints: [userRole.ADMIN],
       banners: [userRole.ADMIN],
+      links: [userRole.ADMIN],
+      tours: [userRole.ADMIN],
     }
   }
 };

backend/index.js

@@ -21,6 +21,7 @@ const hint = require('./src/routes/hint.routes');
 const tourRoutes = require('./src/routes/tour.routes');
 const linkRoutes = require('./src/routes/link.routes');
 const helperLinkRoutes = require('./src/routes/helperLink.routes');
+const guideRoutes = require('./src/routes/guide.routes');
 
 const app = express();
 
@@ -30,16 +31,15 @@ app.use(bodyParser.json({ limit: MAX_FILE_SIZE }));
 app.use(jsonErrorMiddleware);
 // app.use(fileSizeValidator);
 
-const { sequelize, Team } = require("./src/models");
-const config = require("./config/config");
+const { sequelize } = require("./src/models");
 
 sequelize
   .authenticate()
   .then(() => console.log('Database connected...'))
   .catch((err) => console.log('Error: ' + err));
 
 sequelize
-  .sync({ force: true })
+  .sync({ force: false })
   .then(() => console.log("Models synced with the database..."))
   .catch((err) => console.log("Error syncing models: " + err));
 
@@ -50,7 +50,7 @@ app.use('/api/popup', popup);
 app.use('/api/popup_log', popup_log);
 app.use('/api/banner', banner);
 app.use('/api/team', teamRoutes);
-// app.use('/api/tours', tourRoutes);
+app.use('/api/guide', guideRoutes);
 app.use('/api/hint', hint);
 app.use('/api/tour', tourRoutes);
 app.use('/api/link', linkRoutes);

backend/src/controllers/banner.controller.js

@@ -2,7 +2,7 @@ const bannerService = require("../service/banner.service.js");
 const { internalServerError } = require("../utils/errors.helper");
 const { validateCloseButtonAction } = require("../utils/guide.helper");
 const { validatePosition } = require("../utils/banner.helper");
-const { checkColorFieldsFail } =require("../utils/guide.helper");
+const { checkColorFieldsFail } = require("../utils/guide.helper");
 
 class BannerController {
   async addBanner(req, res) {
@@ -27,7 +27,7 @@ class BannerController {
 
     const colorFields = { fontColor, backgroundColor };
     const colorCheck = checkColorFieldsFail(colorFields, res)
-    if(colorCheck){return colorCheck};
+    if (colorCheck) { return colorCheck };
 
     try {
       const newBannerData = { ...req.body, createdBy: userId };
@@ -47,7 +47,7 @@ class BannerController {
     try {
       const { id } = req.params;
 
-      if (Number.isNaN(Number(id)) || id.trim() === "")  {
+      if (Number.isNaN(Number(id)) || id.trim() === "") {
         return res.status(400).json({ errors: [{ msg: "Invalid id" }] });
       }
 
@@ -77,31 +77,31 @@ class BannerController {
     try {
       const { id } = req.params;
       const { fontColor, backgroundColor, url, position, closeButtonAction, bannerText } = req.body;
-  
+
       if (!position || !closeButtonAction) {
         return res
           .status(400)
           .json({
             errors: [{ msg: "position and closeButtonAction are required" }],
           });
       }
-  
+
       if (!validatePosition(position)) {
         return res
           .status(400)
           .json({ errors: [{ msg: "Invalid value for position" }] });
       }
-  
+
       if (!validateCloseButtonAction(closeButtonAction)) {
         return res
           .status(400)
           .json({ errors: [{ msg: "Invalid value for closeButtonAction" }] });
       }
-  
+
       const colorFields = { fontColor, backgroundColor };
       const colorCheck = checkColorFieldsFail(colorFields, res)
-      if(colorCheck){return colorCheck};
-  
+      if (colorCheck) { return colorCheck };
+
       const updatedBanner = await bannerService.updateBanner(id, req.body);
       res.status(200).json(updatedBanner);
     } catch (err) {
@@ -125,7 +125,7 @@ class BannerController {
       res.status(statusCode).json(payload);
     }
   }
-  
+
   async getBanners(req, res) {
     try {
       const userId = req.user.id;
@@ -144,7 +144,7 @@ class BannerController {
     try {
       const { id } = req.params;
 
-      if (Number.isNaN(Number(id)) || id.trim() === "")  {
+      if (Number.isNaN(Number(id)) || id.trim() === "") {
         return res.status(400).json({ errors: [{ msg: "Invalid id" }] });
       }
 
@@ -163,7 +163,23 @@ class BannerController {
       res.status(statusCode).json(payload);
     }
   }
+  async getBannerByUrl(req, res) {
+    try {
+      const { url } = req.body;
+
+      if (!url || typeof url !== 'string' ) {
+        return res.status(400).json({ errors: [{ msg: "URL is missing or invalid" }] });
+      }
 
+      const banner = await bannerService.getBannerByUrl(url);
+      res.status(200).json({banner});
+    } catch (error) {
+      internalServerError(
+        "GET_BANNER_BY_URL_ERROR",
+        error.message,
+      );
+    }
+  };
 }
 
 module.exports = new BannerController();

backend/src/controllers/guide.controller.js

@@ -0,0 +1,28 @@
+const bannerService = require("../service/banner.service");
+const linkService = require("../service/link.service");
+const popupService = require("../service/popup.service");
+
+class GuideController {
+    async getGuidesByUrl(req, res) {
+        try {
+            const { url } = req.body;
+
+            if (!url || typeof url !== 'string') {
+                return res.status(400).json({ errors: [{ msg: "URL is missing or invalid" }] });
+            }
+            const [banner, popup, link] = await Promise.all([
+                bannerService.getBannerByUrl(url),
+                popupService.getPopupByUrl(url),
+                linkService.getLinkByUrl(url),
+            ]);
+            res.status(200).json({ banner, popup, link });
+        } catch (error) {
+            internalServerError(
+                "GET_GUIDES_BY_URL_ERROR",
+                error.message,
+            );
+        }
+    }
+}
+
+module.exports = new GuideController();

backend/src/controllers/hint.controller.js

@@ -1,8 +1,6 @@
 const HintService = require("../service/hint.service");
 const { internalServerError } = require("../utils/errors.helper");
 const validateHintData = require("../utils/hint.helper");
-const db = require("../models");
-const Hint = db.Hint;
 
 class HintController {
   async addHint(req, res) {
@@ -147,6 +145,24 @@ class HintController {
       res.status(statusCode).json(payload);
     }
   }
+
+  async getHintByUrl(req, res) {
+    try {
+      const { url } = req.body;
+
+      if (!url || typeof url !== 'string') {
+        return res.status(400).json({ errors: [{ msg: "URL is missing or invalid" }] });
+      }
+
+      const hint = await HintService.getHintByUrl(url);
+      res.status(200).json({ hint });
+    } catch (error) {
+      internalServerError(
+        "GET_HINT_BY_URL_ERROR",
+        error.message,
+      );
+    }
+  };
 }
 
 module.exports = new HintController();

backend/src/controllers/link.controller.js

@@ -1,3 +1,4 @@
+const bannerService = require("../service/banner.service");
 const linkService = require("../service/link.service");
 const { internalServerError } = require("../utils/errors.helper");
 const { validateUrl } = require("../utils/link.helper");
@@ -165,6 +166,24 @@ class LinkController {
       res.status(statusCode).json(payload);
     }
   }
+
+  async getLinkByUrl(req, res) {
+    try {
+      const { url } = req.body;
+
+      if (!url || typeof url !== 'string') {
+        return res.status(400).json({ errors: [{ msg: "URL is missing or invalid" }] });
+      }
+
+      const link = await linkService.getLinkByUrl(url);
+      res.status(200).json({ link });
+    } catch (error) {
+      internalServerError(
+        "GET_LINK_BY_URL_ERROR",
+        error.message,
+      );
+    }
+  };
 }
 
 module.exports = new LinkController();

backend/src/controllers/popup.controller.js

@@ -189,7 +189,23 @@ class PopupController {
       res.status(statusCode).json(payload);
     }
   }
+  async getPopupByUrl(req, res) {
+    try {
+      const { url } = req.body;
+
+      if (!url || typeof url !== 'string' ) {
+        return res.status(400).json({ errors: [{ msg: "URL is missing or invalid" }] });
+      }
 
+      const popup = await popupService.getPopupByUrl(url);
+      res.status(200).json({popup});
+    } catch (error) {
+      internalServerError(
+        "GET_POPUP_BY_URL_ERROR",
+        error.message,
+      );
+    }
+  };
 
 }
 

backend/src/controllers/tour.controller.js

@@ -142,6 +142,24 @@ class TourController {
       res.status(statusCode).json(payload);
     }
   }
+
+  async getTourByUrl(req, res) {
+    try {
+      const { url } = req.body;
+
+      if (!url || typeof url !== 'string') {
+        return res.status(400).json({ errors: [{ msg: "URL is missing or invalid" }] });
+      }
+
+      const tour = await tourService.getTourByUrl(url);
+      res.status(200).json({ tour });
+    } catch (error) {
+      internalServerError(
+        "GET_TOUR_BY_URL_ERROR",
+        error.message,
+      );
+    }
+  };
 }
 
 module.exports = new TourController();

backend/src/routes/banner.routes.js

@@ -13,5 +13,6 @@ router.put("/edit_banner/:id", authenticateJWT, accessGuard(teamPermissions.bann
 router.get("/all_banners", authenticateJWT, bannerController.getAllBanners);
 router.get("/banners", authenticateJWT, bannerController.getBanners);
 router.get("/get_banner/:id", authenticateJWT, bannerController.getBannerById);
+router.get("/get_banner_by_url", bannerController.getBannerByUrl);
 
 module.exports = router;

backend/src/routes/guide.routes.js

@@ -0,0 +1,9 @@
+const express = require("express");
+const guideController = require("../controllers/guide.controller.js");
+
+const router = express.Router();
+
+router.get("/get_guides_by_url", guideController.getGuidesByUrl);
+// router.get("/get_incomplete_guides_by_url", guideController.getIncompleteGuidesByUrl);
+
+module.exports = router;

backend/src/routes/hint.routes.js

@@ -13,5 +13,6 @@ router.put("/edit_hint/:hintId", authenticateJWT, accessGuard(teamPermissions.hi
 router.get("/all_hints", authenticateJWT, hintController.getAllHints);
 router.get("/hints", authenticateJWT, hintController.getHints);
 router.get("/get_hint/:hintId", authenticateJWT, hintController.getHintById);
+// router.get("/get_hint_by_url", hintController.getHintByUrl);
 
 module.exports = router;

backend/src/routes/link.routes.js

@@ -1,16 +1,18 @@
 const express = require("express");
 const linkController = require("../controllers/link.controller");
 const authenticateJWT = require("../middleware/auth.middleware");
+const settings = require('../../config/settings');
+const accessGuard = require('../middleware/accessGuard.middleware');
 
 const router = express.Router();
+const teamPermissions = settings.team.permissions;
 
-router.use(authenticateJWT);
-
-router.route("/add_link").post(linkController.addLink);
-router.route("/get_links").get(linkController.getLinksByHelperId);
-router.route("/all_links").get(linkController.getAllLinks);
-router.route("/get_link/:id").get(linkController.getLinksById);
-router.route("/edit_link/:id").put(linkController.editLink);
-router.route("/delete_link/:id").delete(linkController.deleteLink);
+router.post("/add_link", authenticateJWT, accessGuard(teamPermissions.links), linkController.addLink);
+router.get("/get_links", authenticateJWT, linkController.getLinksByHelperId);
+router.get("/all_links", authenticateJWT, linkController.getAllLinks);
+router.get("/get_link/:id", authenticateJWT, linkController.getLinksById);
+router.put("/edit_link/:id", authenticateJWT, accessGuard(teamPermissions.links), linkController.editLink);
+router.delete("/delete_link/:id", authenticateJWT, accessGuard(teamPermissions.links), linkController.deleteLink);
+router.get("/get_link_by_url", linkController.getLinkByUrl);
 
 module.exports = router;

backend/src/routes/popup.routes.js

@@ -13,5 +13,6 @@ router.put("/edit_popup/:id", authenticateJWT, accessGuard(teamPermissions.popup
 router.get("/all_popups", authenticateJWT, popupController.getAllPopups);
 router.get("/popups", authenticateJWT, popupController.getPopups);
 router.get("/get_popup/:id", authenticateJWT, popupController.getPopupById);
+router.get("/get_popup_by_url", popupController.getPopupByUrl);
 
 module.exports = router;

backend/src/routes/tour.routes.js

@@ -1,25 +1,18 @@
 const express = require("express");
 const tourController = require("../controllers/tour.controller");
 const authenticateJWT = require("../middleware/auth.middleware");
+const settings = require('../../config/settings');
+const accessGuard = require('../middleware/accessGuard.middleware');
 
 const router = express.Router();
+const teamPermissions = settings.team.permissions;
 
-// Create a new tour
-router.post("/add_tour", authenticateJWT, tourController.addTour);
-
-// Delete a tour by ID
-router.delete("/delete_tour/:id", authenticateJWT, tourController.deleteTour);
-
-// Edit a tour by ID
-router.put("/edit_tour/:id", authenticateJWT, tourController.editTour);
-
-// Get all tours
+router.post("/add_tour", authenticateJWT, accessGuard(teamPermissions.tours), tourController.addTour);
+router.delete("/delete_tour/:id", authenticateJWT, accessGuard(teamPermissions.tours), tourController.deleteTour);
+router.put("/edit_tour/:id", authenticateJWT, accessGuard(teamPermissions.tours), tourController.editTour);
 router.get("/all_tours", authenticateJWT, tourController.getAllTours);
-
-// Get tours created by the authenticated user
 router.get("/tours", authenticateJWT, tourController.getTours);
-
-// Get a specific tour by ID
 router.get("/get_tour/:id", authenticateJWT, tourController.getTourById);
+// router.get("/get_tour_by_url", tourController.getTourByUrl);
 
 module.exports = router;