@ozdao/martyrs 0.2.601 → 0.2.603

package/src/modules/orders/middlewares/customers.verifier.js

@@ -18,24 +18,13 @@ export default (function (db) {
         .string()
         .pattern(/^\+?[1-9]\d{1,14}$/, 'Invalid phone format')
     },
-    'profile.name': {
+    profile: {
       rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .min(1, 'Name must be at least 1 character')
-        .max(255, 'Name must not exceed 255 characters')
-    },
-    'profile.description': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(1000, 'Description must not exceed 1000 characters')
-    },
-    'profile.photo': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(500, 'Photo URL must not exceed 500 characters')
+      validator: Validator.schema().object({
+        name: Validator.schema().string().min(1).max(255),
+        description: Validator.schema().string().max(1000),
+        photo: Validator.schema().string().max(500)
+      })
     },
     source: {
       rule: 'optional',
@@ -44,17 +33,12 @@ export default (function (db) {
         .string()
         .oneOf(['web', 'mobile', 'api', 'import', 'manual', 'referral', 'social', 'email'])
     },
-    'referral.code': {
+    referral: {
       rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(50, 'Referral code must not exceed 50 characters')
-    },
-    'referral.source': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid referral source ID format')
+      validator: Validator.schema().object({
+        code: Validator.schema().string().max(50),
+        source: Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
+      })
     },
     tags: {
       rule: 'optional',
@@ -76,17 +60,12 @@ export default (function (db) {
         .string()
         .oneOf(['active', 'inactive', 'blocked'])
     },
-    'identity.type': {
+    identity: {
       rule: 'required',
-      validator: Validator.schema()
-        .string()
-        .oneOf(['Visitor', 'User', 'Organization'])
-    },
-    'identity.target': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid identity target ID format')
+      validator: Validator.schema().object({
+        type: Validator.schema().string().oneOf(['Visitor', 'User', 'Organization']).required(),
+        target: Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
+      })
     },
     owner: {
       rule: 'required',
@@ -95,35 +74,15 @@ export default (function (db) {
         target: Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
       })
     },
-    'address.country': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(100, 'Country must not exceed 100 characters')
-    },
-    'address.addressLine1': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(255, 'Address line 1 must not exceed 255 characters')
-    },
-    'address.addressLine2': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(255, 'Address line 2 must not exceed 255 characters')
-    },
-    'address.city': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(100, 'City must not exceed 100 characters')
-    },
-    'address.postalCode': {
+    address: {
       rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(20, 'Postal code must not exceed 20 characters')
+      validator: Validator.schema().object({
+        country: Validator.schema().string().max(100),
+        addressLine1: Validator.schema().string().max(255),
+        addressLine2: Validator.schema().string().max(255),
+        city: Validator.schema().string().max(100),
+        postalCode: Validator.schema().string().max(20)
+      })
     }
   });
 
@@ -149,24 +108,13 @@ export default (function (db) {
         .string()
         .pattern(/^\+?[1-9]\d{1,14}$/, 'Invalid phone format')
     },
-    'profile.name': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .min(1, 'Name must be at least 1 character')
-        .max(255, 'Name must not exceed 255 characters')
-    },
-    'profile.description': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(1000, 'Description must not exceed 1000 characters')
-    },
-    'profile.photo': {
+    profile: {
       rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(500, 'Photo URL must not exceed 500 characters')
+      validator: Validator.schema().object({
+        name: Validator.schema().string().min(1).max(255),
+        description: Validator.schema().string().max(1000),
+        photo: Validator.schema().string().max(500)
+      })
     },
     source: {
       rule: 'optional',
@@ -174,17 +122,12 @@ export default (function (db) {
         .string()
         .oneOf(['web', 'mobile', 'api', 'import', 'manual', 'referral', 'social', 'email'])
     },
-    'referral.code': {
+    referral: {
       rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(50, 'Referral code must not exceed 50 characters')
-    },
-    'referral.source': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .pattern(/^[0-9a-fA-F]{24}$/, 'Invalid referral source ID format')
+      validator: Validator.schema().object({
+        code: Validator.schema().string().max(50),
+        source: Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
+      })
     },
     tags: {
       rule: 'optional',
@@ -205,35 +148,15 @@ export default (function (db) {
         .string()
         .oneOf(['active', 'inactive', 'blocked'])
     },
-    'address.country': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(100, 'Country must not exceed 100 characters')
-    },
-    'address.addressLine1': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(255, 'Address line 1 must not exceed 255 characters')
-    },
-    'address.addressLine2': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(255, 'Address line 2 must not exceed 255 characters')
-    },
-    'address.city': {
+    address: {
       rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(100, 'City must not exceed 100 characters')
-    },
-    'address.postalCode': {
-      rule: 'optional',
-      validator: Validator.schema()
-        .string()
-        .max(20, 'Postal code must not exceed 20 characters')
+      validator: Validator.schema().object({
+        country: Validator.schema().string().max(100),
+        addressLine1: Validator.schema().string().max(255),
+        addressLine2: Validator.schema().string().max(255),
+        city: Validator.schema().string().max(100),
+        postalCode: Validator.schema().string().max(20)
+      })
     }
   });
 
@@ -308,4 +231,4 @@ export default (function (db) {
     updateVerifier,
     deleteVerifier
   };
-});
+});

