@ozdao/prometheus-framework 0.2.137 → 0.2.139

package/src/modules/organizations/components/sections/MembersAdd.vue

@@ -1,48 +1,97 @@
 <template>
   <div>
     <p class="mn-b-thin t-transp p-medium">{{text}}</p> 
-      <section class="cols-1 mn-b-small radius-medium pd-semi bg-light">
-        <div
-          v-for="(member, index) in members" 
-          :key="index" 
-          class="
-            br-1px br-solid br-grey-transp-25
-            flex
-            gap-thin
-            radius-small
-            mn-b-thin
-          "
+
+    <div class="mn-b-thin pos-relative">
+      <BlockSearch 
+        v-click-outside="() => {searchUserShow = false}" 
+        @search="(event) => { searchUser = event; searchUserShow = true }"
+        placeholder="Enter name, phone or email"
+        class="bg-grey"
+      />
+
+      <div 
+        v-if="searchUser && searchUserShow" 
+        class="mn-t-thin pos-absolute w-100 pos-t-100 pos-l-0 z-index-3 bg-light pd-small radius-small
+      ">
+        <Feed
+          :states="{
+            empty: {
+              title: 'No User Found',
+              description: 'Currently, there are no such user.'
+            }
+          }"
+          :store="{
+            read: (options) => users.actions.read(options),
+            state: null
+          }"
+          :options="{
+            search: searchUser
+          }"
+          :showLoadMore="false"
+          v-slot="{ 
+            items 
+          }"
+          class="h-max-20r o-scroll"
+        >
+          <CardUser
+            v-for="(user, index) in items" :key="user._id"
+            :user="user"
+            :photo="user.profile.photo"
+            :name="user.profile.name || user.phone || user.email"
+            @click="() => { 
+              members.push({contact: user.email || user.phone})
+              searchUserShow = false
+            }"
+            class="bg-white h-2r pd-thin radius-medium w-100 mn-b-thin"
+          />
+        </Feed>
+      </div>
+    </div>
+
+    <section class="cols-1 mn-b-small radius-medium pd-semi bg-light pos-relative">
+
+      <div
+        v-for="(member, index) in members" 
+        :key="index" 
+        class="
+          br-1px br-solid br-grey-transp-25
+          flex
+          gap-thin
+          radius-small
+          mn-b-thin
+        "
+      >
+        <Field 
+          v-model:field="member.contact"   
+          placeholder="Enter email or phone" 
+          class="w-100 pd-small radius-small bg-white"
+          :validation="contactValidation"
         >
-          <Field 
-            v-model:field="member.contact"   
-            placeholder="Enter email or phone" 
-            class="w-100 pd-small radius-small bg-white"
-            :validation="contactValidation"
+          <div 
+            v-if="index < 1" 
+            @click="() => members.push({contact: ''})"  
+            class="radius-small h-100 i-big flex-center flex aspect-1x1 bg-green"
           >
-            <div 
-              v-if="index < 1" 
-              @click="() => members.push({contact: ''})"  
-              class="radius-small h-100 i-big flex-center flex aspect-1x1 bg-green"
-            >
-              <IconAdd 
-                class="i-medium"
-                :fill="'rgb(var(--white)'"
-              />
-            </div>
+            <IconAdd 
+              class="i-medium"
+              :fill="'rgb(var(--white)'"
+            />
+          </div>
 
-            <div 
-              v-else 
-              @click="() => members.splice(index, 1)" 
-              class="radius-small h-100 i-big flex-center flex aspect-1x1 bg-red"
-            >
-              <IconDelete 
-                class="i-medium"
-                :fill="'rgb(var(--white)'"
-              />
-            </div>
-          </Field>
-        </div>
-      </section>
+          <div 
+            v-else 
+            @click="() => members.splice(index, 1)" 
+            class="radius-small h-100 i-big flex-center flex aspect-1x1 bg-red"
+          >
+            <IconDelete 
+              class="i-medium"
+              :fill="'rgb(var(--white)'"
+            />
+          </div>
+        </Field>
+      </div>
+    </section>
 
 
       <Button  
@@ -59,19 +108,26 @@
   import Field    from '@pf/src/components/Field/Field.vue'
   import Select   from '@pf/src/components/Select/Select.vue'
   import Button   from '@pf/src/components/Button/Button.vue'
