@ozdao/prometheus-framework 0.2.138 → 0.2.139

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

@@ -4,6 +4,7 @@ const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils
 
 const controllerFactory = (db) => {
   const Membership = db.membership;
+  const Department = db.department;
 
   const read = async (req, res) => {
     try {
@@ -109,21 +110,27 @@ const controllerFactory = (db) => {
   const deleteMembership = async (req, res) => {
     const { _id, type, target, user, role } = req.body;
     
-
-    console.log(req.body)
-
     try {
-      // const membership = await Membership.findOne({ type, target, user, role });
-      const membership = _id ? await Membership.findOneAndDelete({ _id: new ObjectId(req.body._id)}) : await Membership.findOne({ type, target, user, role })
+      // Обрабатываем сценарий когда мы не знаем _id нашего membership
+      const membership = _id 
+        ? await Membership.findOneAndDelete({ _id: new ObjectId(_id) })
+        : await Membership.findOneAndDelete({ type, target, user, role });
 
       if (!membership) {
         return res.status(404).send({ errorCode: 'MEMBERSHIP_NOT_FOUND' });
-      } else {
-        await Membership.deleteOne({ _id: membership._id });
-        res.status(200).send(membership);
       }
+
+      // Удаление пользователя из departments
+      if (membership.type === 'organization') {
+        await Department.updateMany(
+          { organization: target },
+          { $pull: { members: { user: user } } }
+        );
+      }
+
+      res.status(200).send(membership);
     } catch (error) {
-      console.log(error)
+      console.log(error);
       res.status(500).send({ errorCode: 'SERVER_ERROR' });
     }
   };

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

@@ -27,7 +27,6 @@ const controllerFactory = (db) => {
     const sort = {
       ...(sortParam === 'distance' ? { 'distanceExist': -1 } : {}),
       [sortParam]: sortOrder === 'desc' ? -1 : 1,
-      'numberOfProducts': -1,
       "_id": 1
     };
     console.log(sort)
@@ -140,7 +139,7 @@ const controllerFactory = (db) => {
       }
 
       // Determine the search radius based on the level of specificity
-      const radius = city ? 500 : state ? 1000 : 5000;
+      const radius = city ? 25 : state ? 50 : 250;
 
       // Use MongoDB's $geoNear to find organizations within a certain radius
       matchConditions.push({
@@ -185,9 +184,9 @@ const controllerFactory = (db) => {
       if (locationRadius) {
         radius = parseFloat(locationRadius) / earthRadiusKm;
       } else if (city) {
-          radius = 500 / earthRadiusKm;
+          radius = 25 / earthRadiusKm;
       } else if (state) {
-          radius = 1000 / earthRadiusKm;
+          radius = 50 / earthRadiusKm;
       } else {
           radius = null
       }

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

@@ -31,6 +31,8 @@ module.exports = (mongoose) => {
     timestamps: true 
   });
 
+  MembershipSchema.index({ user: 1, target: 1});
+
   const Membership = mongoose.model('Membership', MembershipSchema);
 
   return Membership;

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

@@ -67,6 +67,10 @@ module.exports = (db) => {
   });
 
   applyEngagementSchema(OrganizationSchema,db);
+
+
+  OrganizationSchema.index({ _id: 1, owner: 1 });
+
   
   // const Testimonial = require('./testimonial.model');
 

package/src/modules/organizations/routes/invites.routes.js

@@ -1,11 +1,11 @@
 // Factories
 const controllerFactory = require("../controllers/invites.controller");
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 // Routes
 module.exports = function(app, db) {
   const controller = controllerFactory(db);
-  const { verifyInvites } = middlewareFactory(db);
+  const { verifyInvites } = middlewareFactoryAuth(db);
   
   // Get one invite
   app.get(

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

@@ -38,7 +38,8 @@ const actions = {
   },  
   async create(invites) {  
     try {
-      await $axios.post(`/api/invites/create`, invites);
+      const response = await $axios.post(`/api/invites/create`, invites);
+      return Promise.resolve(response.data);
       state.error = null;
     } catch (error) {
       setError(error);

package/src/modules/products/controllers/leftovers.controller.js

@@ -59,7 +59,7 @@ const controllerFactory = (db) => {
 
       const leftoveres = await Leftover.aggregate(stages).exec();
 
-      if (!leftoveres.length) {
+      if (!leftoveres) {
           return res.status(404).send({ message: "LEFTOVERES_NOT_FOUND" });
       }
 

package/src/modules/products/middlewares/index.js

@@ -0,0 +1,11 @@
+// middlewareIndexFactory.js
+
+const middlewareIndexFactory = (db) => {
+  const verifyCategory = require("./verifyCategory")(db);
+  
+  return {
+    verifyCategory
+  };
+};
+
+module.exports = middlewareIndexFactory;

package/src/modules/products/routes/categories.routes.js

@@ -1,12 +1,12 @@
 // Factories
 const controllerFactory = require("../controllers/categories.controller");
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryProducts = require('@pf/src/modules/products/middlewares');
 
 module.exports = function(app, db) {
   const controller = controllerFactory(db);
   
-  const { verifyCategory } = middlewareFactory(db);
+  const { verifyCategory } = middlewareFactoryProducts(db);
   // Get categorys
   app.get(
     "/categories",

package/src/modules/reports/routes/reports.routes.js

@@ -1,11 +1,11 @@
 const controllerFactory = require("../controllers/reports.controller");
 // Middlewares
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+// const middlewareFactoryGlobal = require('@pf/src/modules/middlewares');
 
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  // const { authJwt } = middlewareFactoryGlobal(db);
 
   app.get(
     "/reports",

package/src/modules/spots/components/layouts/Spots.vue

@@ -101,7 +101,7 @@
 		    delivery: query.delivery ? query.delivery.split(',') : [],
 		    // Продолжайте этот паттерн для остальных полей фильтра
 		  };
-		  marketplace.state.filter = newFilterValue;
+		  marketplace.state.filter.selected = newFilterValue;
 		}
 
 
@@ -109,7 +109,7 @@
 		await categories.actions.fetchCategories()
 	})
 
-	watch(() => marketplace.state.filter, (newFilterValue, oldFilterValue) => {
+	watch(() => marketplace.state.filter.selected, (newFilterValue, oldFilterValue) => {
 	  // Переводим фильтр в формат query
 	  const query = { ...route.query };
 

package/src/modules/spots/components/pages/Map.vue

@@ -89,106 +89,107 @@ onMounted(async () => {
 
   // Определите уровень зума в зависимости от доступной информации
   if (route.params.location || globals.state.position?.location) {
-    zoomLevel = 12;
+    zoomLevel = 15;
   } else if (route.params.country || globals.state.position?.country) {
     zoomLevel = 9;
   } else if (route.params.state || globals.state.position?.state) {
     zoomLevel = 6;
   } else if (route.params.city || globals.state.position?.city) {
-    zoomLevel = 4;
+    zoomLevel = 14;
   } else {
     zoomLevel = 2;
   }
 
-  // Если координаты не заданы, попробуйте их получить
-  if (!lat || !lng) {
-    let country
-
-    const geocoder = new google.maps.Geocoder();
+  const loader = new GMLoader({
+    apiKey: props.apiKey,
+    version: "weekly",
+    libraries: ["places"],
+    language: 'en'
+  });
 
-    try {
-      country = await getCountry();
-    } catch {
-      country = 'Thailand' 
-      console.log(error)
-    }
+  loader.load().then(async () => {
 
-    try {
-      const results = await geocoder.geocode({ 'address': country })
+    // Если координаты не заданы, попробуйте их получить
+    if (!lat || !lng) {
+      let country
 
-      console.log(results);
+      const geocoder = new google.maps.Geocoder();
 
-      if (results) {
-        lat = results.results[0].geometry.location.lat();
-        lng = results.results[0].geometry.location.lng();
-        zoomLevel = 6;
-      } else {
-        console.error('No results found for the country code.');
-      }
-    } catch (error) {
-      console.error('Error getting coordinates from country code:', error);
-    }
-  }
-  
-  // If there's no lat/lng in the query, try to use country/state/city to get the lat/lng
-  if (!lat && !lng && (route.params.country || route.params.state || route.params.city)) {
-    const geocoder = new google.maps.Geocoder();
-
-    const address = [
-      route.params.city,
-      route.params.state,
-      route.params.country
-    ].filter(Boolean).join(', ');
-
-    try {
-      const results = await geocoder.geocode({ address });
-
-      if (results[0]) {
-        lat = results[0].geometry.location.lat();
-        lng = results[0].geometry.location.lng();
+      try {
+        country = await getCountry();
+      } catch {
+        country = 'Thailand' 
+        console.log(error)
       }
 
-    } catch (error) {
-      console.error('Error getting coordinates:', error);
-    }
-  }
+      try {
+        const results = await geocoder.geocode({ 'address': country })
 
-  const loader = new GMLoader({
-    apiKey: props.apiKey,
-    version: "weekly",
-    libraries: ["places"],
-    language: 'en'
-  });
+        console.log(results);
 
-  skip.value += limit.value;
+        if (results) {
+          lat = results.results[0].geometry.location.lat();
+          lng = results.results[0].geometry.location.lng();
+          zoomLevel = 6;
+        } else {
+          console.error('No results found for the country code.');
+        }
+      } catch (error) {
+        console.error('Error getting coordinates from country code:', error);
+      }
+    }
+    
+    // If there's no lat/lng in the query, try to use country/state/city to get the lat/lng
+    if (!lat && !lng && (route.params.country || route.params.state || route.params.city)) {
+      const geocoder = new google.maps.Geocoder();
+
+      const address = [
+        route.params.city,
+        route.params.state,
+        route.params.country
+      ].filter(Boolean).join(', ');
+
+      try {
+        const results = await geocoder.geocode({ address });
+
+        if (results[0]) {
+          lat = results[0].geometry.location.lat();
+          lng = results[0].geometry.location.lng();
+        }
 
-  const params = {
-    // country: route.params.country,
-    // state: route.params.state,
-    // city: route.params.city,
-    // categories: route.query.categories,
-    // prices: route.query.prices,
-    // delivery: route.query.delivery,
-    country: route.params.country,
-    state: route.params.state,
-    city: route.params.city,
-    categories: route.query.categories,
-    prices: route.query.prices,
-    delivery: route.query.delivery,
-    sortParam: route.query.sortParam || marketplace.state.sort.param,
-    sortOrder: route.query.sortOrder || marketplace.state.sort.order,
-    location: {coordinates: [lng,lat] },
-    locationRadius: 1000,
-    limit: 500,
-  };
+      } catch (error) {
+        console.error('Error getting coordinates:', error);
+      }
+    }
 
-  console.log(params)
 
-  const data = await actions.read(params);
+    skip.value += limit.value;
+
+    const params = {
+      // country: route.params.country,
+      // state: route.params.state,
+      // city: route.params.city,
+      // categories: route.query.categories,
+      // prices: route.query.prices,
+      // delivery: route.query.delivery,
+      country: route.params.country,
+      state: route.params.state,
+      city: route.params.city,
+      categories: route.query.categories,
+      prices: route.query.prices,
+      delivery: route.query.delivery,
+      sortParam: route.query.sortParam || marketplace.state.sort.param,
+      sortOrder: route.query.sortOrder || marketplace.state.sort.order,
+      location: {coordinates: [lng,lat] },
+      locationRadius: 1000,
+      limit: 500,
+    };
+
+    console.log(params)
 
-  state.all = [...state.all, ...data];
+    const data = await actions.read(params);
 
-  loader.load().then(() => {
+    state.all = [...state.all, ...data];
 
     map.value = new google.maps.Map(document.getElementById('map'), {
       mapTypeControl: false,

package/src/modules/users/components/pages/ProfileEdit.vue

@@ -1,17 +1,17 @@
 <template>
-	<div class="pd-medium for-transition w-100">
+	<div  v-if="show" class="pd-medium for-transition w-100">
    
     <ProfileCompletion 
       v-if="route.params._id === auth.state.user._id" 
-      :user="auth.state.user._id" 
-      :target="user"
+      :user="auth.state.user._id"
+      :target="users.state.current"
       :cta="false"
     />
     <!--  -->
     <h3 class="mn-b-small">Username</h3>
 
     <Field 
-      v-model:field="user.username"     
+      v-model:field="users.state.current.username"     
       label="@"  
       placeholder="Not specified" 
       class="mn-b-thin w-100 bg-light pd-medium radius-small" 
@@ -25,15 +25,15 @@
 
     <div class="mn-b-thin radius-small w-100 h-10r bg-light flex-center flex-column flex">
        <UploadImage 
-          v-model:photo="user.profile.photo"
-          :uploadPath="'users/' + user._id + '/avatars'"
+          v-model:photo="users.state.current.profile.photo"
+          :uploadPath="'users/' + users.state.current._id + '/avatars'"
           class="h-4r w-4r aspect-1x1 o-hidden bg-white mn-b-thin radius-extra" 
         />
         <h4>Upload userpic</h4>
     </div>
 
     <Field 
-      v-model:field="user.profile.name"     
+      v-model:field="users.state.current.profile.name"     
       label="Name"  
       placeholder="Not specified" 
       class="mn-b-thin bg-light pd-medium radius-small" 
@@ -41,18 +41,17 @@
     />
 
     <Field 
-      v-model:field="user.profile.description"     
+      v-model:field="users.state.current.profile.description"     
       label="Description"  
       placeholder="Not specified" 
       class="mn-b-semi bg-light pd-medium radius-small" 
-      disabled="true"
       :validation="organizationName" 
     />
 
     <!-- <p class="mn-b-thin">Select your birthday if you want to receive your birthday gift.</p>
     
     <Field 
-      v-model:field="user.birthday"     
+      v-model:field="users.state.current.birthday"     
       label="Birthday"  
       type="date"
       placeholder="Not specified" 
@@ -63,25 +62,25 @@
     <p class="mn-b-thin">Please provide only the username for social media profiles, without full links.</p>
 
     <Field 
-      v-model:field="user.socials.instagram"
+      v-model:field="users.state.current.socials.instagram"
       label="Instagram"   
       placeholder="" 
       class="mn-b-thin bg-light pd-medium radius-small" 
     />
     <Field 
-      v-model:field="user.socials.twitter"
+      v-model:field="users.state.current.socials.twitter"
       label="Twitter"   
       placeholder="" 
       class="mn-b-thin bg-light pd-medium radius-small" 
     />
     <Field 
-      v-model:field="user.socials.facebook"
+      v-model:field="users.state.current.socials.facebook"
       label="Facebook"   
       placeholder="" 
       class="mn-b-thin bg-light pd-medium radius-small" 
     />
     <Field 
-      v-model:field="user.socials.telegram"
+      v-model:field="users.state.current.socials.telegram"
       label="Telegram"   
       placeholder="" 
       class="mn-b-semi bg-light pd-medium radius-small" 
@@ -90,7 +89,7 @@
     <h3 class="mn-b-small">Account</h3>
       
     <Field 
-      v-model:field="user.phone"     
+      v-model:field="users.state.current.phone"     
       label="Phone"  
       placeholder="Not specified" 
       class="mn-b-thin bg-light pd-medium mn-b-thin radius-small" 
@@ -99,17 +98,29 @@
     />
 
     <Field 
-      v-model:field="user.email"     
+      v-model:field="users.state.current.email"     
       label="Email"  
       placeholder="Not specified" 
-      class="mn-b-semi  bg-light pd-medium radius-small" 
+      class="mn-b-semi bg-light pd-medium radius-small" 
       :disabled="true"
       :validation="organizationName" 
     />
 
-    <Button :submit="onSubmit" :callback="redirectTo" class="mn-b-thin">Save</Button>
+    <Button 
+      :submit="onSubmit" 
+      :callback="redirectTo" 
+      class="mn-b-thin bg-main w-100"
+    > 
+      Save
+    </Button>
 
-		<Button :submit="onSubmitDelete" :callback="a = () => {router.push({name: 'Sign In'})}" class="mn-b-thin bg-red t-white">Delete Account</Button>
+		<Button
+      :submit="onSubmitDelete" 
+      :callback="a = () => {router.push({name: 'Sign In'})}" 
+      class="mn-b-thin w-100 bg-red t-white"
+    >
+      Delete Account
+    </Button>
 	</div>
 </template>
 
@@ -132,10 +143,14 @@
   // Accessing router
   const route = useRoute()
   const router = useRouter()
-  // Async requests
-  const user = ref(users.state.current);
+
+  const user = ref(null)
+  const show = ref(false)
+
+
   onMounted(async () => {
-    await users.actions.read({ _id: route.params._id });
+    await users.actions.read({ _id: route.params._id, user: auth.state.user._id });
+    show.value = true
   })
   // Methods
   async function onSubmit() {

package/src/modules/wallet/controllers/routes/payments.routes.js

@@ -1,5 +1,5 @@
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 // Factories
 const controllerFactory = require("../factories/payments.factory");
 const controllerFactoryTickets = require("@pf/src/modules/events/controllers/tickets.controller");
@@ -16,7 +16,7 @@ module.exports = function(app, db, origins, publicPath) {
   const controller = controllerFactory(db);
   const controllerTickets = controllerFactoryTickets(db, publicPath);
 
-  const { verifySignUp, verifyUser } = middlewareFactory(db);
+  const { verifySignUp, verifyUser } = middlewareFactoryAuth(db);
 
   observer.subscribe('checkout.session.completed', async (paymentIntent) => {
     const event = await db.event.findOne({ _id: paymentIntent.metadata.product });

package/src/modules/wallet/controllers/routes/rewards.routes.js

@@ -2,13 +2,13 @@
 const rewardsControllerFactory = require('../factories/rewards.factory');
 
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 
 // Routes
 module.exports = (app, db, wss, wdmClient, origins) => {
   const controller = rewardsControllerFactory(db, wdmClient, wss);
 
-  const { authJwt, authSecret } = middlewareFactory(db);
+  const { authJwt, authSecret } = middlewareFactoryAuth(db);
 
   app.use((req, res, next) => {
     const origin = req.headers.origin;

package/src/modules/middlewares/server/authJwt.js

@@ -1,68 +0,0 @@
-const jwt = require("jsonwebtoken");
-
-const middlewareFactory = (db) => {
-  const User = db.user;
-  const Role = db.role;
-
-  const verifyToken = async (req, res, next) => {
-    try {
-      if (!req.cookies.user) {
-        // Вместо возврата ошибки, просто устанавливаем req.userId как null
-        req.userId = null;
-        return next();
-      }
-
-      let user = JSON.parse(req.cookies.user);
-      let token = req.headers["x-access-token"] || user.accessToken;
-
-      if (!token) {
-        // Также устанавливаем req.userId как null
-        req.userId = null;
-        return next();
-      }
-
-      const decoded = jwt.verify(token, process.env.SECRET_KEY);
-      req.userId = decoded._id;
-      
-      next();
-    } catch (err) {
-      console.log(err);
-      req.userId = null;
-      next();
-    }
-  };
-
-  const checkRole = roleToCheck => async (req, res, next) => {
-    try {
-      const user = await User.findById(req.userId).exec();
-
-      if (!user) {
-        return res.status(404).send({ message: "User Not found." });
-      }
-
-      const roles = await Role.find({ _id: { $in: user.roles }}).exec();
-
-      for (let role of roles) {
-        if (role.name === roleToCheck) {
-          next();
-          return;
-        }
-      }
-
-      res.status(403).send({ message: `Require ${roleToCheck} Role!` });
-    } catch (err) {
-      res.status(500).send({ message: err.message });
-    }
-  };
-
-  const isAdmin = checkRole("admin");
-  const isModerator = checkRole("moderator");
-
-  return {
-    verifyToken,
-    isAdmin,
-    isModerator
-  };
-};
-
-module.exports = middlewareFactory;