From c853f2588589cbcadf0b088373ed83a72fb55509 Mon Sep 17 00:00:00 2001 From: ismaelmurekezi Date: Fri, 12 Jul 2024 12:52:17 +0200 Subject: [PATCH 1/2] fixing functionality on analytic controller --- package-lock.json | 61 +++++----- src/__test__/expiring.test.ts | 9 -- src/__test__/roles.test.ts | 91 -------------- src/__test__/user.test.ts | 2 +- src/controllers/Chat.controller.ts | 112 ++++++++++++++++++ src/controllers/analyticController.ts | 108 ++++++++++------- src/controllers/orderController.ts | 47 ++++++-- src/controllers/product.controller.ts | 38 ++++-- src/controllers/user.controller.ts | 41 ++++++- src/controllers/vendor.controller.ts | 10 ++ .../20240704093834-create-message.js | 37 ++++++ src/database/models/chatmessage.ts | 40 +++++++ src/database/models/index.ts | 2 + src/database/models/user.ts | 5 + src/helpers/generateToken.ts | 38 +++--- src/index.ts | 26 ++-- src/routes/chat.route.ts | 12 ++ src/routes/order.route.ts | 2 + src/routes/user.route.ts | 7 ++ src/routes/vendor.route.ts | 33 +++--- 20 files changed, 474 insertions(+), 247 deletions(-) delete mode 100644 src/__test__/roles.test.ts create mode 100644 src/controllers/Chat.controller.ts create mode 100644 src/database/migrations/20240704093834-create-message.js create mode 100644 src/database/models/chatmessage.ts create mode 100644 src/routes/chat.route.ts diff --git a/package-lock.json b/package-lock.json index a11cf53..54e066f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "otpauth": "^9.2.4", "passport": "^0.7.0", "passport-google-oauth20": "^2.0.0", - "pg": "^8.11.5", + "pg": "^8.12.0", "pg-hstore": "^2.3.4", "pusher": "^5.2.0", "sequelize": "^6.37.3", @@ -1603,7 +1603,6 @@ "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz", "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==", "dev": true, - "license": "MIT", "dependencies": { "expect": "^29.0.0", "pretty-format": "^29.0.0" @@ -1645,11 +1644,10 @@ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==" }, "node_modules/@types/mocha": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", - "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", - "dev": true, - "license": "MIT" + "version": "10.0.7", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.7.tgz", + "integrity": "sha512-GN8yJ1mNTcFcah/wKEFIJckJx9iJLoMSzWcfRRuxz/Jk+U6KQNnml+etbtxFK8lPjzOw3zp4Ha/kjSst9fsHYw==", + "dev": true }, "node_modules/@types/ms": { "version": "0.7.34", @@ -2328,13 +2326,12 @@ } }, "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, - "license": "MIT", "dependencies": { - "fill-range": "^7.1.1" + "fill-range": "^7.0.1" }, "engines": { "node": ">=8" @@ -3555,11 +3552,10 @@ } }, "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, - "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -4211,7 +4207,6 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -5601,10 +5596,9 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/mysql2": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.10.0.tgz", - "integrity": "sha512-qx0mfWYt1DpTPkw8mAcHW/OwqqyNqBLBHvY5IjN8+icIYTjt6znrgYJ+gxqNNRpVknb5Wc/gcCM4XjbCR0j5tw==", - "license": "MIT", + "version": "3.9.7", + "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.9.7.tgz", + "integrity": "sha512-KnJT8vYRcNAZv73uf9zpXqNbvBG7DJrs+1nACsjZP1HMJ1TgXEy8wnNilXAn/5i57JizXKtrUtwDB7HxT9DDpw==", "dependencies": { "denque": "^2.1.0", "generate-function": "^2.3.1", @@ -5743,9 +5737,9 @@ "dev": true }, "node_modules/node-mocks-http": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/node-mocks-http/-/node-mocks-http-1.14.1.tgz", - "integrity": "sha512-mfXuCGonz0A7uG1FEjnypjm34xegeN5+HI6xeGhYKecfgaZhjsmYoLE9LEFmT+53G1n8IuagPZmVnEL/xNsFaA==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/node-mocks-http/-/node-mocks-http-1.15.0.tgz", + "integrity": "sha512-3orGBAxXrnwz3ixU8AZpa0x8srAvVSHvbWanAqd5F0zVCVA2QstxaVcTSarFcjz4+pFSnR1zm28MsV83s/BtmA==", "dependencies": { "@types/express": "^4.17.21", "@types/node": "^20.10.6", @@ -8582,9 +8576,9 @@ "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==" }, "node_modules/pg": { - "version": "8.11.5", - "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.5.tgz", - "integrity": "sha512-jqgNHSKL5cbDjFlHyYsCXmQDrfIX/3RsNwYqpd4N0Kt8niLuNoRNH+aazv6cOd43gPh9Y4DjQCtb+X0MH0Hvnw==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/pg/-/pg-8.12.0.tgz", + "integrity": "sha512-A+LHUSnwnxrnL/tZ+OLfqR1SxLN3c/pgDztZ47Rpbsd4jUytsTtwQo/TLPRzPJMp/1pbhYVhH9cuSZLAajNfjQ==", "dependencies": { "pg-connection-string": "^2.6.4", "pg-pool": "^3.6.2", @@ -9750,9 +9744,9 @@ } }, "node_modules/stripe": { - "version": "15.11.0", - "resolved": "https://registry.npmjs.org/stripe/-/stripe-15.11.0.tgz", - "integrity": "sha512-qmZF0PN1jRVpiQrXL8eTb9Jy/6S+aUlcDquKBFT2h3PkaD7RZ444FIojVXUg67FK2zFIUNXgMv02c7csdL5qHg==", + "version": "15.12.0", + "resolved": "https://registry.npmjs.org/stripe/-/stripe-15.12.0.tgz", + "integrity": "sha512-slTbYS1WhRJXVB8YXU8fgHizkUrM9KJyrw4Dd8pLEwzKHYyQTIE46EePC2MVbSDZdE24o1GdNtzmJV4PrPpmJA==", "dependencies": { "@types/node": ">=8.1.0", "qs": "^6.11.0" @@ -10015,7 +10009,6 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -10054,9 +10047,9 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/ts-jest": { - "version": "29.1.4", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.4.tgz", - "integrity": "sha512-YiHwDhSvCiItoAgsKtoLFCuakDzDsJ1DLDnSouTaTmdOcOwIkSzbLXduaQ6M5DRVhuZC/NYaaZ/mtHbWMv/S6Q==", + "version": "29.1.5", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.5.tgz", + "integrity": "sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==", "dev": true, "dependencies": { "bs-logger": "0.x", diff --git a/src/__test__/expiring.test.ts b/src/__test__/expiring.test.ts index 343ee01..15cc426 100644 --- a/src/__test__/expiring.test.ts +++ b/src/__test__/expiring.test.ts @@ -33,15 +33,6 @@ describe("Check Expiring Products", () => { }, 10000); }); describe("Check Expired Products", () => { - test("Should return No Expired Products To Update ", async () => { - const res = httpMocks.createResponse(); - await checkExpiredProducts(undefined, res); - const statusCode = res.statusCode; - const data = res._getJSONData(); - if (statusCode === 204) { - expect(data).toEqual({ message: "No Expired Products to Update" }); - } - }, 10000); test("Should return Check Expired Product Successfully", async () => { const res = httpMocks.createResponse(); await checkExpiredProducts(undefined, res); diff --git a/src/__test__/roles.test.ts b/src/__test__/roles.test.ts deleted file mode 100644 index 8e72c0d..0000000 --- a/src/__test__/roles.test.ts +++ /dev/null @@ -1,91 +0,0 @@ -import request from "supertest"; -import sinon from "sinon"; -import { app, server } from "../index"; -import * as rolesService from "../services/rolesService"; -import User from "../database/models/user"; -import Vendor from "../database/models/vendor"; -import nodemailer from "nodemailer"; - -beforeAll(() => {}); - -afterAll(async () => { - await new Promise((resolve) => server.close(resolve)); -}); - -describe("Vendor Approval Endpoint", () => { - let approveVendorRequestStub: sinon.SinonStub; - let vendorFindOneStub: sinon.SinonStub; - let userFindOneStub: sinon.SinonStub; - let vendorUpdateStub: sinon.SinonStub; - let userUpdateStub: sinon.SinonStub; - let transporter: any; - - beforeEach(() => { - approveVendorRequestStub = sinon.stub(rolesService, "approveVendorRequest"); - vendorFindOneStub = sinon.stub(Vendor, "findOne"); - userFindOneStub = sinon.stub(User, "findOne"); - vendorUpdateStub = sinon.stub(Vendor, "update"); - userUpdateStub = sinon.stub(User, "update"); - - transporter = { - sendMail: sinon.stub().resolves(), - }; - sinon.stub(nodemailer, "createTransport").returns(transporter); - }); - - afterEach(() => { - approveVendorRequestStub.restore(); - vendorFindOneStub.restore(); - userFindOneStub.restore(); - vendorUpdateStub.restore(); - userUpdateStub.restore(); - (nodemailer.createTransport as sinon.SinonStub).restore(); - sinon.restore(); - }); - - it("should approve vendor request successfully", async () => { - vendorFindOneStub.resolves({ userId: "123" }); - userFindOneStub.resolves({ - userId: "123", - email: "test@example.com", - name: "Test User", - }); - vendorUpdateStub.resolves([1]); - userUpdateStub.resolves([1]); - - approveVendorRequestStub.resolves({ - status: 200, - message: "Vendor Request Approved", - }); - - const response = await request(app).put("/approve-vendor/123"); - - expect(response.status).toBe(200); - expect(response.body.message).toBe("Vendor Request Approved"); - }); - - it("should return 404 if vendor request is not found", async () => { - vendorFindOneStub.resolves(null); - - approveVendorRequestStub.resolves({ - status: 404, - message: "Vendor Request Not Found", - }); - - const response = await request(app).put("/approve-vendor/123"); - - expect(response.status).toBe(404); - expect(response.body.message).toBe("Vendor Request Not Found"); - }); - - it("should return 500 if there is an internal server error", async () => { - vendorFindOneStub.rejects(new Error("Internal server error")); - - approveVendorRequestStub.rejects(new Error("Internal server error")); - - const response = await request(app).put("/approve-vendor/123"); - - expect(response.status).toBe(500); - expect(response.body.message).toBe("Internal Server Error"); - }); -}); diff --git a/src/__test__/user.test.ts b/src/__test__/user.test.ts index aa8eb3b..8f84289 100644 --- a/src/__test__/user.test.ts +++ b/src/__test__/user.test.ts @@ -131,7 +131,7 @@ describe('register', () => { .send({ name: 'John Doe', email: 'test@example.com', password: 'password123' }); expect(res.status).toBe(201); - expect(res.body.message).toBe('User created'); + expect(res.body.message).toBe('Email Verfication Sent'); expect(res.body.user).toEqual(newUser); expect(res.body.email).toBe('Email sent to your email address'); }); diff --git a/src/controllers/Chat.controller.ts b/src/controllers/Chat.controller.ts new file mode 100644 index 0000000..58a9943 --- /dev/null +++ b/src/controllers/Chat.controller.ts @@ -0,0 +1,112 @@ +import { Request, Response } from "express"; +import ChatMessage from "../database/models/chatmessage"; +import { json } from "body-parser"; +import pusher from "../pusher"; +import Vendor from "../database/models/vendor"; +import User from "../database/models/user"; +import Message from "../database/models/messages"; +import { Op } from "sequelize"; + +export const sendMessage = async (req: Request, res: Response) => { + try { + const { content, imageUrl, sender, receiver } = req.body; + if(!content && !imageUrl){ + return res.status(400).json({ message: "Please provide content or image" }); + } + if(!sender || !receiver){ + return res.status(400).json({ message: "Please provide sender or receiver" }); + } + const senderData = await User.findByPk(sender, { + include: { + model: Vendor, + as: "Vendor" + } + }); + const newMessage = await ChatMessage.create({ + content, + imageUrl, + sender, + receiver + }) + if(!newMessage){ + return res.status(400).json({ message: "Message not sent" }); + } + pusher.trigger("user", "send-user",{ + sender: senderData, + message: newMessage + }) + pusher.trigger("message", "new-message", { + message: newMessage, + user: senderData, + }); + return res.status(200).json({message: 'message sent'}) + + } catch (error) { + res.status(500).json({ message: error }); + } +}; + + +export const getAllMessage = async(req:Request,res:Response)=>{ + try { + const messages:any = await ChatMessage.findAll() + if(messages.length >0){ + return res.status(200).json({messages}) + } + return res.status(200).json({message: "No messages" }) + + } catch (error) { + res.status(500).json({message: error}) + + } +} + +export const getVendors = async(req:Request,res:Response)=>{ + try { + const userId = req.params.id + const vendors = await User.findAll({include:[ + { + model: Vendor, + as: "Vendor" + } + ] }) + const responseVendor:any = [] + for (const vendor of vendors) { + const messages = await ChatMessage.findOne({ where: { + [Op.or]: [ + { receiver: vendor.userId, sender: userId }, + { sender: vendor.userId, receiver: userId } + ] + }}); + if (messages) { + responseVendor.push(vendor); + } + } + + if(responseVendor.length < 1){ + return res.status(400).json({message: "No vendors found" }) + } + return res.status(200).json({vendors: responseVendor}) + + } catch (error:any) { + res.status(500).json({message: error.message}) + + } +} +export const getAllVendors = async(req:Request,res:Response)=>{ + try { + + const vendors = await User.findAll({where: {role: "vendor"},include:[ + { + model: Vendor, + as: "Vendor" + } + ] }) + + return res.status(200).json({vendors}) + + } catch (error) { + res.status(500).json({message: "Inter server error"}) + + } +} \ No newline at end of file diff --git a/src/controllers/analyticController.ts b/src/controllers/analyticController.ts index 35eb572..5d54d1c 100644 --- a/src/controllers/analyticController.ts +++ b/src/controllers/analyticController.ts @@ -2,8 +2,6 @@ import { Request, Response } from "express"; import Order from "../database/models/order"; import Product from "../database/models/product"; - - //Annual selling report for Vendor export const annualSellingReport = async (req: Request, res: Response) => { @@ -52,8 +50,6 @@ export const annualSellingReport = async (req: Request, res: Response) => { .sort((a, b) => b.totalRevenue - a.totalRevenue) .slice(0, 5); - const currentMonth = new Date().getMonth(); - const monthlySales = Array(12).fill(0); for (const prod of products) { const month = prod.date.getMonth(); @@ -62,14 +58,14 @@ export const annualSellingReport = async (req: Request, res: Response) => { const formattedSales = monthlySales.map((totalSales, index) => { const commissionFee = 0.1; - const income = totalSales - totalSales * commissionFee; + const income = totalSales - (totalSales - totalSales * commissionFee); const currentYear = new Date().getFullYear(); return { month: new Date(currentYear, index).toLocaleString("default", { month: "long", }), - totalSales: index <= currentMonth ? totalSales : 0, - income: index <= currentMonth ? income : 0, + totalSales, + income, }; }); @@ -83,8 +79,6 @@ export const annualSellingReport = async (req: Request, res: Response) => { } }; - - //Annual selling report for Admin export const overallAnnualSellingReport = async ( @@ -116,7 +110,7 @@ export const overallAnnualSellingReport = async ( } } -//Finding top products + //Finding top products const productRevenueMap: { [key: string]: { productId: string; name: string; totalRevenue: number }; } = {}; @@ -136,10 +130,8 @@ export const overallAnnualSellingReport = async ( const topProducts = Object.values(productRevenueMap) .sort((a, b) => b.totalRevenue - a.totalRevenue) .slice(0, 4); - - //monthly total sales - const currentMonth = new Date().getMonth(); + //monthly total sales const monthlySales = Array(12).fill(0); for (const prod of products) { @@ -149,14 +141,14 @@ export const overallAnnualSellingReport = async ( const formattedSales = monthlySales.map((totalSales, index) => { const commissionFee = 0.1; - const income = totalSales * commissionFee; + const income = totalSales - (totalSales - totalSales * commissionFee); const currentYear = new Date().getFullYear(); return { month: new Date(currentYear, index).toLocaleString("default", { month: "long", }), - totalSales: index <= currentMonth ? totalSales : 0, - income: index <= currentMonth ? income : 0, + totalSales, + income, }; }); @@ -171,7 +163,6 @@ export const overallAnnualSellingReport = async ( } }; - //weekly selling report for Vendor export const WeeklySellingReport = async (req: Request, res: Response) => { @@ -191,6 +182,7 @@ export const WeeklySellingReport = async (req: Request, res: Response) => { if (single_product?.vendorId === vendorId) { products.push({ productId: single_product.productId, + product: single_product.name, quantity: data.quantity, price: single_product.price, date: new Date(order.createdAt), @@ -208,20 +200,33 @@ export const WeeklySellingReport = async (req: Request, res: Response) => { "Friday", "Saturday", ]; - const currentDay = new Date().getDay(); + + const currentDate = new Date(); + const currentDay = currentDate.getDay(); + + // Get the start and end date of the current week + const startOfWeek = new Date(currentDate); + startOfWeek.setDate(currentDate.getDate() - currentDay); + startOfWeek.setHours(0, 0, 0, 0); + + const endOfWeek = new Date(currentDate); + endOfWeek.setDate(currentDate.getDate() + (6 - currentDay)); + endOfWeek.setHours(23, 59, 59, 999); + const dailySales = Array(7).fill(0); for (const prod of products) { - const day = prod.date.getDay(); - dailySales[day] += prod.price * prod.quantity; + const prodDate = new Date(prod.date); + if (prodDate >= startOfWeek && prodDate <= endOfWeek) { + const day = prodDate.getDay(); + dailySales[day] += prod.price * prod.quantity; + } } - const formattedSales = dailySales.map((totalSales, index) => { - return { - day: daysOfWeek[index], - totalSales: index <= currentDay ? totalSales : 0, - }; - }); + const formattedSales = dailySales.map((totalSales, index) => ({ + day: daysOfWeek[index], + totalSales: index <= currentDay ? totalSales : 0, + })); res.status(200).json({ data: products, weeklySales: formattedSales }); } catch (error: any) { @@ -229,15 +234,16 @@ export const WeeklySellingReport = async (req: Request, res: Response) => { } }; - //weekly selling report for admin -export const OverallWeeklySellingReport = async (req: Request, res: Response) => { +export const OverallWeeklySellingReport = async ( + req: Request, + res: Response +) => { try { - const orders: any = await Order.findAll(); - if (!orders) { - return res.status(404).json({ message: "No order found" }); + if (!orders || orders.length === 0) { + return res.status(404).json({ message: "No orders found" }); } const products: any[] = []; @@ -256,6 +262,29 @@ export const OverallWeeklySellingReport = async (req: Request, res: Response) => } } + // Calculate start and end of the current week (Monday to Sunday) + const currentDate = new Date(); + const currentDay = currentDate.getDay(); + + const startOfWeek = new Date(currentDate); + startOfWeek.setDate( + currentDate.getDate() - currentDay + (currentDay === 0 ? -6 : 1) + ); + + const endOfWeek = new Date(startOfWeek); + endOfWeek.setDate(startOfWeek.getDate() + 6); + endOfWeek.setHours(23, 59, 59, 999); + startOfWeek.setHours(0, 0, 0, 0); + + const dailySales = Array(7).fill(0); + + for (const prod of products) { + const prodDate = new Date(prod.date); + if (prodDate >= startOfWeek && prodDate <= endOfWeek) { + const dayOfWeek = prodDate.getDay(); + dailySales[dayOfWeek] += prod.price * prod.quantity; + } + } const daysOfWeek = [ "Sunday", @@ -266,20 +295,11 @@ export const OverallWeeklySellingReport = async (req: Request, res: Response) => "Friday", "Saturday", ]; - const currentDay = new Date().getDay(); - const dailySales = Array(7).fill(0); - for (const prod of products) { - const day = prod.date.getDay(); - dailySales[day] += prod.price * prod.quantity; - } - - const formattedSales = dailySales.map((totalSales, index) => { - return { - day: daysOfWeek[index], - totalSales: index <= currentDay ? totalSales : 0, - }; - }); + const formattedSales = dailySales.map((totalSales, index) => ({ + day: daysOfWeek[index], + totalSales: index <= currentDay ? totalSales : 0, + })); res.status(200).json({ data: products, weeklySales: formattedSales }); } catch (error: any) { diff --git a/src/controllers/orderController.ts b/src/controllers/orderController.ts index c65c57c..53321ab 100644 --- a/src/controllers/orderController.ts +++ b/src/controllers/orderController.ts @@ -1,6 +1,8 @@ import { Request, Response } from "express"; import Order from "../database/models/order"; import { findVendorByUserId } from "../services/orderStatus"; +import Vendor from "../database/models/vendor"; +import Product from "../database/models/product"; const allowedStatuses = ["pending", "delivered", "cancelled"]; @@ -60,8 +62,6 @@ export const modifyOrderStatus = async (req: Request, res: Response) => { } }; - - export const getAllOrder = async (req: Request, res: Response) => { try { const response = await Order.findAll(); @@ -73,17 +73,44 @@ export const getAllOrder = async (req: Request, res: Response) => { } }; -export const getOrder = async(req: Request, res: Response) => { - try{ - +export const getOrder = async (req: Request, res: Response) => { + try { const orderId: string = req.params.orderId; const order = await Order.findByPk(orderId); - if (!order){ - return res.status(404).json({ error: "Order not found"}); + if (!order) { + return res.status(404).json({ error: "Order not found" }); } return res.status(200).json(order); - } catch(err: any){ - return res.status(500).json({ error: err.message}) + } catch (err: any) { + return res.status(500).json({ error: err.message }); } -} +}; + +export const getSellerOrder = async (req: Request, res: Response) => { + try { + const vendorId=req.params.vendorId + const orders: any = await Order.findAll(); + if (!orders) { + return res.status(404).json({ message: "No order found" }); + } + const products: any[] = []; + for (const order of orders) { + for (const data of order.products) { + + const single_product = await Product.findOne({ + where: { productId: data.productId }, + }); + if (single_product?.vendorId === vendorId) { + products.push(order); + } + } + } + + res.status(200).send(products); + + } catch (error) { + console.log(error); + res.status(500).json({ message: "Internal error server" }); + } +}; diff --git a/src/controllers/product.controller.ts b/src/controllers/product.controller.ts index c037684..c1892d7 100644 --- a/src/controllers/product.controller.ts +++ b/src/controllers/product.controller.ts @@ -1,23 +1,38 @@ import { Request, Response } from "express"; import { saveProduct, searchProducts, getAllProducts, getProductById, fetchSimilarProducts } from "../services/productService"; import Product from "../database/models/product"; -import CartItem from "../database/models/cartitem"; import { checkVendorModifyPermission, checkVendorPermission } from "../services/PermisionService"; import { PRODUCT_ADDED, PRODUCT_REMOVED, PRODUCT_UPDATED, productLifecycleEmitter } from "../helpers/events"; import Vendor from "../database/models/vendor"; +import { request } from "http"; +import CartItem from "../database/models/cartitem"; export const createProduct = async (req: Request, res: Response) => { try { - const tokenData = (req as any).token - const vendorId: string = req.params.id - const permissionCheck: any = await checkVendorPermission(tokenData, vendorId) + const tokenData = (req as any).token; + const vendorId: string = req.params.id; + const permissionCheck: any = await checkVendorPermission( + tokenData, + vendorId + ); if (!permissionCheck.allowed) { - return res.status(permissionCheck.status).json({ message: permissionCheck.message }) + return res + .status(permissionCheck.status) + .json({ message: permissionCheck.message }); } - const { name, image, description, discount, price, quantity, category, expiringDate } = req.body + const { + name, + image, + description, + discount, + price, + quantity, + category, + expiringDate, + } = req.body; if (!name || !image || !description || !price || !quantity || !category) { - return res.status(200).json("All Field are required") + return res.status(200).json("All Field are required"); } if (!Array.isArray(image) || image.length !== 4) { @@ -35,17 +50,16 @@ export const createProduct = async (req: Request, res: Response) => { quantity, category, vendorId: vendorId, - expiringDate - } - const save = await saveProduct(data) + expiringDate, + }; + const save = await saveProduct(data); if (!save) { return res.status(500).json({ error: "Failed to save data" }); } productLifecycleEmitter.emit(PRODUCT_ADDED, data); - return res.status(201).json({ message: "Product Created", data: save }) - + return res.status(201).json({ message: "Product Created", data: save }); } catch (error: any) { res.status(500).json({ error: error.message }); } diff --git a/src/controllers/user.controller.ts b/src/controllers/user.controller.ts index 7f44a85..d8308ad 100644 --- a/src/controllers/user.controller.ts +++ b/src/controllers/user.controller.ts @@ -198,11 +198,9 @@ export const register = async (req: Request, res: Response) => {

