@ozdao/martyrs 0.2.561 → 0.2.562

package/src/modules/core/views/components/sections/filters/FilterRange.vue

@@ -1,75 +1,98 @@
-<!-- FilterRange.vue -->
+<!-- filters/FilterPrice.vue -->
 <template>
-  <div class="filter-range">
-    <div class="flex gap-thin mn-b-small">
+  <div class="filter-price">
+    <div class="flex flex-v-center gap-thin">
       <Field
-        v-model="localValue.min"
-        :placeholder="minPlaceholder"
         type="number"
-        class="w-50 bg-light pd-small radius-small"
-        @keypress.enter="applyRange"
+        v-model:field="localValue.min"
+        :placeholder="minPlaceholder"
+        :label="label"
+        class="flex-1 bg-light pd-regular radius-small"
+        @blur="updateValue"
       />
+      <span class="t-small">—</span>
       <Field
-        v-model="localValue.max"
-        :placeholder="maxPlaceholder"
         type="number"
-        class="w-50 bg-light pd-small radius-small"
-        @keypress.enter="applyRange"
+        v-model:field="localValue.max"
+        :placeholder="maxPlaceholder"
+        :label="label"
+        class="flex-1 bg-light pd-regular radius-small"
+        @blur="updateValue"
       />
     </div>
-    <button 
-      @click="applyRange"
-      class="button bg-main t-white w-100 pd-small radius-small"
-    >
-      Apply
-    </button>
+    
+    <div v-if="config?.presets" class="mt-thin">
+      <button
+        v-for="preset in config.presets"
+        :key="preset.label"
+        @click="applyPreset(preset)"
+        class="btn btn-small mr-thin mb-thin"
+        :class="isPresetActive(preset) ? 'btn-primary' : 'btn-secondary'"
+      >
+        {{ preset.label }}
+      </button>
+    </div>
   </div>
 </template>
 
 <script setup>
 import { ref, watch } from 'vue'
-import Field from '@martyrs/src/components/Field/Field.vue'
+import Field from '@martyrs/src/components/Field/Field.vue';
 
 const props = defineProps({
+  config: {
+    type: Object,
+    default: () => ({})
+  },
   minPlaceholder: {
     type: String,
-    default: 'From'
+    default: 'Min'
   },
   maxPlaceholder: {
     type: String,
-    default: 'To'
+    default: 'Max'
+  },
+  label: {
+    type: String,
+    default: undefined
   }
 })
 
 const model = defineModel({
   type: Object,
-  default: () => ({ min: '', max: '' })
+  default: () => ({ min: null, max: null })
 })
 
 const emit = defineEmits(['update:modelValue', 'apply'])
 
 const localValue = ref({ 
-  min: model.value?.min || '', 
-  max: model.value?.max || '' 
+  min: model.value?.min || null, 
+  max: model.value?.max || null 
 })
 
