@ozdao/prometheus-framework 0.1.35 → 0.1.37

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

@@ -0,0 +1,56 @@
+function getPeriodConditions(period) {
+  const date = new Date();
+  const matchStage = [];
+
+  switch (period) {
+    case 'today':
+      date.setDate(date.getDate() - 1);
+      break;
+    case 'week':
+      date.setDate(date.getDate() - 7);
+      break;
+    case 'month':
+      date.setMonth(date.getMonth() - 1);
+      break;
+    case 'year':
+      date.setFullYear(date.getFullYear() - 1);
+      break;
+    default:
+      date.setFullYear(date.getFullYear() - 1);
+  }
+
+  if (date) {
+   return [{ $match: { createdAt: { $gte: date } } }];
+  } else {
+  return []
+ };
+}
+
+async function getCategoryConditions(category, user) {
+  const aggregationStages = [];
+
+  if (category) {
+    switch (category) {
+      case 'featured':
+        aggregationStages.push({ $match: { tags: { $in: ["Featured"] } } });
+        break;
+      case 'popular':
+        aggregationStages.push({ $sort: { views: -1, likes: -1 } });
+        break;
+      case 'new':
+        aggregationStages.push({ $sort: { createdAt: -1 } });
+        break;
+    }
+  }
+
+  // Возвращаем накопленные этапы агрегации.
+  console.log(aggregationStages)
+  return aggregationStages;
+}
+
+  
+module.exports = { 
+  getPeriodConditions,
+  getCategoryConditions,
+  // ... other functions that you might want to export
+};

package/src/modules/community/controllers/utils/queryProcessorReactions.js

@@ -0,0 +1,63 @@
+const ObjectId = require('mongoose').Types.ObjectId;
+
+function getCommentsLookupStage() {
+  return {
+    $lookup: {
+      from: "comments",
+      localField: "_id",
+      foreignField: "target",
+      as: "comments"
+    }
+  };
+}
+
+function getReactionsLookupStage() {
+  return {
+    $lookup: {
+      from: "reactions",
+      localField: "_id",
+      foreignField: "target",
+      as: "reactions"
+    }
+  };
+}
+
+function getReactionsCommentsFields(user) {
+  return {
+    $addFields: {
+      numberOfComments: { $size: "$comments" },
+      numberOfReactions: { $size: "$reactions" },
+      isReacted: {
+        $in: [
+          new ObjectId(user), // make sure db is accessible or pass as param
+          "$reactions.user"
+        ]
+      },
+      reactionId: {
+        $let: {
+          vars: {
+            reactionIndex: {
+              $indexOfArray: [
+                "$reactions.user",
+                new ObjectId(user) // same here for db accessibility
+              ]
+            }
+          },
+          in: {
+            $cond: [
+              { $gte: ["$$reactionIndex", 0] },
+              { $arrayElemAt: ["$reactions._id", "$$reactionIndex"] },
+              null
+            ]
+          }
+        }
+      }
+    }
+  };
+}
+
+module.exports = { 
+  getCommentsLookupStage,
+  getReactionsLookupStage,
+  getReactionsCommentsFields
+};

package/src/modules/community/routes/blog.routes.js

@@ -3,18 +3,22 @@ const controllerFactory = require("../controllers/blog.controller");
 const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
 const middlewareFactoryCommunity = require('../middlewares/server');
 
