@ozdao/prometheus-framework 0.2.309 → 0.2.311

package/src/modules/products/models/category.model.js

@@ -1,75 +1,24 @@
 module.exports = (db) => {
-  const СategorySchema = new db.mongoose.Schema({
-    name: {
-      type: String, 
-      required: true, 
-      trim: true
-    }, 
+  const CategorySchema = new db.mongoose.Schema({
+    name: { type: String, required: true, trim: true },
     status: {
       type: String,
-      enum: ['draft','internal','published','removed'], 
+      enum: ['draft','internal','published','removed'],
       default: 'draft',
       required: true,
     },
-    order: {
-      type: Number, 
-      required: true
-    }, 
-    url: {
-      type: String, 
-      required: true, 
-      trim: true
-    }, 
-    subcategories: {
-      type: Array
-    },
-    localization: {
-      type: Array
-    },
-    filters: {
-      type: Array
-    },
-    // owner: {
-    //   type: {
-    //     type: String,
-    //     required: true
-    //   },
-    //   target: {
-    //     type: mongoose.Schema.Types.ObjectId,
-    //     ref: function (value) {
-    //       if (this.owner.type === 'user') return 'User';
-    //       if (this.owner.type === 'organization') return 'Organization';
-    //     },
-    //     required: true,
-    //   },
-    // },
-    // creator: {
-    //   hidden: {
-    //     type: Boolean,
-    //     required: true
-    //   },
-    //   type: {
-    //     type: String,
-    //     required: true
-    //   },
-    //   target: {
-    //     type: mongoose.Schema.Types.ObjectId,
-    //     ref: function (value) {
-    //       if (this.owner.type === 'user') return 'User';
-    //       if (this.owner.type === 'organization') return 'Organization';
-    //     },
-    //     required: true,
-    //   },
-    // }
+    order: { type: Number, required: true },
+    url: { type: String, required: true, trim: true },
+    parent: { type: db.mongoose.Schema.Types.ObjectId, ref: 'Category' },
+    localization: { type: Array },
+    filters: { type: Array }
   }, {
-    timestamps: { 
-      currentTime: () => Date.now() 
-    }
+    timestamps: { currentTime: () => Date.now() }
   });
 
-  СategorySchema.index({ 'owner.target': 1, 'creator.target': 1});
-
-  const Сategory = db.mongoose.model('Сategory', СategorySchema, 'categories');
-
-  return Сategory;
-}
+  CategorySchema.index({ parent: 1 });
+  CategorySchema.index({ 'owner.target': 1, 'creator.target': 1});
+  
+  const Category = db.mongoose.model('Category', CategorySchema, 'categories');
+  return Category;
+};

package/src/modules/products/models/product.model.js

@@ -2,7 +2,13 @@ const applyOwnershipSchema = require('@pf/src/modules/globals/models/schemas/own
 
 module.exports = (db) => {
     const ProductSchema = new db.mongoose.Schema({
-        status:         {type: String}, 
+        status: {
+            type: String
+        }, 
+        listing: {
+            type: String,
+            enum: ['sale', 'rent']
+        },
         name:           {type: String}, 
         category:       {type: Array},
         description:    {type: String},
@@ -17,7 +23,13 @@ module.exports = (db) => {
             value: {type: String}
         }],
         // ЗАДАЧА: Нужно отрефачить price, перенести его в default variant
-        price: { type: Number },
+        price: { 
+            type: Number
+        },
+        price_currency: { 
+            type: String,
+            default: '$',
+        },
         prices: { type: Array}, 
         // 
         variants: [{ 
@@ -64,16 +76,7 @@ module.exports = (db) => {
                 min: [0, 'Quantity-based discount cannot be less than 0'],
                 max: [100, 'Quantity-based discount cannot be more than 100']
             },
-        }],
-        // Refactor
-        owner: {
-            type: db.mongoose.Schema.Types.ObjectId,
-            ref: 'User', 
-        },
-        organization: {
-            type: db.mongoose.Schema.Types.ObjectId,
-            ref: 'Organization',
-        },
+        }]
     }, {
         timestamps: { 
             currentTime: () => Date.now() 

package/src/modules/products/products.client.js

@@ -51,7 +51,6 @@ function initializeProducts(app, store, router, options = {}) {
   const routesProducts = createProductRoutes();
   
   router.addRoute(route, routesProducts);
-
   router.addRoute(route, routerMarketplace);
   
   store.addStore('categories', storeCategories);

package/src/modules/products/router/categories.router.js

@@ -2,21 +2,33 @@ import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.val
 
 const categoriesRoutes = [{
   path: 'categories',
-  name: 'Categories Organization',
+  name: 'Categories',
   meta: {
     title: {
-      en: 'Category',
-      ru: 'Категория'
+      en: 'Categories',
+      ru: 'Категории'
     }
   },
   component: () => import('@pf/src/modules/products/components/pages/Categories.vue')
 }, {
   path: 'categories/add',
-  name: 'CategoryAdd',
+  name: 'Category Add',
+  meta: {
+    title: {
+      en: 'Add Category',
+      ru: 'Добавить Категорию'
+    }
+  },
   component: () => import('@pf/src/modules/products/components/pages/CategoryEdit.vue')
 },{
   path: 'categories/:category/edit',
-  name: 'CategoryEdit',
+  name: 'Category Edit',
+  meta: {
+    title: {
+      en: 'Edit Category',
+      ru: 'Редактировать Категорию'
+    }
+  },
   beforeEnter: [validationAuth.requiresAuth],
   component: () => import('@pf/src/modules/products/components/pages/CategoryEdit.vue')
 }];  

package/src/modules/products/router/products.router.js

@@ -2,7 +2,6 @@ import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.val
 
 import * as auth from '@pf/src/modules/auth/views/store/auth';
 
-import IconPlus from '@pf/src/modules/icons/navigation/IconPlus.vue'
 
 export function createProductRoutes(prefix = '', options = {}) {
   const nameWithPrefix = (name) => prefix ? `${prefix}${name}` : name;
@@ -18,17 +17,6 @@ export function createProductRoutes(prefix = '', options = {}) {
             en: 'Products',
             ru: 'Товары'
           },
-
-          actions: [
-          {
-            component: IconPlus,
-            props: {
-              fill: "rgb(var(--main))" 
-            },
-            condition: () => auth.state.user && auth.state.user._id,
-            action: (router) => router.push({ name: 'ProductAdd' })
-          }
-        ],
           authorize: options.productsAuthorize || []
         },
         component: () => import(/* webpackChunkName: 'Products' */ '@pf/src/modules/products/components/pages/Products.vue'),

package/src/modules/products/routes/categories.routes.js

@@ -7,40 +7,11 @@ module.exports = function(app, db) {
   const controller = controllerFactory(db);
   
   const { verifyCategory } = middlewareFactoryProducts(db);
-  // Get categorys
-  app.get(
-    "/categories",
-    controller.getCategories
-  );
-  app.post(
-    "/categories",
-    controller.updateCategories
-  );
-  // Get category
-  app.get(
-    "/categories/:url",
-    controller.getCategory
-  );
-  // Add category
-  app.post(
-    "/categories/add",
-    [
-      verifyCategory.checkCategoryExistOrNot,
-    ],
-    controller.addCategory
-  );
-  // Update catagory
-  app.post(
-    "/categories/:url",
-    controller.updateCategory
-  );
-  // Delete category
-  app.delete(
-    "/categories/:url",
-    controller.deleteCategory
-  );
 
+  app.get('/api/categories', controller.read);
+  app.post('/api/categories/create', [verifyCategory.checkCategoryExistOrNot], controller.create);
+  app.post('/api/categories/update', controller.update);
+  app.post('/api/categories/delete', controller.delete);
 };
 
-
-
+module.exports.controllerFactory = controllerFactory;

package/src/modules/products/store/categories.js

@@ -1,114 +1,97 @@
-/////////////////////////////
-// DEPENDENCIES
-/////////////////////////////
-import { reactive, watch, computed  } from "vue";
-// Globals 
-import { setError }   from '@pf/src/modules/globals/views/store/globals'
-// Setup Axios
+// Dependencies
+import { reactive, watch } from "vue";
+import { setError } from '@pf/src/modules/globals/views/store/globals';
+
 import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 
+// State
 const state = reactive({
   all: [],
+  filter: {
+    status: null,
+    search: null
+  },
   current: {
     order: 1,
     name: "",
     url: "",
     status: "draft",
-    subcategories: [],
+    parent: null,
+    children: [],
     filters: [],
     localization: [],
-  },
+  }
 });
 
+// Methods
 const actions = {
-  async fetchCategories(options) {
-    return await $axios.get(`/categories`, { params: options }).then(
-      categories => {
-        state.all = categories.data;
-        return Promise.resolve(categories.data);
-      },
-      error => {
-        setError(error);
-        return Promise.reject(error);
+  async read(options = {}) {
+    try {
+      const response = await $axios.get('/api/categories', { params: options });
+     
+      if (options.url) {
+        state.current = {...response.data[0]}; 
+        return Promise.resolve(response.data[0]);
+      } else {
+        return Promise.resolve(response.data);
       }
-    );
+    } catch (error) {
+      setError(error);
+      return Promise.reject(error);
+    }
   },
 
-  updateCategories(categories) {
-    return $axios.post(`/categories`, categories).then(
-      (categoriesUpdated) => {
-        state.all = categories;
-        return Promise.resolve(categories);
-      },
-      (error) => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
+  async create(category) {
+    try {
+      const response = await $axios.post('/api/categories/create', category);
+      state.all.push(response.data);
+      return Promise.resolve(response.data);
+    } catch (error) {
+      setError(error);
+      return Promise.reject(error);
+    }
   },
 
-  fetchCategory(url) {
-    return $axios.get("/categories/" + url).then(
-      (category) => {
-        state.current = category.data;
-        return Promise.resolve(category.data);
-      },
-      (error) => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
-  },
+  async update(categories) {
+    try {
+      // Handle both single category and bulk update
+      const isArray = Array.isArray(categories);
 
-  addCategory() {
-    return $axios.post("/categories/add", state.current).then(
-      (category) => {
-        state.all.push(category.data);
-        return Promise.resolve(category.data);
-      },
-      (error) => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
+      const response = await $axios.post('/api/categories/update', {
+        categories: isArray ? categories : [categories],
+      });
+      
+      // state.all = response.data;
+      return Promise.resolve(response.data);
+    } catch (error) {
+      setError(error);
+      return Promise.reject(error);
+    }
   },
 
-  updateCategory(url) {
-    return $axios.post("/categories/" + url, state.current).then(
-      (category) => {
-        state.current = category.data;
-        return Promise.resolve(category.data);
-      },
-      (error) => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
+  async delete(url) {
+    try {
+      await $axios.post('/api/categories/delete', { url });
+      state.all = state.all.filter(c => c.url !== url);
+      return Promise.resolve();
+    } catch (error) {
+      setError(error);
+      return Promise.reject(error);
+    }
   },
 
-  resetCategory(){
+  clean() {
     state.current = {
-      order: 0,
+      order: 1,
       name: "",
       url: "",
       status: "draft",
-      subcategories: [],
+      parent: null,
+      children: [],
       filters: [],
       localization: [],
-    }
-  },
-
-  deleteCategory(url) {
-    return $axios.delete("/categories/" + url).then(
-      (response) => {
-        const index = state.all.findIndex((c) => c.url === url);
-        state.all.splice(index, 1);
-      },
-      (error) => {
-        setError(error);
-      }
-    );
-  },
+    };
+  }
 };
 
 const history = [];
@@ -116,6 +99,9 @@ history.push(state);
 
 watch(state, (newState) => {
   history.push(newState);
-});
+}, { deep: true });
 
-export { state, actions };
+export {
+  state,
+  actions
+};

package/src/modules/products/store/products.js

@@ -15,6 +15,7 @@ const state = reactive({
     recommendation: false,
     category: [],
     status: 'unpublished',
+    listing: 'sale',
     information: [],
     images: [],
     files: [],
@@ -22,6 +23,7 @@ const state = reactive({
     name: '',
     sale: 0,
     price: 0,
+    price_currency: '$',
     localization: [],
     modifications: [],
     quantityDiscount: [],
@@ -35,12 +37,8 @@ const state = reactive({
 /////////////////////////////
 const actions = {
 
-  async create(organization, product) {
-    const newProduct = {
-      ...product,
-      organization: organization
-    }
-    return await $axios.post("/api/products/create", newProduct).then(
+  async create(product) {
+    return await $axios.post("/api/products/create", product).then(
       (response) => {
         set(response.data, 'current')
         return Promise.resolve(response.data);
@@ -67,8 +65,8 @@ const actions = {
       query.category = options.category;
     }
 
-    if (options.organization) {
-      query.organization = options.organization;
+    if (options.owner) {
+      query.owner = options.owner;
     }
 
     if (options.count) {