@ozdao/martyrs 0.2.477 → 0.2.479

package/src/modules/core/model/Validation.js

@@ -0,0 +1,97 @@
+// ModelValidator.js
+import Validator from '@martyrs/src/modules/globals/controllers/classes/globals.validator.js';
+import Verifier from '@martyrs/src/modules/globals/controllers/classes/globals.verifier.js';
+
+class ModelValidator {
+  constructor(schema) {
+    this.schema = schema;
+    this.verifier = new Verifier();
+    this._initVerifier();
+  }
+  
+  _initVerifier() {
+    const schemaDefinition = this.schema.getDefinition();
+    
+    for (const [field, config] of Object.entries(schemaDefinition)) {
+      let validator;
+      
+      // Если есть кастомный валидатор, используем его
+      if (config.custom) {
+        validator = config.custom;
+      } else {
+        // Иначе создаем базовый валидатор по типу
+        validator = this._createBaseValidator(field, config);
+      }
+      
+      // Регистрируем в верификаторе
+      this.verifier.updateConfig({
+        [field]: {
+          rule: 'optional',
+          validator,
+          default: config.default
+        }
+      });
+    }
+  }
+  
+  _createBaseValidator(field, config) {
+    let validator = Validator.schema({ context: field });
+    
+    // Базовые проверки по типу
+    if (config.type === String) {
+      validator = validator.string();
+    } else if (config.type === Number) {
+      validator = validator.number();
+    } else if (config.type === Boolean) {
+      validator = validator.boolean();
+    } else if (config.type === Date) {
+      validator = validator.date();
+    } else if (config.type === Array) {
+      validator = validator.array();
+    } else if (config.type === Object) {
+      validator = validator.object({});
+    }
+    
+    // Дополнительные ограничения
+    if (config.required) {
+      validator = validator.required();
+    }
+    
+    if (config.min !== undefined) {
+      validator = validator.min(config.min);
+    }
+    
+    if (config.max !== undefined) {
+      validator = validator.max(config.max);
+    }
+    
+    if (config.enum) {
+      validator = validator.oneOf(config.enum);
+    }
+    
+    if (config.pattern) {
+      validator = validator.pattern(config.pattern);
+    }
+    
+    return validator;
+  }
+  
+  // Валидация всех данных
+  validate(data) {
+    return this.verifier.verify(data);
+  }
+  
+  // Валидация одного поля
+  validateField(field, value) {
+    const config = this.schema.getFieldDefinition(field);
+    
+    if (!config) {
+      return { isValid: false, errors: [`Unknown field: ${field}`] };
+    }
+    
+    const validator = this.verifier._getConfig()[field].validator;
+    return validator.validate(value);
+  }
+}
+
+export default ModelValidator;

package/src/modules/events/components/elements/ButtonCheck.vue

@@ -23,7 +23,7 @@
 import { ref, onMounted, onUnmounted } from 'vue'
 import { BarcodeScanner } from '@capacitor-mlkit/barcode-scanning'
 import Button from '@martyrs/src/components/Button/Button.vue'
-import * as tickets from '@martyrs/src/modules/events/store/tickets'
+import * as tickets from '@martyrs/src/modules/events/store/tickets.js'
 
 const emits = defineEmits(['qrcodecheck'])
 const error = ref('')

package/src/modules/events/components/elements/ButtonJoin.vue

@@ -11,8 +11,8 @@
   import Button from "@martyrs/src/components/Button/Button.vue";
   
   import { ref } from 'vue'
-  import * as auth from '@martyrs/src/modules/auth/views/store/auth'
-  import * as tickets from '@martyrs/src/modules/events/store/tickets' // replace memberships with tickets
+  import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
+  import * as tickets from '@martyrs/src/modules/events/store/tickets.js' // replace memberships with tickets
 
   const emits = defineEmits(['updateTicket'])  // Rename the event to updateTicket
 

package/src/modules/events/components/pages/EditEvent.vue

@@ -80,9 +80,9 @@
 
     <section v-if="event" class="pd-thin pos-sticky pos-l-0 pos-b-0 w-100 ">
       <div class="pd-thin radius-big  bg-main w-100 flex-nowrap flex">
-        <a v-if="route.params.url" @click="onDelete()" class="mn-r-auto bg-red t-white t-black button">Delete</a>
-        <a @click="onDrafts()" class="mn-l-auto bg-white t-black button">To Drafts</a>
-        <a @click="openPublicationPopup()" class="mn-l-thin bg-black t-white button">Publish</a>
+        <a v-if="route.params.url" @click="onDelete()" class="mn-r-auto bg-red t-white t-black button"><span>Delete</span></a>
+        <a @click="onDrafts()" class="mn-l-auto bg-white t-black button"><span>To Drafts</span></a>
+        <a @click="openPublicationPopup()" class="mn-l-thin bg-black t-white button"><span>Publish</span></a>
       </div>
     </section>
 
