@ozdao/prometheus-framework 0.2.112 → 0.2.114

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

@@ -18,28 +18,30 @@ const controllerFactory = (db) => {
   const Role = db.role;
 
   const read = async (req, res) => {
-    const Organization = db.organization;
-    const Membership = db.membership;
-    // Auth Module
-    const User = db.user;
-    const Role = db.role;
-    
+    //////////////////////////////////////
+    // 1. Sorting Condition
+    //////////////////////////////////////
     const sortParam = req.query.sortParam || 'numberOfProducts';
     const sortOrder = req.query.sortOrder || 'desc';
-    
+
     const sort = {
+      ...(sortParam === 'distance' ? { 'distanceExist': -1 } : {}),
       'numberOfProducts': -1,
       [sortParam]: sortOrder === 'desc' ? -1 : 1,
       "_id": 1
     };
-    
-    const options = {
+    console.log(sort)
+    // if (sortParam === 'distance') sort.numberOfSpots = -1
+    //////////////////////////////////////
+    // 2. Pagination Condition
+    //////////////////////////////////////
+    const pagination = {
       skip: parseInt(req.query.skip) || 0,
       limit: parseInt(req.query.limit) || 20
-    };
-
-    const categories = req.query.categories?.split(',') || [];
-    const delivery = req.query.delivery?.split(',') || [];
+    }
+    //////////////////////////////////////
+    // 3. Prices Condition
+    //////////////////////////////////////
     const prices = req.query.prices?.split(',') || [];
 
     let priceConditions = prices.map(priceRange => {
@@ -48,16 +50,18 @@ const controllerFactory = (db) => {
       const [min, max] = priceRange.split('-').map(Number);
       return { "products.price": { $gte: min, $lte: max } };
     });
-
+    //////////////////////////////////////
+    // 4. Organization Contain (blogpost, events, photos, etc...) Condition
+    //////////////////////////////////////
     let containConditions = []
-
-
     if (req.query.contain) { 
       containConditions = req.query.contain.map(property => ({
         [property]: { $exists: true, $not: { $size: 0 } }
       }));
     } 
-
+    //////////////////////////////////////
+    // MATCH CONDITIONS
+    //////////////////////////////////////
     const matchConditions = [
       ...(req.query._id ? [{ _id: new ObjectId(req.query._id) }] : []),
       ...(req.query.owner ? [{ owner: new ObjectId(req.query.owner) }] : []),
@@ -67,15 +71,42 @@ const controllerFactory = (db) => {
       ...(req.query.types ?  [{ types: { $in: req.query.types } }] : []),  // Если req.query.types - строка
       // to remove
       ...(req.query.onlyuser ? [{ "memberships.user": new ObjectId(req.query.onlyuser) }] : []),
-      ...(categories.length > 0 ? [{ "products.category": { $in: categories } }] : []),
-      ...(delivery.length > 0 ? [{ "spots.delivery": { $all: delivery } }] : []),
+      ...(req.query.categories?.split(',').length > 0 ? [{ "products.category": { $in: req.query.categories?.split(',') } }] : []),
+      ...(req.query.delivery?.split(',').length > 0 ? [{ "spots.delivery": { $all: req.query.delivery?.split(',') } }] : []),
       ...(priceConditions.length > 0 ? [{ $or: priceConditions }] : []),
       ...(req.query.contain ? containConditions : []),
     ];
+    //////////////////////////////////////
+    // 5. Search Condition
+    //////////////////////////////////////
+    const search = req.query.search;
 
+    if (search) {
+      const parts = search.split('.');
+
+      let regexPattern = '';
+
+      if (parts.length === 2) {
+        // Создаем паттерн, который допускает замену одного символа в каждой части
+        regexPattern = parts.map(part => part.substr(0, part.length - 1) + '.{1}').join('\\.');
+      } else {
+        // Если нет точки, применяем аналогичный подход к всей строке
+        regexPattern = search.substr(0, search.length - 1) + '.{1}';
+      }
+
+      matchConditions.push({
+        $or: [
+          { "profile.name": { $regex: regexPattern, $options: 'i' } },
+          { "products.name": { $regex: regexPattern, $options: 'i' } }
+        ]
+      });
+    }
+    //////////////////////////////////////
+    // 6. LOCATION CONDITION
+    //////////////////////////////////////
     let { location, address, locationRadius, city, state, country } = req.query;
 
-    let userLocation = { coordinates:[0,0] }
+    let userLocation = { coordinates: [0,0] }
 
     if (!location && (address || city || state || country)) {
       let geoLocation;
@@ -124,57 +155,35 @@ const controllerFactory = (db) => {
       });
     } 
 
-    const search = req.query.search;
-
-    if (search) {
-      const parts = search.split('.');
-
-      let regexPattern = '';
-
-      if (parts.length === 2) {
-        // Создаем паттерн, который допускает замену одного символа в каждой части
-        regexPattern = parts.map(part => part.substr(0, part.length - 1) + '.{1}').join('\\.');
-      } else {
-        // Если нет точки, применяем аналогичный подход к всей строке
-        regexPattern = search.substr(0, search.length - 1) + '.{1}';
-      }
-
-      matchConditions.push({
-        $or: [
-          { "profile.name": { $regex: regexPattern, $options: 'i' } },
-          { "products.name": { $regex: regexPattern, $options: 'i' } }
-        ]
-      });
-    }
-
     if (location) {
 
       console.log(location)
 
-      if (typeof location === 'string') {
-        location = JSON.parse(location);
-      }
+      if (typeof location === 'string') { location = JSON.parse(location); }
 
-     let lng
+      let lng
       let lat
       
       if (location.lng) {
          lng = location.lng
          lat = location.lat
-          userLocation.coordinates = [lng,lat]
+        
+        userLocation.coordinates = [lng,lat]
        } else {
         lng = location.coordinates[0]
         lat = location.coordinates[1]
+
         userLocation.coordinates = [lng,lat]
       }
 
-      // Determine the search radius based on the level of specificity
       const earthRadiusKm = 6378.1;
 
+
+      // Determine the search radius based on the level of specificity
       let radius = null;
 
       if (locationRadius) {
-          radius = parseFloat(locationRadius) / earthRadiusKm;
+        radius = parseFloat(locationRadius) / earthRadiusKm;
       } else if (city) {
           radius = 500 / earthRadiusKm;
       } else if (state) {
@@ -187,8 +196,8 @@ const controllerFactory = (db) => {
           "spots.location.coordinates": {
               $geoWithin: {
                   $centerSphere: [
-                      [parseFloat(lng), parseFloat(lat)],
-                      radius
+                    [parseFloat(lng), parseFloat(lat)],
+                    radius
                   ]
               }
           }
@@ -200,7 +209,9 @@ const controllerFactory = (db) => {
     } 
 
     const matchStage = matchConditions.length > 0 ? { $match: { $and: matchConditions } } : null;
-
+    //////////////////////////////////////
+    // AGGREGATION PIPELINE
+    //////////////////////////////////////
     const stages = [
     {
       $lookup: {
@@ -210,6 +221,11 @@ const controllerFactory = (db) => {
         as: "products"
       }
     },
+    {
+      $addFields: {
+        numberOfProducts: { $size: '$products' }
+      }
+    },
     {
       $lookup: {
         from: "blogposts",
@@ -218,11 +234,6 @@ const controllerFactory = (db) => {
         as: "blogposts"
       }
     },
-    {
-      $addFields: {
-        numberOfProducts: { $size: '$products' }
-      }
-    },
     {
       $lookup: {
         from: "departments",
@@ -286,7 +297,14 @@ const controllerFactory = (db) => {
     },
     {
       $addFields: {
-        distance: { $min: "$spots.distance" } // Add the minDistance field here
+        distance: { $min: "$spots.distance" },
+      }
+    },
+    {
+      $addFields: {
+        distanceExist: {
+          $cond: { if: { $eq: [{ $type: "$distance" }, "double"] }, then: true, else: false }
+        }
       }
     },
     {
@@ -299,21 +317,15 @@ const controllerFactory = (db) => {
     },
     addMembersQuantity(),
     addUserStatusFields(req.query.user),
-    {
-      $addFields: {
-        numberOfProducts: { $size: '$products' }
-      }
-    },
       ...(matchStage != null ? [matchStage] : []),
       { $sort: sort },
-      { $skip: options.skip },
-      { $limit: options.limit }
+      { $skip: pagination.skip },
+      { $limit: pagination.limit }
     ];
 
     try {
       console.log(stages)
       const organizations = await Organization.aggregate(stages);
-      console.log(organizations)
       res.status(200).send(organizations);
     } catch(err) {
       console.log(err)
@@ -361,33 +373,31 @@ const controllerFactory = (db) => {
     }
   };
 
-const create = async (req, res) => {
-  if(req.body._id === null) {
-    delete req.body._id;
-  }
-
-  try {
-    const organization = new Organization(req.body);
-    const savedOrganization = await organization.save();
-
-    const membership = new Membership({
-      user: savedOrganization.owner,
-      type: 'organization',
-      target: savedOrganization._id,
-      role: 'owner',
-      label: 'owner',
-    });
-    
-    const savedMembership = await membership.save();
-
-    res.status(201).json(savedOrganization);
-  } catch (error) {
-    console.error('Error:', error);
-    res.status(500).send(error);
-  }
-};
+  const create = async (req, res) => {
+    if(req.body._id === null) {
+      delete req.body._id;
+    }
 
+    try {
+      const organization = new Organization(req.body);
+      const savedOrganization = await organization.save();
+
+      const membership = new Membership({
+        user: savedOrganization.owner,
+        type: 'organization',
+        target: savedOrganization._id,
+        role: 'owner',
+        label: 'owner',
+      });
+      
+      const savedMembership = await membership.save();
 
+      res.status(201).json(savedOrganization);
+    } catch (error) {
+      console.error('Error:', error);
+      res.status(500).send(error);
+    }
+  };
 
   const update = async (req, res) => {
     try {
@@ -418,7 +428,7 @@ const create = async (req, res) => {
         }
 
         // Удаление всех memberships, связанных с этой организацией
-        Membership.deleteMany({ organization: req.params._id })
+        Membership.deleteMany({ target: req.params._id })
           .then(() => {
             const newToken = jwt.sign({
               _id: user._id,

package/src/modules/organizations/models/organization.model.js

@@ -1,10 +1,10 @@
-const { ObjectId } = require('mongodb');
+const applyEngagementSchema = require('@pf/src/modules/globals/models/engagement.schema.js');
 
-module.exports = (mongoose) => {
-  const OrganizationSchema = new mongoose.Schema({
+module.exports = (db) => {
+  const OrganizationSchema = new db.mongoose.Schema({
     // Creator and owner of organizations
     owner: {
-      type: ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'User', 
       required: true,
     },
@@ -14,8 +14,8 @@ module.exports = (mongoose) => {
     },
     // Types of organizations
     types: {
-        type: Array,
-        required: true,
+      type: Array,
+      required: true,
     },
     // Information for profile
     profile: {
@@ -65,6 +65,9 @@ module.exports = (mongoose) => {
   }, { 
     timestamps: true 
   });
+
+  applyEngagementSchema(OrganizationSchema,db);
+  
   // const Testimonial = require('./testimonial.model');
 
   // OrganizationSchema.methods.calculateRating = async function() {
@@ -105,6 +108,6 @@ module.exports = (mongoose) => {
   //   await this.save();
   // }
 
-  const Organization = mongoose.model('Organization', OrganizationSchema);
+  const Organization = db.mongoose.model('Organization', OrganizationSchema);
   return Organization
 }

package/src/modules/organizations/store/organizations.js

@@ -48,51 +48,20 @@ const actions = {
     organization.owner = owner
     try {
       const response = await $axios.post('/api/organizations/create', organization);
-      console.log('Organization created successfully');
       state.current = response.data;
       return response.data;
     } catch (error) {
-      console.log('Organization creation failed');
+      console.log(error);
       setError(error);
       throw error;
     }
   },
    async read(options = {}) {
 
-    let params = {}
+    console.log(options)
 
-    if (options._id) params._id = options._id;
-    if (options.owner) params.owner = options.owner;
-    if (options.user) params.user = options.user;
-    if (options.member) params.member = options.member;
-    if (options.subscriber) params.subscriber = options.subscriber;
-    if (options.postable) params.postable = options.postable;
-    if (options.location) params.location = options.location;
-    if (options.search) params.search = options.search;
-
-    if (options.location) params.location = options.location;
-    if (options.locationRadius) params.locationRadius = options.locationRadius;
-
-    if (options.country) params.country = options.country;
-    if (options.state) params.state = options.state;
-    if (options.city) params.city = options.city;
-    if (options.categories) params.categories = options.categories;
-    if (options.prices) params.prices = options.prices;
-    if (options.delivery) params.delivery = options.delivery;
-    if (options.types) params.types = options.types;
-    if (options.skip) params.skip = options.skip;
-    if (options.limit) params.limit = options.limit;
-    
-
-    params.contain = options.contain || [];
-
-   
-    params.sortParam = options.sortParam;
-    params.sortOrder = options.sortOrder;
-
-    console.log(params)
     try {
-      const response = await $axios.get('/api/organizations', { params: params });
+      const response = await $axios.get('/api/organizations', { params: options });
 
       if (options._id) {
         Object.assign(state.current || {}, response.data[0])

package/src/modules/products/components/blocks/CardPosition.vue

@@ -29,7 +29,7 @@
 					'g',
 					'ml'
 				]"
-				class="bg-grey pd-r-thin pd-l-thin pd-t-nano pd-b-nano radius-thin"
+				class="bg-light pd-r-thin pd-l-thin pd-t-nano pd-b-nano radius-thin"
 			/>
 
 			</Field>
@@ -71,7 +71,7 @@
 					'g',
 					'ml'
 				]"
-				class="bg-grey pd-r-thin pd-l-thin pd-t-nano pd-b-nano radius-thin"
+				class="bg-light pd-r-thin pd-l-thin pd-t-nano pd-b-nano radius-thin"
 			/>
 
 			</Field>

package/src/modules/products/components/blocks/LeftoverPositions.vue

@@ -26,14 +26,14 @@
           type="number"   
           label="Price" 
           :symbol="returnCurrency()"
-          class="bg-grey pd-medium radius-small" 
+          class="bg-light pd-medium radius-small" 
         />
 
         <Field 
           v-model:field="product.quantity" 
           type="number"  
           label="Quantity" 
-          class="bg-grey pd-medium radius-small" 
+          class="bg-light pd-medium radius-small" 
           :symbol="product.type"
         />
        

package/src/modules/products/components/pages/Categories.vue

@@ -36,7 +36,7 @@
         :key="category.id"
         :category="category" 
         @delete="deleteCategory"
-        class="pd-medium bg-grey radius-medium mn-b-thin"
+        class="pd-medium bg-light radius-medium mn-b-thin"
       />
     </VueDraggableNext>
   </div>

package/src/modules/products/components/pages/EditLeftover.vue

@@ -20,7 +20,7 @@
       :isPopupOpen="isOpenProductsPopup"
       class="bg-white w-min-30r w-max-30r radius-big pd-medium"
     >
-      <div class="bg-grey mn-b-thin h-min-20r h-max-20r o-scroll pd-medium radius-big">
+      <div class="bg-light mn-b-thin h-min-20r h-max-20r o-scroll pd-medium radius-big">
         <Feed
           :search="true"
           :states="{

package/src/modules/products/components/pages/Leftovers.vue

@@ -11,14 +11,14 @@
       </button>
     </header>
     
-    <section class="mn-b-semi pd-medium bg-grey radius-big">
+    <section class="mn-b-semi pd-medium bg-light radius-big">
       <p class="mn-b-thin">Balance:</p>
       <h3>{{formatPrice(totalPrice)}}</h3>
     </section>
 
     <!-- <h3>Low Stock</h3>
 
-    <section class="mn-b-semi pd-medium bg-grey radius-big">
+    <section class="mn-b-semi pd-medium bg-light radius-big">
       <div>
         Name: Code Red
         Left: 3
@@ -43,7 +43,7 @@
         { name: 'Stock-In',   value: 'stock-in' },
         { name: 'Stock-Out',  value: 'stock-out' }
       ]"
-      class="mn-b-small o-hidden h5 radius-big bg-grey"
+      class="mn-b-small o-hidden h5 radius-big bg-light"
     />
 
     <Feed
@@ -69,7 +69,7 @@
       <CardLeftover 
         v-for="leftover in items" 
         :leftover="leftover"
-        class="bg-grey pd-small mn-b-thin radius-small"
+        class="bg-light pd-small mn-b-thin radius-small"
       />
     </Feed>
   </div>

package/src/modules/products/components/pages/Product.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="flex flex-column w-100 o-hidden gap-thin pd-thin">
-		<!-- <Breadcrumbs class="bg-grey radius-big pd-small"/> -->
+		<!-- <Breadcrumbs class="bg-light radius-big pd-small"/> -->
 		<!-- {{product.quantity}}
 		<div v-if="product.ingredients">
 			{{product?.ingredients[0]?._id}}
@@ -14,14 +14,10 @@
 </template>
 
 <script setup="props">
-	/////////////////////////////
-	// COMPONENT DEPENDENCIES
-	/////////////////////////////
 	// Import components
 	import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
 	import PopularProducts 	from '@pf/src/modules/products/components/sections/PopularProducts.vue'
 	import SectionProduct from '@pf/src/modules/products/components/sections/SectionProduct.vue'
-	import Footer from '@pf/src/components/Footer/Footer.vue'
 	// Import libs
 	import { computed, onMounted } from 'vue'
 	import { useRoute,useRouter } from 'vue-router'

package/src/modules/products/components/pages/ProductEdit.vue

@@ -84,7 +84,7 @@
 	      :isPopupOpen="isOpenIngredientPopup"
 	      class="bg-white w-min-30r w-max-30r radius-big pd-medium"
 	    >
-	      <div class="bg-grey mn-b-thin h-min-20r h-max-20r o-scroll pd-medium radius-big">
+	      <div class="bg-light mn-b-thin h-min-20r h-max-20r o-scroll pd-medium radius-big">
 	        <Feed
 	          :search="{
 	          	class: 'bg-white mn-b-thin'

package/src/modules/products/components/pages/Products.vue

@@ -23,10 +23,10 @@
       { name: 'Unpublished',  value: 'unpublished' }, 
       { name: 'Archivied',    value: 'archivied' } 
     ]"
-    class="mn-b-small o-hidden h5 radius-big bg-grey"
+    class="mn-b-small o-hidden h5 radius-big bg-light"
   />
 
-  <div class="cols-2-1_3 bg-grey pd-thin radius-big gap-thin">
+  <div class="cols-2-1_3 bg-light pd-thin radius-big gap-thin">
 
     <FilterProducts
 

package/src/modules/products/components/sections/EditProductInfo.vue

@@ -31,7 +31,7 @@
         :options="[
           '฿'
         ]"
-        class="pos-relative bg-grey pd-thin radius-thin"
+        class="pos-relative bg-light pd-thin radius-thin"
       />
     </Field>
 

package/src/modules/products/components/sections/FilterProducts.vue

@@ -50,7 +50,7 @@
 
       <!-- Delivery Filter -->
      <!--  <Spoiler 
-        class="radius-small o-hidden br-1px br-solid br-grey mn-b-small"
+        class="radius-small o-hidden br-1px br-solid br-grey-transp-25 mn-b-small"
         :status="false"
       >
         <template #header>