@ozdao/prometheus-framework 0.1.32 → 0.1.33

package/src/modules/community/components/sections/Feed.vue

@@ -1,44 +1,41 @@
 <template>
-  <section class="feed">
-    <transition name="scaleTransition">
-      <Loader 
-        v-if="isLoading" 
-        class="z-index-5 pos-t-50 left-t-50 pos-absolute"
-      />
-    </transition>
+  <transition name="scaleTransition">
+    <Loader 
+      v-if="isLoading" 
+      class="z-index-5 pos-t-50 left-t-50 pos-absolute"
+    />
+  </transition>
 
-    <transition name="scaleTransition">
-      <EmptyState 
-        v-if="!isLoading && posts.length < 1"
-        title="No Blog Posts Found"
-        description="Currently, there are no posts available in this blog. Please check back later."
-        class="pd-medium mn-thin bg-grey radius-big"
-      />
-      <div v-else>
+  <transition name="scaleTransition">
+    <EmptyState 
+      v-if="!isLoading && posts.length < 1"
+      title="No Blog Posts Found"
+      description="Currently, there are no posts available in this blog. Please check back later."
+      class="pd-medium mn-thin bg-grey radius-big"
+    />
+    <div :class="$attrs.class" v-else>
 
-        <CardBlogpost 
-          v-for="blogpost in posts" 
-          :key="blogpost._id" 
-          :blogpost="blogpost" 
-          :user="user" 
-          class="mn-medium"
-        />
-          
-          <transition 
-            name="scaleTransition"
+      <CardBlogpost 
+        v-for="blogpost in posts" 
+        :key="blogpost._id" 
+        :blogpost="blogpost" 
+        :user="user" 
+        class="mn-medium"
+      />
+        
+        <transition 
+          name="scaleTransition"
+        >
+          <button 
+            v-if="hasMorePosts && posts.length > 0" 
+            @click="loadMorePosts" 
+            class="w-100 bg-main button"
           >
-            <button 
-              v-if="hasMorePosts && posts.length > 0" 
-              @click="loadMorePosts" 
-              class="w-100 bg-main button"
-            >
-              Load more
-            </button>
-          </transition>
-      </div>
-    </transition>
-    
-  </section>
+            Load more
+          </button>
+        </transition>
+    </div>
+  </transition>
 </template>
 
 <script setup>
@@ -56,6 +53,14 @@
       type: String,
       default: null
     },