@@ -198,8 +198,8 @@ import { useRoute, useRouter } from 'vue-router';
 import { useGlobalMixins } from "@martyrs/src/modules/globals/views/mixins/mixins.js"
 
 import * as events from '@martyrs/src/modules/events/store/events.js';
-import * as auth from '@martyrs/src/modules/auth/views/store/auth';
-import * as organizations from '@martyrs/src/modules/organizations/store/organizations';
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js';
 
 const route = useRoute();
 const router = useRouter();

package/src/modules/events/components/pages/EditEventTickets.vue

@@ -153,10 +153,10 @@ import { ref, onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 import * as events from '@martyrs/src/modules/events/store/events.js';
-import * as auth from '@martyrs/src/modules/auth/views/store/auth';
-import * as organizations from '@martyrs/src/modules/organizations/store/organizations';
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
+import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js';
 
-import * as tickets from '@martyrs/src/modules/events/store/tickets';
+import * as tickets from '@martyrs/src/modules/events/store/tickets.js';
 
 import { useGlobalMixins } from "@martyrs/src/modules/globals/views/mixins/mixins.js"
 

package/src/modules/events/components/pages/Event.vue

@@ -105,7 +105,6 @@
           :type="'event'" 
           :target="event._id" 
           :owner="auth.state.user._id"
-           class="bg-light radius-big pd-medium"
         />
 
       </div>
@@ -140,7 +139,7 @@ import User from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue
 
 import * as events from '@martyrs/src/modules/events/store/events.js';
 import * as tickets from '@martyrs/src/modules/events/store/tickets.js';
-import * as auth from '@martyrs/src/modules/auth/views/store/auth';
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 
 import { useRoute } from 'vue-router';
 

package/src/modules/events/components/pages/Events.vue

@@ -158,9 +158,9 @@
   import CardOrganization from '@martyrs/src/modules/organizations/components/blocks/CardOrganization.vue'
 
   // Import state
-  import * as auth from '@martyrs/src/modules/auth/views/store/auth'
-  import * as organizations from '@martyrs/src/modules/organizations/store/organizations'
-  import * as memberships from '@martyrs/src/modules/organizations/store/memberships'
+  import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
+  import * as organizations from '@martyrs/src/modules/organizations/store/organizations.js'
+  import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js'
 
 
   import * as events from '@martyrs/src/modules/events/store/events.js'; 

package/src/modules/events/components/pages/EventsBackoffice.vue

@@ -152,7 +152,7 @@ import Table from '@martyrs/src/components/Table/Table.vue'
 
   import CardEvent from '@martyrs/src/modules/events/components/blocks/CardEvent.vue';
 
-	import * as auth from '@martyrs/src/modules/auth/views/store/auth';
+	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 	import * as events from '@martyrs/src/modules/events/store/events.js'; 
 	// Accessing router
 	const route = useRoute()

package/src/modules/events/components/pages/EventsSearch.vue

@@ -41,7 +41,7 @@
   import DatePicker from '@martyrs/src/components/DatePicker/DatePicker.vue' 
   import CardEvent from '@martyrs/src/modules/events/components/blocks/CardEvent.vue';
   // Import state
-  import * as auth from '@martyrs/src/modules/auth/views/store/auth'
+  import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
   import * as events from '@martyrs/src/modules/events/store/events.js'; 
 
   import { useI18n } from 'vue-i18n';

package/src/modules/events/components/sections/EventsHot.vue

@@ -53,7 +53,7 @@ import SliderNative from '@martyrs/src/components/Slider/Slider.native.vue'
 import Media from '@martyrs/src/components/Media/Media.vue'
 
 import * as events from '@martyrs/src/modules/events/store/events.js'; 
-import * as auth from '@martyrs/src/modules/auth/views/store/auth'
+import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 
 const props = defineProps({
   skip: {

package/src/modules/events/components/sections/FeaturedEvents.vue

@@ -35,7 +35,7 @@
   import List from '@martyrs/src/modules/events/components/sections/List.vue';   
   // Import state
   import * as events from '@martyrs/src/modules/events/store/events.js'; 
-  import * as auth from '@martyrs/src/modules/auth/views/store/auth'
+  import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
 
   // State
   const route = useRoute();

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

@@ -1,56 +1,31 @@
-const ObjectId = require('mongoose').Types.ObjectId;
-// Query Processor
-const queryProcessor = require('./utils/queryProcessor');
-const queryProcessorGlobals = require('@martyrs/src/modules/globals/controllers/utils/queryProcessor');
-// Utils
-const createFriendlyURL = require('@martyrs/src/modules/globals/controllers/utils/seo-friendly-url');
-// Integrations
-const integrationStripe = require('@martyrs/src/modules/integrations/stripe/controllers/services/stripe.service');
-
-const middlewareFactory = (db) => {
+import queryProcessorGlobals from '@martyrs/src/modules/globals/controllers/utils/queryProcessor.js';
+import createFriendlyURL from '@martyrs/src/modules/globals/controllers/utils/seo-friendly-url.js';
+import integrationStripe from '@martyrs/src/modules/integrations/stripe/controllers/services/stripe.service.js';
+import { Types } from 'mongoose';
+import queryProcessor from './utils/queryProcessor.js';
+const ObjectId = { Types }.Types.ObjectId;
+const middlewareFactory = db => {
   const Ticket = db.ticket;
   const Event = db.event;
   const Membership = db.membership;
-
-  const serviceStripe = new integrationStripe
-
+  const serviceStripe = new integrationStripe();
   const read = async (req, res) => {
-
-    console.log('req is', req.query)
-
+    console.log('req is', req.query);
     let stages = [];
-
     stages = [
-      ...queryProcessorGlobals.getSearchOptions(
-        req.query.search, { 
-          fields: ['name'] 
-        }
-      ),
-      ...queryProcessorGlobals.getBasicOptions(
-        req.query
-      ),
-      ...queryProcessor.getDateConditions(
-        req.query.date
-      ),
-      ...queryProcessor.getPeriodConditions(
-        req.query.period,
-        req.query.periodStart,
-        req.query.periodEnd
-      ),
-      ...queryProcessor.getPhaseConditions(
-        req.query.phase
-      ),
+      ...queryProcessorGlobals.getSearchOptions(req.query.search, {
+        fields: ['name'],
+      }),
+      ...queryProcessorGlobals.getBasicOptions(req.query),
+      ...queryProcessor.getDateConditions(req.query.date),
+      ...queryProcessor.getPeriodConditions(req.query.period, req.query.periodStart, req.query.periodEnd),
+      ...queryProcessor.getPhaseConditions(req.query.phase),
       // Tickets and Participants
       queryProcessor.getTicketsLookupStage(),
       queryProcessor.getParticipantsPhotosStage(),
       queryProcessor.getNumberOfTicketsStage(),
-
-      ...queryProcessor.getHasTicketStage(
-        req.query.user
-      ),
-      ...queryProcessor.getParticipantStages(
-        req.query.participant
-      ),
+      ...queryProcessor.getHasTicketStage(req.query.user),
+      ...queryProcessor.getParticipantStages(req.query.participant),
       // For creator
       queryProcessorGlobals.getCreatorUserLookupStage(),
       queryProcessorGlobals.getCreatorOrganizationLookupStage(),
@@ -61,142 +36,102 @@ const middlewareFactory = (db) => {
       // Get object
       // queryProcessor.getProjectStage(),
       // Pagination
-      ...queryProcessorGlobals.getSortingOptions(
-        req.query.sortParam,
-        req.query.sortOrder,
-      ),
-      ...queryProcessorGlobals.getPaginationOptions(
-        req.query.skip,
-        req.query.limit
-      )
+      ...queryProcessorGlobals.getSortingOptions(req.query.sortParam, req.query.sortOrder),
+      ...queryProcessorGlobals.getPaginationOptions(req.query.skip, req.query.limit),
     ];
-
     try {
       const events = await Event.aggregate(stages).exec();
       res.status(200).send(events);
-
     } catch (err) {
       console.log(err);
       return res.status(500).send({
-        message: err
+        message: err,
       });
     }
   };
-
-
   const create = async (req, res) => {
     delete req.body._id;
     try {
-        req.body.url = createFriendlyURL(req.body.name);
-        let event = new Event(req.body);
-        
-        if (!event) {
-            return res.status(404).send({ message: "Event is not created." });
-        }
-
-        if (event.ticketsTypes && event.ticketsTypes.length > 0) {
-            const stripeProducts = await serviceStripe.createProducts(
-                event._id.toString(),
-                event.ticketsTypes,
-                event.name
-            );
-
-            event.ticketsTypes = event.ticketsTypes.map((ticket, index) => ({
-                ...ticket,
-                stripeProductId: stripeProducts[index].productId,
-                stripePriceId: stripeProducts[index].priceId,
-                stripePaymentLinkId: stripeProducts[index].paymentLinkId,
-                link: stripeProducts[index].paymentLink
-            }));
-        }
-
-        await event.save();
-        res.status(200).send(event);
+      req.body.url = createFriendlyURL(req.body.name);
+      let event = new Event(req.body);
+      if (!event) {
+        return res.status(404).send({ message: 'Event is not created.' });
+      }
+      if (event.ticketsTypes && event.ticketsTypes.length > 0) {
+        const stripeProducts = await serviceStripe.createProducts(event._id.toString(), event.ticketsTypes, event.name);
+        event.ticketsTypes = event.ticketsTypes.map((ticket, index) => ({
+          ...ticket,
+          stripeProductId: stripeProducts[index].productId,
+          stripePriceId: stripeProducts[index].priceId,
+          stripePaymentLinkId: stripeProducts[index].paymentLinkId,
+          link: stripeProducts[index].paymentLink,
+        }));
+      }
+      await event.save();
+      res.status(200).send(event);
     } catch (err) {
-        console.log(err);
-        return res.status(500).send({
-            message: err.message
-        });
+      console.log(err);
+      return res.status(500).send({
+        message: err.message,
+      });
     }
-};
-
-const update = async (req, res) => {
+  };
+  const update = async (req, res) => {
     try {
-        let existingEvent = await Event.findOne({ url: req.body.url });
-        
-        if (!existingEvent) {
-            return res.status(404).send({
-                message: "Event not found."
-            });
-        }
-
-        if (req.body.ticketsTypes && req.body.ticketsTypes.length > 0) {
-           
-            const stripeUpdates = await serviceStripe.updateProducts(
-                existingEvent._id.toString(),
-                req.body.ticketsTypes,
-                existingEvent.ticketsTypes || [],
-                req.body.name
-            );
-
-            req.body.ticketsTypes = req.body.ticketsTypes.map(ticket => {
-                const stripeData = stripeUpdates.find(update => update.name === ticket.name);
-
-                return {
-                    ...ticket,
-                    stripeProductId: stripeData?.productId,
-                    stripePriceId: stripeData?.priceId,
-                    stripePaymentLinkId: stripeData?.paymentLinkId,
-                    link: stripeData?.paymentLink || ticket.link
-                };
-            });
-        } else {
-            req.body.ticketsTypes = [];
-        }
-
-        await Event.updateOne(
-            { _id: existingEvent._id },
-            { $set: req.body }
-        );
-
-        res.status(200).send(req.body);
-    } catch (err) {
-        console.log(err);
-        return res.status(500).send({
-            message: err.message
+      let existingEvent = await Event.findOne({ url: req.body.url });
+      if (!existingEvent) {
+        return res.status(404).send({
+          message: 'Event not found.',
+        });
+      }
+      if (req.body.ticketsTypes && req.body.ticketsTypes.length > 0) {
+        const stripeUpdates = await serviceStripe.updateProducts(existingEvent._id.toString(), req.body.ticketsTypes, existingEvent.ticketsTypes || [], req.body.name);
+        req.body.ticketsTypes = req.body.ticketsTypes.map(ticket => {
+          const stripeData = stripeUpdates.find(update => update.name === ticket.name);
+          return {
+            ...ticket,
+            stripeProductId: stripeData?.productId,
+            stripePriceId: stripeData?.priceId,
+            stripePaymentLinkId: stripeData?.paymentLinkId,
+            link: stripeData?.paymentLink || ticket.link,
+          };
         });
+      } else {
+        req.body.ticketsTypes = [];
+      }
+      await Event.updateOne({ _id: existingEvent._id }, { $set: req.body });
+      res.status(200).send(req.body);
+    } catch (err) {
+      console.log(err);
+      return res.status(500).send({
+        message: err.message,
+      });
     }
-};
-
-const deleteMethod = async (req, res) => {
+  };
+  const deleteMethod = async (req, res) => {
     try {
-        const event = await Event.findOne({ _id: req.body._id });
-        
-        if (!event) {
-            return res.status(404).send({
-                message: "Event not found."
-            });
-        }
-
-        if (event.ticketsTypes && event.ticketsTypes.length > 0) {
-            await serviceStripe.deactivateProduct(event._id.toString());
-        }
-
-        await Event.deleteOne({ _id: req.body._id });
-        res.status(200).send(event);
-    } catch (err) {
-        return res.status(500).send({
-            message: err.message
+      const event = await Event.findOne({ _id: req.body._id });
+      if (!event) {
+        return res.status(404).send({
+          message: 'Event not found.',
         });
+      }
+      if (event.ticketsTypes && event.ticketsTypes.length > 0) {
+        await serviceStripe.deactivateProduct(event._id.toString());
+      }
+      await Event.deleteOne({ _id: req.body._id });
+      res.status(200).send(event);
+    } catch (err) {
+      return res.status(500).send({
+        message: err.message,
+      });
     }
-};
-
+  };
   return {
     read,
     create,
     update,
-    delete: deleteMethod
+    delete: deleteMethod,
   };
 };
-
-module.exports = middlewareFactory;
+export default middlewareFactory;