-module.exports = function(app, db) {
+module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
   const { authJwt } = middlewareFactoryGlobal(db);
   const { verifyBlogpost } = middlewareFactoryCommunity(db);
 
   app.use(function(req, res, next) {
-    res.header(
-      "Access-Control-Allow-Headers",
-      "Access-Control-Allow-Origin",
-      "x-access-token, Origin, Content-Type, Accept"
-    );
+    
+    const origin = req.headers.origin;
+
+    if (origins.includes(origin)) {
+      res.setHeader('Access-Control-Allow-Origin', origin);
+    }
+
+    res.header("Access-Control-Allow-Headers", "x-access-token, Origin, Content-Type, Accept");
+
     next();
   });
 

package/src/modules/community/store/blogposts.js

@@ -56,14 +56,14 @@ async function read(options = {}) {
   if (options.category) {
     options.params.category = options.category;
   }
-  // Organization
-  if (options.organization) {
-    options.params.organization = options.organization;
-  }
-  // Author
+  // Owner
   if (options.owner) {
     options.params.owner = options.owner;
   }
+  // Following
+   if (options.following) {
+    options.params.following = options.following;
+  }
   // Creator
    if (options.creator) {
     options.params.creator = options.creator;

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

@@ -134,9 +134,8 @@
 
 	import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 
-	import CardHeader  from '@pf/src/components/CardHeader/CardHeader.vue'
-	import CardFooter  from '@pf/src/components/CardFooter/CardFooter.vue'
-
+	import CardHeader  from '@pf/src/modules/globals/components/blocks/CardHeader.vue'
+	import CardFooter  from '@pf/src/modules/globals/components/blocks/CardFooter.vue'
 	import { ref, computed } from 'vue'
 	import { useRouter } from 'vue-router'
 

package/src/modules/events/components/pages/Events.vue

@@ -1,10 +1,10 @@
 <template>
   <section>
-    <!-- <List
+    <List
       :user="auth.state.user._id"
-      class="bg-grey radius-big"
-      :status="'today'"
-    /> -->
+      class="bg-grey mn-thin radius-big"
+      :phase="'week'"
+    />
     
     <Feed 
       :category="route.params.category" 

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

@@ -1,4 +1,4 @@
-f<template>
+<template>
   <section class="feed">
     <TransitionGroup tag="ul" name="scaleTransition" class="o-hidden bg-grey radius-big">
       <SkeletonEvent
@@ -88,7 +88,7 @@ f<template>
       type: String,
       default: null
     },
-    status: {
+    phase: {
       type: String,
       default: null
     }
@@ -117,7 +117,7 @@ f<template>
         owner: props.owner,
         organization: props.organization,
         period: props.period,
-        status: props.status
+        phase: props.phase
       });
 
       if (data.length === 0) {
@@ -145,7 +145,7 @@ f<template>
       date: props.selectedDate,
       organization: props.organization,
       period: props.period,
-      status: props.status
+      phase: props.phase
     });
 
     if (data.length === 0) {

package/src/modules/events/components/sections/List.vue

@@ -79,7 +79,7 @@
       type: String,
       default: null
     },
-    status: {
+    phase: {
       type: String,
       default: null
     }
@@ -101,7 +101,7 @@
       owner: props.owner,
       organization: props.organization,
       period: props.period,
-      status: props.status
+      phase: props.phase
     });
 
     eventsList.value = data;

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