-const applyRange = () => {
+watch(model, (val) => {
+  if (val) {
+    localValue.value = { 
+      min: val.min || null, 
+      max: val.max || null 
+    }
+  }
+}, { deep: true })
+
+const updateValue = () => {
   model.value = { ...localValue.value }
   emit('apply')
 }
 
-watch(() => model.value, (newVal) => {
-  if (newVal) {
-    localValue.value = { 
-      min: newVal.min || '', 
-      max: newVal.max || '' 
-    }
+const applyPreset = (preset) => {
+  localValue.value = { 
+    min: preset.min || null, 
+    max: preset.max || null 
   }
-}, { deep: true })
-</script>
+  updateValue()
+}
 
-<style scoped>
-.filter-range {
-  width: 100%;
+const isPresetActive = (preset) => {
+  return localValue.value.min === preset.min && localValue.value.max === preset.max
 }
-</style>
+</script>

package/src/modules/core/views/components/sections/filters/FiltersGroup.vue

@@ -0,0 +1,178 @@
+<template>
+  <div>
+    <div v-if="showHeader" class="flex-v-center flex-nowrap flex mn-b-medium">
+      <h3 class="flex-child-full">Filters</h3>
+    </div>
+
+    <div class="filters-content">
+      <div
+        v-for="filter in filters"
+        :key="filter.value"
+        class="mn-b-medium"
+      >
+        <h4 class="mn-b-small">{{ filter.title }}</h4>
+
+        <!-- Checkbox Filter -->
+        <FilterCheckbox
+          v-if="filter.type === 'checkbox'"
+          v-model="workingValues[filter.value]"
+          :options="filter.options"
+          @apply="handleApply(filter.value)"
+        />
+
+        <!-- Range Filter -->
+        <FilterRange
+          v-else-if="filter.type === 'range'"
+          v-model="workingValues[filter.value]"
+          :minPlaceholder="filter.minPlaceholder || 'Min'"
+          :maxPlaceholder="filter.maxPlaceholder || 'Max'"
+          :label="filter.label"
+          @apply="handleApply(filter.value)"
+        />
+
+        <!-- Date Filter -->
+        <FilterDateRange
+          v-else-if="filter.type === 'date'"
+          v-model="workingValues[filter.value]"
+          @apply="handleApply(filter.value)"
+        />
+
+        <!-- Radio/Options Filter -->
+        <FilterOptions
+          v-else-if="filter.type === 'radio'"
+          v-model="workingValues[filter.value]"
+          :options="filter.options"
+        />
+      </div>
+    </div>
+
+    <div class="flex gap-thin mn-t-medium">
+      <button
+        v-if="showApplyButton"
+        @click="applyFilters"
+        class="button bg-main flex-child-full"
+      >
+        Apply
+      </button>
+      <button
+        v-if="showResetButton"
+        @click="resetFilters"
+        class="button bg-light"
+        :class="{ 'flex-child-full': !showApplyButton }"
+      >
+        Reset Filters
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, watch } from 'vue'
+import { useGlobalMixins } from '@martyrs/src/modules/core/views/mixins/mixins.js'
+import FilterCheckbox from './FilterCheckbox.vue'
+import FilterRange from './FilterRange.vue'
+import FilterDateRange from './FilterDateRange.vue'
+import FilterOptions from './FilterOptions.vue'
+
+const props = defineProps({
+  filters: {
+    type: Array,
+    required: true
+  },
+  immediate: {
+    type: Boolean,
+    default: false
+  },
+  showHeader: {
+    type: Boolean,
+    default: true
+  },
+  showApplyButton: {
+    type: Boolean,
+    default: false
+  },
+  showResetButton: {
+    type: Boolean,
+    default: true
+  }
+})
+
+const selected = defineModel('selected', {
+  type: Object,
+  default: () => ({})
+})
+
+const { returnCurrency } = useGlobalMixins()
+
+const workingValues = reactive({})
+
+// Initialize working values
+watch(() => props.filters, (newFilters) => {
+  newFilters.forEach(filter => {
+    if (!workingValues[filter.value]) {
+      if (filter.type === 'checkbox') {
+        workingValues[filter.value] = [...(selected.value[filter.value] || [])]
+      } else if (filter.type === 'range') {
+        workingValues[filter.value] = { ...(selected.value[filter.value] || { min: '', max: '' }) }
+      } else if (filter.type === 'date') {
+        workingValues[filter.value] = selected.value[filter.value] || null
+      } else {
+        workingValues[filter.value] = selected.value[filter.value] || null
+      }
+    }
+  })
+}, { immediate: true, deep: true })
+
+// Sync selected to workingValues
+watch(selected, (newValue) => {
+  Object.keys(newValue).forEach(key => {
+    const filter = props.filters.find(f => f.value === key)
+    if (filter) {
+      if (filter.type === 'checkbox') {
+        workingValues[key] = [...(newValue[key] || [])]
+      } else if (filter.type === 'range') {
+        workingValues[key] = { ...(newValue[key] || { min: '', max: '' }) }
+      } else {
+        workingValues[key] = newValue[key]
+      }
+    }
+  })
+}, { deep: true })
+
+const handleApply = (filterValue) => {
+  if (props.immediate) {
+    const updated = { ...selected.value }
+    updated[filterValue] = workingValues[filterValue]
+    selected.value = updated
+  }
+}
+
+const applyFilters = () => {
+  const updated = {}
+  Object.keys(workingValues).forEach(key => {
+    updated[key] = workingValues[key]
+  })
+  selected.value = updated
+}
+
+const resetFilters = () => {
+  props.filters.forEach(filter => {
+    if (filter.type === 'checkbox') {
+      workingValues[filter.value] = []
+    } else if (filter.type === 'range') {
+      workingValues[filter.value] = { min: '', max: '' }
+    } else if (filter.type === 'date') {
+      workingValues[filter.value] = null
+    } else {
+      workingValues[filter.value] = null
+    }
+  })
+
+  if (props.immediate) {
+    applyFilters()
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/src/modules/core/views/utils/vue-app-renderer.js

@@ -79,6 +79,8 @@ export function renderAndMountApp({ createApp, hooks = {} }) {
     }
 
 
+
+
     if (initialState) {
       console.log('[AUTH COOKIE DEBUG] Browser initialState.auth:', initialState.auth);
       console.log('[AUTH COOKIE DEBUG] Has token?', !!initialState?.auth?.access?.token);
@@ -89,6 +91,7 @@ export function renderAndMountApp({ createApp, hooks = {} }) {
 
       if (initialState?.auth?.access?.token) {
         console.log('[AUTH COOKIE DEBUG] Setting auth token from initialState');
+
         setAuthToken(initialState.auth.access.token);
       } else if (initialState?.auth && !initialState.auth.access?.status) {
         // Если SSR сбросил auth (из-за ошибки), удаляем куку в браузере
@@ -106,6 +109,12 @@ export function renderAndMountApp({ createApp, hooks = {} }) {
       }
     }
 
+    const savedPosition = localStorage.getItem('position');
+
+    if (savedPosition) {
+      store.core.state.position = JSON.parse(savedPosition);
+    }
+
     // app.config.globalProperties.$i18n.locale = router.currentRoute.value.params.locale
     // app.config.globalProperties.$i18n.locale = router.currentRoute.value.params.locale
     // If user browser locae supported then change locale
@@ -171,6 +180,9 @@ export async function render({ url, cookies,  ssrContext, createApp}) {
     }
   }
 
+  
+
+
   if (user) {
     // [LOADING 27] SSR auth initialization
     performance.mark('loading-27-start');

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

@@ -0,0 +1,123 @@
+import Cache from '@martyrs/src/modules/core/controllers/classes/core.cache.js';
+import queryProcessorCore from '@martyrs/src/modules/core/controllers/utils/queryProcessor.js';
+import { getLookupStages } from '@martyrs/src/modules/organizations/controllers/utils/queryProcessorOrganizations.js';
+import lookupConfigs from './utils/lookupConfigs.js';
+import {
+  getBasicMatchConditions,
+  getPriceConditions,
+  getCategoryConditions,
+  getContainConditions,
+  getSpotsLocationStages,
+} from './utils/queryProcessorMarketplace.js';
+
+const controllerFactory = db => {
+  const Spot = db.spot;
+
+  const cache = new Cache({ ttlSeconds: 60 * 5 });
+
+  const readCatalog = async (req, res) => {
+    console.log('marketplace catalog 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 matchConditions = getBasicMatchConditions(req.query);
+
+      const stages = [
+        // Базовые фильтры spots (delivery, payment)
+        ...(matchConditions.length > 0 ? [{ $match: { $and: matchConditions } }] : []),
+
+        // Геопоиск ПЕРВЫМ (если есть location)
+        ...(req.query.location || req.query.city || req.query.state || req.query.country
+          ? (await getSpotsLocationStages(req.query)).stages
+          : [{ $addFields: { distance: null } }]),
+
+        // Lookups (без availability пока)
+        ...getLookupStages(['products', 'organizations'], lookupConfigs),
+
+        // Фильтр по наличию products
+        ...getContainConditions(['products', 'organizations']),
+
+        // Фильтр по ценам
+        ...getPriceConditions(req.query.priceMin, req.query.priceMax),
+
+        // Фильтр по категориям
+        ...getCategoryConditions(req.query.categories),
+
+        // Group по organization
+        {
+          $group: {
+            _id: { $arrayElemAt: ['$organizations._id', 0] },
+            profile: { $first: { $arrayElemAt: ['$organizations.profile', 0] } },
+            rating: { $first: { $arrayElemAt: ['$organizations.rating', 0] } },
+            official: { $first: { $arrayElemAt: ['$organizations.official', 0] } },
+            views: { $first: { $arrayElemAt: ['$organizations.views', 0] } },
+            spots: {
+              $push: {
+                _id: '$_id',
+                name: '$profile.name',
+                address: '$address',
+                location: '$location',
+                distance: '$distance',
+                delivery: '$delivery',
+                payment: '$payment',
+              },
+            },
+            products: { $first: '$products' },
+            distance: { $min: '$distance' },
+          },
+        },
+
+        // Добавляем numberOfProducts
+        {
+          $addFields: {
+            numberOfProducts: { $size: { $ifNull: ['$products', []] } },
+          },
+        },
+
+        // Финальная структура
+        {
+          $project: {
+            _id: 1,
+            profile: 1,
+            rating: 1,
+            official: 1,
+            views: 1,
+            spots: 1,
+            products: 1,
+            distance: 1,
+            numberOfProducts: 1,
+          },
+        },
+
+        // Сортировка
+        ...queryProcessorCore.getSortingOptions(req.query.sortParam || 'distance', req.query.sortOrder),
+
+        // Пагинация
+        ...queryProcessorCore.getPaginationOptions(req.query.skip, req.query.limit),
+      ].filter(Boolean);
+
+      console.log('Marketplace pipeline:', JSON.stringify(stages, null, 2));
+
+      const catalog = await Spot.aggregate(stages);
+
+      await cache.setWithTags(cacheKey, catalog, ['marketplace_catalog']);
+
+      res.status(200).send(catalog);
+    } catch (err) {
+      console.error('Marketplace catalog error:', err);
+      res.status(500).send({ message: err.message });
+    }
+  };
+
+  return {
+    readCatalog,
+  };
+};
+
+export default controllerFactory;

package/src/modules/marketplace/controllers/utils/lookupConfigs.js

@@ -0,0 +1,130 @@
+const lookupConfigs = {
+  availability: {
+    lookup: {
+      from: 'stockavailabilities',
+      localField: '_id',
+      foreignField: 'storage',
+      pipeline: [
+        {
+          $match: {
+            $expr: { $gt: ['$available', 0] },
+          },
+        },
+        {
+          $project: {
+            _id: 1,
+            product: 1,
+            variant: 1,
+            available: 1,
+            quantity: 1,
+          },
+        },
+      ],
+      as: 'availability',
+    },
+  },
+  variants: {
+    lookup: {
+      from: 'variants',
+      let: { variantIds: '$availability.variant' },
+      pipeline: [
+        {
+          $match: {
+            $expr: {
+              $in: ['$_id', '$$variantIds'],
+            },
+            status: 'published',
+          },
+        },
+        {
+          $project: {
+            _id: 1,
+            product: 1,
+            name: 1,
+            price: 1,
+            unit: 1,
+            images: 1,
+            sku: 1,
+          },
+        },
+      ],
+      as: 'variants',
+    },
+  },
+  products: {
+    lookup: {
+      from: 'products',
+      localField: 'organization',
+      foreignField: 'owner.target',
+      pipeline: [
+        {
+          $match: {
+            status: 'published',
+          },
+        },
+        {
+          $lookup: {
+            from: 'variants',
+            localField: '_id',
+            foreignField: 'product',
+            pipeline: [
+              {
+                $project: {
+                  _id: 1,
+                  name: 1,
+                  price: 1,
+                  unit: 1,
+                  images: 1,
+                  sku: 1,
+                },
+              },
+            ],
+            as: 'variants',
+          },
+        },
+        {
+          $project: {
+            _id: 1,
+            name: 1,
+            description: 1,
+            images: 1,
+            category: 1,
+            'owner.target': 1,
+            'owner.type': 1,
+            variants: 1,
+          },
+        },
+      ],
+      as: 'products',
+    },
+  },
+  organizations: {
+    lookup: {
+      from: 'organizations',
+      let: { orgIds: '$products.owner.target' },
+      pipeline: [
+        {
+          $match: {
+            $expr: {
+              $in: ['$_id', '$$orgIds'],
+            },
+          },
+        },
+        {
+          $project: {
+            _id: 1,
+            'profile.name': 1,
+            'profile.photo': 1,
+            'profile.description': 1,
+            'profile.tags': 1,
+            rating: 1,
+            official: 1,
+          },
+        },
+      ],
+      as: 'organizations',
+    },
+  },
+};
+
+export default lookupConfigs;