@ozdao/martyrs 0.2.429 → 0.2.430

package/src/modules/orders/components/blocks/CardOrderUser.vue

@@ -148,17 +148,24 @@ const statusText = computed(() => {
     case 'canceled':
       return `Canceled, ${updatedDate}`;
     default:
-      // Расчет задержки
-      if (props.positions?.length) {
-        const lastEndDate = new Date(props.positions[props.positions.length - 1].date.end);
+    // Расчет задержки
+    if (props.positions?.length) {
+      const lastPosition = props.positions[props.positions.length - 1];
+      const lastEndDateRaw = lastPosition?.date?.end;
+
+      if (lastEndDateRaw) {
+        const lastEndDate = new Date(lastEndDateRaw);
         const now = new Date();
-        const diffTime = Math.abs(now - lastEndDate);
+        const diffTime = Math.abs(now.getTime() - lastEndDate.getTime());
         const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+
         if (diffDays > 0 && props.status !== 'finished' && props.status !== 'canceled') {
           return `Delay ${diffDays} day${diffDays > 1 ? 's' : ''}`;
         }
       }
-      return `Created, ${createdDate}`;
+    }
+    return `Created, ${createdDate}`;
+
   }
 });
 
@@ -192,16 +199,16 @@ threeDaysFromNow.setDate(today.getDate() + 3);
 // Показывать ли уведомление о возврате
 const showReturnNotice = computed(() => {
   return props.positions.some(position => {
-    const endDate = getDateWithoutTime(position.date.end);
-    return endDate <= threeDaysFromNow;
+    const endDate = position?.date?.end ? getDateWithoutTime(position.date.end) : null;
+    return endDate !== null && endDate <= threeDaysFromNow;
   });
 });
 
 // Есть ли просроченные позиции
 const hasOverdue = computed(() => {
   return props.positions.some(position => {
-    const endDate = getDateWithoutTime(position.date.end);
-    return endDate < today;
+    const endDate = position?.date?.end ? getDateWithoutTime(position.date.end) : null;
+    return endDate !== null && endDate < today;
   });
 });
 

package/src/modules/orders/components/pages/OrderCreate.vue

@@ -260,14 +260,14 @@ async function handleCreate() {
   let order = await orders.actions.create(orders.state.current);
 
   if (order) {
-  	shopcart.actions.resetShopcart()
-
   	router.push({
   		name: 'Order',
   		params: {
   			order: order._id
   		}
   	})
+  		
+  	shopcart.actions.resetShopcart()
   } else {
   	alert('something wrong')
   }

package/src/modules/orders/components/pages/OrderCreateBackoffice.vue

@@ -53,7 +53,7 @@
             state: null
           }"
           :options="{
-            organization: route.params._id
+            owner: route.params._id
           }"
           v-slot="{ 
             items 
@@ -165,12 +165,14 @@
 
     <FormDelivery  
       v-if="tabOrderCreate === 'delivery'" 
-      :order="orders.state.current"  
+      :order="orders.state.current"
+      :organization="orderOrganization[0]" 
     />
 
     <FormPayment  
       v-if="tabOrderCreate === 'payment'"
       :order="orders.state.current"  
+      :organization="orderOrganization[0]" 
     />
 
     <Popup 
@@ -223,6 +225,7 @@
   import * as globals from '@martyrs/src/modules/globals/views/store/globals';
   import * as auth from '@martyrs/src/modules/auth/views/store/auth';
   import * as orders from '@martyrs/src/modules/orders/store/orders';
+  import * as organizations from '@martyrs/src/modules/organizations/store/organizations';
   import * as products from '@martyrs/src/modules/products/store/products';
 
   import customers from '@martyrs/src/modules/orders/store/customers.store';
@@ -296,7 +299,16 @@
     })
   }
 
