powr-sdk-api 2.4.3 → 2.4.5

package/dist/routes/activities.js

@@ -6,31 +6,25 @@ const {
   getDb
 } = require("../services/mongo");
 
-// Get activities
+// Get all activities
 router.get("/", async (req, res) => {
-  const {
-    projectId,
-    contentId
-  } = req.query;
   try {
+    const {
+      contentId
+    } = req.query;
+    const projectId = req.projectId; // Use middleware-injected projectId
+
     const query = {
       projectId
     };
     if (contentId) {
       query.contentId = contentId;
     }
-    console.log("Filter.....:", query);
-    const activities = await getDb().collection("activities").find(query).toArray();
-    if (!activities || activities.length === 0) {
-      console.log("Data not found.");
-      return res.status(200).json({
-        success: true,
-        activities: []
-      });
-    }
-    return res.status(200).json({
+    const db = await getDb();
+    const activities = await db.collection("activities").find(query).toArray();
+    return res.json({
       success: true,
-      activities: activities
+      data: activities
     });
   } catch (error) {
     console.error("Error retrieving activities:", error);
@@ -41,40 +35,39 @@ router.get("/", async (req, res) => {
   }
 });
 
-// Add activity
+// Create new activity
 router.post("/", async (req, res) => {
-  const {
-    projectId,
-    contentId,
-    activity
-  } = req.body;
-  const activityData = {
-    projectId,
-    contentId,
-    activity,
-    createdAt: new Date()
-  };
   try {
-    const result = await getDb().collection("activities").insertOne(activityData);
-    if (result && result.insertedId) {
-      console.log("Activity added with ID:", result.insertedId);
-      return res.status(200).json({
-        success: true,
-        message: "Activity added successfully.",
-        activityId: result.insertedId
-      });
-    } else {
-      console.error("Insert operation failed. Result:", result);
-      return res.status(500).json({
+    const {
+      contentId,
+      activity
+    } = req.body;
+    const projectId = req.projectId; // Use middleware-injected projectId
+
+    if (!contentId || !activity) {
+      return res.status(400).json({
         success: false,
-        message: "Activity could not be added."
+        message: "Content ID and activity are required"
       });
     }
+    const activityData = {
+      projectId,
+      contentId,
+      activity,
+      createdAt: new Date()
+    };
+    const db = await getDb();
+    const result = await db.collection("activities").insertOne(activityData);
+    return res.status(201).json({
+      success: true,
+      message: "Activity created successfully",
+      id: result.insertedId
+    });
   } catch (error) {
-    console.error("Error adding activity:", error);
+    console.error("Error creating activity:", error);
     return res.status(500).json({
       success: false,
-      message: "Failed to add activity due to a server error."
+      message: "Failed to create activity."
     });
   }
 });

package/dist/routes/auth.js

@@ -128,7 +128,8 @@ router.post("/login", async (req, res) => {
       }]
     };
     console.log(q);
-    const user = await getDb().collection("users").findOne(q);
+    const db = await getDb();
+    const user = await db.collection("users").findOne(q);
     console.log(user);
     if (!user) {
       return res.status(401).json({
@@ -147,13 +148,13 @@ router.post("/login", async (req, res) => {
     // Fetch profile data if projectId is provided
     let profile = null;
     if (projectId) {
-      profile = await getDb().collection("profiles").findOne({
+      profile = await db.collection("profiles").findOne({
         userId: user._id,
         projectId: projectId
       });
       if (profile) {
         // Update lastActiveAt
-        await getDb().collection("profiles").updateOne({
+        await db.collection("profiles").updateOne({
           _id: profile._id
         }, {
           $set: {
@@ -168,7 +169,7 @@ router.post("/login", async (req, res) => {
           createdAt: new Date(),
           updatedAt: new Date()
         };
-        const profileResult = await getDb().collection("profiles").insertOne(newProfile);
+        const profileResult = await db.collection("profiles").insertOne(newProfile);
         profile = {
           _id: profileResult.insertedId,
           ...newProfile
@@ -226,7 +227,8 @@ router.post("/forgot-password", async (req, res) => {
         message: "Username is required"
       });
     }
-    const user = await getDb().collection("users").findOne({
+    const db = await getDb();
+    const user = await db.collection("users").findOne({
       username: username
     });
     if (!user) {
@@ -243,7 +245,7 @@ router.post("/forgot-password", async (req, res) => {
       exp: Math.floor(Date.now() / 1000) + 60 * 60
     };
     const resetToken = jwt.sign(resetPayload, config.jwtToken);
-    await getDb().collection("users").updateOne({
+    await db.collection("users").updateOne({
       _id: user._id
     }, {
       $set: {
@@ -294,7 +296,8 @@ router.post("/reset-password", async (req, res) => {
         message: "Invalid reset token type or missing user ID"
       });
     }
-    const user = await getDb().collection("users").findOne({
+    const db = await getDb();
+    const user = await db.collection("users").findOne({
       _id: new ObjectId(decoded.userId),
       resetToken: resetToken,
       resetTokenExpiry: {
@@ -311,7 +314,9 @@ router.post("/reset-password", async (req, res) => {
     // Hash the new password
     const saltRounds = 10;
     const hashedPassword = await bcrypt.hash(newPassword, saltRounds);
-    await getDb().collection("users").updateOne({
+
+    // Update user with new password and clear reset token
+    await db.collection("users").updateOne({
       _id: user._id
     }, {
       $set: {
@@ -327,7 +332,7 @@ router.post("/reset-password", async (req, res) => {
       message: "Password reset successfully"
     });
   } catch (error) {
-    console.error("Error resetting password:", error);
+    console.error("Error in reset password:", error);
     return res.status(500).json({
       success: false,
       message: "Failed to reset password."

package/dist/routes/comments.js

@@ -5,32 +5,29 @@ const router = express.Router();
 const {
   getDb
 } = require("../services/mongo");
+const {
+  ObjectId
+} = require("mongodb");
 
-// Get comments
+// Get all comments
 router.get("/", async (req, res) => {
-  const {
-    projectId,
-    contentId
-  } = req.query;
   try {
+    const {
+      contentId
+    } = req.query;
+    const projectId = req.projectId; // Use middleware-injected projectId
+
     const query = {
       projectId
     };
     if (contentId) {
       query.contentId = contentId;
     }
-    console.log("Filter.....:", query);
-    const commentData = await getDb().collection("comments").find(query).toArray();
-    if (!commentData || commentData.length === 0) {
-      console.log("Data not found.");
-      return res.status(200).json({
-        success: true,
-        comments: []
-      });
-    }
-    return res.status(200).json({
+    const db = await getDb();
+    const commentData = await db.collection("comments").find(query).toArray();
+    return res.json({
       success: true,
-      comments: commentData
+      data: commentData
     });
   } catch (error) {
     console.error("Error retrieving comments:", error);
@@ -41,42 +38,41 @@ router.get("/", async (req, res) => {
   }
 });
 
-// Add comment
+// Create new comment
 router.post("/", async (req, res) => {
-  const {
-    projectId,
-    contentId,
-    comment,
-    ...customFields
-  } = req.body;
-  const commentData = {
-    projectId,
-    contentId,
-    comment,
-    ...customFields,
-    createdAt: new Date()
-  };
   try {
-    const result = await getDb().collection("comments").insertOne(commentData);
-    if (result && result.insertedId) {
-      console.log("Comment added with ID:", result.insertedId);
-      return res.status(200).json({
-        success: true,
-        message: "Comment added successfully.",
-        commentId: result.insertedId
-      });
-    } else {
-      console.error("Insert operation failed. Result:", result);
-      return res.status(500).json({
+    const {
+      contentId,
+      comment,
+      ...customFields
+    } = req.body;
+    const projectId = req.projectId; // Use middleware-injected projectId
+
+    if (!contentId || !comment) {
+      return res.status(400).json({
         success: false,
-        message: "Comment could not be added."
+        message: "Content ID and comment are required"
       });
     }
+    const commentData = {
+      projectId,
+      contentId,
+      comment,
+      ...customFields,
+      createdAt: new Date()
+    };
+    const db = await getDb();
+    const result = await db.collection("comments").insertOne(commentData);
+    return res.status(201).json({
+      success: true,
+      message: "Comment created successfully",
+      id: result.insertedId
+    });
   } catch (error) {
-    console.error("Error adding comment:", error);
+    console.error("Error creating comment:", error);
     return res.status(500).json({
       success: false,
-      message: "Failed to add comment due to a server error."
+      message: "Failed to create comment."
     });
   }
 });

package/dist/routes/slides.js

@@ -1,38 +1,29 @@
 "use strict";
 
-const express = require('express');
+const express = require("express");
 const router = express.Router();
 const {
   getDb
 } = require('../services/mongo');
 
-// Get slides
-router.get('/', async (req, res) => {
-  const {
-    projectId,
-    tag
-  } = req.query;
+// Get all slides
+router.get("/", async (req, res) => {
   try {
+    const {
+      tag
+    } = req.query;
+    const projectId = req.projectId; // Use middleware-injected projectId
     const query = {
       projectId
     };
     if (tag) {
       query.tag = tag;
     }
-    console.log("Filter.....:", query);
-    const slidesData = await getDb().collection('slides').find(query).toArray();
-    if (!slidesData || slidesData.length === 0) {
-      console.log("Data not found.");
-      return res.status(200).json({
-        success: true,
-        slides: []
-      });
-    }
-    const sortedData = slidesData.sort((a, b) => new Date(b === null || b === void 0 ? void 0 : b.createdAt) - new Date(a === null || a === void 0 ? void 0 : a.createdAt));
-    console.log("Slides retrieved and sorted:", sortedData);
-    return res.status(200).json({
+    const db = await getDb();
+    const slidesData = await db.collection('slides').find(query).toArray();
+    return res.json({
       success: true,
-      slides: sortedData
+      data: slidesData
     });
   } catch (error) {
     console.error("Error retrieving slides:", error);
@@ -43,58 +34,47 @@ router.get('/', async (req, res) => {
   }
 });
 
-// Add slide
-router.post('/', async (req, res) => {
-  const {
-    projectId,
-    tag,
-    city,
-    url,
-    title,
-    description,
-    expiry
-  } = req.body;
-  if (!url || !title || !description || !expiry) {
-    return res.status(400).json({
-      success: false,
-      message: "All fields are required."
-    });
-  }
-  const slideData = {
-    projectId,
-    url,
-    title,
-    description,
-    expiry,
-    createdAt: new Date()
-  };
-  if (city) {
-    slideData.city = city;
-  }
-  if (tag) {
-    slideData.tag = tag;
-  }
+// Create new slide
+router.post("/", async (req, res) => {
   try {
-    const result = await getDb().collection('slides').insertOne(slideData);
-    if (result && result.insertedId) {
-      console.log("Slide added with ID:", result.insertedId);
-      return res.status(200).json({
-        success: true,
-        message: "Slide added successfully.",
-        slideId: result.insertedId
-      });
-    } else {
-      console.error("Insert operation failed. Result:", result);
-      return res.status(500).json({
+    const {
+      tag,
+      city,
+      url,
+      title,
+      description,
+      expiry
+    } = req.body;
+    const projectId = req.projectId; // Use middleware-injected projectId
+
+    if (!url || !title) {
+      return res.status(400).json({
         success: false,
-        message: "Slide could not be added."
+        message: "URL and title are required"
       });
     }
+    const slideData = {
+      projectId,
+      tag,
+      city,
+      url,
+      title,
+      description,
+      expiry,
+      createdAt: new Date()
+    };
+    const db = await getDb();
+    const result = await db.collection('slides').insertOne(slideData);
+    return res.status(201).json({
+      success: true,
+      message: "Slide created successfully",
+      id: result.insertedId
+    });
   } catch (error) {
-    console.error("Error adding slide:", error);
+    console.error("Error creating slide:", error);
     return res.status(500).json({
       success: false,
-      message: "Failed to add slide due to a server error."
+      message: "Failed to create slide."
     });
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "powr-sdk-api",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "description": "Shared API core library for PowrStack projects",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",