@ozdao/prometheus-framework 0.2.53 → 0.2.54

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

@@ -1,55 +1,29 @@
 const { sendChatMessageTelegram } = require('@pf/src/modules/globals/utils/mailing');
- 
+const queryProcessorGlobals = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
+
+function formatPositions(positions) {
+  return positions.map(pos => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join('\n');
+}
+
+// Функция для форматирования сообщения об ордере
+function formatOrderMessage(order) {
+  return `
+    🆕 New Order Received!
+    👤 Client: ${order.user.name} (${order.user.phone.number ? order.user.phone.number : 'No phone'})
+    💬 Messenger: ${order.user.messenger ? order.user.messenger.type + ' ' + order.user.messenger.value : 'None'}
+    🏢 Organization: ${order.organization}
+    📦 Positions:\n${formatPositions(order.positions)}
+    📝 Comment: ${order.comment ? order.comment : 'No comment'}
+    💳 Payment: ${order.payment.type}
+    🚚 Delivery: ${order.delivery.type} to ${order.delivery.address}
+    📌 Status: ${order.status}
+  `;
+}
 
 const controllerFactory = (db) => {
   const Order = db.order;
 
-  // Получение всех заказов
-  const read = async (req, res) => {
-    try {
-      const orders = await Order.find({}).exec();
-      if (!orders) {
-        return res.status(404).send({ errorCode: "ORDER_NOT_FOUND", message: "Orders not found." });
-      }
-      res.status(200).send(orders);
-    } catch (err) {
-      res.status(500).send({ errorCode: "GET_ORDERS_FAILED", message: "Error occurred while fetching orders.", error: err });
-    }
-  };
-
-  // Получение одного заказа
-  const getOrder = async (req, res) => {
-    try {
-      const order = await Order.findOne({ _id: req.params._id }).exec();
-      if (!order) {
-        return res.status(404).send({ errorCode: "SINGLE_ORDER_NOT_FOUND", message: "Order not found." });
-      }
-      res.status(200).send(order);
-    } catch (err) {
-      res.status(500).send({ errorCode: "GET_ORDER_FAILED", message: "Error occurred while fetching the order.", error: err });
-    }
-  };
-
-  function formatPositions(positions) {
-    return positions.map(pos => `🔹 ${pos.name} - Price: $${pos.price}, Quantity: ${pos.quantity}`).join('\n');
-  }
-
-  // Функция для форматирования сообщения об ордере
-  function formatOrderMessage(order) {
-    return `
-      🆕 New Order Received!
-      👤 Client: ${order.user.name} (${order.user.phone.number ? order.user.phone.number : 'No phone'})
-      💬 Messenger: ${order.user.messenger ? order.user.messenger.type + ' ' + order.user.messenger.value : 'None'}
-      🏢 Organization: ${order.organization}
-      📦 Positions:\n${formatPositions(order.positions)}
-      📝 Comment: ${order.comment ? order.comment : 'No comment'}
-      💳 Payment: ${order.payment.type}
-      🚚 Delivery: ${order.delivery.type} to ${order.delivery.address}
-      📌 Status: ${order.status}
-    `;
-  }
-
-  // Создание заказа
+    // Создание заказа
   const create = async (req, res) => {
     delete req.body._id;
 
@@ -81,9 +55,50 @@ const controllerFactory = (db) => {
     }
   };
 
+  const read = async (req, res) => {
+
+    let stages = [];
+    
+    stages = [
+      ...queryProcessorGlobals.getBasicOptions(
+        req.query
+      ), 
+      // For creator
+      queryProcessorGlobals.getCreatorUserLookupStage(),
+      queryProcessorGlobals.getCreatorOrganizationLookupStage(),
+      // For owner
+      queryProcessorGlobals.getOwnerUserLookupStage(),
+      queryProcessorGlobals.getOwnerOrganizationLookupStage(),
+      queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+      // Pagination
+      ...queryProcessorGlobals.getSortingOptions(
+        req.query.sortParam,
+        req.query.sortOrder,
+      ),
+      ...queryProcessorGlobals.getPaginationOptions(
+        req.query.skip,
+        req.query.limit
+      )
+    ];
+    
+    try {
+      const orders = await Order.aggregate(stages);
+
+      if (!orders) {
+        return res.status(404).send({ errorCode: "ORDER_NOT_FOUND", message: "Orders not found." });
+      }
+
+      res.status(200).send(orders);
+
+    } catch (err) {
+      console.log(err);
+      res.status(500).send({ errorCode: "GET_ORDERS_FAILED", message: "Error occurred while fetching orders.", error: err });
+    }
+  };
+
   // Обновление заказа
   const update = async (req, res) => {
-    const order = await Order.findById(req.body._id);
+    const order = await Order.findById(new db.mongoose.Schema.Types.ObjectId(req.body._id));
     
     if (!order) {
       return res.status(404).send({ errorCode: "ORDER_NOT_FOUND", message: "Order not found." });
@@ -141,7 +156,6 @@ const controllerFactory = (db) => {
   return {
     create,
     read,
-    getOrder,
     update,
     changePaymentStatus,
     deleteOrder

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

@@ -1,30 +1,24 @@
+const applyOwnershipSchema = require('@pf/src/modules/globals/models/ownership.schema.js');
+
 module.exports = (db) => {
-  
+    
   const OrderSchema = new db.mongoose.Schema({
-    owner: {
-      type: db.mongoose.Schema.Types.ObjectId,
-      ref: 'User', 
-    },
-    user: {
-      _id: { type: Boolean },
+   client: {
       name: { type: String, trim: true },
       phone: { type: Object, trim: true },
-      number: { type: String, trim: true },
+      email: { type: String, trim: true },
       messenger: {
         type: { type: String, trim: true },
         value: { type: String, trim: true }
       }
     },
-    organization: {
-      type: db.mongoose.Schema.Types.ObjectId,
-      ref: 'Organization',
-    },
     positions: { 
       type: Array 
     },
     status: { 
       type: String 
     },
+
     status_history: [{
       status: { 
         type: String, 
@@ -42,8 +36,8 @@ module.exports = (db) => {
         type: String,
         trim: true
       }
-      // Здесь вы можете добавить любые другие поля, которые считаете нужными
     }],
+    
     comment: { 
       type: String, 
       trim: true 
@@ -78,6 +72,8 @@ module.exports = (db) => {
     }
   });
 
+  applyOwnershipSchema(OrderSchema,db);
+
   const Order = db.mongoose.model("Order", OrderSchema);
 
   return Order;

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

@@ -5,6 +5,7 @@ const middlewareFactory = require('@pf/src/modules/middlewares/server');
 // Routes
 module.exports = function(app, db) {
   const controller = controllerFactory(db);
+  
   const { authJwt } = middlewareFactory(db);
 
   app.use(function(req, res, next) {
@@ -20,11 +21,6 @@ module.exports = function(app, db) {
   app.post(
     "/api/orders/create",
     controller.create
-  );
-    // Get order
-  app.get(
-    "/api/orders/:_id",
-    controller.getOrder
   );
     // Get orders
   app.get(
@@ -37,27 +33,17 @@ module.exports = function(app, db) {
       authJwt.verifyToken
     ],
     controller.update
-  );
-    // Update order
-  app.post(
-    "/api/orders/:_id",
-    controller.update
-  );
-  // Get orders
-  app.post(
-    "/api/orders/payment/:_id",
-    controller.changePaymentStatus
-  );
-  // Delete product
-  app.delete(
-    "/api/orders/:_id",
-    controller.deleteOrder
   );
   app.post(
     "/api/orders/delete",
     controller.deleteOrder
   );
 
+  // Change Payment status
+  // app.post(
+  //   "/api/orders/payment/:_id",
+  //   controller.changePaymentStatus
+  // );
 
 };
 

package/src/modules/orders/store/orders.js

@@ -10,22 +10,32 @@ import { setError }   from '@pf/src/modules/globals/store/globals'
 const state = reactive({
   all: [], 
   current: {
-    _id: '',
-    organization: '',
+    _id: null,
+  
     positions: [],
     status: null,
     comment: '',
 
-    user: {
-      _id: null,
-      name: '',
+    owner: {
+      type: 'organization',
+      target: null,
+    },
+    
+    creator: {
+      type: 'client',
+      target: null,
+    },
+
+    client: {
+      name: null,
       phone: null,
       messenger: {
-        type: '',
-        value: ''
+        type: null,
+        value: null
       },
     },
 
+
     payment: {
       type: '',
       status: '',
@@ -40,12 +50,14 @@ const state = reactive({
 });
 
 const actions = {
-  async create(order, organization) {
+  async create(positions, owner, creator) {
     try {
-      state.current.positions = order
-      state.current.organization = organization
-
-      const response = await $axios.post('/api/orders/create', state.current);
+      let order = {
+        positions: positions,
+        owner: owner,
+        creator: creator
+      }
+      const response = await $axios.post('/api/orders/create', order);
 
       state.all.push(response.data);
 

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

@@ -168,16 +168,35 @@ const controllerFactory = (db) => {
         userLocation.coordinates = [lng,lat]
       }
 
-      matchConditions.push({
-        "spots.location.coordinates": {
-          $geoWithin: {
-            $centerSphere: [
-              [parseFloat(lng), parseFloat(lat)],
-              (locationRadius || 50) / 6378.1
-            ]
+      // Determine the search radius based on the level of specificity
+      const earthRadiusKm = 6378.1;
+
+      let radius = null;
+
+      if (locationRadius) {
+          radius = parseFloat(locationRadius) / earthRadiusKm;
+      } else if (city) {
+          radius = 500 / earthRadiusKm;
+      } else if (state) {
+          radius = 1000 / earthRadiusKm;
+      } else {
+          radius = null
+      }
+
+      const geoWithinCondition = {
+          "spots.location.coordinates": {
+              $geoWithin: {
+                  $centerSphere: [
+                      [parseFloat(lng), parseFloat(lat)],
+                      radius
+                  ]
+              }
           }
-        }
-      });
+      };
+
+      if (radius !== null) {
+        matchConditions.push(geoWithinCondition);
+      }
     } 
 
     const matchStage = matchConditions.length > 0 ? { $match: { $and: matchConditions } } : null;

package/src/modules/organizations/router/organizations.js

@@ -6,6 +6,8 @@ import { membersRoutes } from './members.router.js';
 import departmentRoutes from './departments.router.js'
 import productRoutes from './products.router.js';
 
+import backofficeRoutes from '@pf/src/modules/backoffice/router/backoffice.js'
+
 const organizations = [{
   path: 'organizations',
   component: layoutEmpty,
@@ -19,7 +21,8 @@ const organizations = [{
     ...organizationRoutes,
     ...membersRoutes,
     ...departmentRoutes,
-    ...productRoutes
+    ...productRoutes,
+    ...backofficeRoutes
     
   ]
 }];

package/src/modules/organizations/router/organizations.router.js

@@ -1,16 +1,32 @@
 import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue';
 import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
+import backofficeRoutes from '@pf/src/modules/backoffice/router/backoffice.js'
+
 const organizationRoutes = [{
   path: ':_id',
-  name: 'Organization',
+  name: 'OrganizationRoot',
   meta: {
     title: {
       en: 'Organization',
       ru: 'Организация'
     }
   },
-  component: () => import('@pf/src/modules/organizations/components/pages/Organization.vue'),
+  component: () => layoutEmpty,
+  children: [
+    {
+      path: '',
+      name: 'Organization',
+      meta: {
+        title: {
+          en: 'Organization',
+          ru: 'Организация'
+        }
+      },
+      component: () => import('@pf/src/modules/organizations/components/pages/Organization.vue'),
+    },
+    ...backofficeRoutes
+  ],
 }, {
   path: 'create',
   name: 'Create Organization',

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

@@ -5,11 +5,12 @@ const path = require('path');
 
 const OpenAI = require("openai");
 
-console.log(process.env.OPENAI_API_KEY)
 const openai = new OpenAI({
-  apiKey: process.env.OPENAI_API_KEY
+  organization: process.env.OPENAI_ORG_KEY,
+  apiKey: process.env.OPENAI_API_KEY,
 });
 
+
 // Factory
 const controllerFactory = (db) => {
   const Product = db.product;

package/src/modules/users/components/pages/Profile.vue

@@ -203,7 +203,7 @@
 			    </span>
 			  </MenuItem>
 
-			  <MenuItem 
+			  <!-- <MenuItem 
 			  	@click="router.push({
 			  		name: 'Legal', 
 			  		params: {
@@ -214,7 +214,7 @@
 			    <span>
 			    	About
 			    </span>
-			  </MenuItem>
+			  </MenuItem> -->
 			  
 			  <MenuItem 
 			  	class="cursor-pointer"

package/src/modules/orders/components/sections/FormOrderDetails.vue

@@ -1,220 +0,0 @@
-<template>
-<div class="order-form col">
-  <!-- Client info -->
-  <Block
-    title="Personal Data"
-    class="mn-b-thin"
-  >
-    <!-- Name and surname -->
-    <Field 
-      v-model:field="order.user.name"     
-      label="Name*"    
-      placeholder="Enter your name"  
-      class="
-        bg-white
-        pd-medium
-        radius-small
-        mn-b-thin
-      "
-    />
-    <!-- Phone -->
-    <FieldPhone
-      v-model:modelValue="order.user.phone"  
-      @country="(country) => { order.user.number = country }"
-      :inputOptions="{
-        placeholder: 'Enter contact phone number',
-        type: 'tel',
-      }"
-      :defaultCountry="'TH'"
-      :validCharactersOnly="true"
-      :dropdownOptions="{
-        showDialCodeInSelection: true,
-        showFlags: true,
-        showDialCodeInList: true
-      }" 
-      mode="national"
-      class="bg-white pd-small radius-small mn-b-thin" 
-    />
-
-    <p class="mn-b-small">
-     Prefer to chat instead of calling? Just drop your messenger info here:
-    </p>
-
-    <div class="flex-nowrap flex">
-      <Select 
-        :options="[
-          {name: 'Telegram',        value: 'telegram'}, 
-          {name: 'WhatsApp',        value: 'whatsapp'},
-          {name: 'Line',            value: 'line'}, 
-        ]"
-        @update:select="(option) => order.user.messenger.type = option.value"
-        placeholder="Messenger" 
-        size="small"
-        class="
-          bg-white
-          pd-medium
-          radius-small
-          mn-r-small
-        "
-      />
-
-      <Field 
-        v-model:field="order.user.messenger.value"     
-        placeholder="Enter your contact here"  
-        class="
-          bg-white
-          pd-medium
-          radius-small
-          w-100
-        "
-      />
-    </div>
-  </Block>
-
-  <!-- Delivery -->
-  <Block
-    title="Delivery"
-    class="mn-b-thin"
-    :tooltip="'Delivery by mail takes 3-5 days.'"
-  >
-    <!-- Type of delivery -->
-    <div class="mn-b-small flex-nowrap flex">
-      <Radio 
-        v-model:radio="order.delivery.type"
-        label="Courier"
-        value="courier"
-        class="
-          bg-white
-          pd-medium
-          radius-small
-          w-100
-          mn-r-small
-        "
-      />
-      <Radio 
-        v-model:radio="order.delivery.type"
-        label="Post"
-        value="Post"
-        class="
-          bg-white
-          pd-medium
-          radius-small
-          w-100
-          mn-r-small
-        "
-      />
-    </div>
-    <!-- Adress-->
-    <Address
-      label="Address"    
-
-      apiKey="AIzaSyDDR6WgYB7XMt7yTDDzQNEdF_gTdUiq8dI" 
-      
-      :address="order.delivery.address" 
-      :location="order.delivery.location"  
-      
-      placeholder="Enter your address"  
-
-      class="
-        bg-white radius-tl-medium radius-tr-medium  t-black br-grey br-solid br-2px pd-medium
-      "
-
-      @update:location="newLocation => {
-        order.delivery.location = newLocation;
-      }"
-      @update:address="newAddress => {
-        order.delivery.address = newAddress;
-      }"
-    />
-
-    <LocationMarker 
-      apiKey="AIzaSyDDR6WgYB7XMt7yTDDzQNEdF_gTdUiq8dI" 
-
-      :address="order.delivery.address" 
-      :location="order.delivery.location"
-
-      class="mn-b-thin radius-bl-medium radius-br-medium h-15r o-hidden"
-
-      @update:location="newLocation => {
-        order.delivery.location = newLocation;
-      }"
-      @update:address="newAddress => {
-        order.delivery.address = newAddress;
-      }"
-    />
-   <Field 
-      v-model:field="order.comment"     
-      placeholder="Comments regarding the address (apartment unit, floor level, building section)"
-      type="textarea"  
-      class="
-        bg-white
-        pd-medium
-        radius-small
-      "
-    />
-  </Block>
-  <!-- Type of payment -->
-  <Block
-    title="Payment"
-  >
-    <div class="mn-b-small flex-nowrap flex">
-      <Select 
-        v-model:select="order.payment.type"
-        :property="'value'"
-        :options="[
-          {name: 'Cash On Delivery',  value: 'cash'}, 
-          {name: 'Bank Transfer',     value: 'bank'},
-          {name: 'Crypto',            value: 'crypto'}, 
-        ]"
-       
-        placeholder="Select type of payment" 
-        size="small"
-        class="
-          bg-white
-          pd-medium
-          radius-small
-          w-100
-        "
-      />
-    </div>
-  </Block>
-
-  
-</div>
-
-</template>
-
-<script setup="props">
-import { computed, onMounted, watch } from 'vue'
-
-import * as globals from '@pf/src/modules/globals/store/globals';
-import * as orders from '@pf/src/modules/orders/store/orders';
-/////////////////////////////
-// COMPONENT DEPENDENCIES
-/////////////////////////////
-import Block           from '@pf/src/components/Block/Block.vue'
-import Field           from '@pf/src/components/Field/Field.vue'
-import FieldPhone    from '@pf/src/components/FieldPhone/FieldPhone2.vue'
-import Select           from '@pf/src/components/Select/Select.vue'
-import Address           from '@pf/src/components/Address/Address.vue'
-
-import LocationMarker from "@pf/src/components/LocationMarker/LocationMarker.vue";
-import Radio           from '@pf/src/components/Radio/Radio.vue'
-/////////////////////////////
-// CREATED
-/////////////////////////////
-const props = defineProps({
-  order: Object,
-});
-/////////////////////////////
-// MOUNTED
-/////////////////////////////
-onMounted(() => {
-  if (globals.state.position) props.order.delivery.address = globals.state.position.address
-  if (globals.state.position) props.order.delivery.location = globals.state.position.location
-})
-</script>
-
-<style lang="scss">
-
-</style>