package/src/modules/orders/models/customer.model.js

@@ -51,7 +51,6 @@ export default db => {
         },
         addressLine1: {
           type: String,
-          required: true,
         },
         addressLine2: {
           type: String,

package/src/modules/orders/routes/applications.routes.js

@@ -1,7 +1,6 @@
 import CRUD from '@martyrs/src/modules/core/controllers/classes/crud/crud.js';
 import ABAC from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
-import mailing from '@martyrs/src/modules/core/controllers/utils/mailing.js';
-import axios from 'axios';
+import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
 
 import verifierFactory from '../middlewares/applications.verifier.js';
 
@@ -10,6 +9,65 @@ const { getInstance } = ABAC;
 export default function setupApplicationsRoutes(app, db) {
   const abac = getInstance(db);
   const verifier = verifierFactory(db);
+  const middleware = middlewareFactoryAuth(db);
+  // --- Push notification helpers (same pattern as orders) ---
+
+  const getUsersWithOrdersAccess = async (organizationId) => {
+    const pipeline = [
+      { $match: {
+        organization: new db.mongoose.Types.ObjectId(organizationId),
+        'accesses.orders.confirm': true
+      }},
+      { $unwind: '$members' },
+      { $group: { _id: '$members.user' }},
+      { $project: { userId: '$_id' }}
+    ];
+    const result = await db.department.aggregate(pipeline);
+    return result.map(item => item.userId);
+  };
+
+  const sendApplicationNotifications = async (application, userIds) => {
+    if (!userIds || userIds.length === 0) return;
+
+    const notifications = userIds.map(userId => ({
+      title: 'New Application',
+      body: `New application from ${application.contacts?.name || 'Unknown'}`,
+      type: 'application_created',
+      metadata: {
+        type: 'application_created',
+        applicationId: application._id,
+        context: 'organization',
+        organization: application.owner?.target
+      },
+      userId: userId
+    }));
+
+    try {
+      await fetch(`${process.env.API_URL || ''}/api/notifications/batch`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'X-Service-Key': process.env.SERVICE_KEY,
+        },
+        body: JSON.stringify({ notifications }),
+      });
+    } catch (error) {
+      console.error('Error sending application push notifications:', error);
+    }
+  };
+
+  const notifyApplicationCreated = async (application) => {
+    try {
+      if (application.owner?.target) {
+        const userIds = await getUsersWithOrdersAccess(application.owner.target);
+        await sendApplicationNotifications(application, userIds);
+      }
+    } catch (err) {
+      console.error('Error in application created notification:', err);
+    }
+  };
+
+  // --- End notification helpers ---
 
   const applicationsCRUD = new CRUD({
     app,
@@ -41,53 +99,51 @@ export default function setupApplicationsRoutes(app, db) {
     }
   });
 