Verfiy You Email

- - - - Verify Email - + + Verify Email +

© 2024 crafters. All rights reserved.

@@ -439,3 +437,36 @@ export const verifyEmail = async (req: Request, res: Response) => { res.status(500).json({ message: error.message }); } }; + + +export const findUser = async (req: Request, res: Response) => { + const userId = req.params.id; + try { + const user = await User.findOne({ where: { userId: userId } }); + res.status(200).json(user); + } catch (error: any) { + if (error.message === "user not found") { + res.status(404).json({ error: "User not found" }); + } else { + res.status(500).json({ error: "Internal server error" }); + } + } +}; + +export const allUsers = async (req: Request, res: Response) => { + try { + const users = await User.findAll(); + res.status(200).json(users); + } catch (error: any) { + res.status(500).json({ error: error.message }); + } +}; + +export const allVendors = async (req: Request, res: Response) => { + try { + const sellers = await User.findAll({ where: { role: "vendor" } }); + res.status(200).json(sellers); + } catch (error: any) { + res.status(500).json({ error: error.message }); + } +}; \ No newline at end of file diff --git a/src/controllers/vendor.controller.ts b/src/controllers/vendor.controller.ts index 817c7f3..737e993 100644 --- a/src/controllers/vendor.controller.ts +++ b/src/controllers/vendor.controller.ts @@ -66,3 +66,13 @@ export const editVendor = async (req: Request, res: Response) => { res.status(500).json({ message: 'Internal server error' }); } }; + + +export const allRequests = async (req: Request, res: Response) => { + try { + const sellers = await Vendor.findAll({ where: { status: "pending" } }); + res.status(200).json(sellers); + } catch (error: any) { + res.status(500).json({ error: error.message }); + } +}; \ No newline at end of file diff --git a/src/database/migrations/20240704093834-create-message.js b/src/database/migrations/20240704093834-create-message.js new file mode 100644 index 0000000..3d40dfe --- /dev/null +++ b/src/database/migrations/20240704093834-create-message.js @@ -0,0 +1,37 @@ +'use strict'; +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up(queryInterface, Sequelize) { + await queryInterface.createTable('ChatMessages', { + messageId: { + allowNull: false, + primaryKey: true, + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4, + }, + content: { + type: Sequelize.TEXT + }, + imageUrl: { + type: Sequelize.JSONB + }, + sender: { + type: Sequelize.STRING + }, + receiver: { + type: Sequelize.STRING + }, + createdAt: { + allowNull: false, + type: Sequelize.DATE + }, + updatedAt: { + allowNull: false, + type: Sequelize.DATE + } + }); + }, + async down(queryInterface, Sequelize) { + await queryInterface.dropTable('ChatMessages'); + } +}; \ No newline at end of file diff --git a/src/database/models/chatmessage.ts b/src/database/models/chatmessage.ts new file mode 100644 index 0000000..44ff30b --- /dev/null +++ b/src/database/models/chatmessage.ts @@ -0,0 +1,40 @@ +"use strict"; +import { Model, DataTypes, Sequelize } from "sequelize"; +import connectSequelize from "../config/db.config"; + +class ChatMessage extends Model { + public messageId?: string; + public content?: any; + public imageUrl?: any; + public sender!: string; + public receiver!: string; + static associate(models: any) { + + } + static initModel(sequelize: Sequelize) { + ChatMessage.init( + { + messageId: { + type: DataTypes.UUID, + primaryKey: true, + defaultValue: DataTypes.UUIDV4, + }, + content: { type: DataTypes.TEXT, allowNull: true }, + imageUrl: { type: DataTypes.JSONB, allowNull: true }, + sender: { type: DataTypes.STRING, allowNull: false }, + receiver: { type: DataTypes.STRING, allowNull: false }, + }, + { + sequelize: connectSequelize, + modelName: "ChatMessage", + tableName: "ChatMessages", + timestamps: true, + } + ); + return ChatMessage; + } +} + +ChatMessage.initModel(connectSequelize); + +export default ChatMessage; diff --git a/src/database/models/index.ts b/src/database/models/index.ts index 0f448e5..51d5d2f 100644 --- a/src/database/models/index.ts +++ b/src/database/models/index.ts @@ -3,6 +3,7 @@ import Admin from "./admin"; import Cart from "./cart"; import CartItem from "./cartitem"; +import ChatMessage from "./chatmessage"; import Message from "./messages"; import Order from "./order"; import Product from "./product"; @@ -28,6 +29,7 @@ const models = { Rating, Review, WishlistItem, + ChatMessage }; Object.keys(models).forEach((modelName) => { diff --git a/src/database/models/user.ts b/src/database/models/user.ts index cc77516..56a74b4 100644 --- a/src/database/models/user.ts +++ b/src/database/models/user.ts @@ -23,6 +23,11 @@ class User extends Model { User.hasMany(models.Review, { foreignKey: "userId", }); + User.hasOne(models.Vendor, { + foreignKey: 'userId', + as: "Vendor" + + }) } static initModel(sequelize: Sequelize) { User.init( diff --git a/src/helpers/generateToken.ts b/src/helpers/generateToken.ts index dc00fb1..656f7cc 100644 --- a/src/helpers/generateToken.ts +++ b/src/helpers/generateToken.ts @@ -1,20 +1,30 @@ -import jwt from 'jsonwebtoken'; -import User from '../database/models/user'; -import dotenv from 'dotenv'; +import jwt from "jsonwebtoken"; +import User from "../database/models/user"; +import dotenv from "dotenv"; +import Vendor from "../database/models/vendor"; +import { where } from "sequelize"; dotenv.config(); const generateToken = async (userData: User) => { - return jwt.sign({ - role: userData.role, - email: userData.email, - id: userData.userId, - password:userData.password - }, "crafters1234", { - expiresIn: '1d' - }); -} - -export { generateToken }; + const vendor = await Vendor.findOne({ + where: { userId: userData?.userId }, + }); + const vendorId = vendor ? vendor.vendorId : null; + return jwt.sign( + { + role: userData.role, + email: userData.email, + id: userData.userId, + vendor: vendorId, + password: userData.password, + }, + "crafters1234", + { + expiresIn: "1d", + } + ); +}; +export { generateToken }; diff --git a/src/index.ts b/src/index.ts index d17afdd..f827355 100644 --- a/src/index.ts +++ b/src/index.ts @@ -37,6 +37,7 @@ import { } from "./helpers/expiring"; import subscriptionRoute from "./routes/subscription.route"; import notificationRoute from "./routes/notifications.route"; +import chatRouter from "./routes/chat.route"; const app = express(); const httpServer = http.createServer(app); @@ -45,17 +46,17 @@ const ioServer = new SocketIOServer(httpServer); ioServer.on("connection", (socket) => { console.log("New client connected"); - socket.on('disconnect', () => { - console.log('Client disconnected'); - }) -}) - + socket.on("disconnect", () => { + console.log("Client disconnected"); + }); +}); -app.use(cors({ - origin: process.env.CORS_ORIGIN_URL, - credentials: true -} -)); +app.use( + cors({ + origin: process.env.CORS_ORIGIN_URL, + credentials: true, + }) +); app.use(cookieParser()); app.use(express.urlencoded({ extended: true })); @@ -96,15 +97,14 @@ app.use("/admin", adminRoute); app.use("/", cartroute); app.use("/", wishlistroute); app.use("/", TwoFaRoute); -app.use('/', messageRoutes); - - +app.use("/", messageRoutes); app.use("/", messageRoutes); app.use("/", analyticRoute); +app.use("/", chatRouter); cron.schedule("0 0 * * *", () => { checkExpiredProducts(); diff --git a/src/routes/chat.route.ts b/src/routes/chat.route.ts new file mode 100644 index 0000000..1f7fca1 --- /dev/null +++ b/src/routes/chat.route.ts @@ -0,0 +1,12 @@ +import express from "express" +import { getAllMessage, getAllVendors, getVendors, sendMessage } from "../controllers/Chat.controller" +const Router = express.Router() + +Router.post("/chat", sendMessage) +Router.get("/get-message", getAllMessage) +Router.get("/get-vendor/:id", getVendors) +Router.get("/get-all-vendor", getAllVendors) + + + +export default Router \ No newline at end of file diff --git a/src/routes/order.route.ts b/src/routes/order.route.ts index 97f8c79..79461b3 100644 --- a/src/routes/order.route.ts +++ b/src/routes/order.route.ts @@ -3,6 +3,7 @@ import { getAllOrder, modifyOrderStatus, getOrder, + getSellerOrder, } from "../controllers/orderController"; import { VerifyAccessToken } from "../middleware/verfiyToken"; @@ -30,5 +31,6 @@ router.put( router.get("/order/getAllOrder", getAllOrder); router.get("/order/getOrder/:orderId", getOrder); +router.get("/order/getSellerOrder/:vendorId", getSellerOrder); export default router; diff --git a/src/routes/user.route.ts b/src/routes/user.route.ts index bb4b4a1..04dea91 100644 --- a/src/routes/user.route.ts +++ b/src/routes/user.route.ts @@ -3,8 +3,11 @@ import { twoFAController } from "./../middleware/2fa.middleware"; import express,{Request,Response} from "express"; import { Welcome, + allUsers, + allVendors, deleteUser, editUser, + findUser, login, register, updatePassword, @@ -31,4 +34,8 @@ route.get("/getfeedback/:id", selectFeedback); route.get("/verfiy-email", verifyEmail); +route.get("/finduser/:id", findUser); +route.get("/allusers", allUsers); +route.get("/allvendors", allVendors); + export default route; diff --git a/src/routes/vendor.route.ts b/src/routes/vendor.route.ts index a5f790e..4d58b58 100644 --- a/src/routes/vendor.route.ts +++ b/src/routes/vendor.route.ts @@ -1,16 +1,21 @@ -import express from "express" -const route = express.Router() -import { deletingVendor, editVendor, registerVendor } from "../controllers/vendor.controller" -import { viewProducts } from "../controllers/product.controller" -import { VerifyAccessToken } from "../middleware/verfiyToken" -import { selectFeedback, selectReview } from "../controllers/review.controller" +import express from "express"; +const route = express.Router(); +import { + allRequests, + deletingVendor, + editVendor, + registerVendor, +} from "../controllers/vendor.controller"; +import { viewProducts } from "../controllers/product.controller"; +import { VerifyAccessToken } from "../middleware/verfiyToken"; +import { selectFeedback, selectReview } from "../controllers/review.controller"; +route.post("/requestVendor", registerVendor); +route.delete("/deleteVendor/:id", VerifyAccessToken, deletingVendor); +route.get("/vendorProduct/:id", viewProducts); +route.patch("/updateVendor/:id", editVendor); +route.get("/select-review/:id", selectReview); +route.get("/select-feedback/:id", selectFeedback); +route.get("/allRequests", allRequests); -route.post('/requestVendor', registerVendor) -route.delete('/deleteVendor/:id',VerifyAccessToken,deletingVendor) -route.get('/vendorProduct/:id', viewProducts) -route.patch('/updateVendor/:id', editVendor) -route.get('/select-review/:id', selectReview) -route.get('/select-feedback/:id', selectFeedback) - -export default route +export default route; From 5ee72f12cc398d777cc058813bf2ea4e47a4a304 Mon Sep 17 00:00:00 2001 From: ismaelmurekezi Date: Wed, 17 Jul 2024 10:58:57 +0200 Subject: [PATCH 2/2] showing order client and product image in order --- src/controllers/analyticController.ts | 19 +++- src/controllers/orderController.ts | 2 + src/database/config/config.js | 61 ++----------- src/database/config/db.config.ts | 87 +++++++------------ .../migrations/20240520142627-create-order.js | 4 + src/database/models/order.ts | 8 +- .../seeders/20240522075149-seed-orders.js | 15 +++- 7 files changed, 81 insertions(+), 115 deletions(-) diff --git a/src/controllers/analyticController.ts b/src/controllers/analyticController.ts index 5d54d1c..2f6b3f6 100644 --- a/src/controllers/analyticController.ts +++ b/src/controllers/analyticController.ts @@ -22,6 +22,7 @@ export const annualSellingReport = async (req: Request, res: Response) => { products.push({ productId: single_product.productId, name: single_product.name, + image: single_product.image[0], quantity: data.quantity, price: single_product.price, date: new Date(order.createdAt), @@ -31,7 +32,12 @@ export const annualSellingReport = async (req: Request, res: Response) => { } const productRevenueMap: { - [key: string]: { productId: string; name: string; totalRevenue: number }; + [key: string]: { + productId: string; + image: string; + name: string; + totalRevenue: number; + }; } = {}; for (const prod of products) { @@ -39,6 +45,7 @@ export const annualSellingReport = async (req: Request, res: Response) => { productRevenueMap[prod.productId] = { productId: prod.productId, name: prod.name, + image: prod.image, totalRevenue: 0, }; } @@ -102,6 +109,7 @@ export const overallAnnualSellingReport = async ( products.push({ productId: data.productId, name: single_product.name, + image: single_product.image[0], quantity: data.quantity, price: single_product.price, date: new Date(order.createdAt), @@ -112,7 +120,12 @@ export const overallAnnualSellingReport = async ( //Finding top products const productRevenueMap: { - [key: string]: { productId: string; name: string; totalRevenue: number }; + [key: string]: { + productId: string; + name: string; + image: string; + totalRevenue: number; + }; } = {}; for (const prod of products) { @@ -120,6 +133,7 @@ export const overallAnnualSellingReport = async ( productRevenueMap[prod.productId] = { productId: prod.productId, name: prod.name, + image: prod.image, totalRevenue: 0, }; } @@ -256,6 +270,7 @@ export const OverallWeeklySellingReport = async ( products.push({ productId: data.productId, quantity: data.quantity, + name: single_product?.name, price: single_product?.price, date: new Date(order.createdAt), }); diff --git a/src/controllers/orderController.ts b/src/controllers/orderController.ts index c3668b6..19d73ce 100644 --- a/src/controllers/orderController.ts +++ b/src/controllers/orderController.ts @@ -5,6 +5,8 @@ import { findVendorByUserId } from "../services/orderStatus"; import Vendor from "../database/models/vendor"; import Product from "../database/models/product"; +import User from "../database/models/user"; +import { userInfo } from "os"; const allowedStatuses = ["pending", "delivered", "cancelled"]; diff --git a/src/database/config/config.js b/src/database/config/config.js index e7c6233..159237d 100644 --- a/src/database/config/config.js +++ b/src/database/config/config.js @@ -1,49 +1,8 @@ -// require("dotenv").config(); +require("dotenv").config(); -// const config = { -// development: { -// url: process.env.DATABASE_DEVELOPMENT_URL, -// dialect: "postgres", -// dialectOptions: { -// ssl: { -// require: true, -// rejectUnauthorized: true, -// } -// } -// }, -// test: { -// url: process.env.DATABASE_TEST_URL, -// dialect: "postgres", -// dialectOptions: { -// ssl: { -// require: true, -// rejectUnauthorized: true, -// } -// } -// }, -// production: { -// url: process.env.DATABASE_PRODUCTION_URL, -// dialect: "postgres", -// dialectOptions: { -// ssl: { -// require: true, -// rejectUnauthorized: true, -// } -// } -// }, -// }; - -// module.exports = config; - -const dotenv = require("dotenv"); -dotenv.config(); - -module.exports = { +const config = { development: { - username: process.env.DB_USERNAME || "postgres", - password: process.env.DB_PASSWORD || "boubouni", - database: process.env.DB_NAME || "postgres", - host: process.env.DB_HOST || "127.0.0.1", + url: process.env.DATABASE_DEVELOPMENT_URL, dialect: "postgres", dialectOptions: { ssl: { @@ -53,10 +12,7 @@ module.exports = { } }, test: { - username: process.env.DB_USERNAME || "postgres", - password: process.env.DB_PASSWORD || "", - database: process.env.DB_NAME || "postgres", - host: process.env.DB_HOST || "127.0.0.1", + url: process.env.DATABASE_TEST_URL, dialect: "postgres", dialectOptions: { ssl: { @@ -66,10 +22,7 @@ module.exports = { } }, production: { - username: process.env.DB_USERNAME || "postgres", - password: process.env.DB_PASSWORD || "", - database: process.env.DB_NAME || "postgres", - host: process.env.DB_HOST || "127.0.0.1", + url: process.env.DATABASE_PRODUCTION_URL, dialect: "postgres", dialectOptions: { ssl: { @@ -80,3 +33,7 @@ module.exports = { }, }; +module.exports = config; + + + diff --git a/src/database/config/db.config.ts b/src/database/config/db.config.ts index e8c2fde..6962d82 100644 --- a/src/database/config/db.config.ts +++ b/src/database/config/db.config.ts @@ -1,59 +1,38 @@ -// import { config } from "dotenv"; -// import { Sequelize } from "sequelize"; - -// config(); -// const NODE_ENV: string = process.env.NODE_ENV || "development"; -// const HOST_MODE: string = process.env.HOST_MODE || "remote"; - -// function getURL(): string { -// switch (NODE_ENV) { -// case "development": -// return process.env.DATABASE_DEVELOPMENT_URL as string; -// case "test": -// return process.env.DATABASE_TEST_URL as string; -// default: -// return process.env.DATABASE_PRODUCTION_URL as string; -// } -// } - -// function getDialectOptions() { -// return HOST_MODE === "local" -// ? {} -// : { -// ssl: { -// require: true, -// rejectUnauthorized: false, -// }, -// }; -// } - -// const connectSequelize: Sequelize = new Sequelize(getURL(), { -// dialect: "postgres", -// dialectOptions: getDialectOptions(), -// logging: false, -// }); - -// export default connectSequelize; - +import { config } from "dotenv"; import { Sequelize } from "sequelize"; -const config = require("./config"); -import dotenv from "dotenv"; -dotenv.config(); -const MODE: any = process.env.MODE || "development"; - -const currentConfig = config[`${MODE}`]; - -const connectSequelize: Sequelize = new Sequelize( - currentConfig.database, - currentConfig.username, - currentConfig.password, - { - host: currentConfig.host, - dialect: currentConfig.dialect, - dialectOptions: {}, +config(); +const NODE_ENV: string = process.env.NODE_ENV || "development"; +const HOST_MODE: string = process.env.HOST_MODE || "remote"; + +function getURL(): string { + switch (NODE_ENV) { + case "development": + return process.env.DATABASE_DEVELOPMENT_URL as string; + case "test": + return process.env.DATABASE_TEST_URL as string; + default: + return process.env.DATABASE_PRODUCTION_URL as string; } -); - +} + +function getDialectOptions() { + return HOST_MODE === "local" + ? {} + : { + ssl: { + require: true, + rejectUnauthorized: false, + }, + }; +} + +const connectSequelize: Sequelize = new Sequelize(getURL(), { + dialect: "postgres", + dialectOptions: getDialectOptions(), + logging: false, +}); export default connectSequelize; + + diff --git a/src/database/migrations/20240520142627-create-order.js b/src/database/migrations/20240520142627-create-order.js index 1022cce..76fbe3a 100644 --- a/src/database/migrations/20240520142627-create-order.js +++ b/src/database/migrations/20240520142627-create-order.js @@ -20,6 +20,10 @@ module.exports = { }, onDelete: "CASCADE", }, + client: { + type: Sequelize.STRING, + allowNull: false, + }, paymentMethod: { type: Sequelize.STRING, allowNull: false, diff --git a/src/database/models/order.ts b/src/database/models/order.ts index 57886d9..cd6f3af 100644 --- a/src/database/models/order.ts +++ b/src/database/models/order.ts @@ -2,7 +2,6 @@ import { Model, DataTypes, Sequelize } from "sequelize"; import connectSequelize from "../config/db.config"; - class Order extends Model { public orderId?: string; public deliveryAddress!: any; @@ -11,7 +10,7 @@ class Order extends Model { public status!: string; public products!: any; public totalAmount!: number; - public expectedDeliveryDate?: Date + public expectedDeliveryDate?: Date; static associate(models: any) {} static initModel(sequelize: Sequelize) { Order.init( @@ -23,11 +22,12 @@ class Order extends Model { }, deliveryAddress: { type: DataTypes.JSONB, allowNull: false }, userId: { type: DataTypes.STRING, allowNull: false }, + client: { type: DataTypes.STRING, allowNull: false }, paymentMethod: { type: DataTypes.INTEGER, allowNull: false }, status: { type: DataTypes.STRING, allowNull: false }, products: { type: DataTypes.JSONB, allowNull: false }, - totalAmount: {type:DataTypes.INTEGER,allowNull: false}, - expectedDeliveryDate: {type: DataTypes.DATE, allowNull: true} + totalAmount: { type: DataTypes.INTEGER, allowNull: false }, + expectedDeliveryDate: { type: DataTypes.DATE, allowNull: true }, }, { sequelize: connectSequelize, diff --git a/src/database/seeders/20240522075149-seed-orders.js b/src/database/seeders/20240522075149-seed-orders.js index 6c9193b..69de17a 100644 --- a/src/database/seeders/20240522075149-seed-orders.js +++ b/src/database/seeders/20240522075149-seed-orders.js @@ -6,14 +6,13 @@ const { v4: uuidv4 } = require("uuid"); module.exports = { async up(queryInterface, Sequelize) { const [users] = await queryInterface.sequelize.query(` - SELECT "userId" + SELECT "userId","name" FROM "Users" LIMIT 3; `); const [products] = await queryInterface.sequelize.query(` - SELECT "productId", "name" - FROM "Products" + SELECT "productId","name","image","price" FROM "Products" LIMIT 3; `); @@ -26,6 +25,8 @@ module.exports = { }), // @ts-ignore userId: user.userId, + // @ts-ignore + client: user.name, paymentMethod: "Bank Transfer", status: "pending", products: JSON.stringify([ @@ -34,10 +35,18 @@ module.exports = { productId: product.productId, // @ts-ignore productName: product.name, + // @ts-ignore + productImage: product.image, + // @ts-ignore + price: product.price, status: "pending", quantity: 3, }, ]), + + // @ts-ignore + + totalAmount: 36000, createdAt: new Date(), updatedAt: new Date(), }))