+  import Feed from '@pf/src/components/Feed/Feed.vue'
+
+  import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
+
+  import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
 
   import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
   import IconAdd from '@pf/src/modules/icons/navigation/IconAdd.vue';
   // Import validation
   import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
-
-  import * as invites from '@pf/src/modules/organizations/store/invites';
+  // Store
+  import * as users from '@pf/src/modules/users/store/users';
   // Props
   const props = defineProps({
     organization: Object,
     text: String,
   });
-
+  // User Search
+  let searchUser = ref(null)
+  let searchUserShow = ref(false)
   // Validation
   const contactValidation = ref(null)
   // Define Emits
@@ -80,6 +136,8 @@
   const members = ref([{ contact: ''}]);
 
   async function submitMembers() {
-    emits('send-invite', members.value);
+    return new Promise((resolve, reject) => {
+      emits('send-invite', members.value, resolve, reject);
+    });
   }
 </script>

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

@@ -34,15 +34,20 @@ const сontrollerFactory = (db) => {
   };
 
   const create = async (req, res) => {
-    const creator = req.body.creator
-    const owner = req.body.owner
-
-    const list = req.body.invites
+    const creator = req.body.creator;
+    const owner = req.body.owner;
+    const list = req.body.invites;
+    const createdInvites = [];
+    const createdMemberships = [];
 
     try {
       for (let invite of list) {
         let user = null;
 
+        if (!invite || !invite.contact) {
+          continue; // Пропускаем пустые объекты или объекты без contact
+        }
+        
         if (invite.contact.includes('@')) {
           user = await User.findOne({ email: invite.contact });
         } else {
@@ -50,7 +55,6 @@ const сontrollerFactory = (db) => {
         }
         
         if (user) {
-          
           const membership = new Membership({
             user: user._id,
             type: 'organization',
@@ -58,10 +62,9 @@ const сontrollerFactory = (db) => {
             role: 'member',
             label: 'member'
           });
-
-          await membership.save();
+          const savedMembership = await membership.save();
+          createdMemberships.push(savedMembership);
         } else {
-          
           const newInvite = new Invite({
             code: uuid(),
             creator: creator,
@@ -70,26 +73,28 @@ const сontrollerFactory = (db) => {
             email: invite.contact.includes('@') ? invite.contact : null,
             phone: !invite.contact.includes('@') ? invite.contact : null,
           });
-
           const savedInvite = await newInvite.save();
+          createdInvites.push(savedInvite);
 
           if (savedInvite.email !== null) {
             const to = savedInvite.email;
             const subject = 'You have been added to the organization';
-            const text = `You have been invited to join an organization on ${process.env.APP_NAME}! Use this link to register: ${process.env.API_URL}/auth/invite?inviteCode=${newInvite.code}&type=email"`;
+            const text = `You have been invited to join an organization on ${process.env.APP_NAME}! Use this link to register: ${process.env.API_URL}/auth/invite?inviteCode=${newInvite.code}&type=email`;
             
             await sendEmail(to, subject, text);
           }
-
           if (savedInvite.phone !== null) {
             const phone = savedInvite.phone;
             const message = `You have been invited to join an organization on ${process.env.APP_NAME}! Use this link to register: ${process.env.API_URL}/auth/invite?inviteCode=${newInvite.code}&type=phone`;
-
             await sendSms(phone, message);
           }
         }
       }
-      res.status(200).json({ message: 'Invites sent successfully!' });
+      res.status(200).json({ 
+        message: 'Invites sent successfully!',
+        createdInvites: createdInvites,
+        createdMemberships: createdMemberships
+      });
     } catch (error) {
       console.error(error);
       res.status(500).json({ message: 'Something went wrong' });

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 {
@@ -66,10 +67,10 @@ const controllerFactory = (db) => {
         )
       ]);
 
-      if (!memberships || memberships.length === 0) {
+      if (!memberships) {
         return res.status(404).send({ errorCode: 'MEMBERSHIPS_NOT_FOUND' });
       }
-      console.log('membership is', memberships[0].user)
+      
       res.send(memberships);
     } catch (err) {
       console.log(err);
@@ -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/blocks/CardSpot.vue

@@ -25,7 +25,6 @@
       />
    
     
-
         <p 
         @click="$router.push(`/app/organization/${props.organization._id}/spots/${spot._id}`)"
         class="pd-thin bg-white radius-small mn-b-thin p-small w-max"

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,