-  onMounted(() => {
+  const orderOrganization = ref({})
+
+
+
+  onMounted(async() => {
+
+    orderOrganization.value = await organizations.actions.read({
+      _id: route.params._id,
+      lookup: ['spots']
+    })
 
     // await orders.actions.fetchOrder(route.params.id) // Implement this action in your store
 

package/src/modules/orders/components/pages/Orders.vue

@@ -4,8 +4,9 @@
       v-if="!MOBILE_APP"
       title="Orders"
       :actions="[
-        ...(route.meta.context !== 'user' ? [{ to: { name: 'BackofficeAdminCreateOrder'}, label: 'Create Order' }] : [])
-      ]"
+        route.meta.context === 'backoffice' && { to: { name: 'BackofficeAdminCreateOrder' }, label: 'Create Order' },
+        route.meta.context === 'organization' && { to: { name: 'OrganizationAdminCreateOrder', params: { _id: route.params._id}}, label: 'Create Order' }
+      ].filter(Boolean)"
       class="mn-b-small"
     />
 
@@ -44,7 +45,7 @@
       }"
       :options="{
         limit: 15,
-        ...(route.meta.context === 'organization' && { organization: route.params._id }),
+        ...(route.meta.context === 'organization' && { owner: route.params._id }),
         ...(route.meta.context === 'user' && { customer: route.params._id }),
         ...(tab !== 'all' && { status: tab })
       }"
@@ -62,98 +63,14 @@
             ? { order: order._id } 
             : { order: order._id, organization: order.owner.target || order.owner._id  }
         }" 
-        class="bg-light pos-relative pd-medium radius-big"
       >
-        <CardHeader 
-          :entity="order"
-          :entityType="'order'"
+        <CardOrderBackoffice 
+          :order="order"
           :user="auth.state.user"
-          :owner="order.creator" 
-          :creator="order.creator"
-          :date="order.createdAt"
-          class="mn-b-small"
+          :formatDate="formatDate"
+          :getTotal="orders.getters.getTotal"
+          :currency="returnCurrency()"
         />
-
-        <div class="mn-b-small pd-small bg-white radius-small flex-nowrap flex"> 
-          <div class="w-100">
-            <!-- <h3 class="mn-b-thin">{{order.customer.target.profile?.name || order.customer.target.phone || order.customer.target.email || 'No name'}}</h3> -->
-            <p class="t-truncate">{{order.delivery.address || 'Not specified'}}</p> 
-          </div>
-
-          <div class=" w-100 t-right">
-            <h3 class="mn-b-thin">{{returnCurrency()}}{{orders.getters.getTotal(order.positions)}}</h3>
-            <p>#{{order._id.slice(0, 4) + '...' + order._id.slice(-4)}}</p> 
-          </div>
-        </div>
-     
-        <div class="cols-1 mn-b-small gap-thin pd-small bg-white radius-small">
-          <!-- Always display the first two positions -->
-          <div
-            v-for="(position, index) in order.positions.slice(0, 2)"
-            :key="index"
-            class="w-100 flex"
-          >
-            <p class="mn-r-auto">{{ position.name }}</p>
-            <p class="t-right">
-              {{ position.quantity }} {{ position.type }}
-              x
-              {{ position.price }}
-              <span class="t-transp">{{ returnCurrency() }}</span>
-            </p>
-          </div>
-
-          <transition name="fade">
-            <!-- Display the rest of the positions if there are more than two and spoiler is true -->
-            <div v-if="spoiler && order.positions.length > 2">
-              <div
-                v-for="(position, index) in order.positions.slice(2)"
-                :key="index + 2"
-                class="w-100 flex"
-              >
-                <p class="mn-r-auto">{{ position.name }}</p>
-                <p class="t-right">
-                  {{ position.quantity }} {{ position.type }}
-                  x
-                  {{ position.price }}
-                  <span class="t-transp">{{ returnCurrency() }}</span>
-                </p>
-              </div>
-            </div>
-          </transition>
-
-          <!-- Toggle button for additional positions, visible only if there are more than two positions -->
-          <button
-            v-if="order.positions.length > 2"
-            @click.prevent="spoiler = !spoiler"
-            class="radius-big bg-light-transp-50 pd-nano w-100 flex-center flex"
-          >
-            {{ !spoiler ? `+${order.positions.length - 2} more` : `Hide` }} 
-          </button>
-        </div>
-
-
-        <div class="pd-small bg-white radius-small gap-micro flex-v-center flex-nowrap flex"> 
-          <IconTime class="i-semi t-transp" fill="rgb(var(--black)" />
-          <p class="t-medium mn-r-auto">{{formatDate(order.deadline)}}</p>
-
-          <span 
-            class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin bg-main"
-          >
-            {{order.status}}
-          </span>
-
-          <span 
-            class="flex-child flex-child-shrink-0 capitalize w-max t-medium radius-big pd-b-nano pd-t-nano pd-r-thin pd-l-thin t-white bg-red"
-          >
-            Unpaid
-          </span>
-        </div>
-      
-
-        <div v-if="order.comment" class="pos-relative radius-small bg-fifth-transp-10 mn-t-thin pd-small">
-          <p class="mn-b-thin t-transp uppercase p-small t-medium">Comment</p>
-          <p>{{order.comment}}</p>
-        </div>
       </router-link>
 
       <router-link 