+    limit: {
+      type: Number,
+      default: 7
+    },
+    skip: {
+      type: Number,
+      default: 0
+    },
     owner: {
       type: String,
       default: null
@@ -82,8 +87,8 @@
   const hasMorePosts = ref(true);
   let isLoading = ref(true);
 
-  let skip = ref(0);
-  let limit = ref(7);
+  let skip = ref(props.skip);
+  let limit = ref(props.limit);
 
   const loadMorePosts = async () => {
     if (hasMorePosts.value) {

package/src/modules/community/components/sections/HotPosts.vue

@@ -1,55 +1,23 @@
 <template>
 	<section class="community-feed">
 		<h2 class="w-m-75r mn-auto pd-t-big pd-b-big t-center">Discover the Vibrant Community</h2>
-		<div class="grid-container">
-			<CardBlogpost v-for="(blogpost, index) in posts" 
-					:blogpost="blogpost" 
-					:owner="auth.state.user._id" 
-					:key="index" 
-					:class="gridClass(index)"
-			/>
-		</div>
+
+		<Feed 
+			:skip="0" 
+			:limit="3" 
+	      	:user="auth.state.user._id"
+	      	:period="'year'"
+	      	class="cols-2 gap-thin"
+	    />
 	</section>
 </template>
 
 <script setup="props">
 	import { ref, onMounted } from 'vue'
-	import CardBlogpost from '@pf/src/modules/community/components/blocks/CardBlogpost.vue'
- 	
+	import Feed from '@pf/src/modules/community/components/sections/Feed.vue'; 
 	// Import state
 	import * as blog from '@pf/src/modules/community/store/blogposts.js';
 	import * as auth  from '@pf/src/modules/auth/store/auth'
-
-	const posts = ref([]);
-
-	const loadPosts = async () => {
-		const data = await blog.read({skip: 0, limit: 7, period: 'year'});
-		console.log(data)
-		posts.value = data;
-	};
-
-	await loadPosts()
-
-
-	const gridClass = (index) => {
-    switch(index) {
-        case 0: 
-            return 'grid-item-2x2';
-        case 1: 
-            return 'grid-item-2x1';
-        case 2: 
-            return 'grid-item-1x1';
-        case 3: 
-        case 4: 
-            return 'grid-item-1x1';
-        case 6: 
-            return 'grid-item-2x1';
-        default: 
-            return '';
-    }
-};
-
-
 </script>
 
 <style scoped>
@@ -63,21 +31,6 @@
     grid-gap: 20px;
 	}
 
-	.grid-item-2x2 {
-	    grid-row: span 2;
-	    grid-column: span 2;
-	}
-
-	.grid-item-2x1 {
-	    grid-row: span 1;
-	    grid-column: span 2;
-	}
-
-	.grid-item-1x1 {
-	    grid-row: span 1;
-	    grid-column: span 1;
-	}
-
 
 </style>
 

package/src/modules/events/components/blocks/CardEvent.vue

@@ -20,10 +20,8 @@
     	:membersPhotos="event.participantsPhotos"
     	:type="type"
     	:dateFormatted="daysUntilEvent"
-
     />
 
-
  		<div 
  			v-if="event.cover && type !== 'short'" 
  			class="o-hidden pos-relative bg-grey mn-small w-100"

package/src/modules/events/controllers/events.controller.js

@@ -1,275 +1,65 @@
 const ObjectId = require('mongoose').Types.ObjectId;
+// Query Processor
+const queryProcessor = require('./utils/queryProcessor');
+const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
+// Utils
+const createFriendlyURL = require('@pf/src/modules/globals/utils/seo-friendly-url');
 
 const middlewareFactory = (db) => {
-  const Ticket = db.ticket; // замена Membership на Ticket
+  const Ticket = db.ticket;
   const Event = db.event;
   const Membership = db.membership;
 
   const read = async (req, res) => {
 
-    console.log(req.query)
-
-    const sortParam = req.query.sortParam || 'date.start';
-    const sortOrder = req.query.sortOrder || 'desc';
-    
-    const sort = {
-      [sortParam]: sortOrder === 'desc' ? -1 : 1,
-      '_id': 1,
-    };
-
-    const options = {
-      skip: parseInt(req.query.skip) || 0,
-      limit: parseInt(req.query.limit) || 20
-    };
-
-    const status = req.query.status;
-
-    // Initialize the current date once
-    const now = new Date();
-
-    // For handling 'status'
-    const todayStart = new Date(now.getTime()); // getTime returns the number of milliseconds since Unix epoch
-    todayStart.setHours(0, 0, 0, 0);
-    const todayEnd = new Date(now.getTime());
-    todayEnd.setHours(23, 59, 59, 999);
-    let dateConditions = [];
-
-    if (req.query.date) {
-      const dateString = req.query.date.toString(); // Just to ensure it's a string
-      const day = parseInt(dateString.substring(0, 2), 10);
-      const month = parseInt(dateString.substring(2, 4), 10) - 1; // months are 0-based in JavaScript
-      const year = parseInt(dateString.substring(4, 8), 10);
-      
-      const customDate = new Date(year, month, day);
-      customDate.setHours(0, 0, 0, 0); // Set the start of the day
-      
-      const customDateEnd = new Date(year, month, day);
-      customDateEnd.setHours(23, 59, 59, 999); // Set the end of the day
-
-      dateConditions.push({ "date.start": { $gte: customDate, $lte: customDateEnd } });
-    }
-
-    // Handling period query parameter
-    if (req.query.period) {
-      let startDate = new Date(now.getTime()); // Make a copy
-      let endDate = new Date(now.getTime());  // New end date variable
-      
-      switch (req.query.period) {
-        case 'today':
-          startDate.setHours(0, 0, 0, 0);
-          endDate.setHours(23, 59, 59, 999);
-          break;
-        case 'week':
-          endDate.setDate(now.getDate() + 7);
-          break;
-        case 'month':
-          endDate.setDate(now.getDate() + 30); // Or endDate.setMonth(now.getMonth() + 1); based on your requirement
-          break;
-        case 'year':
-          endDate.setFullYear(now.getFullYear() + 1);
-          break;
-        default:
-          break;
-      }
-      dateConditions.push({ "date.start": { $gte: startDate, $lte: endDate } });
-    }
-
-    console.log(dateConditions)
-
-    // Handling custom period range from frontend
-    if (req.query.periodStart && req.query.periodEnd) {
-      const periodStart = new Date(req.query.periodStart);
-      const periodEnd = new Date(req.query.periodEnd);
-      dateConditions.push({ "date.start": { $gte: periodStart, $lte: periodEnd } });
-    }
-
-    // Handling 'status'
-    if (req.query.status) {
-      const status = req.query.status;
-      switch (status) {
-        case 'finished':
-          dateConditions.push({ "date.start": { $lt: now } });
-          break;
-        case 'today':
-          dateConditions.push({ "date.start": { $gte: todayStart, $lte: todayEnd } });
-          break;
-        case 'live':
-          dateConditions.push({ "date.start": { $lte: now } });
-          dateConditions.push({ "date.end": { $gte: now } });
-          break;
-        case 'planned':
-          dateConditions.push({ "date.start": { $gt: now } });
-          break;
-        default:
-          break;
-      }
-    }
-    
-    const matchConditions = [
-      ...(dateConditions.length > 0 ? [{ $and: dateConditions }] : []),
-      ...(req.query.url ? [{ url: req.query.url }] : []),
-      ...(req.query.owner ? [{ "owner.target": new ObjectId(req.query.owner) }] : []),
-      ...(req.query.creator ? [{ "creator.target": new ObjectId(req.query.creator) }] : []),
-    ];
-
-    const matchStage = matchConditions.length > 0 ? { $match: { $and: matchConditions } } : null;
-
-    console.log(dateConditions)
-
-
-    const stages = [
-       ...(matchStage != null ? [matchStage] : []),
-      {
-        $lookup: {
-          from: "tickets", // замена memberships на tickets
-          localField: "_id",
-          foreignField: "target",
-          as: "tickets",
-          pipeline: [{
-            $lookup: {
-              from: "users",
-              localField: "user",
-              foreignField: "_id",
-              as: "user"
-            }
-          },{ 
-            $unwind: { path: "$user", preserveNullAndEmptyArrays: true } 
-          }]
-        }
-      },
-      {
-        $addFields: {
-          participantsPhotos: {
-            $map: {
-              input: "$tickets",
-              as: "ticket",
-              in: "$$ticket.user.profile.photo"
-            }
-          }
-        }
-      },
-      {
-        $addFields: {
-          numberOfTickets: { $size: '$tickets' }
-        }
-      },
-      {
-        $addFields: {
-          hasTicket: {
-            $cond: {
-              if: req.query.user,
-              then: {
-                $in: [ new db.mongoose.Types.ObjectId(req.query.user), "$tickets.user._id" ]
-              },
-              else: "$$REMOVE"
-            }
-          }
-        }
-      },
-      {
-        $lookup: {
-          from: "users",
-          localField: "creator.target",
-          foreignField: "_id",
-          as: "creatorUser"
-        }
-      },
-      {
-        $lookup: {
-          from: "organizations",
-          localField: "creator.target",
-          foreignField: "_id",
-          as: "creatorOrganization"
-        }
-      },
-      // Для owner
-      {
-        $lookup: {
-          from: "users",
-          localField: "owner.target",
-          foreignField: "_id",
-          as: "ownerUser"
-        }
-      },
-      {
-        $lookup: {
-          from: "organizations",
-          localField: "owner.target",
-          foreignField: "_id",
-          as: "ownerOrganization"
-        }
-      },
-      {
-        $addFields: {
-          "creator.target": {
-            $cond: [
-              { $eq: ["$creator.type", "user"] },
-              { $arrayElemAt: ["$creatorUser", 0] },
-              { $arrayElemAt: ["$creatorOrganization", 0] }
-            ]
-          },
-          "owner.target": {
-            $cond: [
-              { $eq: ["$owner.type", "user"] },
-              { $arrayElemAt: ["$ownerUser", 0] },
-              { $arrayElemAt: ["$ownerOrganization", 0] }
-            ]
-          }
-        }
-      },
-      {
-        $project: {
-          _id: 1,
-          url: 1,
-          cover: 1,
-          name: 1,
-          status: 1,
-          description: 1,
-          content: 1,
-          owner: 1,
-          creator: 1,
-          tags: 1,
-          date: 1,
-          numberOfTickets: 1,
-          participantsPhotos: 1,
-          hasTicket: 1,
-          tickets: 1,
-          createdAt: 1
-        }
-      },
+    let stages = [];
+
+    stages = [
+      ...queryProcessorGlobals.getBasicOptions(
+        req.query
+      ), 
+      ...queryProcessorGlobals.getDateConditions(
+        req.query.date
+      ),
+      ...queryProcessorGlobals.getPeriodConditions(
+        req.query.period,
+        req.query.periodStart,
+        req.query.periodEnd
+      ),
+      ...queryProcessorGlobals.getStatusConditions(
+        req.query.status
+      ),
+      // Tickets and Participants
+      queryProcessor.getTicketsLookupStage(),
+      queryProcessor.getParticipantsPhotosStage(),
+      queryProcessor.getNumberOfTicketsStage(),
+
+      ...queryProcessor.getHasTicketStage(
+        req.query.user
+      ),
+      ...queryProcessor.getParticipantStages(
+        req.query.participant
+      ),
+      // For creator
+      queryProcessorGlobals.getCreatorUserLookupStage(),
+      queryProcessorGlobals.getCreatorOrganizationLookupStage(),
+      // For owner
+      queryProcessorGlobals.getOwnerUserLookupStage(),
+      queryProcessorGlobals.getOwnerOrganizationLookupStage(),
+      queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+      // Get object
+      queryProcessor.getProjectStage(),
+      // Pagination
+      ...queryProcessorGlobals.getSortingOptions(
+        req.query
+      ),
+      ...queryProcessorGlobals.getPaginationOptions(
+        req.query
+      )
     ];
 
-    const participantId = req.query.participant ? new db.mongoose.Types.ObjectId(req.query.participant) : null;
-
-    if (participantId) {
-        stages.push({
-            $addFields: {
-                "participantTickets": {
-                    $filter: {
-                        input: "$tickets",
-                        as: "ticket",
-                        cond: { $eq: ["$$ticket.user._id", participantId] }
-                    }
-                }
-            }
-        });
-
-        stages.push({
-            $match: {
-                "participantTickets.0": { $exists: true }
-            }
-        });
-    }
-    
-    stages.push({ $sort: sort });
-    stages.push({ $skip: options.skip });
-    stages.push({ $limit: options.limit });
-
-
     try {
-
-      const events = await Event.aggregate(stages);
-          console.log(events)
+      const events = await Event.aggregate(stages).exec();
       res.status(200).send(events);
     } catch (err) {
       console.log(err);
@@ -279,19 +69,19 @@ const middlewareFactory = (db) => {
 
 
   const create = async (req, res) => {
-    try {
+    if (req.body._id) delete req.body._id;
 
-      delete req.body._id;
-      req.body.url = req.body.name.toLowerCase().replace(/ /g, '-').replace(/[^\w-]+/g, '');
+    try {
+      req.body.url = createFriendlyURL(req.body.name);
 
       const event = await Event.create(req.body);
 
       if (!event) {
         return res.status(404).send({ message: "Event is not created." });
       }
+
       res.status(200).send(event);
     } catch (err) {
-      console.log(err)
       return res.status(500).send({ message: err.message });
     }
   };

package/src/modules/events/controllers/utils/queryProcessor.js

@@ -0,0 +1,118 @@
+const ObjectId = require('mongoose').Types.ObjectId;
+
+function getTicketsLookupStage() {
+  return {
+    $lookup: {
+      from: "tickets",
+      localField: "_id",
+      foreignField: "target",
+      as: "tickets",
+      pipeline: [{
+        $lookup: {
+          from: "users",
+          localField: "user",
+          foreignField: "_id",
+          as: "user"
+        }
+      },{ 
+        $unwind: { path: "$user", preserveNullAndEmptyArrays: true } 
+      }]
+    }
+  };
+}
+
+function getParticipantsPhotosStage() {
+  return {
+    $addFields: {
+      participantsPhotos: {
+        $map: {
+          input: "$tickets",
+          as: "ticket",
+          in: "$$ticket.user.profile.photo"
+        }
+      }
+    }
+  };
+}
+
+function getNumberOfTicketsStage() {
+  return {
+    $addFields: {
+      numberOfTickets: { $size: '$tickets' }
+    }
+  };
+}
+
+
+function getHasTicketStage(user) {
+  if (user) {
+    return [{
+      $addFields: {
+        hasTicket: {
+          $in: [ new ObjectId(user), "$tickets.user._id" ]
+        }
+      }
+    }];
+  } else {
+    return [];
+  }
+}
+
+function getProjectStage() {
+  return {
+    $project: {
+      _id: 1,
+      url: 1,
+      cover: 1,
+      name: 1,
+      status: 1,
+      description: 1,
+      content: 1,
+      owner: 1,
+      creator: 1,
+      tags: 1,
+      date: 1,
+      numberOfTickets: 1,
+      participantsPhotos: 1,
+      hasTicket: 1,
+      tickets: 1,
+      createdAt: 1
+    }
+  };
+}
+
+function getParticipantStages(participantQuery) {
+    const participantId = participantQuery ? new ObjectId(participantQuery) : null;
+    let stages = [];
+
+    if (participantId) {
+        stages.push({
+            $addFields: {
+                "participantTickets": {
+                    $filter: {
+                        input: "$tickets",
+                        as: "ticket",
+                        cond: { $eq: ["$$ticket.user._id", participantId] }
+                    }
+                }
+            }
+        });
+
+        stages.push({
+            $match: {
+              "participantTickets.0": { $exists: true }
+            }
+        });
+    }
+
+    return stages;
+}
+
+module.exports = { 
+  getTicketsLookupStage,
+  getParticipantsPhotosStage,
+  getNumberOfTicketsStage,
+  getHasTicketStage,
+  getProjectStage,
+  getParticipantStages
+};