@@ -18,16 +18,16 @@ const middlewareFactory = (db) => {
       ...queryProcessorGlobals.getBasicOptions(
         req.query
       ), 
-      ...queryProcessorGlobals.getDateConditions(
+      ...queryProcessor.getDateConditions(
         req.query.date
       ),
-      ...queryProcessorGlobals.getPeriodConditions(
+      ...queryProcessor.getPeriodConditions(
         req.query.period,
         req.query.periodStart,
         req.query.periodEnd
       ),
-      ...queryProcessorGlobals.getStatusConditions(
-        req.query.status
+      ...queryProcessor.getPhaseConditions(
+        req.query.phase
       ),
       // Tickets and Participants
       queryProcessor.getTicketsLookupStage(),
@@ -51,10 +51,12 @@ const middlewareFactory = (db) => {
       queryProcessor.getProjectStage(),
       // Pagination
       ...queryProcessorGlobals.getSortingOptions(
-        req.query
+        req.query.sortParam,
+        req.query.sortOrder,
       ),
       ...queryProcessorGlobals.getPaginationOptions(
-        req.query
+        req.query.skip,
+        req.query.limit
       )
     ];
 

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

@@ -1,5 +1,111 @@
 const ObjectId = require('mongoose').Types.ObjectId;
 
+function getDateConditions(date) {
+  if (date) {
+    const dateString = 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
+
+    return [{ $match: { "date.start": { $gte: customDate, $lte: customDateEnd } } }];
+  } else {
+    return []
+  }
+}
+
+function getPeriodConditions(period,periodStart, periodEnd) {
+  const now = new Date();
+
+  let startDate, endDate;
+
+  if (periodStart && periodEnd) {
+    startDate = new Date(periodStart);
+    endDate = new Date(periodEnd);
+
+    return [{ 
+      $match: { 
+        "date.start": { 
+          $gte: startDate, 
+          $lte: endDate 
+        } 
+      } 
+    }];
+  } else if (period) {
+    startDate = new Date(now.getTime()); // Make a copy
+    endDate = new Date(now.getTime());  // New end date variable
+    
+    switch (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;
+    }
+    return [{ 
+      $match: { 
+        "date.start": { 
+          $gte: startDate, 
+          $lte: endDate 
+        } 
+      } 
+    }];
+  } else {
+    return []
+  }
+}
+
+function getPhaseConditions(phase) {
+  const now = new Date();
+
+  const todayStart = new Date(now.getTime());
+  todayStart.setHours(0, 0, 0, 0);
+  const todayEnd = new Date(now.getTime());
+  todayEnd.setHours(23, 59, 59, 999);
+
+  let matchConditions = [];
+
+  switch (phase) {
+    case 'finished':
+      matchConditions.push({ "date.start": { $lt: now } });
+      break;
+    case 'today':
+      matchConditions.push({ "date.start": { $gte: todayStart, $lte: todayEnd } });
+      break;
+    case 'live':
+      matchConditions.push({ "date.start": { $lte: now } });
+      matchConditions.push({ "date.end": { $gte: now } });
+      break;
+    case 'planned':
+      matchConditions.push({ "date.start": { $gt: now } });
+      break;
+    default:
+      break;
+  }
+
+  if (matchConditions && matchConditions.length > 0) {
+    return [{ $match: { $and: matchConditions } }];
+  } else {
+    return []
+  }
+}
+
 function getTicketsLookupStage() {
   return {
     $lookup: {
@@ -65,7 +171,7 @@ function getProjectStage() {
       url: 1,
       cover: 1,
       name: 1,
-      status: 1,
+      phase: 1,
       description: 1,
       content: 1,
       owner: 1,
@@ -109,6 +215,10 @@ function getParticipantStages(participantQuery) {
 }
 
 module.exports = { 
+  getDateConditions,
+  getPhaseConditions,
+  getPeriodConditions,
+
   getTicketsLookupStage,
   getParticipantsPhotosStage,
   getNumberOfTicketsStage,

package/src/modules/events/models/event.model.js

@@ -46,10 +46,6 @@ module.exports = (db) => {
     applyOwnershipSchema(EventSchema,db);
     applyMetadataSchema(EventSchema,db);
 
-    EventSchema.post('aggregate', async function(docs) {
-        console.log(EventSchema)
-    });
-
     const Event = db.mongoose.model("Event", EventSchema);
 
     return Event;

package/src/modules/events/routes/events.routes.js

@@ -4,7 +4,7 @@ const controllerFactory = require("../controllers/events.controller");
 const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
 const middlewareFactoryEvents = require('../middlewares/server');
 // Routes
-module.exports = function(app, db) {
+module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
   const { authJwt } = middlewareFactoryGlobal(db);
@@ -12,11 +12,14 @@ module.exports = function(app, db) {
 
   app.use(function(req, res, next) {
     
-    res.header(
-      "Access-Control-Allow-Headers",
-      "Access-Control-Allow-Origin",
-      "x-access-token, Origin, Content-Type, Accept"
-    );
+    const origin = req.headers.origin;
+
+    if (origins.includes(origin)) {
+      res.setHeader('Access-Control-Allow-Origin', origin);
+    }
+
+    res.header("Access-Control-Allow-Headers", "x-access-token, Origin, Content-Type, Accept");
+
     next();
   });
 

package/src/modules/events/store/events.js

@@ -46,12 +46,10 @@ async function read(options = {}) {
   options.params.skip = options.skip || 0;
   options.params.limit = options.limit || 9;
   options.params.tags = options.tags || [];
-
-  // Period
-
-  // Handle status
-  if (options.status) {
-    options.params = { status: options.status };
+  
+  // Handle phase
+  if (options.phase) {
+    options.params = { phase: options.phase };
   }
   // Handle fetching a specific event by _id
   if (options.url) {
@@ -165,7 +163,7 @@ function clean () {
     _id: "",
     cover: "",
     url: "",
-    status: "",
+    phase: "",
     name: "",
     tags: [],
     date: {

package/src/{components/CardHeader → modules/globals/components/blocks}/CardHeader.vue

@@ -78,8 +78,23 @@
 					<div v-if="members" class="w-4r i-thin">
 					    <!-- Круг с числом участников -->
 					    <span 
-					        :style="{ position: 'absolute', top: '0px', right: '0px' }"
-					        class="br-solid br-2px br-white z-index-1 radius-big i-thin bg-second flex flex-center t-white p-small t-semi"
+					        :style="{ 
+					        	position: 'absolute', 
+					        	top: '0px', 
+					        	right: '0px' 
+					        }"
+					        class="
+					        	br-solid 
+					        	br-2px 
+					        	br-white 
+					        	z-index-1 
+					        	radius-big 
+					        	i-thin 
+					        	bg-second 
+					        	flex flex-center 
+					        	t-white 
+					        	p-small 
+					        	t-semi"
 					    >
 					        {{members}}
 					    </span>
@@ -89,8 +104,20 @@
 					        v-for="(photo, index) in membersPhotos.slice(0,2)"
 					        :key="index"
 					        :src="(FILE_SERVER_URL || '') + photo"
-					        :style="{ position: 'absolute', top: '0px', right: (index * 20 + 20) + '%', zIndex: 1 - index }"
-					        class="br-solid br-2px br-white i-thin bg-grey radius-big"
+					        :style="{ 
+					        	position: 'absolute', 
+					        	top: '0px', 
+					        	right: (index * 20 + 20) + '%', 
+					        	zIndex: 1 - index 
+					        }"
+					        class="
+					        	br-solid 
+					        	br-2px 
+					        	br-white 
+					        	i-thin 
+					        	bg-grey 
+					        	radius-big
+					        "
 					    />
 					</div>
 				</div>

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

@@ -0,0 +1,136 @@
+<template>
+  <section class="feed">
+
+    <TransitionGroup tag="ul" name="scaleTransition" class="o-hidden bg-grey radius-big">
+      <SkeletonEvent
+        v-if="isLoading"
+        v-for="i in currentLimit" :key="i"
+      />
+    </TransitionGroup>
+
+    <transition name="scaleTransition">
+      <EmptyState
+        v-if="!isLoading && itemsList.length < 1"
+        :title="states.empty.title"
+        :description="states.empty.description"
+        class="pd-medium mn-thin bg-grey radius-big"
+      />
+    </transition>
+
+    <!-- <SortProducts
+
+    /> -->
+
+    <TransitionGroup tag="ul" name="scaleTransition" class="cols-1 gap-thin">
+    
+
+      <slot
+        v-if="!isLoading && itemsList.length > 0"
+        :items="itemsList"
+        :user="user"
+      ></slot>
+
+      <button
+        v-if="hasMoreItems && itemsList.length > 0"
+        @click="loadMoreItems"
+        class="w-100 bg-main button"
+      >
+        Load more
+      </button>
+    </TransitionGroup>
+  </section>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+
+import SkeletonEvent from '@pf/src/modules/icons/skeletons/SkeletonEvent.vue'
+
+import Loader from '@pf/src/components/Loader/Loader.vue';
+import EmptyState from '@pf/src/components/EmptyState/EmptyState.vue';
+import SortProducts from '@pf/src/modules/products/components/sections/SortProducts.vue'
+
+// Пропсы
+const props = defineProps({
+  states: {
+    type: Object,
+    default: () => ({
+      empty: {
+        title: String,
+        description: String,
+      },
+    }),
+  },
+  store: {
+    type: Object,
+    default: () => ({
+      read: Function,
+      state: Object,
+    }),
+  },
+  options: {
+    type: Object,
+    default: () => ({
+      category: null,
+      limit: 20, 
+      skip: 0 ,
+      owner:  null,
+      creator:  null,
+      user:  null,
+      status: null,
+      period:  null,
+    }),
+  },
+});
+  
+const itemsList = ref([]);
+const hasMoreItems = ref(true);
+
+let isLoading = ref(true);
+
+let currentSkip = ref(props.options.skip ? props.options.skip : 0);
+let currentLimit = ref(props.options.limit ? props.options.limit : 10);
+
+const query = computed(() => ({
+  skip: currentSkip.value,
+  limit: currentLimit.value,
+  ...props.options
+}));
+
+const loadMoreItems = async () => {
+  if (hasMoreItems.value) {
+    currentSkip.value += currentLimit.value;
+    
+    const data = await props.store.read({
+      skip: currentSkip.value,
+      limit: currentLimit.value,
+      ...props.options
+    });
+
+    if (data.length === 0) {
+      hasMoreItems.value = false;
+    }
+
+    itemsList.value = [...itemsList.value, ...data];
+  }
+};
+
+onMounted(async () => {
+  console.log(props.options)
+  const data = await props.store.read({
+    skip: currentSkip.value,
+    limit: currentLimit.value,
+    ...props.options
+  });
+
+  if (data.length === 0) {
+    hasMoreItems.value = false;
+  } else {
+    hasMoreItems.value = true;
+  }
+
+  itemsList.value = data;
+  
+  isLoading.value = false;
+});
+</script>