@@ -192,7 +109,7 @@
   import CardOrder from '@martyrs/src/modules/orders/components/blocks/CardOrder.vue'
 
   import CardOrderUser from '@martyrs/src/modules/orders/components/blocks/CardOrderUser.vue'
-  import CardHeader  from '@martyrs/src/modules/globals/views/components/blocks/CardHeader.vue'
+  import CardOrderBackoffice from '@martyrs/src/modules/orders/components/blocks/CardOrderBackoffice.vue'
 
   import SectionPageTitle from '@martyrs/src/modules/globals/views/components/sections/SectionPageTitle.vue'
 

package/src/modules/orders/components/partials/ShopCart.vue

@@ -3,7 +3,7 @@
     <!-- ---------------------------------------------------------------- -->
     <!-- 01. Popup Header  -->
     <!-- ---------------------------------------------------------------- -->
-    <div class="mn-t-medium flex-nowrap flex">
+    <div class="flex-nowrap flex">
       <div class="mn-b-medium w-100">
         <h4 class="mn-b-thin p-big">{{t('title')}}</h4>
         <p class="t-transp p-small">{{t('subtitle')}} {{ t('positions', { count: StoreCartAmount }) }}</p>
@@ -13,7 +13,7 @@
     <!-- ---------------------------------------------------------------- -->
     <!-- 02. Popup Content  -->
     <!-- ---------------------------------------------------------------- -->
-    <div class="rows-1 gap-small mn-b-big shopcart-content">
+    <div class="h-100 flex flex-column w-100 pos-relative o-x-hidden o-y-scroll gap-small shopcart-content">
       <!-- Empty State -->
       <p v-if="!(shopcart.state.positions.length > 0)" class="mn-t-medium"><i>{{t('emptystate')}}</i></p>
       <!-- Shopcart positions -->

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

@@ -113,6 +113,7 @@ const controllerFactory = (db) => {
 
     // Start a database transaction
     const session = await db.mongoose.startSession();
+    
     session.startTransaction();
 
     try {
@@ -192,7 +193,7 @@ const controllerFactory = (db) => {
       await session.commitTransaction();
 
       // Send notification
-      await sendOrderMessage(orderData);
+      sendOrderMessage(orderData);
       
       // Return the created order
       res.status(201).send(createdOrder);

package/src/modules/organizations/components/pages/Organization.vue

@@ -69,55 +69,57 @@
 				/>
 			</transition>
 
-			<Block
-				v-if="tabOrganization === 'products' && hasAccess(route.params._id, null, null, auth.state.accesses, auth.state.access.roles)"
-				class="o-scroll mn-b-small "
-			>
-			<div class="w-100 gap-thin flex flex-nowrap	 o-x-scroll">
-				<router-link 
-					class="bg-black t-nowrap t-white uppercase t-semi pd-thin radius-extra "
-					:to="{
-						name:'Organization_ProductAdd', 
-						params: {
-							_id: route.params._id
-						}
-					}"
-					>
-					Add Product
-				</router-link>
-
-				<router-link 
-					class=" uppercase t-nowrap t-semi  pd-thin radius-extra "
-					:to="{
-						name:'Leftovers', 
-						params: {
-							_id: route.params._id
-						}
-					}"
-					>
-					Change Invetory
-				</router-link>
-
-				
-				<router-link 
-					class="d-block t-nowrap  mn-l-auto uppercase t-semi bg-white pd-thin radius-extra "
-					:to="{
-						name:'Backoffice', 
-						params: {
-							_id: route.params._id
-						}
-					}"
-					>
-					Go to Backoffice
-				</router-link>
-			</div>
-			</Block>
+			
 
 			<transition name="slide-fade">
 				<Products 
 					v-if="tabOrganization === 'products'"
 					:organization="organization.state.current"
