Merge branch 'master' into feature/customer

seeder.js

@@ -28,7 +28,8 @@ async function init() {
     require(path.join(process.cwd(), 'src/modules/order/order-product.model'));
     require(path.join(process.cwd(), 'src/modules/order/order.model'));
     require(path.join(process.cwd(), 'src/modules/cart/cart.model'));
-    require(path.join(process.cwd(), 'src/modules/review/review.model'));
+    require(path.join(process.cwd(), 'src/modules/review/product-review.model'));
+    require(path.join(process.cwd(), 'src/modules/review/shop-review.model'));
 
     await sequelize.sync();
 

src/modules/category/category.model.js

@@ -1,5 +1,6 @@
 const path = require("path");
 const sequelize = require(path.join(process.cwd(), 'src/config/lib/sequelize'));
+const Product = require(path.join(process.cwd(), 'src/modules/product/product.model'));
 const { DataTypes } = require('sequelize');
 const SubCategory = require('./sub-category.model');
 
@@ -24,4 +25,6 @@ const Category = sequelize.define('categories', {
 Category.hasMany(SubCategory, { as: 'subCategories', foreignKey: 'category_id' });
 SubCategory.belongsTo(Category, { as: 'category', foreignKey: 'category_id' });
 
+Product.belongsTo(Category, { as: 'category', foreignKey: 'category_id' });
+
 module.exports = Category;

src/modules/core/authorization/authorization.constants.js

@@ -6,6 +6,7 @@ const Services = {
     MANAGE_ROLE: "manage-roles",
     MANAGE_SHOP: "manage-shop",
     MANAGE_CLIENT: "manage-client",
+    MANAGE_REVIEW: "manage-review"
 };
 
 module.exports = { Services };

src/modules/customer/customer.controller.js

@@ -12,7 +12,7 @@ async function login(req, res) {
     try {
         const { email, password } = req.body;
 
-        const customer = await Customer.findOne({ where: { email }});
+        const customer = await Customer.findOne({ where: { email } });
 
         if (!customer || !customer.password || !customer.validPassword(password)) return res.status(400).send("Invalid email or password!");
 
@@ -52,9 +52,9 @@ const registerCustomer = async (req, res) => {
     }
 };
 
-async function getSignedInCustomerProfile (req, res) {
+async function getSignedInCustomerProfile(req, res) {
     try {
-        const customer = await Customer.findOne({ where: { id: req.user.id }});
+        const customer = await Customer.findOne({ where: { id: req.user.id } });
 
         if (!customer) return res.status(404).send("Customer not found!");
 
@@ -65,17 +65,17 @@ async function getSignedInCustomerProfile (req, res) {
     }
 }
 
-async function updateSignedInCustomerProfile (req, res) {
+async function updateSignedInCustomerProfile(req, res) {
     try {
         const { first_name, last_name, username, email, phone } = req.body;
 
-        const customer = await Customer.findOne({ where: { id: req.user.id }});
+        const customer = await Customer.findOne({ where: { id: req.user.id } });
 
         if (!customer) return res.status(404).send("Customer not found!");
-        
+
         await customer.update({ first_name, last_name, username, email, phone });
 
-        if(req.file?.path) {
+        if (req.file?.path) {
             const file_url = await cloudinary.uploader.upload(req.file.path);
             await customer.update({ avatar_url: file_url.secure_url });
         }
@@ -87,63 +87,63 @@ async function updateSignedInCustomerProfile (req, res) {
     }
 }
 
-async function getOrders (req, res) {
+async function getOrders(req, res) {
     try {
         const orders = await Order.findAll({
             where: { customer_id: req.user.id },
             include: [{
                 model: OrderProduct,
                 as: "order_products",
-                attributes: ["id"],                    
+                attributes: ["id"],
                 include: [{
                     model: Product,
                     as: "product",
                     attributes: ["id", "name", "price"],
                     include: [{
                         model: Shop,
                         as: 'shop'
-                    }]  
+                    }]
                 }]
             }]
         });
 
         res.status(200).send(orders);
-        
+
     } catch (err) {
         console.error(err);
         res.status(500).send("Internal server error!");
-    } 
+    }
 }
 
-async function getOrder (req, res) {
+async function getOrder(req, res) {
     try {
         const order = await Order.findOne({
             where: { id: req.params.id },
             include: [{
                 model: OrderProduct,
                 as: "order_products",
-                attributes: ["id"],                    
+                attributes: ["id"],
                 include: [{
                     model: Product,
                     as: "product",
                     attributes: ["id", "name", "price"],
                     include: [{
                         model: Shop,
                         as: 'shop'
-                    }]  
+                    }]
                 }]
             }]
         });
 
         res.status(200).send(order);
-        
+
     } catch (err) {
         console.error(err);
         res.status(500).send("Internal server error!");
-    } 
+    }
 }
 
-async function createOrder (req, res) {
+async function createOrder(req, res) {
     try {
         const carts = await Cart.findAll({
             where: {
@@ -207,12 +207,12 @@ async function createOrder (req, res) {
     }
 }
 
-async function addToCart (req, res) {
+async function addToCart(req, res) {
     try {
         const { product_id, quantity } = req.body;
 
         const [cart, created] = await Cart.findOrCreate({
-            where: { 
+            where: {
                 customer_id: req.user.id,
                 product_id
             },
@@ -223,7 +223,7 @@ async function addToCart (req, res) {
             },
         });
 
-        if(cart) await cart.update({ quantity });
+        if (cart) await cart.update({ quantity });
 
         res.status(201).send((cart || created));
     }
@@ -233,11 +233,11 @@ async function addToCart (req, res) {
     }
 }
 
-async function getCart (req, res) {
+async function getCart(req, res) {
     try {
-        const cart = await Cart.findAll({ 
-            where: { 
-                customer_id: req.user.id 
+        const cart = await Cart.findAll({
+            where: {
+                customer_id: req.user.id
             },
             include: [{
                 model: Product,
@@ -246,7 +246,7 @@ async function getCart (req, res) {
                 include: [{
                     model: Shop,
                     as: 'shop'
-                }]  
+                }]
             }]
         });
 
@@ -258,6 +258,36 @@ async function getCart (req, res) {
     }
 }
 
+async function deleteFromCart(req, res) {
+    try {
+
+        const cart = await Cart.findOne({
+            where: {
+                customer_id: req.user.id
+            },
+            include: [
+                {
+                    model: Product,
+                    as: 'product'
+                }
+            ]
+        });
+
+        await Cart.destroy({
+            where: {
+                customer_id: req.user.id
+            }
+        });
+        if (cart) await cart.update({ quantity });
+        res.status(201).send(('cart updated '));
+
+    } catch (err) {
+        console.error(err);
+        res.status(500).send("Internal server error!");
+    }
+
+}
+
 module.exports.login = login;
 module.exports.logout = logout;
 module.exports.registerCustomer = registerCustomer;
@@ -267,4 +297,5 @@ module.exports.getOrders = getOrders;
 module.exports.getOrder = getOrder;
 module.exports.createOrder = createOrder;
 module.exports.addToCart = addToCart;
-module.exports.getCart = getCart;
+module.exports.getCart = getCart;
+module.exports.deleteFromCart = deleteFromCart;

src/modules/platform/user/user.model.js

@@ -82,14 +82,14 @@ User.prototype.validPassword = function (password) {
 User.belongsTo(User, { as: 'createdByUser', foreignKey: 'created_by' });
 User.belongsTo(User, { as: 'updatedByUser', foreignKey: 'created_by' });
 
-Profile.hasMany(User, { as: 'users', foreignKey: 'profile_id' });
-User.belongsTo(Profile, { as: 'profile', foreignKey: 'profile_id' });
+Profile.hasMany(User, { as: 'users', foreignKey: 'profile_id', constraints: false });
+User.belongsTo(Profile, { as: 'profile', foreignKey: 'profile_id', constraints: false });
 
 Profile.belongsTo(User, { as: "createdByUser", foreignKey: "created_by" });
 Profile.belongsTo(User, { as: "updatedByUser", foreignKey: "updated_by" });
 
-Role.hasMany(User, { as: 'users', foreignKey: 'role_id' });
-User.belongsTo(Role, { as: 'role', foreignKey: 'role_id' });
+Role.hasMany(User, { as: 'users', foreignKey: 'role_id', constraints: false });
+User.belongsTo(Role, { as: 'role', foreignKey: 'role_id', constraints: false });
 
 Role.belongsTo(User, { as: "createdByUser", foreignKey: "created_by" });
 Role.belongsTo(User, { as: "updatedByUser", foreignKey: "updated_by" });

src/modules/product/product.controller.js

@@ -1,10 +1,6 @@
 const path = require("path");
-const Shop = require("../shop/shop.model");
-const Product = require("./product.model");
-const Category = require("./category.model");
-
-const { getPagination, getPagingData } = require("./services/product.service");
-
+const Product = require(path.join(process.cwd(), "src/modules/product/product.model"));
+const Shop = require(path.join(process.cwd(), "src/modules/shop/shop.model"));
 
 async function getProducts(req, res) {
     try {

src/modules/review/product-review.model.js

@@ -0,0 +1,39 @@
+const path = require("path");
+const sequelize = require(path.join(process.cwd(), "src/config/lib/sequelize"));
+const Product = require(path.join(process.cwd(), "src/modules/product/product.model"));
+const { DataTypes } = require("sequelize");
+
+const ProductReview = sequelize.define("product_reviews", {
+    id: {
+        allowNull: false,
+        primaryKey: true,
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4
+    },
+    customer_id: {
+        allowNull: false,
+        type: DataTypes.UUID
+    },
+    product_id: {
+        allowNull: false,
+        type: DataTypes.UUID
+    },
+    rating: {
+        allowNull: false,
+        type: DataTypes.INTEGER
+    },
+    comment: {
+        allowNull: false,
+        type: DataTypes.STRING(500)
+    }
+},
+ {
+    tableName: 'product_reviews',
+    timestamps: true,
+    createdAt: 'created_at',
+    updatedAt: 'updated_at'
+});
+
+ProductReview.belongsTo(Product, { as: 'product', foreignKey: 'product_id' });
+
+module.exports = ProductReview;