-  // Добавляем кастомный роут для телеграм вебхука
-  applicationsCRUD.addAction('telegram-webhook', {
-    method: 'post',
-    path: '/telegram-webhook',
-    auth: false,
-    abac: { enabled: false },
-    handler: async (req, res) => {
-      const update = req.body;
-      
-      if (update.callback_query) {
-        const callbackQuery = update.callback_query;
-        const callbackData = callbackQuery.data;
-        const [action, applicationId] = callbackData.split('_');
-        
-        try {
-          let updatedApplication = null;
-          switch (action) {
-            case 'confirm':
-              updatedApplication = await db.application.findOneAndUpdate({ _id: applicationId }, { status: 'confirmed' }, { new: true });
-              break;
-            case 'lost':
-              updatedApplication = await db.application.findOneAndUpdate({ _id: applicationId }, { status: 'lost' }, { new: true });
-              break;
-            case 'delete':
-              updatedApplication = await db.application.findOneAndDelete({ _id: applicationId });
-              break;
-          }
-          
-          if (!updatedApplication) {
-            console.log('Application not found or not updated.');
-          } else {
-            console.log('Application updated:', updatedApplication);
-          }
-        } catch (err) {
-          console.log('Error updating application:', err);
+  // afterCreate hook — push notifications
+  applicationsCRUD.addHook('afterCreate', async (application, context) => {
+    notifyApplicationCreated(application).catch(console.error);
+  });
+
+  // Статистика заявок
+  app.get('/api/applications/stats',
+    middleware.authJwt.verifyToken(),
+    abac.middleware('orders', 'read'),
+    async (req, res) => {
+      try {
+        const now = new Date();
+        const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+
+        let matchStage = {};
+        if (req.query.organization) {
+          matchStage['owner.target'] = new db.mongoose.Types.ObjectId(req.query.organization);
         }
-        
-        const queryId = callbackQuery.id;
-        const telegramToken = '6206215053:AAHYCYzpFZF9jDZC-TC03NSff8oo2ExqsSU';
-        axios.post(`https://api.telegram.org/bot${telegramToken}/answerCallbackQuery`, {
-          callback_query_id: queryId,
+
+        const [totalStats, inProgressStats, monthlyStats, statusBreakdown] = await Promise.all([
+          db.application.countDocuments(matchStage),
+          db.application.countDocuments({ ...matchStage, status: 'in_progress' }),
+          db.application.countDocuments({ ...matchStage, createdAt: { $gte: startOfMonth } }),
+          db.application.aggregate([
+            { $match: matchStage },
+            { $group: { _id: '$status', count: { $sum: 1 } } }
+          ])
+        ]);
+
+        res.status(200).json({
+          total: totalStats,
+          inProgress: inProgressStats,
+          newThisMonth: monthlyStats,
+          statusBreakdown
+        });
+      } catch (err) {
+        console.error(err);
+        res.status(500).json({
+          errorCode: 'GET_APPLICATION_STATS_FAILED',
+          message: 'Error occurred while fetching application stats.',
+          error: err.message,
         });
       }
-      
-      res.sendStatus(200);
     }
-  });
+  );
 
   // Добавляем публичный роут для создания заявок пользователями
   applicationsCRUD.addAction('public-create', {
@@ -99,9 +155,9 @@ export default function setupApplicationsRoutes(app, db) {
       try {
         const applicationData = {
           ...req.body,
-          owner: {
+          owner: req.body.owner || {
             type: 'platform',
-            target: '000000000000000000000000' // заглушка для отдела платформы
+            target: '000000000000000000000000'
           },
           creator: {
             type: 'platform',
@@ -109,9 +165,11 @@ export default function setupApplicationsRoutes(app, db) {
           }
         };
 
-        const application = new db.application(applicationData);
-        const saved = await application.save();
-        
+        const saved = await applicationsCRUD.service.create(applicationData);
+
+        // Push notifications
+        notifyApplicationCreated(saved).catch(console.error);
+
         res.status(201).json(saved);
       } catch (error) {
         console.error('Error creating public application:', error);

package/src/modules/orders/routes/orders.routes.js

@@ -1,8 +1,11 @@
 import middlewareFactoryAuth from '@martyrs/src/modules/auth/controllers/middlewares/index.js';
 import controllerFactory from '../controllers/orders.controller.js';
+import ABAC from '@martyrs/src/modules/core/controllers/classes/abac/abac.js';
+const { getInstance } = ABAC;
 export default (function (app, db, origins, publicPath) {
   const controller = controllerFactory(db);
   const middleware = middlewareFactoryAuth(db);
+  const abac = getInstance(db);
   app.post(
     '/api/orders/create',
     [
@@ -10,12 +13,17 @@ export default (function (app, db, origins, publicPath) {
     ],
     controller.create
   );
-  app.get('/api/orders/read', 
+  app.get('/api/orders/read',
     [
       middleware.authJwt.verifyToken(true)
     ],
     controller.read
   );
+  app.get('/api/orders/stats',
+    middleware.authJwt.verifyToken(),
+    abac.middleware('orders', 'read'),
+    controller.getStats
+  );
   app.post(
     '/api/orders/update',
     [

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     class="o-hidden pos-relative cursor-pointer bg-light "
-    @click="$router.push('/organizations/' + organization._id)"
+    @click="$router.push({ name: 'OrganizationProfile', params: { _id: organization._id } })"
   >
     <div class="h-4r flex pos-relative">
 
@@ -84,7 +84,7 @@
         }} 
       </span>
 
-      <span v-if="organization.distance && organization.distance < 50" class="t-transp t-grey mn-r-micro">|</span>
+      <span v-if="organization.distance && organization.distance < 50" class="t-transp t-dark mn-r-micro">|</span>
       <span v-if="organization.distance && organization.distance < 50" class="mn-r-thin">{{organization.distance ? organization.distance.toFixed(1) + 'KM' : ''}}</span>
       <!-- <span class="mn-r-thin">{{organization.nearestSpotDistance}}</span> -->
       <!-- <IconPrice class="i-medium mn-r-micro"/> -->
@@ -122,8 +122,8 @@
 </template>
 
 <script setup>
-  import { ref } from 'vue'
-  import { useRouter } from 'vue-router'
+  import { ref, computed } from 'vue'
+  import { useRoute, useRouter } from 'vue-router'
   import CardOrderItem from '@martyrs/src/modules/orders/components/blocks/CardOrderItem.vue';
 
   import Text     from '@martyrs/src/components/Text/Text.vue'
@@ -166,7 +166,15 @@
 
   const emits = defineEmits(['updateMembership'])
 
+  const route = useRoute();
   const router = useRouter();
+
+  const routePrefix = computed(() => {
+    const ctx = route.meta.context
+    if (ctx === 'user') return 'User'
+    if (ctx === 'backoffice') return 'Backoffice'
+    return ''
+  })
 </script>
 
 <style>

package/src/modules/organizations/components/forms/DepartmentForm.vue

@@ -103,17 +103,22 @@
       </div>
     </div>
 
-    <!-- Action Buttons -->
-    <div class="flex gap-thin mn-t-medium">
+    <!-- Delete Department -->
+    <div v-if="editingDepartment" class="bg-light pd-medium o-hidden radius-medium mn-t-thin">
+      <h3 class="mn-b-small">Delete Department</h3>
+      <p class="p-regular mn-b-medium">Once you delete this department, all associated data including members and settings will be permanently removed. This action cannot be undone.</p>
       <Button
-        v-if="editingDepartment"
         :submit="onDelete"
         :showSuccess="true"
         :showLoader="true"
         class="bg-red"
       >
-        Delete
+        Delete Department
       </Button>
+    </div>
+
+    <!-- Action Buttons -->
+    <div class="flex gap-thin mn-t-medium">
       <Button
         :showSuccess="false"
         :showLoader="false"

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

@@ -149,6 +149,59 @@
       </Feed>
     </section>
 
+    <!-- Subscribers Section -->
+    <section>
+      <SectionPageTitle
+        title="Subscribers"
+        class="mn-b-small bg-light radius-medium pd-medium"
+      />
+
+      <div class="cols-1 gap-thin">
+        <Feed
+          v-model:items="subscribersList"
+          :search="true"
+          :states="{
+            empty: {
+              title: 'No Subscribers',
+              description: 'Currently, there are no subscribers.'
+            },
+          }"
+          :store="{
+            read: (options) => membershipsStore.read(options)
+          }"
+          :options="{
+            target: route.params._id,
+            role: ['subscriber']
+          }"
+          v-slot="{
+            items
+          }"
+          class="gap-thin cols-1"
+        >
+          <CardUser
+            v-for="(subscriber, index) in items"
+            :key="index"
+            :user="subscriber"
+            :_id="subscriber.user._id"
+            :photo="subscriber.user.profile.photo"
+            :phone="subscriber.user.phone"
+            :email="subscriber.user.email"
+            :name="subscriber.user.profile.name || 'No name'"
+            :role="'subscriber'"
+            @click="$router.push({ name: 'User Profile', params: { _id: subscriber.user._id } })"
+            :action="{
+              label: {
+                is: IconDelete,
+                props: { class: 'i-medium', fill: 'rgb(var(--white)' }
+              },
+              method: () => removeSubscriber(index, subscriber)
+            }"
+            class="h-4r w-100 bg-light radius-medium flex-nowrap flex pd-medium"
+          />
+        </Feed>
+      </div>
+    </section>
+
     <!-- Invite Members Popup -->
     <Popup 
       title="Invite members"
@@ -230,6 +283,7 @@ const router = useRouter();
 // Data
 const organizationData = ref(null);
 const membersList = ref([]);
+const subscribersList = ref([]);
 const invitesList = ref([]);
 const departmentsList = ref([]);
 const isLoaded = ref(false);
@@ -352,7 +406,14 @@ async function removeMember(index, member) {
   if (confirm("Confirm remove of member") == true) {
     await membershipsStore.delete(member);
     membershipsStore.removeItem(member, membersList.value);
-  } 
+  }
+}
+
+async function removeSubscriber(index, subscriber) {
+  if (confirm("Confirm remove of subscriber") == true) {
+    await membershipsStore.delete(subscriber);
+    membershipsStore.removeItem(subscriber, subscribersList.value);
+  }
 }
 
 async function removeInvite(index, invite) {