-				/>
+				>
+					<Block
+						v-if="hasAccess(route.params._id, null, null, auth.state.accesses, auth.state.access.roles)"
+						class="o-y-scroll w-100 pos-relative mn-b-small"
+					>
+						<div class="w-100 gap-thin flex flex-nowrap	 o-x-scroll">
+							<router-link 
+								class="bg-black t-nowrap t-white uppercase t-semi pd-thin radius-extra "
+								:to="{
+									name:'Organization_ProductAdd', 
+									params: {
+										_id: route.params._id
+									}
+								}"
+								>
+								Add Product
+							</router-link>
+
+							<router-link 
+								class=" uppercase t-nowrap t-semi  pd-thin radius-extra "
+								:to="{
+									name:'Leftovers', 
+									params: {
+										_id: route.params._id
+									}
+								}"
+								>
+								Change Invetory
+							</router-link>
+
+							
+							<router-link 
+								class="d-block t-nowrap  mn-l-auto uppercase t-semi bg-white pd-thin radius-extra "
+								:to="{
+									name:'Backoffice', 
+									params: {
+										_id: route.params._id
+									}
+								}"
+								>
+								Go to Backoffice
+							</router-link>
+						</div>
+					</Block>
+				</Products>
 
 			</transition>
 
@@ -131,13 +133,12 @@
 			        }
 			      }"
 			      :store="{
-			        read: (options) => spots.actions.read(route.params._id),
+			        read: (options) => spots.actions.read(options),
 			        state: organization.state
 			      }"
 			      :options="{
 			        	user: auth.state.user._id,
-								sort: 'numberOfMemberships',
-								contain: ['blogposts'],
+								organization: route.params._id,
 								limit: 10
 			      }"
 			      v-slot="{ 

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

@@ -1,5 +1,7 @@
 const jwt = require("jsonwebtoken");
 
