fix: changes to events

ngoworldcommunity · Feb 27, 2024 · 3c6f89b · 3c6f89b
1 parent 9da9de9
commit 3c6f89b
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 43 deletions.
diff --git a/routes/events/Event.js b/routes/events/Event.js
@@ -3,6 +3,8 @@ const router = express.Router();
 const Event = require("../../schema/events/EventSchema");
 const { STATUSCODE, STATUSMESSAGE } = require("../../static/Status");
 const { setTime } = require("../../utils/SetTime");
+const jwt = require("jsonwebtoken");
+const User = require("../../schema/user/UserSchema");
 
 router.get("/", async (req, res) => {
   try {
@@ -30,19 +32,21 @@ router.post("/create", async (req, res) => {
   try {
     const { uid, ...data } = req.body;
 
-    // Validate required fields:
     if (
       !data.name ||
       !uid ||
-      !data.about ||
-      !data.hostUsername ||
-      !data.hostName ||
-      !data.thumbnailImage ||
+      !data.description ||
+      !data.coverImage ||
       !data.mode ||
-      !data.date ||
+      !data.startDate ||
+      !data.endDate ||
       !data.startTime ||
       !data.endTime ||
-      !data.timezone
+      !data.city ||
+      !data.state ||
+      !data.country ||
+      !data.address ||
+      !data.mapIframe
     ) {
       console.log(data);
       return res
@@ -58,15 +62,20 @@ router.post("/create", async (req, res) => {
         .json({ message: "Already exists" });
     }
 
-    // Combine sanitized data with timestamp fields:
+    const { Token } = req.cookies;
+    const user = await User.findOne({
+      email: jwt.verify(Token, process.env.JWT_SECRET).User.id,
+    });
+
     const newEvent = new Event({
       ...data,
       uid,
+      hostName: user.name,
+      hostUsername: user.username,
       createdAt: setTime(),
       updatedAt: setTime(),
     });
 
-    // Validate data before saving:
     const validationErrors = newEvent.validateSync();
     if (validationErrors) {
       const errors = Object.values(validationErrors.errors).map(
@@ -77,11 +86,11 @@ router.post("/create", async (req, res) => {
         .json({ message: "Event Validation failed", errors });
     }
 
-    // Save the event:
     const savedEvent = await newEvent.save();
 
-    // Respond with the created event:
-    res.status(STATUSCODE.CREATED).json(savedEvent);
+    res
+      .status(STATUSCODE.CREATED)
+      .json({ message: "Event Created", savedEvent });
   } catch (error) {
     console.error(error);
     res

diff --git a/schema/events/EventSchema.js b/schema/events/EventSchema.js
@@ -11,12 +11,11 @@ const EventSchema = new mongoose.Schema({
     required: true,
     unique: true,
   },
-  about: {
+  description: {
     type: String,
     required: true,
     trim: true,
   },
-
   hostUsername: {
     type: String,
     required: true,
@@ -26,20 +25,19 @@ const EventSchema = new mongoose.Schema({
     required: true,
     trim: true,
   },
-  bannerImage: {
+  coverImage: {
     type: String,
     trim: true,
   },
-  thumbnailImage: {
-    type: String,
-    required: true,
-    trim: true,
-  },
-
+  // thumbnailImage: {
+  //   type: String,
+  //   required: true,
+  //   trim: true,
+  // },
   mode: {
     type: String,
     required: true,
-    enum: ["online", "offline"],
+    enum: ["Online", "Offline"],
   },
   address: {
     type: String,
@@ -57,14 +55,14 @@ const EventSchema = new mongoose.Schema({
     type: String,
     trim: true,
   },
-  iframe: {
+  mapIframe: {
     type: String,
     trim: true,
   },
-  date: {
-    type: Date,
-    required: true,
-  },
+  // date: {
+  //   type: Date,
+  //   required: true,
+  // },
   startTime: {
     type: Date,
     required: true,
@@ -73,26 +71,35 @@ const EventSchema = new mongoose.Schema({
     type: Date,
     required: true,
   },
-  timezone: {
-    type: String,
-    required: true,
-  },
-  tags: {
-    type: [String],
-    default: [],
-  },
-  isApproved: {
-    type: Boolean,
-    default: false,
-  },
-  createdAt: {
+  startDate: {
     type: Date,
-    default: Date.now,
+    required: true,
   },
-  updatedAt: {
+  endDate: {
     type: Date,
-    default: Date.now,
+    required: true,
   },
+
+  // timezone: {
+  //   type: String,
+  //   required: true,
+  // },
+  // tags: {
+  //   type: [String],
+  //   default: [],
+  // },
+  // isApproved: {
+  //   type: Boolean,
+  //   default: false,
+  // },
+  // createdAt: {
+  //   type: Date,
+  //   default: Date.now,
+  // },
+  // updatedAt: {
+  //   type: Date,
+  //   default: Date.now,
+  // },
 });
 
 // Indexes for efficient querying: