diff --git a/src/modules/order/order-product.model.js b/src/modules/order/order-product.model.js index 15ae0e9..d1ed1a6 100644 --- a/src/modules/order/order-product.model.js +++ b/src/modules/order/order-product.model.js @@ -1,6 +1,5 @@ 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 OrderProduct = sequelize.define('order_products', { @@ -29,6 +28,4 @@ const OrderProduct = sequelize.define('order_products', { updatedAt: 'updated_at' }); -OrderProduct.belongsTo(Product, { as: "product", foreignKey: "product_id" }); - module.exports = OrderProduct; \ No newline at end of file diff --git a/src/modules/order/order.model.js b/src/modules/order/order.model.js index d168083..80f509a 100644 --- a/src/modules/order/order.model.js +++ b/src/modules/order/order.model.js @@ -18,7 +18,7 @@ const Order = sequelize.define('orders', { }, total_price: { allowNull: false, - type: DataTypes.INTEGER + type: DataTypes.DECIMAL(10, 2) }, staus: { type: DataTypes.ENUM, @@ -30,12 +30,6 @@ const Order = sequelize.define('orders', { values: ['process-pending', 'processing', 'success', 'failed'], defaultValue: 'process-pending' }, - created_by: { - type: DataTypes.INTEGER - }, - updated_by: { - type: DataTypes.INTEGER - } }, { tableName: 'orders', timestamps: true, @@ -46,6 +40,7 @@ const Order = sequelize.define('orders', { Customer.hasMany(Order, { as: 'orders', foreignKey: 'customer_id' }); Order.belongsTo(Customer, { as: 'customer', foreignKey: 'customer_id' }); Order.hasMany(OrderProduct, { as: 'order_products', foreignKey: 'order-product_id' }); +OrderProduct.belongsTo(Product, { as: "product", foreignKey: "product_id" }); const OrderModel = new Order; module.exports = OrderModel; \ No newline at end of file