+const Cache = require('@martyrs/src/modules/globals/controllers/classes/globals.cache');
+
 const queryProcessorGlobals = require('@martyrs/src/modules/globals/controllers/utils/queryProcessor');
 
 const {
@@ -23,25 +25,33 @@ const controllerFactory = (db) => {
   const Department = db.department;
   const Membership = db.membership;
 
-  const read = async (req, res) => {
+  // Создаем экземпляр вашего кэша с TTL 5 минут (по умолчанию)
+  const cache = new Cache({ ttlSeconds: 60 * 5 });
 
-    console.log('controler query', req.query)
+  const read = async (req, res) => {
+    console.log('controller query', req.query);
 
     try {
+      const cacheKey = JSON.stringify(req.query); // Ключ кэша на основе запроса
+
+      // Проверяем, есть ли данные в кэше
+      let cachedResult = await cache.get(cacheKey);
+      if (cachedResult) {
+        // Если данные в кэше есть, возвращаем их
+        return res.status(200).send(cachedResult);
+      }
+
       const requestedLookups = getRequestedLookups(req.query);
       const matchConditions = getBasicMatchConditions(req.query);
 
       const stages = [
         ...getLookupStages(requestedLookups, lookupConfigs),
-      
         ...getPostableConditions(req.query.postable),
         ...getContainConditions(req.query.contain),
-      
         ...queryProcessorGlobals.getSearchOptions(
           req.query.search, 
           { fields: requestedLookups.includes('products') ? ['profile.name', 'products.name'] : ['profile.name'] }
         ),
-
         ...(requestedLookups.includes('products') && req.query.prices ? getPriceConditions(req.query.prices) : []),
         ...(requestedLookups.includes('spots') ? (await getLocationStages(req.query)).stages : []),
         ...(requestedLookups.includes('memberships') ? [
@@ -56,50 +66,17 @@ const controllerFactory = (db) => {
       console.log(JSON.stringify(stages, null, 2));
 
       const organizations = await Organization.aggregate(stages);
-      res.status(200).send(organizations);
-    } catch (err) {
-      console.error(err);
-      res.status(500).send({ message: err.message });
-    }
-  };
 
-  const fetch = async (req, res) => {
-    const Organization = db.organization;
-    
-    let query = {};
-
-    console.log(req.query)
-
-    // Fetch by website
-    if (req.query._id) {
-      query['_id'] = req.query._id;
-    }
-
-    if (req.query.owner) {
-      query['owner'] = req.query.owner;
-    }
-
-    // Fetch by type
-    if (req.query.type) {
-      query.types = req.query.type;
-    }
-
-    // Pagination options
-    let options = {};
-    options.skip = parseInt(req.query.skip) || 0;
-    options.limit = parseInt(req.query.limit) || 10;
-
-    try {
-      const organizations = await Organization.find(query, null, options);
-      
-      if (!organizations || organizations.length === 0) {
-        return res.status(404).send({ message: "Organizations not found." });
+      // Кэшируем результат с тегами для каждой организации
+      for (const org of organizations) {
+        const orgTag = `organization_${org._id}`; // Уникальный тег для каждой организации
+        await cache.setWithTags(cacheKey, organizations, [orgTag, 'organizations']); // Добавляем оба тега
       }
 
-      // Send fetched organizations
       res.status(200).send(organizations);
-    } catch(err) {
-      return res.status(500).send({ message: err });
+    } catch (err) {
+      console.error(err);
+      res.status(500).send({ message: err.message });
     }
   };
 
@@ -122,6 +99,14 @@ const controllerFactory = (db) => {
       
       const savedMembership = await membership.save();
 
+      // Очищаем кэш для этой организации
+      const orgTag = `organization_${savedOrganization._id}`;
+      await cache.delByTag(orgTag);
+
+      // Обновляем кэш, добавляя новую организацию
+      const newCacheKey = JSON.stringify({ _id: savedOrganization._id }); // Ключ для новой записи
+      await cache.setWithTags(newCacheKey, [savedOrganization], [orgTag, 'organizations']);
+
       res.status(201).json(savedOrganization);
     } catch (error) {
       console.error('Error:', error);
@@ -144,6 +129,14 @@ const controllerFactory = (db) => {
         return res.status(404).json({ message: 'Organization not found' });
       }
 
+      // Очищаем кэш для этой организации
+      const orgTag = `organization_${organizationId}`;
+      await cache.delByTag(orgTag);
+
+      // Обновляем кэш новой версией организации
+      const updateCacheKey = JSON.stringify({ _id: organizationId }); // Ключ для обновленной записи
+      await cache.setWithTags(updateCacheKey, [organization], [orgTag, 'organizations']);
+
       res.status(200).json({ message: 'Organization updated successfully', organization });
     } catch (error) {
       res.status(500).json({ error: error.message });
@@ -167,6 +160,10 @@ const controllerFactory = (db) => {
               expiresIn: 86400 // 24 hours
             });
 
+            // Очищаем кэш для этой организации
+            const orgTag = `organization_${req.params._id}`;
+            cache.delByTag(orgTag);
+
             res.send({ newToken });
           })
           .catch(err => {
@@ -181,6 +178,14 @@ const controllerFactory = (db) => {
   const checkAccesses = async (req, res) => {
     try {
       const uid = new db.mongoose.Types.ObjectId(req.userId);
+      const cacheKey = `accesses_${uid.toString()}`; // Уникальный ключ для кэша на основе userId
+
+      // Проверяем, есть ли данные в кэше
+      const cachedResult = await cache.get(cacheKey);
+      if (cachedResult) {
+        return res.status(200).json(cachedResult);
+      }
+
       const depts = await Department.find({ 'members.user': uid });
       const ownedOrgs = await Organization.find({ owner: uid });
       const ownedOrgIds = ownedOrgs.map(org => org._id.toString());
@@ -200,8 +205,8 @@ const controllerFactory = (db) => {
             rights[key] = {};
           }
           const accessRights = accessData[key];
-          Object.keys(accessRights).forEach(right => {
-            rights[key][right] = isOwner || rights[key][right] || accessRights[right];
+          Object.entries(accessRights).forEach(([right, value]) => {
+            rights[key][right] = isOwner || rights[key][right] || value;
           });
         });
       };
@@ -239,6 +244,11 @@ const controllerFactory = (db) => {
       });
 
       const accessArray = Object.values(accesses);
+
+      // Кэшируем результат с тегами: уникальный тег для пользователя и общий тег для всех доступов
+      const userTag = `access_${uid.toString()}`; // Тег для конкретного пользователя
+      await cache.setWithTags(cacheKey, accessArray, [userTag, 'accesses']);
+
       res.status(200).json(accessArray);
     } catch (err) {
       console.error('Error getting accesses:', err);

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

@@ -141,13 +141,13 @@ const actions = {
   }
 }
 
-const history = []
-history.push(state) 
+// const history = []
+// history.push(state) 
 
-// // Watch
-watch(state, (newState, oldState) => {
-  history.push(newState)
-})
+// // // Watch
+// watch(state, (newState, oldState) => {
+//   history.push(newState)
+// })
 
 // Module Export
 export {

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

@@ -48,11 +48,12 @@
   </div>
 
     <div class="z-index-3 bg-white radius-tl-big radius-tr-big">
-      <div class="pd-thin z-index-3 radius-tl-big radius-tr-big">
+      <slot></slot>
+      <div class="  z-index-3 radius-tl-big radius-tr-big">
         <BlockSearch 
           @search="updateSearch"
           placeholder="Enter product name"
-          class="bg-light h-4r"
+          class="bg-light mn-b-thin h-4r"
         />
       </div>
       <Feed
@@ -82,7 +83,7 @@
         v-slot="{ 
           items 
         }"
-        class="cols-4 rows-1 pd-t-zero pd-thin gap-thin mn-b-thin"
+        class="cols-4 rows-1 gap-thin"
        
       >
         <router-link  

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

@@ -33,13 +33,13 @@ const controllerFactory = (db) => {
     ];
 
     try {
-      const spots = await Spots.aggregate(stages);
+      const spots = await Spot.aggregate(stages);
 
-      if (!stpos) {
+      if (!spots) {
         return res.status(404).send({ errorCode: "SPOTS_NOT_FOUND", message: "Spots not found." });
       }
 
-      res.status(200).send(spos);
+      res.status(200).send(spots);
 
     } catch (err) {
       console.log(err);
@@ -60,19 +60,6 @@ const controllerFactory = (db) => {
       });
   };
 
-  const readOld = (req, res) => {
-    Spot.find({ organization: req.params._id })
-      .then(spots => {
-        if (!spots) {
-          return res.status(404).send({ message: "Spots not found" });
-        }
-        res.send(spots);
-      })
-      .catch(err => {
-        res.status(500).send({ message: err.message });
-      });
-  };
-
   const create = async (req, res) => {
     try {
       const newSpot = new Spot({
@@ -117,7 +104,6 @@ const controllerFactory = (db) => {
   return {
     read,
     readOne,
-    readOld,
     create,
     update,
     delete: deleteSpot