From 7b6d1a46fb6b41713a6668bc0f6a56e6609e5704 Mon Sep 17 00:00:00 2001 From: Icyeza Date: Mon, 6 May 2024 03:28:28 +0200 Subject: [PATCH 01/20] Implement user profile update feature --- src/__test__/route.test.ts | 52 +++++++++++++++++++ src/controllers/authController.ts | 5 ++ src/entities/User.ts | 17 ++++++ src/routes/UserRoutes.ts | 15 +++--- src/services/index.ts | 2 + .../userServices/userProfileUpdateServices.ts | 51 ++++++++++++++++++ 6 files changed, 136 insertions(+), 6 deletions(-) create mode 100644 src/services/userServices/userProfileUpdateServices.ts diff --git a/src/__test__/route.test.ts b/src/__test__/route.test.ts index d1c3be2..78e8de6 100644 --- a/src/__test__/route.test.ts +++ b/src/__test__/route.test.ts @@ -2,14 +2,24 @@ import request from 'supertest'; import { app, server } from '../index'; import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; import { User } from '../entities/User'; +import { response } from 'express'; beforeAll(async () => { // Connect to the test database const connectionOptions = await getConnectionOptions(); await createConnection({ ...connectionOptions, name: 'testConnection' }); +<<<<<<< HEAD }); +======= + +}, 10000); + + + +jest.setTimeout(20000); +>>>>>>> 7d33625 (Implement user profile update feature) afterAll(async () => { const connection = getConnection('testConnection'); const userRepository = connection.getRepository(User); @@ -194,3 +204,45 @@ describe('Password Reset Service', () => { } }); }); +<<<<<<< HEAD +======= +describe.only('PUT/user/update', () =>{ + it('should return 401 if user is not authenticated', async() =>{ + const newUser = { + firstName: 'John', + lastName: 'Doe', + email: 'john.doe23@example.com', + password: 'password', + gender: 'Male', + phoneNumber: '12345678900', + userType: 'Buyer', + photoUrl: 'https://example.com/photo.jpg', + }; + + // Create a new user + const res = await request(app).post('/user/register').send(newUser); + const userRepository = getRepository(User); + const updateUser = { + firstName: "Biguseers2399", + lastName: "1", + email: "john.doe23@example.com", + gender: "Male", + phoneNumber: "0790easdas7dsdfd76175", + photoUrl: "photo", + } + const user = await userRepository.findOne({ where: { email: updateUser.email } }); + + if(user){ + const res = await request(app).put('/user/update').send(updateUser) + expect(res.status).toBe(201); + expect(res.body).toEqual({ + status: 'success', + data: { + code: 201, + message: 'User Profile has successfully been updated', + }, + }); + } + }); +}); +>>>>>>> 7d33625 (Implement user profile update feature) diff --git a/src/controllers/authController.ts b/src/controllers/authController.ts index fbc025d..2513edd 100644 --- a/src/controllers/authController.ts +++ b/src/controllers/authController.ts @@ -8,11 +8,13 @@ import { userValidateOTP, userResendOtpService, logoutService, + } from '../services'; import { userPasswordResetService } from '../services/userServices/userPasswordResetService'; import { sendPasswordResetLinkService } from '../services/userServices/sendResetPasswordLinkService'; import { activateUserService } from '../services/updateUserStatus/activateUserService'; import { deactivateUserService } from '../services/updateUserStatus/deactivateUserService'; +import {userProfileUpdateServices} from '../services/userServices/userProfileUpdateServices'; export const userRegistration = async (req: Request, res: Response) => { await userRegistrationService(req, res); @@ -63,3 +65,6 @@ export async function disactivateUser(req: Request, res: Response) { export const logout = async (req: Request, res: Response) => { await logoutService(req, res); }; +export const userProfileUpdate = async(req: Request, res: Response) =>{ + await userProfileUpdateServices(req,res); +} diff --git a/src/entities/User.ts b/src/entities/User.ts index 0c9a19a..d48030b 100644 --- a/src/entities/User.ts +++ b/src/entities/User.ts @@ -27,6 +27,23 @@ export interface UserInterface { updatedAt: Date; } +export interface UserInterface { + id: string; + firstName: string; + lastName: string; + email: string; + password: string; + gender: string; + phoneNumber: string; + photoUrl?: string; + verified: boolean; + status: 'active' | 'suspended'; + userType: 'Admin' | 'Buyer' | 'Vendor'; + role: string; + createdAt: Date; + updatedAt: Date; +} + @Entity() @Unique(['email']) export class User { diff --git a/src/routes/UserRoutes.ts b/src/routes/UserRoutes.ts index 9eac282..9d08ace 100644 --- a/src/routes/UserRoutes.ts +++ b/src/routes/UserRoutes.ts @@ -12,8 +12,10 @@ import { logout, } from '../controllers'; -import { activateUser, disactivateUser } from '../controllers/index'; -import { hasRole } from '../middlewares/roleCheck'; + + +import { activateUser,disactivateUser , userProfileUpdate} from '../controllers/index'; +import {hasRole} from '../middlewares/roleCheck'; import { isTokenValide } from '../middlewares/isValid'; const router = Router(); @@ -26,9 +28,10 @@ router.post('/enable-2fa', enable2FA); router.post('/disable-2fa', disable2FA); router.post('/verify-otp', verifyOTP); router.post('/resend-otp', resendOTP); -router.post('/activate', isTokenValide, hasRole('ADMIN'), activateUser); -router.post('/deactivate', isTokenValide, hasRole('ADMIN'), disactivateUser); -router.post('/password/reset', userPasswordReset); -router.post('/password/reset/link', sendPasswordResetLink); +router.post('/activate',isTokenValide,hasRole("ADMIN"),activateUser); +router.post('/deactivate',isTokenValide,hasRole("ADMIN"),disactivateUser); +router.post("/password/reset", userPasswordReset); +router.post("/password/reset/link", sendPasswordResetLink); +router.put('/update', userProfileUpdate); export default router; diff --git a/src/services/index.ts b/src/services/index.ts index a7b7863..0c53b05 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -9,3 +9,5 @@ export * from './userServices/userValidateOTP'; export * from './userServices/userLoginService'; export * from './userServices/userResendOTP'; export * from './userServices/logoutServices'; + +export * from './userServices/userProfileUpdateServices'; diff --git a/src/services/userServices/userProfileUpdateServices.ts b/src/services/userServices/userProfileUpdateServices.ts new file mode 100644 index 0000000..8926fe2 --- /dev/null +++ b/src/services/userServices/userProfileUpdateServices.ts @@ -0,0 +1,51 @@ +import { Request, Response } from "express"; +import { responseError, responseSuccess } from "../../utils/response.utils"; +import { User, UserInterface } from "../../entities/User"; +import { getRepository } from "typeorm"; +import { userProfileUpdate } from "../../controllers/authController"; + +declare module "express"{ + interface Request{ + user?: Partial + } +} + + +export const userProfileUpdateServices = async (req: Request, res: Response) =>{ +try { + console.log(req.body) + if(!req.body){ + return responseError(res, 401, "body required") + } + + const { firstName, lastName, gender, phoneNumber, photoUrl, email } = req.body; + + // Validate user input + if (!firstName.trim() && !lastName.trim() && !gender.trim() && !phoneNumber.trim() && !photoUrl.trim() && !email.trim()) { + return responseError(res, 400, 'Fill all the field'); + } + + + const userRepository = getRepository(User) + const existingUser = await userRepository.findOne({ + where: {email: req.body.email} + }) + + if (!existingUser){ + return responseError(res, 401, "User not found") + } + + existingUser.firstName = firstName + existingUser.lastName = lastName + existingUser.gender = gender + existingUser.phoneNumber = phoneNumber + existingUser.photoUrl = photoUrl + + await userRepository.save(existingUser); + return responseSuccess(res, 201, "User Profile has successfully been updated"); +} catch (error) { + responseError(res, 400, (error as Error).message) + +} + +} From 93f5d330c0e66e17d053a0807bf1fc11e983d72d Mon Sep 17 00:00:00 2001 From: Icyeza Date: Tue, 7 May 2024 12:41:00 +0200 Subject: [PATCH 02/20] --amend --- jest.config.ts | 1 + src/__test__/isAllowed.test.ts | 6 +++- src/__test__/logout.test.ts | 10 +++++- src/__test__/roleCheck.test.ts | 2 +- src/__test__/route.test.ts | 33 ++++++++----------- src/__test__/userServices.test.ts | 2 +- src/__test__/userStatus.test.ts | 4 +++ .../userServices/userProfileUpdateServices.ts | 8 +++-- src/utils/sendStatusMail.ts | 2 +- 9 files changed, 40 insertions(+), 28 deletions(-) diff --git a/jest.config.ts b/jest.config.ts index 296ffe3..15175c6 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -6,6 +6,7 @@ export default { verbose: true, forceExit: true, clearMocks: true, + testTimeout: 30000, resetMocks: true, restoreMocks: true, collectCoverageFrom: [ diff --git a/src/__test__/isAllowed.test.ts b/src/__test__/isAllowed.test.ts index a6bd2ef..fba23ea 100644 --- a/src/__test__/isAllowed.test.ts +++ b/src/__test__/isAllowed.test.ts @@ -50,8 +50,12 @@ afterAll(async () => { const connection = getConnection(); const userRepository = connection.getRepository(User); + + // Delete all records from the User + await userRepository.delete({}); + // Close the connection to the test database - await connection.close(); + await connection.close(); }); describe('Middleware - checkUserStatus', () => { diff --git a/src/__test__/logout.test.ts b/src/__test__/logout.test.ts index 19cdf70..d777f7a 100644 --- a/src/__test__/logout.test.ts +++ b/src/__test__/logout.test.ts @@ -10,7 +10,15 @@ beforeAll(async () => { }); afterAll(async () => { - await getConnection('testConnection').close(); + const connection = getConnection('testConnection'); + const userRepository = connection.getRepository(User); + + // Delete all records from the User + await userRepository.delete({}); + + // Close the connection to the test database + await connection.close(); + server.close(); }); diff --git a/src/__test__/roleCheck.test.ts b/src/__test__/roleCheck.test.ts index 196066e..a9279c5 100644 --- a/src/__test__/roleCheck.test.ts +++ b/src/__test__/roleCheck.test.ts @@ -38,7 +38,7 @@ afterAll(async () => { const userRepository = connection.getRepository(User); // Delete all records from the User - await userRepository.clear(); + await userRepository.delete({}); // Close the connection to the test database await connection.close(); diff --git a/src/__test__/route.test.ts b/src/__test__/route.test.ts index 78e8de6..3a546e3 100644 --- a/src/__test__/route.test.ts +++ b/src/__test__/route.test.ts @@ -9,23 +9,18 @@ beforeAll(async () => { const connectionOptions = await getConnectionOptions(); await createConnection({ ...connectionOptions, name: 'testConnection' }); -<<<<<<< HEAD -}); - -======= -}, 10000); +}); jest.setTimeout(20000); ->>>>>>> 7d33625 (Implement user profile update feature) afterAll(async () => { const connection = getConnection('testConnection'); const userRepository = connection.getRepository(User); // Delete all records from the User - await userRepository.clear(); + await userRepository.delete({}); // Close the connection to the test database await connection.close(); @@ -204,9 +199,7 @@ describe('Password Reset Service', () => { } }); }); -<<<<<<< HEAD -======= -describe.only('PUT/user/update', () =>{ +describe('PUT/user/update', () =>{ it('should return 401 if user is not authenticated', async() =>{ const newUser = { firstName: 'John', @@ -222,17 +215,18 @@ describe.only('PUT/user/update', () =>{ // Create a new user const res = await request(app).post('/user/register').send(newUser); const userRepository = getRepository(User); - const updateUser = { - firstName: "Biguseers2399", - lastName: "1", - email: "john.doe23@example.com", - gender: "Male", - phoneNumber: "0790easdas7dsdfd76175", - photoUrl: "photo", - } - const user = await userRepository.findOne({ where: { email: updateUser.email } }); + const user = await userRepository.findOne({ where: { email: newUser.email } }); if(user){ + const updateUser = { + id: user.id, + firstName: "Biguseers2399", + lastName: "1", + email: "john.doe23@example.com", + gender: "Male", + phoneNumber: "0790easdas7dsdfd76175", + photoUrl: "photo", + } const res = await request(app).put('/user/update').send(updateUser) expect(res.status).toBe(201); expect(res.body).toEqual({ @@ -245,4 +239,3 @@ describe.only('PUT/user/update', () =>{ } }); }); ->>>>>>> 7d33625 (Implement user profile update feature) diff --git a/src/__test__/userServices.test.ts b/src/__test__/userServices.test.ts index 5e435d1..5249a9a 100644 --- a/src/__test__/userServices.test.ts +++ b/src/__test__/userServices.test.ts @@ -15,7 +15,7 @@ afterAll(async () => { const userRepository = connection.getRepository(User); // Delete all records from the User - await userRepository.clear(); + await userRepository.delete({}); // Close the connection to the test database await connection.close(); diff --git a/src/__test__/userStatus.test.ts b/src/__test__/userStatus.test.ts index f253551..8c8bb95 100644 --- a/src/__test__/userStatus.test.ts +++ b/src/__test__/userStatus.test.ts @@ -38,6 +38,10 @@ afterAll(async () => { const connection = getConnection(); const userRepository = connection.getRepository(User); + + // Delete all records from the User + await userRepository.delete({}); + // Close the connection to the test database await connection.close(); server.close(); diff --git a/src/services/userServices/userProfileUpdateServices.ts b/src/services/userServices/userProfileUpdateServices.ts index 8926fe2..1c0ec7e 100644 --- a/src/services/userServices/userProfileUpdateServices.ts +++ b/src/services/userServices/userProfileUpdateServices.ts @@ -13,15 +13,14 @@ declare module "express"{ export const userProfileUpdateServices = async (req: Request, res: Response) =>{ try { - console.log(req.body) if(!req.body){ return responseError(res, 401, "body required") } - const { firstName, lastName, gender, phoneNumber, photoUrl, email } = req.body; + const { firstName, lastName, gender, phoneNumber, photoUrl, email, id} = req.body; // Validate user input - if (!firstName.trim() && !lastName.trim() && !gender.trim() && !phoneNumber.trim() && !photoUrl.trim() && !email.trim()) { + if (!firstName.trim() && !lastName.trim() && !gender.trim() && !phoneNumber.trim() && !photoUrl.trim() && !email.trim() && !id.trim()) { return responseError(res, 400, 'Fill all the field'); } @@ -34,6 +33,9 @@ try { if (!existingUser){ return responseError(res, 401, "User not found") } + if (existingUser.id !== id) { + return responseError(res, 403, "You are not authorized to edit this profile."); + } existingUser.firstName = firstName existingUser.lastName = lastName diff --git a/src/utils/sendStatusMail.ts b/src/utils/sendStatusMail.ts index 877b2a0..34f547a 100644 --- a/src/utils/sendStatusMail.ts +++ b/src/utils/sendStatusMail.ts @@ -92,4 +92,4 @@ export const sendEmail = async (type: string, data: IData) => { console.error('Email or password for mail server not configured'); return } -}; +}; \ No newline at end of file From e817309e2a77046051ba61a9c5c27aa70d270de0 Mon Sep 17 00:00:00 2001 From: Mc-Knight Date: Thu, 9 May 2024 05:39:40 +0200 Subject: [PATCH 03/20] feat(product managment) add product managment this commit adds product entity with its relation of a vendor. it is used to implement product managment for vendor. Resolves: #48 feat(product managment) add product managment this commit adds product entity with its relation of a vendor. it is used to implement product managment for vendor. Resolves: #48 adding recommended products route --- .env.example | 7 +- .github/workflows/ci.yml | 3 + README.md | 2 +- package.json | 4 + src/@types/index.d.ts | 0 src/__test__/isAllowed.test.ts | 108 ++-- src/__test__/roleCheck.test.ts | 112 ++--- src/__test__/route.test.ts | 34 +- src/__test__/test-assets/photo1.png | Bin 0 -> 42194 bytes src/__test__/test-assets/photo2.webp | Bin 0 -> 27306 bytes src/__test__/userStatus.test.ts | 1 - src/__test__/vendorProduct.test.ts | 461 ++++++++++++++++++ src/controllers/authController.ts | 13 +- src/controllers/index.ts | 3 +- src/controllers/productController.ts | 32 ++ src/docs/authDocs.yml | 2 +- src/docs/vendorProduct.yml | 235 +++++++++ src/entities/Category.ts | 20 + src/entities/Order.ts | 40 ++ src/entities/Product.ts | 74 +++ src/entities/User.ts | 36 +- src/helper/productValidator.ts | 30 ++ src/lib/types.ts | 16 + src/middlewares/isAllowed.ts | 48 +- src/middlewares/multer.ts | 14 + src/middlewares/verifyToken.ts | 50 ++ src/routes/ProductRoutes.ts | 31 ++ src/routes/UserRoutes.ts | 14 +- src/routes/index.ts | 4 +- src/services/index.ts | 18 +- src/services/productServices/createProduct.ts | 101 ++++ src/services/productServices/deleteProduct.ts | 32 ++ .../getRecommendedProductsService.ts | 63 +++ src/services/productServices/readProduct.ts | 70 +++ .../productServices/removeProductImage.ts | 54 ++ src/services/productServices/updateProduct.ts | 109 +++++ .../updateUserStatus/activateUserService.ts | 48 +- .../updateUserStatus/deactivateUserService.ts | 48 +- .../sendResetPasswordLinkService.ts | 77 ++- .../userServices/userProfileUpdateServices.ts | 102 ++-- src/startups/getSwaggerServer.ts | 2 +- src/utils/cloudinary.ts | 13 + src/utils/logger.ts | 1 - src/utils/response.utils.ts | 2 +- src/utils/sendStatusMail.ts | 21 +- tsconfig.json | 4 +- 46 files changed, 1806 insertions(+), 353 deletions(-) create mode 100644 src/@types/index.d.ts create mode 100644 src/__test__/test-assets/photo1.png create mode 100644 src/__test__/test-assets/photo2.webp create mode 100644 src/__test__/vendorProduct.test.ts create mode 100644 src/controllers/productController.ts create mode 100644 src/docs/vendorProduct.yml create mode 100644 src/entities/Category.ts create mode 100644 src/entities/Order.ts create mode 100644 src/entities/Product.ts create mode 100644 src/helper/productValidator.ts create mode 100644 src/lib/types.ts create mode 100644 src/middlewares/multer.ts create mode 100644 src/middlewares/verifyToken.ts create mode 100644 src/routes/ProductRoutes.ts create mode 100644 src/services/productServices/createProduct.ts create mode 100644 src/services/productServices/deleteProduct.ts create mode 100644 src/services/productServices/getRecommendedProductsService.ts create mode 100644 src/services/productServices/readProduct.ts create mode 100644 src/services/productServices/removeProductImage.ts create mode 100644 src/services/productServices/updateProduct.ts create mode 100644 src/utils/cloudinary.ts diff --git a/.env.example b/.env.example index 069130c..5e17a15 100644 --- a/.env.example +++ b/.env.example @@ -27,6 +27,11 @@ PINDO_API_URL = ******************************** PINDO_SENDER = ******************************** JWT_SECRET = ******************************** TWO_FA_MINS = ******************************** + HOST = ******************* AUTH_EMAIL = ********************* -AUTH_PASSWORD = ****************** \ No newline at end of file +AUTH_PASSWORD = ****************** + +CLOUDNARY_API_KEY = ************** +CLOUDINARY_CLOUD_NAME = ************** +CLOUDINARY_API_SECRET = ************** \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d72e59..e078f9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,9 @@ env: AUTH_EMAIL: ${{secrets.AUTH_EMAIL}} AUTH_PASSWORD: ${{secrets.AUTH_PASSWORD}} JWT_SECRET: ${{secrets.JWT_SECRET}} + CLOUDNARY_API_KEY: ${{secrets.CLOUDNARY_API_KEY}} + CLOUDINARY_CLOUD_NAME: ${{secrets.CLOUDINARY_CLOUD_NAME}} + CLOUDINARY_API_SECRET: ${{secrets.CLOUDINARY_API_SECRET}} jobs: build-lint-test-coverage: diff --git a/README.md b/README.md index 755652f..0d6c5f0 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ functionalities for the frontend, such as storing, retrieving, deleting data and ## Documentation -List of endpoints exposed by the service +[List of endpoints exposed by the service](https://knights-ecomm-be-lcdh.onrender.com/api/v1/docs/) ## Setup diff --git a/package.json b/package.json index 8a90cc1..9851474 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,14 @@ "dependencies": { "@types/express-winston": "^4.0.0", "@types/jsonwebtoken": "^9.0.6", + "@types/multer": "^1.4.11", "@types/nodemailer": "^6.4.14", "@types/swagger-jsdoc": "^6.0.4", "@types/swagger-ui-express": "^4.1.6", "axios": "^1.6.8", "bcrypt": "^5.1.1", "class-validator": "^0.14.1", + "cloudinary": "^2.2.0", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cross-env": "^7.0.3", @@ -33,10 +35,12 @@ "express": "^4.19.2", "express-winston": "^4.2.0", "highlight.js": "^11.9.0", + "joi": "^17.13.1", "jsend": "^1.1.0", "jsonwebtoken": "^9.0.2", "mailgen": "^2.0.28", "morgan": "^1.10.0", + "multer": "^1.4.5-lts.1", "nodemailer": "^6.9.13", "nodemon": "^3.1.0", "pg": "^8.11.5", diff --git a/src/@types/index.d.ts b/src/@types/index.d.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/__test__/isAllowed.test.ts b/src/__test__/isAllowed.test.ts index fba23ea..81c70b5 100644 --- a/src/__test__/isAllowed.test.ts +++ b/src/__test__/isAllowed.test.ts @@ -1,5 +1,5 @@ -import { NextFunction, Request, Response } from "express"; -import { checkUserStatus } from "../middlewares/isAllowed"; +import { NextFunction, Request, Response } from 'express'; +import { checkUserStatus } from '../middlewares/isAllowed'; import { dbConnection } from '../startups/dbConnection'; import { getConnection } from 'typeorm'; import { User } from '../entities/User'; @@ -16,46 +16,45 @@ const activeUserId = uuid(); const suspendedUserId = uuid(); beforeAll(async () => { - const connection = await dbConnection(); - - const userRepository = connection?.getRepository(User); - - const activeUser = new User(); - activeUser.id = activeUserId; - activeUser.firstName = 'John2'; - activeUser.lastName = 'Doe'; - activeUser.email = 'active.doe@example.com'; - activeUser.password = 'password'; - activeUser.gender = 'Male'; - activeUser.phoneNumber = '12347'; - activeUser.photoUrl = 'https://example.com/photo.jpg'; - - await userRepository?.save(activeUser); - - const suspendedUser = new User(); - suspendedUser.id = suspendedUserId; - suspendedUser.firstName = 'John2'; - suspendedUser.lastName = 'Doe'; - suspendedUser.email = 'suspended.doe@example.com'; - suspendedUser.password = 'password'; - suspendedUser.gender = 'Male'; - suspendedUser.status = 'suspended'; - suspendedUser.phoneNumber = '12349'; - suspendedUser.photoUrl = 'https://example.com/photo.jpg'; - - await userRepository?.save(suspendedUser); + const connection = await dbConnection(); + + const userRepository = connection?.getRepository(User); + + const activeUser = new User(); + activeUser.id = activeUserId; + activeUser.firstName = 'John2'; + activeUser.lastName = 'Doe'; + activeUser.email = 'active.doe@example.com'; + activeUser.password = 'password'; + activeUser.gender = 'Male'; + activeUser.phoneNumber = '12347'; + activeUser.photoUrl = 'https://example.com/photo.jpg'; + + await userRepository?.save(activeUser); + + const suspendedUser = new User(); + suspendedUser.id = suspendedUserId; + suspendedUser.firstName = 'John2'; + suspendedUser.lastName = 'Doe'; + suspendedUser.email = 'suspended.doe@example.com'; + suspendedUser.password = 'password'; + suspendedUser.gender = 'Male'; + suspendedUser.status = 'suspended'; + suspendedUser.phoneNumber = '12349'; + suspendedUser.photoUrl = 'https://example.com/photo.jpg'; + + await userRepository?.save(suspendedUser); }); afterAll(async () => { const connection = getConnection(); const userRepository = connection.getRepository(User); - // Delete all records from the User await userRepository.delete({}); - // Close the connection to the test database - await connection.close(); + // Close the connection to the test database + await connection.close(); }); describe('Middleware - checkUserStatus', () => { @@ -67,29 +66,32 @@ describe('Middleware - checkUserStatus', () => { }; nextMock = jest.fn(); }); - + it('should return 401 if user is not authenticated', async () => { await checkUserStatus(reqMock as Request, resMock as Response, nextMock); expect(responseError).toHaveBeenCalledWith(resMock, 401, 'Authentication required'); }); - it('should return 401 if user is not found', async () => { - reqMock = { user: { id: uuid() } }; - - await checkUserStatus(reqMock as Request, resMock as Response, nextMock); - - expect(responseError).toHaveBeenCalledWith(resMock, 401, 'User not found'); - }); - - it('should pass if user status is active', async () => { - reqMock = { user: { id: activeUserId } }; - await checkUserStatus(reqMock as Request, resMock as Response, nextMock); - expect(nextMock).toHaveBeenCalled(); - }); - - it('should return 403 if user status is suspended', async () => { - reqMock = { user: { id: suspendedUserId } }; - await checkUserStatus(reqMock as Request, resMock as Response, nextMock); - expect(responseError).toHaveBeenCalledWith(resMock, 403, 'You have been suspended. Please contact our support team.'); - }); + it('should return 401 if user is not found', async () => { + reqMock = { user: { id: uuid() } }; + + await checkUserStatus(reqMock as Request, resMock as Response, nextMock); + + expect(responseError).toHaveBeenCalledWith(resMock, 401, 'User not found'); + }); + + it('should pass if user status is active', async () => { + reqMock = { user: { id: activeUserId } }; + await checkUserStatus(reqMock as Request, resMock as Response, nextMock); + expect(nextMock).toHaveBeenCalled(); + }); + it('should return 403 if user status is suspended', async () => { + reqMock = { user: { id: suspendedUserId } }; + await checkUserStatus(reqMock as Request, resMock as Response, nextMock); + expect(responseError).toHaveBeenCalledWith( + resMock, + 403, + 'You have been suspended. Please contact our support team.' + ); + }); }); diff --git a/src/__test__/roleCheck.test.ts b/src/__test__/roleCheck.test.ts index a9279c5..58efb9c 100644 --- a/src/__test__/roleCheck.test.ts +++ b/src/__test__/roleCheck.test.ts @@ -13,85 +13,85 @@ let nextMock: NextFunction; const userId = uuid(); beforeAll(async () => { - // Connect to the test database - const connection = await dbConnection(); + // Connect to the test database + const connection = await dbConnection(); - const userRepository = connection?.getRepository(User); + const userRepository = connection?.getRepository(User); - const user = new User(); + const user = new User(); - user.id = userId; - user.firstName = 'John2'; - user.lastName = 'Doe'; - user.email = 'john2.doe@example.com'; - user.password = 'password'; - user.gender = 'Male'; - user.phoneNumber = '1234'; - user.userType = 'Buyer'; - user.photoUrl = 'https://example.com/photo.jpg'; + user.id = userId; + user.firstName = 'John2'; + user.lastName = 'Doe'; + user.email = 'john2.doe@example.com'; + user.password = 'password'; + user.gender = 'Male'; + user.phoneNumber = '1234'; + user.userType = 'Buyer'; + user.photoUrl = 'https://example.com/photo.jpg'; - await userRepository?.save(user); + await userRepository?.save(user); }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); + const connection = getConnection(); + const userRepository = connection.getRepository(User); - // Delete all records from the User - await userRepository.delete({}); + // Delete all records from the User + await userRepository.delete({}); - // Close the connection to the test database - await connection.close(); + // Close the connection to the test database + await connection.close(); }); describe('hasRole MiddleWare Test', () => { - beforeEach(() => { - reqMock = {}; - resMock = { - status: jest.fn().mockReturnThis(), - json: jest.fn(), - }; - nextMock = jest.fn(); - }); + beforeEach(() => { + reqMock = {}; + resMock = { + status: jest.fn().mockReturnThis(), + json: jest.fn(), + }; + nextMock = jest.fn(); + }); - it('should return 401, if user is not authentication', async () => { - await hasRole('ADMIN')(reqMock as Request, resMock as Response, nextMock); - expect(responseError).toHaveBeenCalled; - expect(resMock.status).toHaveBeenCalledWith(401); - }); + it('should return 401, if user is not authentication', async () => { + await hasRole('ADMIN')(reqMock as Request, resMock as Response, nextMock); + expect(responseError).toHaveBeenCalled; + expect(resMock.status).toHaveBeenCalledWith(401); + }); - it('should return 401 if user is not found', async () => { - reqMock = { user: { id: uuid() } }; + it('should return 401 if user is not found', async () => { + reqMock = { user: { id: uuid() } }; - await hasRole('ADMIN')(reqMock as Request, resMock as Response, nextMock); + await hasRole('ADMIN')(reqMock as Request, resMock as Response, nextMock); - expect(responseError).toHaveBeenCalled; - expect(resMock.status).toHaveBeenCalledWith(401); - }); + expect(responseError).toHaveBeenCalled; + expect(resMock.status).toHaveBeenCalledWith(401); + }); - it('should return 403 if user does not have required role', async () => { - reqMock = { user: { id: userId } }; + it('should return 403 if user does not have required role', async () => { + reqMock = { user: { id: userId } }; - await hasRole('ADMIN')(reqMock as Request, resMock as Response, nextMock); + await hasRole('ADMIN')(reqMock as Request, resMock as Response, nextMock); - expect(responseError).toHaveBeenCalled; - expect(resMock.status).toHaveBeenCalledWith(403); - }); + expect(responseError).toHaveBeenCalled; + expect(resMock.status).toHaveBeenCalledWith(403); + }); - it('should call next() if user has required role', async () => { - reqMock = { user: { id: userId } }; + it('should call next() if user has required role', async () => { + reqMock = { user: { id: userId } }; - await hasRole('BUYER')(reqMock as Request, resMock as Response, nextMock); + await hasRole('BUYER')(reqMock as Request, resMock as Response, nextMock); - expect(nextMock).toHaveBeenCalled(); - }); + expect(nextMock).toHaveBeenCalled(); + }); - it('should return 400 if user id is of invalid format', async () => { - reqMock = { user: { id: 'sample userId' } }; + it('should return 400 if user id is of invalid format', async () => { + reqMock = { user: { id: 'sample userId' } }; - await hasRole('BUYER')(reqMock as Request, resMock as Response, nextMock); + await hasRole('BUYER')(reqMock as Request, resMock as Response, nextMock); - expect(responseError).toHaveBeenCalled; - expect(resMock.status).toHaveBeenCalledWith(400); - }); + expect(responseError).toHaveBeenCalled; + expect(resMock.status).toHaveBeenCalledWith(400); + }); }); diff --git a/src/__test__/route.test.ts b/src/__test__/route.test.ts index 3a546e3..933c431 100644 --- a/src/__test__/route.test.ts +++ b/src/__test__/route.test.ts @@ -9,11 +9,8 @@ beforeAll(async () => { const connectionOptions = await getConnectionOptions(); await createConnection({ ...connectionOptions, name: 'testConnection' }); - }); - - jest.setTimeout(20000); afterAll(async () => { const connection = getConnection('testConnection'); @@ -31,7 +28,7 @@ afterAll(async () => { describe('GET /', () => { it('This is a testing route that returns', done => { request(app) - .get('/api/v1/status') + .get('/') .expect(200) .expect('Content-Type', /json/) .expect( @@ -111,9 +108,10 @@ describe('Send password reset link', () => { it('Attempt to send email with rate limiting', async () => { const email = 'elijahladdiedv@gmail.com'; - const requests = Array.from({ length: 5 }, async () => { - return await request(app).post(`/user/password/reset/link?email=${email}`); - }); + const requests = []; + for (let i = 0; i < 5; i++) { + requests.push(await request(app).post(`/user/password/reset/link?email=${email}`)); + } const responses = await Promise.all(requests); const lastResponse = responses[responses.length - 1]; @@ -199,8 +197,8 @@ describe('Password Reset Service', () => { } }); }); -describe('PUT/user/update', () =>{ - it('should return 401 if user is not authenticated', async() =>{ +describe('PUT/user/update', () => { + it('should return 401 if user is not authenticated', async () => { const newUser = { firstName: 'John', lastName: 'Doe', @@ -217,17 +215,17 @@ describe('PUT/user/update', () =>{ const userRepository = getRepository(User); const user = await userRepository.findOne({ where: { email: newUser.email } }); - if(user){ + if (user) { const updateUser = { id: user.id, - firstName: "Biguseers2399", - lastName: "1", - email: "john.doe23@example.com", - gender: "Male", - phoneNumber: "0790easdas7dsdfd76175", - photoUrl: "photo", - } - const res = await request(app).put('/user/update').send(updateUser) + firstName: 'Biguseers2399', + lastName: '1', + email: 'john.doe23@example.com', + gender: 'Male', + phoneNumber: '0790easdas7dsdfd76175', + photoUrl: 'photo', + }; + const res = await request(app).put('/user/update').send(updateUser); expect(res.status).toBe(201); expect(res.body).toEqual({ status: 'success', diff --git a/src/__test__/test-assets/photo1.png b/src/__test__/test-assets/photo1.png new file mode 100644 index 0000000000000000000000000000000000000000..14aacbc37b4dbf9aae0e544691b42b2260cbb896 GIT binary patch literal 42194 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 o33UFjar!{uKkk~5G5?vkYe*5fUODT` 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 { const connection = getConnection(); const userRepository = connection.getRepository(User); - // Delete all records from the User await userRepository.delete({}); diff --git a/src/__test__/vendorProduct.test.ts b/src/__test__/vendorProduct.test.ts new file mode 100644 index 0000000..d355df1 --- /dev/null +++ b/src/__test__/vendorProduct.test.ts @@ -0,0 +1,461 @@ +import request from 'supertest'; +import jwt from 'jsonwebtoken'; +import { app, server } from '../index'; +import { getConnection } from 'typeorm'; +import { dbConnection } from '../startups/dbConnection'; +import { User, UserInterface } from '../entities/User'; +import { v4 as uuid } from 'uuid'; +import { Product } from '../entities/Product'; +import { Category } from '../entities/Category'; + +const vendor1Id = uuid(); +const vendor2Id = uuid(); +const buyer1Id = uuid(); +const product1Id = uuid(); +const product2Id = uuid(); +const catId = uuid(); + +const jwtSecretKey = process.env.JWT_SECRET || ''; + +const getAccessToken = (id: string, email: string) => { + return jwt.sign( + { + id: id, + email: email + }, + jwtSecretKey + ); +}; + +const sampleVendor1: UserInterface = { + id: vendor1Id, + firstName: 'vendor1', + lastName: 'user', + email: 'vendor1@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', +}; +const sampleBuyer1: UserInterface = { + id: buyer1Id, + firstName: 'buyer1', + lastName: 'user', + email: 'buyer1@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; + +const sampleVendor2: UserInterface = { + id: vendor2Id, + firstName: 'vendor2', + lastName: 'user', + email: 'vendor2@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '1638099634', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR' +}; + +const sampleCat = { + id: catId, + name: 'accessories', +}; + +const sampleProduct1 = { + id: product1Id, + name: 'test product', + description: 'amazing product', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor1, + categories: [sampleCat] +}; + +const sampleProduct2 = { + id: product2Id, + name: 'test product2', + description: 'amazing product2', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg', 'photo4.jpg', 'photo5.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor1, + categories: [sampleCat] +}; + + +beforeAll(async () => { + const connection = await dbConnection(); + + const categoryRepository = connection?.getRepository(Category); + await categoryRepository?.save({ ...sampleCat }); + + const userRepository = connection?.getRepository(User); + await userRepository?.save({ ...sampleVendor1 }); + await userRepository?.save({ ...sampleVendor2 }); + await userRepository?.save({ ...sampleBuyer1 }); + + const productRepository = connection?.getRepository(Product); + await productRepository?.save({ ...sampleProduct1 }); + await productRepository?.save({ ...sampleProduct2 }); + +}); + +afterAll(async () => { + const connection = getConnection(); + const userRepository = connection.getRepository(User); + const categoryRepository = connection.getRepository(Category); + + const productRepository = await connection.getRepository(Product).delete({}); + if (productRepository) { + await userRepository.delete({}); + await categoryRepository.delete({}); + } + + // Close the connection to the test database + await connection.close(); + server.close(); +}); + +describe('Vendor product management tests', () => { + describe('Creating new product', () => { + it("should create new product", async () => { + const response = await request(app) + .post('/product') + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.product).toBeDefined; + }, 10000); + + it("return an error if the number of product images exceeds 6", async () => { + const response = await request(app) + .post(`/product/`) + .field('name', 'test-product-images') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.error).toBe('Product cannot have more than 6 images'); + }); + + it("should not create new product it already exist", async () => { + const response = await request(app) + .post('/product') + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('categories', sampleCat.name) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(409); + }); + + it("should not create new product, if there are missing field data", async () => { + const response = await request(app) + .post('/product') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('categories', sampleCat.name) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + }); + + it("should not create new product, images are not at least more than 1", async () => { + const response = await request(app) + .post('/product') + .field('name', 'test-product-image') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('categories', sampleCat.name) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + }); + }); + + describe('Updating existing product', () => { + it("return error, if there are missing field data", async () => { + const response = await request(app) + .put(`/product/${sampleProduct2.id}`) + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + }); + + it("return error, if product do not exist", async () => { + const response = await request(app) + .put(`/product/${uuid()}`) + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.error).toBe('Product not found'); + }); + + it("return an error if the number of product images exceeds 6", async () => { + const response = await request(app) + .put(`/product/${sampleProduct2.id}`) + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 0) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.error).toBe('Product cannot have more than 6 images'); + }); + + it("should update the product", async () => { + const response = await request(app) + .put(`/product/${sampleProduct2.id}`) + .field('name', 'test product3 updated') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('oldPrice', 100) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'tech') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + }); + }); + + describe('Retrieving all vendor product', () => { + it('should retrieve all product belong to logged vendor', async () => { + const response = await request(app) + .get('/product/collection') + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.products).toBeDefined; + }); + + it('should not return any product for a vendor with zero product in stock', async () => { + const response = await request(app) + .get(`/product/collection`) + .set('Authorization', `Bearer ${getAccessToken(vendor2Id, sampleVendor2.email)}`); + + expect(response.status).toBe(200); + expect(response.body.products).toBeUndefined; + }); + + it('should not return any product for incorrect syntax of input', async () => { + const response = await request(app) + .get(`/product/collection?page=sdfsd`) + .set('Authorization', `Bearer ${getAccessToken(vendor2Id, sampleVendor2.email)}`); + + expect(response.status).toBe(400); + expect(response.body).toBeUndefined; + }); + }); + + describe('Retrieving single vendor product', () => { + + it('should retrieve single product for the user', async () => { + const response = await request(app) + .get(`/product/collection/${product1Id}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.product).toBeDefined; + }); + + it('should not return any product if product1Id do not exist', async () => { + const response = await request(app) + .get(`/product/collection/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.product).toBeUndefined; + }); + + it('should not return any product for incorrect syntax of input', async () => { + const response = await request(app) + .get(`/product/collection/id`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.product).toBeUndefined; + }); + }); + + describe('Removing product image', () => { + it('should remove one image', async () => { + const response = await request(app) + .delete(`/product/images/${sampleProduct1.id}`) + .send({ + image: sampleProduct1.images[2] + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + }); + + it('return error, if no image to remove provided', async () => { + const response = await request(app) + .delete(`/product/images/${sampleProduct1.id}`) + + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.error).toBe('Please provide an image to remove'); + }); + + it('return error, if product doesn\'t exist', async () => { + const response = await request(app) + .delete(`/product/images/${uuid()}`) + .send({ + image: sampleProduct1.images[2] + }) + + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.error).toBe('Product not found'); + }); + + it('return error, if product has only 2 images', async () => { + const response = await request(app) + .delete(`/product/images/${sampleProduct1.id}`) + .send({ + image: sampleProduct1.images[0] + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.error).toBe('Product must have at least two image'); + }); + + it('return error, if image to remove deosn\'t exist', async () => { + const response = await request(app) + .delete(`/product/images/${sampleProduct1.id}`) + .send({ + image: 'image' + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.error).toBe('Image not found'); + }); + }); + + describe('Deleting a vendor product', () => { + + it('should delete a product for the vendor', async () => { + const response = await request(app) + .delete(`/product/${product2Id}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + }); + + it('should return error for non existing products', async () => { + const response = await request(app) + .delete(`/product/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + }); + + it('should return error for invalid input syntax', async () => { + const response = await request(app) + .delete(`/product/product2Id`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + }); + }); + + + describe('Retrieving recommended products', () => { + it('should retrieve products', async () => { + const response = await request(app) + .get('/product/recommended') + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(200); + expect(response.body.data).toBeDefined; + }); + + it('should not return any product for a vendor with zero product in stock', async () => { + const response = await request(app) + .get(`/product/recommended`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.products).toBeUndefined; + }); + + it('should not return any product for incorrect syntax of input', async () => { + const response = await request(app) + .get(`/product/recommended?page=sdfsd`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(400); + expect(response.body).toBeUndefined; + }); + }); +}); \ No newline at end of file diff --git a/src/controllers/authController.ts b/src/controllers/authController.ts index 2513edd..a66cecf 100644 --- a/src/controllers/authController.ts +++ b/src/controllers/authController.ts @@ -8,13 +8,12 @@ import { userValidateOTP, userResendOtpService, logoutService, - } from '../services'; import { userPasswordResetService } from '../services/userServices/userPasswordResetService'; import { sendPasswordResetLinkService } from '../services/userServices/sendResetPasswordLinkService'; import { activateUserService } from '../services/updateUserStatus/activateUserService'; import { deactivateUserService } from '../services/updateUserStatus/deactivateUserService'; -import {userProfileUpdateServices} from '../services/userServices/userProfileUpdateServices'; +import { userProfileUpdateServices } from '../services/userServices/userProfileUpdateServices'; export const userRegistration = async (req: Request, res: Response) => { await userRegistrationService(req, res); @@ -54,17 +53,17 @@ export const sendPasswordResetLink = async (req: Request, res: Response) => { await sendPasswordResetLinkService(req, res); }; -export async function activateUser(req: Request, res: Response) { +export async function activateUser (req: Request, res: Response) { await activateUserService(req, res); } -export async function disactivateUser(req: Request, res: Response) { +export async function disactivateUser (req: Request, res: Response) { await deactivateUserService(req, res); } export const logout = async (req: Request, res: Response) => { await logoutService(req, res); }; -export const userProfileUpdate = async(req: Request, res: Response) =>{ - await userProfileUpdateServices(req,res); -} +export const userProfileUpdate = async (req: Request, res: Response) => { + await userProfileUpdateServices(req, res); +}; diff --git a/src/controllers/index.ts b/src/controllers/index.ts index a17886d..c7f3221 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -1 +1,2 @@ -export * from './authController'; \ No newline at end of file +export * from './authController'; +export * from './productController'; diff --git a/src/controllers/productController.ts b/src/controllers/productController.ts new file mode 100644 index 0000000..4676c31 --- /dev/null +++ b/src/controllers/productController.ts @@ -0,0 +1,32 @@ +import { Request, Response } from 'express'; +import { createProductService, updateProductService, removeProductImageService, readProductService, readProductsService, deleteProductService , getRecommendedProductsService} from '../services'; + +export const readProduct = async (req: Request, res: Response) => { + await readProductService(req, res); +}; + +export const readProducts = async (req: Request, res: Response) => { + await readProductsService(req, res); +}; + +export const createProduct = async (req: Request, res: Response) => { + await createProductService(req, res); +}; + +export const updateProduct = async (req: Request, res: Response) => { + await updateProductService(req, res); +}; + +export const removeProductImage = async (req: Request, res: Response) => { + await removeProductImageService(req, res); +}; + +export const deleteProduct = async (req: Request, res: Response) => { + await deleteProductService(req, res); +}; + + +export const getRecommendedProducts = async (req: Request, res: Response) => { + await getRecommendedProductsService(req, res); +}; + diff --git a/src/docs/authDocs.yml b/src/docs/authDocs.yml index 805cc53..fa69d1e 100644 --- a/src/docs/authDocs.yml +++ b/src/docs/authDocs.yml @@ -130,7 +130,7 @@ '500': description: Internal server error -/user//resend-otp: +/user/resend-otp: post: tags: - Auth diff --git a/src/docs/vendorProduct.yml b/src/docs/vendorProduct.yml new file mode 100644 index 0000000..937b097 --- /dev/null +++ b/src/docs/vendorProduct.yml @@ -0,0 +1,235 @@ +/product/collection: + get: + tags: + - Vendor product management + summary: Get all products + description: Return all product for logged user + security: + - bearerAuth: [] + responses: + '200': + description: Return all products for the user or return nothing if no product available + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + +/product/collection/{id}: + get: + tags: + - Vendor product management + summary: Get single product + description: return a product basing on id provided + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of product + responses: + '200': + description: Return info for the product + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found + '500': + description: Internal server error + +/product: + post: + tags: + - Vendor product management + summary: Creates new product + security: + - bearerAuth: [] + consumes: + - application/json + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + name: + type: string + description: + type: string + newPrice: + type: number + quantity: + type: number + images: + type: file + categories: + oneOf: + - type: string + - type: array + items: + type: string + example: "'category' or ['category1', 'category2', ...]" + expirationDate: + type: string + format: date + required: + - name + - description + - quantity + - newPrice + - categories + optional: + - expirationDate + responses: + '201': + description: Successfully added the product + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found + '500': + description: Internal server error + +/product/{id}: + put: + tags: + - Vendor product management + summary: Update a product + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of product + responses: + '200': + description: Successfully updated product + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found + '500': + description: Internal server error + + delete: + tags: + - Vendor product management + summary: Delete a product + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of product + responses: + '200': + description: Successfully deleted product + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found + '500': + description: Internal server error + +/product/images/{id}: + delete: + tags: + - Vendor product management + summary: Delete an image of product + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of product + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + id: + type: string + required: + - id + responses: + '200': + description: Successfully deleted product image + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found + '500': + description: Internal server error + +/product/recommended: + get: + tags: + - Products Recommended + summary: Gets recommended products + security: + - bearerAuth: [] + parameters: + - in: query + name: categories + required: false + schema: + type: string + pattern: '^{"categories":\s*\[[^\]]*\]\s*}$' + description: JSON string representing an array of category IDs + - in: query + name: vendor + required: false + schema: + type: string + description: Vendor ID + responses: + '201': + description: Successfully data retrieved + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Products not found + '500': + description: Internal server error diff --git a/src/entities/Category.ts b/src/entities/Category.ts new file mode 100644 index 0000000..9152553 --- /dev/null +++ b/src/entities/Category.ts @@ -0,0 +1,20 @@ +import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn } from 'typeorm'; +import { IsNotEmpty, IsString } from 'class-validator'; + +@Entity() +export class Category { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @Column() + @IsNotEmpty() + @IsString() + name!: string; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} diff --git a/src/entities/Order.ts b/src/entities/Order.ts new file mode 100644 index 0000000..f52012e --- /dev/null +++ b/src/entities/Order.ts @@ -0,0 +1,40 @@ +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, CreateDateColumn, UpdateDateColumn } from 'typeorm'; +import { IsNotEmpty, IsNumber, IsDate } from 'class-validator'; +import { User } from './User'; +import { Product } from './Product'; + +@Entity() +export class Order { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => User, user => user.orders) // <- Correctly reference the User entity and its orders property + @IsNotEmpty() + buyer!: User; + + @ManyToOne(() => Product, product => product.orders) // <- Correctly reference the Product entity and its orders property + @IsNotEmpty() + product!: Product; + + @Column('decimal') + @IsNotEmpty() + @IsNumber() + totalPrice!: number; + + @Column('int') + @IsNotEmpty() + @IsNumber() + quantity!: number; + + @Column() + @IsDate() + @IsNotEmpty() + orderDate!: Date; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} diff --git a/src/entities/Product.ts b/src/entities/Product.ts new file mode 100644 index 0000000..e541efe --- /dev/null +++ b/src/entities/Product.ts @@ -0,0 +1,74 @@ +import { + Entity, + PrimaryGeneratedColumn, + Column, + Unique, + ManyToOne, + CreateDateColumn, + UpdateDateColumn, + ManyToMany, + OneToMany, + JoinTable, +} from 'typeorm'; +import { IsNotEmpty, IsString, IsBoolean, ArrayNotEmpty, IsArray, MaxLength } from 'class-validator'; +import { User } from './User'; +import { Category } from './Category'; +import { Order } from './Order'; + +@Entity() +@Unique(['id']) +export class Product { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => User) + @IsNotEmpty() + vendor!: User; + + @OneToMany(() => Order, (order: any) => order.product) // Specify the inverse side of the relationship + orders!: Order[]; + + @Column() + @IsNotEmpty() + @IsString() + name!: string; + + @Column() + @IsNotEmpty() + description!: string; + + @Column('simple-array') + @IsArray() + @ArrayNotEmpty() + @MaxLength(10) + images!: string[]; + + @Column('decimal') + @IsNotEmpty() + newPrice!: number; + + @Column('decimal', { nullable: true }) + oldPrice?: number; + + @Column('timestamp', { nullable: true }) + expirationDate?: Date; + + @Column('int') + @IsNotEmpty() + quantity!: number; + + @Column({ default: true }) + @IsBoolean() + isAvailable!: boolean; + + @ManyToMany(() => Category) + @JoinTable() + categories!: Category[]; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} diff --git a/src/entities/User.ts b/src/entities/User.ts index d48030b..71b323e 100644 --- a/src/entities/User.ts +++ b/src/entities/User.ts @@ -6,29 +6,15 @@ import { CreateDateColumn, UpdateDateColumn, BeforeInsert, + OneToMany, } from 'typeorm'; import { IsEmail, IsNotEmpty, IsString, IsBoolean, IsIn } from 'class-validator'; import { roles } from '../utils/roles'; +import { Order } from './Order'; -export interface UserInterface { - id: string; - firstName: string; - lastName: string; - email: string; - password: string; - gender: string; - phoneNumber: string; - photoUrl?: string; - verified: boolean; - status: 'active' | 'suspended'; - userType: 'Admin' | 'Buyer' | 'Vendor'; - role: string; - createdAt: Date; - updatedAt: Date; -} export interface UserInterface { - id: string; + id?: string; firstName: string; lastName: string; email: string; @@ -36,12 +22,12 @@ export interface UserInterface { gender: string; phoneNumber: string; photoUrl?: string; - verified: boolean; - status: 'active' | 'suspended'; + verified?: boolean; + status?: 'active' | 'suspended'; userType: 'Admin' | 'Buyer' | 'Vendor'; - role: string; - createdAt: Date; - updatedAt: Date; + role?: string; + createdAt?: Date; + updatedAt?: Date; } @Entity() @@ -110,6 +96,10 @@ export class User { @Column() role!: string; + @OneToMany(() => Order, (order: any) => order.buyer) + orders!: Order[]; + + @CreateDateColumn() createdAt!: Date; @@ -117,7 +107,7 @@ export class User { updatedAt!: Date; @BeforeInsert() - setRole (): void { + setRole(): void { this.role = this.userType === 'Vendor' ? roles.vendor : roles.buyer; } } diff --git a/src/helper/productValidator.ts b/src/helper/productValidator.ts new file mode 100644 index 0000000..4d93847 --- /dev/null +++ b/src/helper/productValidator.ts @@ -0,0 +1,30 @@ +import Joi from 'joi'; +import { Product } from '../lib/types'; + +export const validateProduct = ( + product: Pick +): Joi.ValidationResult => { + const schema = Joi.object({ + name: Joi.string().min(3).required().messages({ + 'any.required': 'name is required.', + }), + description: Joi.string().min(3).required().messages({ + 'any.required': 'description is required.', + }), + newPrice: Joi.number().required().messages({ + 'any.required': 'newPrice is required.', + }), + quantity: Joi.number().required().messages({ + 'any.required': 'quantity is required.', + }), + categories: Joi.alternatives() + .try(Joi.array().items(Joi.string()).min(1).required(), Joi.string().required()) + .messages({ + 'any.required': 'at least one category is required.', + }), + expirationDate: Joi.date(), + oldPrice: Joi.number(), + }); + + return schema.validate(product); +}; diff --git a/src/lib/types.ts b/src/lib/types.ts new file mode 100644 index 0000000..b8598e8 --- /dev/null +++ b/src/lib/types.ts @@ -0,0 +1,16 @@ +import { User } from '../entities/User'; + +export type Product = { + id: string; + vendor: User; + name: string; + description: string; + images: string[]; + newPrice: number; + oldPrice?: number; + expirationDate?: Date; + quantity: number; + isAvailable: boolean; + createdAt: Date; + updatedAt: Date; +}; diff --git a/src/middlewares/isAllowed.ts b/src/middlewares/isAllowed.ts index 2894be6..77c115b 100644 --- a/src/middlewares/isAllowed.ts +++ b/src/middlewares/isAllowed.ts @@ -1,7 +1,7 @@ -import { NextFunction, Request, Response } from "express"; -import { User } from "../entities/User"; -import { getRepository } from "typeorm"; -import { responseError } from "../utils/response.utils"; +import { NextFunction, Request, Response } from 'express'; +import { User } from '../entities/User'; +import { getRepository } from 'typeorm'; +import { responseError } from '../utils/response.utils'; export interface UserInterface { id: string; @@ -22,33 +22,33 @@ export interface UserInterface { declare module 'express' { interface Request { - user?: Partial; + user?: Partial; } } export const checkUserStatus = async (req: Request, res: Response, next: NextFunction) => { - try { - if (!req.user) { - return responseError(res, 401, 'Authentication required'); - } + try { + if (!req.user) { + return responseError(res, 401, 'Authentication required'); + } - const userId = req.user.id; + const userId = req.user.id; - const userRepository = getRepository(User); + const userRepository = getRepository(User); - const user = await userRepository.findOne({ where: { id: userId } }); - if (!user) { - return responseError(res, 401, 'User not found'); - } + const user = await userRepository.findOne({ where: { id: userId } }); + if (!user) { + return responseError(res, 401, 'User not found'); + } - if (user.status === 'active') { - next(); - } else if (user.status === 'suspended') { - return responseError(res, 403, 'You have been suspended. Please contact our support team.'); - } else { - return responseError(res, 403, 'Unauthorized action'); - } - } catch (error) { - responseError(res, 400, (error as Error).message); + if (user.status === 'active') { + next(); + } else if (user.status === 'suspended') { + return responseError(res, 403, 'You have been suspended. Please contact our support team.'); + } else { + return responseError(res, 403, 'Unauthorized action'); } + } catch (error) { + responseError(res, 400, (error as Error).message); + } }; diff --git a/src/middlewares/multer.ts b/src/middlewares/multer.ts new file mode 100644 index 0000000..0c1eba5 --- /dev/null +++ b/src/middlewares/multer.ts @@ -0,0 +1,14 @@ +import multer from 'multer'; +import path from 'path'; + +export default multer({ + storage: multer.diskStorage({}), + fileFilter: (req, file, next) => { + const ext = path.extname(file.originalname); + const supported = ['.png', '.jpg', '.jpeg', '.webp']; + if (!supported.includes(ext)) { + next(new Error(`file type not supported\ntry ${supported} are supported`)); + } + next(null, true); + }, +}); diff --git a/src/middlewares/verifyToken.ts b/src/middlewares/verifyToken.ts new file mode 100644 index 0000000..3fe4f1a --- /dev/null +++ b/src/middlewares/verifyToken.ts @@ -0,0 +1,50 @@ +import { Request, Response, NextFunction } from 'express'; +import { User, UserInterface } from '../entities/User'; +import { getRepository } from 'typeorm'; +import jwt, { type JwtPayload, type Secret } from 'jsonwebtoken'; +import dotenv from 'dotenv'; + +dotenv.config(); + +interface AuthRequest extends Request { + user?: UserInterface; +} + +export const authMiddleware = async (req: AuthRequest, res: Response, next: NextFunction) => { + const authHeader = req.headers.authorization; + + if (authHeader === undefined) { + return res.status(401).json({ error: 'Access denied. No token provided.' }); + } + + const [bearer, token] = authHeader.split(' '); + + if (bearer !== 'Bearer' || token === undefined) { + return res.status(401).json({ error: 'Please login' }); + } + + if (token !== undefined) { + try { + jwt.verify(token, process.env.JWT_SECRET as Secret, async (err, decodedToken) => { + if (err !== null) { + return res.status(403).json({ status: 'error', error: 'Access denied' }); + } + + if (decodedToken !== undefined) { + const { email } = decodedToken as JwtPayload; + const userRepository = getRepository(User); + const user = await userRepository.findOneBy({ email }); + + if (!user) { + return res.status(401).json({ status: 'error', error: 'You are not Authorized' }); + } + + req.user = user as UserInterface; + next(); + } + }); + } catch (error) { + return res.status(401).json({ error: 'Invalid token' }); + } + } +}; diff --git a/src/routes/ProductRoutes.ts b/src/routes/ProductRoutes.ts new file mode 100644 index 0000000..d8ff799 --- /dev/null +++ b/src/routes/ProductRoutes.ts @@ -0,0 +1,31 @@ +import { Router } from 'express'; + + + + +import { } from '../controllers/index'; +import { hasRole } from '../middlewares/roleCheck'; +import upload from '../middlewares/multer'; +import { authMiddleware } from '../middlewares/verifyToken'; + +import { + createProduct, + updateProduct, + removeProductImage, + readProducts, + readProduct, + deleteProduct, + getRecommendedProducts +} from '../controllers'; +const router = Router(); + +router.get('/recommended', authMiddleware, hasRole("BUYER"), getRecommendedProducts); +router.get('/collection', authMiddleware, hasRole('VENDOR'), readProducts); +router.get('/', authMiddleware, hasRole('BUYER'), readProducts); +router.get('/collection/:id', authMiddleware, hasRole('VENDOR'), readProduct); +router.post('/', authMiddleware, hasRole('VENDOR'), upload.array('images', 10), createProduct); +router.put('/:id', authMiddleware, hasRole('VENDOR'), upload.array('images', 10), updateProduct); +router.delete('/images/:id', authMiddleware, hasRole('VENDOR'), removeProductImage); +router.delete('/:id', authMiddleware, hasRole('VENDOR'), deleteProduct); + +export default router; diff --git a/src/routes/UserRoutes.ts b/src/routes/UserRoutes.ts index 9d08ace..2175d84 100644 --- a/src/routes/UserRoutes.ts +++ b/src/routes/UserRoutes.ts @@ -12,10 +12,8 @@ import { logout, } from '../controllers'; - - -import { activateUser,disactivateUser , userProfileUpdate} from '../controllers/index'; -import {hasRole} from '../middlewares/roleCheck'; +import { activateUser, disactivateUser, userProfileUpdate } from '../controllers/index'; +import { hasRole } from '../middlewares/roleCheck'; import { isTokenValide } from '../middlewares/isValid'; const router = Router(); @@ -28,10 +26,10 @@ router.post('/enable-2fa', enable2FA); router.post('/disable-2fa', disable2FA); router.post('/verify-otp', verifyOTP); router.post('/resend-otp', resendOTP); -router.post('/activate',isTokenValide,hasRole("ADMIN"),activateUser); -router.post('/deactivate',isTokenValide,hasRole("ADMIN"),disactivateUser); -router.post("/password/reset", userPasswordReset); -router.post("/password/reset/link", sendPasswordResetLink); +router.post('/activate', isTokenValide, hasRole('ADMIN'), activateUser); +router.post('/deactivate', isTokenValide, hasRole('ADMIN'), disactivateUser); +router.post('/password/reset', userPasswordReset); +router.post('/password/reset/link', sendPasswordResetLink); router.put('/update', userProfileUpdate); export default router; diff --git a/src/routes/index.ts b/src/routes/index.ts index 851f5c2..faa2456 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -1,13 +1,15 @@ import { Request, Response, Router } from 'express'; import { responseSuccess } from '../utils/response.utils'; import userRoutes from './UserRoutes'; +import productRoutes from './ProductRoutes'; const router = Router(); -router.get('/api/v1/status', (req: Request, res: Response) => { +router.get('/', (req: Request, res: Response) => { return responseSuccess(res, 200, 'This is a testing route.'); }); router.use('/user', userRoutes); +router.use('/product', productRoutes); export default router; diff --git a/src/services/index.ts b/src/services/index.ts index 0c53b05..8deb195 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -1,13 +1,19 @@ - -export * from "./userServices/sendResetPasswordLinkService"; -export * from "./userServices/userPasswordResetService"; -export * from "./userServices/userRegistrationService"; -export * from "./userServices/userValidationService"; +export * from './userServices/sendResetPasswordLinkService'; +export * from './userServices/userPasswordResetService'; +export * from './userServices/userRegistrationService'; +export * from './userServices/userValidationService'; export * from './userServices/userEnableTwoFactorAuth'; export * from './userServices/userDisableTwoFactorAuth'; export * from './userServices/userValidateOTP'; export * from './userServices/userLoginService'; export * from './userServices/userResendOTP'; export * from './userServices/logoutServices'; - export * from './userServices/userProfileUpdateServices'; + +// Vendor product services +export * from './productServices/createProduct'; +export * from './productServices/updateProduct'; +export * from './productServices/removeProductImage'; +export * from './productServices/readProduct'; +export * from './productServices/deleteProduct'; +export * from './productServices/getRecommendedProductsService'; diff --git a/src/services/productServices/createProduct.ts b/src/services/productServices/createProduct.ts new file mode 100644 index 0000000..dbee172 --- /dev/null +++ b/src/services/productServices/createProduct.ts @@ -0,0 +1,101 @@ +import { Request, Response } from 'express'; +import { Product } from '../../entities/Product'; +import { getRepository } from 'typeorm'; +import { validateProduct } from '../../helper/productValidator'; +import cloudinary from '../../utils/cloudinary'; +import { User } from '../../entities/User'; +import { Category } from '../../entities/Category'; + +declare module 'express' { + interface Request { + files?: any; + } +} + +export const createProductService = async (req: Request, res: Response) => { + const { error } = validateProduct(req.body); + if (error !== undefined) { + return res.status(400).json({ status: 'error', error: error?.details[0].message }); + } + + const existingProduct = await getRepository(Product).findOne({ + where: { + name: req.body.name, + vendor: { + id: req.user?.id + } + }, + }); + + if (existingProduct) { + return res.status(409).json({ status: 'error', error: 'Its looks like Product already exists' }); + } + + const files: any = req.files; + + if (files.length < 2) { + return res.status(400).json({ status: 'error', error: 'Please upload more than one image' }); + } + if (files.length > 6) { + return res.status(400).json({ status: 'error', error: 'Product cannot have more than 6 images' }); + } + + const imageUrls: string[] = []; + for (const file of files) { + const image = file.path; + const link = await cloudinary.uploader.upload(image); + imageUrls.push(link.secure_url); + } + + const product = new Product(); + product.name = req.body.name; + product.description = req.body.description; + product.newPrice = req.body.newPrice; + product.quantity = req.body.quantity; + product.images = imageUrls; + + if (req.body.expirationDate) { + product.expirationDate = req.body.expirationDate; + } + product.vendor = req.user as User; + + + const categoryRepository = getRepository(Category); + let categories = []; + if (typeof req.body.categories === 'string') { + let category = await categoryRepository.findOne({ + where: { name: req.body.categories.toLowerCase() } + }); + if (!category) { + category = new Category(); + category.name = req.body.categories.toLowerCase(); + category = await categoryRepository.save(category); + } + categories.push(category); + } else { + categories = await Promise.all( + req.body.categories.map(async (categoryName: string) => { + let category = await categoryRepository.findOne({ where: { name: categoryName.toLowerCase() } }); + if (!category) { + category = new Category(); + category.name = categoryName.toLowerCase(); + await categoryRepository.save(category); + } + return category; + }) + ); + } + product.categories = categories; + + const productRepository = getRepository(Product); + const savedProduct = await productRepository.save(product); + + product.vendor = product.vendor.id as unknown as User; + return res.status(201).json({ + status: 'success', + data: { + message: 'Product created successfully', + product: { ...savedProduct } + }, + }); +}; diff --git a/src/services/productServices/deleteProduct.ts b/src/services/productServices/deleteProduct.ts new file mode 100644 index 0000000..43ec3d1 --- /dev/null +++ b/src/services/productServices/deleteProduct.ts @@ -0,0 +1,32 @@ +import { Request, Response } from 'express'; +import { Product } from '../../entities/Product'; +import { getRepository } from 'typeorm'; +import { responseError, responseSuccess } from '../../utils/response.utils'; + + +export const deleteProductService = async (req: Request, res: Response) => { + try { + const { id } = req.params; + + const productRepository = getRepository(Product); + + const product = await productRepository.findOne({ + where: { + id: id, + vendor: { + id: req.user?.id + } + } + }); + + if (product) { + await productRepository.remove(product); + return responseSuccess(res, 200, 'Product successfully deleted'); + } + + return responseError(res, 404, 'Product not found'); + + } catch (error) { + responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/productServices/getRecommendedProductsService.ts b/src/services/productServices/getRecommendedProductsService.ts new file mode 100644 index 0000000..c75d7be --- /dev/null +++ b/src/services/productServices/getRecommendedProductsService.ts @@ -0,0 +1,63 @@ +import { Request, Response } from "express"; +import { responseError, responseSuccess } from "../../utils/response.utils"; +import { getRepository } from "typeorm"; +import { Product } from "../../entities/Product"; + +interface conditionDoc { + categories: any[] | null; + vendor: any | null +} + +export const getRecommendedProductsService = async (req: Request, res: Response) => { + + try { + // Define pagination parameters + const page = req.query.page ? Number(req.query.page) : 1; + const limit = req.query.limit ? Number(req.query.limit) : 10; + const skip = (page - 1) * limit; + const condition: conditionDoc = { + categories: null, + vendor: null + }; + + if (req.query.categories) { + const categoryIds = Array.isArray(req.query.categories) ? req.query.categories : [req.query.categories]; +console.log(categoryIds) + condition.categories = categoryIds; + }; + if (req.query.vendor) condition.vendor = req.query.vendor; + + const productRepository = getRepository(Product); + const productsQuery = productRepository.createQueryBuilder("product") + .leftJoinAndSelect("product.categories", "category") + .leftJoinAndSelect("product.vendor", "vendor") + .where("1 = 1"); + + // Apply conditions if available + if (condition.categories && condition.categories.length > 0) { + productsQuery.andWhere("category.id IN (:...categories)", { categories: condition.categories }); + } + if (condition.vendor) { + productsQuery.andWhere("vendor.id = :vendorId", { vendorId: condition.vendor }); + } + + console.log("+++++++++++++++++++++++++++++"); + console.log(condition); + console.log("+++++++++++++++++++++++++++++"); + const products = await productsQuery + .skip(skip) + .take(limit) + .getMany(); + if (products.length < 1) { + return responseSuccess(res, 200, `No products found for the specified ${ condition.vendor ? 'vendor' : 'category'}`); + } + // { categories: null, vendor: 'e8150556-8737-47dd-a365-da3e82fa84be' } + return responseSuccess(res, 200, 'Products retrieved', {products}); + } catch (error) { + console.log("**************"); + console.log(error); + console.log("**************"); + return responseError(res, 400, (error as Error).message); + } +}; + diff --git a/src/services/productServices/readProduct.ts b/src/services/productServices/readProduct.ts new file mode 100644 index 0000000..5c9257c --- /dev/null +++ b/src/services/productServices/readProduct.ts @@ -0,0 +1,70 @@ +import { Request, Response } from 'express'; +import { Product } from '../../entities/Product'; +import { getRepository } from 'typeorm'; +import { responseError, responseSuccess } from '../../utils/response.utils'; + +export const readProductsService = async (req: Request, res: Response) => { + try { + // Define pagination parameters + const page = req.query.page ? Number(req.query.page) : 1; + const limit = req.query.limit ? Number(req.query.limit) : 10; + const skip = (page - 1) * limit; + + // Retrieve products + const productRepository = getRepository(Product); + const products = await productRepository.find({ + where: { + vendor: { + id: req.user?.id, + }, + }, + skip, + take: limit, + relations: ['categories', 'vendor'], + select: { + vendor: { + id: true, firstName: true, lastName: true, + email: true, phoneNumber: true, photoUrl: true + } + } + }); + + if (products.length < 1) { + return responseSuccess(res, 200, 'You have no products yet'); + } + return responseSuccess(res, 200, 'Products retrieved', { products }); + } catch (error) { + responseError(res, 400, (error as Error).message); + } +}; + +export const readProductService = async (req: Request, res: Response) => { + try { + const { id } = req.params; + + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ + where: { + id: id, + vendor: { + id: req.user?.id, + }, + }, + relations: ['categories', 'vendor'], + select: { + vendor: { + id: true, firstName: true, lastName: true, + email: true, phoneNumber: true, photoUrl: true + } + } + }); + + if (!product) { + return responseError(res, 404, 'Product not found'); + } + + return responseSuccess(res, 200, 'Product retrieved', { product }); + } catch (error) { + responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/productServices/removeProductImage.ts b/src/services/productServices/removeProductImage.ts new file mode 100644 index 0000000..2995593 --- /dev/null +++ b/src/services/productServices/removeProductImage.ts @@ -0,0 +1,54 @@ +import { Request, Response } from 'express'; +import { Product } from '../../entities/Product'; +import { getRepository } from 'typeorm'; +import { User } from '../../entities/User'; + +declare module 'express' { + interface Request { + files?: any; + } +} + +export const removeProductImageService = async (req: Request, res: Response) => { + const { image } = req.body; + + if (!image) { + return res.status(400).json({ status: 'error', error: 'Please provide an image to remove' }); + } + + const { id } = req.params; + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ + where: { + id, + vendor: { id: req.user?.id } + }, + relations: ['vendor'], + }); + + if (!product) { + return res.status(404).json({ status: 'error', error: 'Product not found' }); + } + + const index = product.images.indexOf(image); + + if (index === -1) { + return res.status(404).json({ status: 'error', error: 'Image not found' }); + } + + if (product.images.length === 2) { + return res.status(400).json({ status: 'error', error: 'Product must have at least two image' }); + } + + product.images.splice(index, 1); + await productRepository.save(product); + product.vendor = product.vendor.id as unknown as User; + + return res.status(200).json({ + status: 'success', + data: { + message: 'Image removed successfully', + product, + }, + }); +}; diff --git a/src/services/productServices/updateProduct.ts b/src/services/productServices/updateProduct.ts new file mode 100644 index 0000000..580adda --- /dev/null +++ b/src/services/productServices/updateProduct.ts @@ -0,0 +1,109 @@ +import { Request, Response } from 'express'; +import { Product } from '../../entities/Product'; +import { getRepository } from 'typeorm'; +import { validateProduct } from '../../helper/productValidator'; +import cloudinary from '../../utils/cloudinary'; +import { User } from '../../entities/User'; +import { Category } from '../../entities/Category'; + +declare module 'express' { + interface Request { + files?: any; + } +} + +export const updateProductService = async (req: Request, res: Response) => { + const { error } = validateProduct(req.body); + if (error !== undefined) { + return res.status(400).json({ status: 'error', error: error?.details[0].message }); + } + + const { id } = req.params; + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ + where: { + id, + vendor: { + id: req.user?.id + } + }, + relations: ['vendor'], + }); + + if (!product) { + return res.status(404).json({ status: 'error', error: 'Product not found' }); + } + + product.name = req.body.name; + product.description = req.body.description; + product.newPrice = req.body.newPrice; + + if (parseInt(req.body.quantity) === 0) { + product.isAvailable = false; + product.quantity = req.body.quantity; + } else { + product.isAvailable = true; + product.quantity = req.body.quantity; + } + + if (req.files) { + if (product.images.length + req.files.length > 6) { + return res.status(400).json({ status: 'error', error: 'Product cannot have more than 6 images' }); + } + + const imageUrls: string[] = []; + for (const image of req.files) { + const link = await cloudinary.uploader.upload(image.path); + imageUrls.push(link.secure_url); + } + product.images = [...product.images, ...imageUrls]; + } + + if (req.body.expirationDate) { + product.expirationDate = req.body.expirationDate; + } + + if (req.body.oldPrice) { + product.oldPrice = req.body.oldPrice; + } + + + const categoryRepository = getRepository(Category); + let categories = []; + if (typeof req.body.categories === 'string') { + let category = await categoryRepository.findOne({ + where: { name: req.body.categories.toLowerCase() } + }); + if (!category) { + category = new Category(); + category.name = req.body.categories.toLowerCase(); + category = await categoryRepository.save(category); + } + categories.push(category); + } else { + categories = await Promise.all( + req.body.categories.map(async (categoryName: string) => { + let category = await categoryRepository.findOne({ where: { name: categoryName.toLowerCase() } }); + if (!category) { + category = new Category(); + category.name = categoryName.toLowerCase(); + await categoryRepository.save(category); + } + return category; + }) + ); + } + + product.categories = categories; + + await productRepository.save(product); + + product.vendor = product.vendor.id as unknown as User; + return res.status(200).json({ + status: 'success', + data: { + message: 'Product updated successfully', + product, + }, + }); +}; diff --git a/src/services/updateUserStatus/activateUserService.ts b/src/services/updateUserStatus/activateUserService.ts index c499280..8ec1a8a 100644 --- a/src/services/updateUserStatus/activateUserService.ts +++ b/src/services/updateUserStatus/activateUserService.ts @@ -4,36 +4,36 @@ import { getRepository } from 'typeorm'; import { sendEmail } from '../../utils/sendStatusMail'; enum UserStatus { - ACTIVE = 'active', - INACTIVE = 'suspended', + ACTIVE = 'active', + INACTIVE = 'suspended', } -export const activateUserService = async (req:Request,res:Response)=>{ - try { - const {email} = req.body; - const userRepository = getRepository(User); +export const activateUserService = async (req: Request, res: Response) => { + try { + const { email } = req.body; + const userRepository = getRepository(User); - if(!email){ - return res.status(404).json({error: 'Email is needed'}); - } + if (!email) { + return res.status(404).json({ error: 'Email is needed' }); + } - const user = await userRepository.findOneBy({ email }); + const user = await userRepository.findOneBy({ email }); - if (!user) { - return res.status(404).json({ error: 'User not found' }); - } + if (!user) { + return res.status(404).json({ error: 'User not found' }); + } - if (user.status === 'active') { - return res.json({ message: 'User is already active' }); - } + if (user.status === 'active') { + return res.json({ message: 'User is already active' }); + } - user.status = UserStatus.ACTIVE; - await userRepository.save(user); + user.status = UserStatus.ACTIVE; + await userRepository.save(user); - await sendEmail('User_Account_activated', { name: user.firstName, email: user.email }); + await sendEmail('User_Account_activated', { name: user.firstName, email: user.email }); - return res.status(200).json({ message: 'User activated successfully', user }); - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); - } -} \ No newline at end of file + return res.status(200).json({ message: 'User activated successfully', user }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/services/updateUserStatus/deactivateUserService.ts b/src/services/updateUserStatus/deactivateUserService.ts index c72c394..597c8f2 100644 --- a/src/services/updateUserStatus/deactivateUserService.ts +++ b/src/services/updateUserStatus/deactivateUserService.ts @@ -4,36 +4,36 @@ import { getRepository } from 'typeorm'; import { sendEmail } from '../../utils/sendStatusMail'; enum UserStatus { - ACTIVE = 'active', - INACTIVE = 'suspended', + ACTIVE = 'active', + INACTIVE = 'suspended', } -export const deactivateUserService = async (req:Request,res:Response)=>{ - try { - const {email} = req.body; - const userRepository = getRepository(User); +export const deactivateUserService = async (req: Request, res: Response) => { + try { + const { email } = req.body; + const userRepository = getRepository(User); - if(!email){ - return res.status(404).json({error: 'Email is needed'}); - } + if (!email) { + return res.status(404).json({ error: 'Email is needed' }); + } - const user = await userRepository.findOneBy({ email }); + const user = await userRepository.findOneBy({ email }); - if (!user) { - return res.status(404).json({ error: 'User not found' }); - } + if (!user) { + return res.status(404).json({ error: 'User not found' }); + } - if (user.status === 'suspended') { - return res.json({ message: 'User is already suspended' }); - } + if (user.status === 'suspended') { + return res.json({ message: 'User is already suspended' }); + } - user.status = UserStatus.INACTIVE; - await userRepository.save(user); + user.status = UserStatus.INACTIVE; + await userRepository.save(user); - await sendEmail('User_Account_diactivated', { name: user.firstName, email: user.email }); + await sendEmail('User_Account_diactivated', { name: user.firstName, email: user.email }); - return res.json({ message: 'User deactivated successfully', user }); - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); - } -} \ No newline at end of file + return res.json({ message: 'User deactivated successfully', user }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/services/userServices/sendResetPasswordLinkService.ts b/src/services/userServices/sendResetPasswordLinkService.ts index b94bb97..f9b7dbf 100644 --- a/src/services/userServices/sendResetPasswordLinkService.ts +++ b/src/services/userServices/sendResetPasswordLinkService.ts @@ -1,34 +1,34 @@ -import { Request, Response } from "express"; -import { responseError, responseServerError, responseSuccess } from "../../utils/response.utils"; +import { Request, Response } from 'express'; +import { responseError, responseServerError, responseSuccess } from '../../utils/response.utils'; import nodemailer from 'nodemailer'; -import { getRepository } from "typeorm"; -import { User } from "../../entities/User"; +import { getRepository } from 'typeorm'; +import { User } from '../../entities/User'; export const sendPasswordResetLinkService = async (req: Request, res: Response) => { - try { - const transporter = nodemailer.createTransport({ - host: process.env.HOST, - port: 587, - secure: false, // true for 465, false for other ports - auth: { - user: process.env.AUTH_EMAIL, - pass: process.env.AUTH_PASSWORD - }, - }); - const email = req.query.email as string; + try { + const transporter = nodemailer.createTransport({ + host: process.env.HOST, + port: 587, + secure: false, // true for 465, false for other ports + auth: { + user: process.env.AUTH_EMAIL, + pass: process.env.AUTH_PASSWORD, + }, + }); + const email = req.query.email as string; - if (!email) { - return responseError(res, 404, 'Missing required field'); - } - const userRepository = getRepository(User); - const existingUser = await userRepository.findOneBy({ email }); - if (!existingUser) { - return responseError(res, 404, 'User not found', existingUser); - } - const mailOptions: nodemailer.SendMailOptions = { - to: email, - subject: `Password reset link `, - html: ` + if (!email) { + return responseError(res, 404, 'Missing required field'); + } + const userRepository = getRepository(User); + const existingUser = await userRepository.findOneBy({ email }); + if (!existingUser) { + return responseError(res, 404, 'User not found', existingUser); + } + const mailOptions: nodemailer.SendMailOptions = { + to: email, + subject: `Password reset link `, + html: ` @@ -102,19 +102,16 @@ export const sendPasswordResetLinkService = async (req: Request, res: Response) - ` - }; - - try { - const sendMail = await transporter.sendMail(mailOptions); - return responseSuccess(res, 200, "Code sent on your email", sendMail); - } catch (error) {; - return responseError(res, 500, 'Error occurred while sending email'); - } - + `, + }; + try { + const sendMail = await transporter.sendMail(mailOptions); + return responseSuccess(res, 200, 'Code sent on your email', sendMail); } catch (error) { - return responseServerError(res, `Internal server error: `); + return responseError(res, 500, 'Error occurred while sending email'); } -} - ; \ No newline at end of file + } catch (error) { + return responseServerError(res, `Internal server error: `); + } +}; diff --git a/src/services/userServices/userProfileUpdateServices.ts b/src/services/userServices/userProfileUpdateServices.ts index 1c0ec7e..c140e38 100644 --- a/src/services/userServices/userProfileUpdateServices.ts +++ b/src/services/userServices/userProfileUpdateServices.ts @@ -1,53 +1,57 @@ -import { Request, Response } from "express"; -import { responseError, responseSuccess } from "../../utils/response.utils"; -import { User, UserInterface } from "../../entities/User"; -import { getRepository } from "typeorm"; -import { userProfileUpdate } from "../../controllers/authController"; - -declare module "express"{ - interface Request{ - user?: Partial - } +import { Request, Response } from 'express'; +import { responseError, responseSuccess } from '../../utils/response.utils'; +import { User, UserInterface } from '../../entities/User'; +import { getRepository } from 'typeorm'; +import { userProfileUpdate } from '../../controllers/authController'; + +declare module 'express' { + interface Request { + user?: Partial; + } } +export const userProfileUpdateServices = async (req: Request, res: Response) => { + try { + if (!req.body) { + return responseError(res, 401, 'body required'); + } -export const userProfileUpdateServices = async (req: Request, res: Response) =>{ -try { - if(!req.body){ - return responseError(res, 401, "body required") - } - - const { firstName, lastName, gender, phoneNumber, photoUrl, email, id} = req.body; - - // Validate user input - if (!firstName.trim() && !lastName.trim() && !gender.trim() && !phoneNumber.trim() && !photoUrl.trim() && !email.trim() && !id.trim()) { - return responseError(res, 400, 'Fill all the field'); - } - - - const userRepository = getRepository(User) - const existingUser = await userRepository.findOne({ - where: {email: req.body.email} - }) - - if (!existingUser){ - return responseError(res, 401, "User not found") - } - if (existingUser.id !== id) { - return responseError(res, 403, "You are not authorized to edit this profile."); - } - - existingUser.firstName = firstName - existingUser.lastName = lastName - existingUser.gender = gender - existingUser.phoneNumber = phoneNumber - existingUser.photoUrl = photoUrl - - await userRepository.save(existingUser); - return responseSuccess(res, 201, "User Profile has successfully been updated"); -} catch (error) { - responseError(res, 400, (error as Error).message) - -} + const { firstName, lastName, gender, phoneNumber, photoUrl, email, id } = req.body; -} + // Validate user input + if ( + !firstName.trim() && + !lastName.trim() && + !gender.trim() && + !phoneNumber.trim() && + !photoUrl.trim() && + !email.trim() && + !id.trim() + ) { + return responseError(res, 400, 'Fill all the field'); + } + + const userRepository = getRepository(User); + const existingUser = await userRepository.findOne({ + where: { email: req.body.email }, + }); + + if (!existingUser) { + return responseError(res, 401, 'User not found'); + } + if (existingUser.id !== id) { + return responseError(res, 403, 'You are not authorized to edit this profile.'); + } + + existingUser.firstName = firstName; + existingUser.lastName = lastName; + existingUser.gender = gender; + existingUser.phoneNumber = phoneNumber; + existingUser.photoUrl = photoUrl; + + await userRepository.save(existingUser); + return responseSuccess(res, 201, 'User Profile has successfully been updated'); + } catch (error) { + responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/startups/getSwaggerServer.ts b/src/startups/getSwaggerServer.ts index 87a1f51..efe12fa 100644 --- a/src/startups/getSwaggerServer.ts +++ b/src/startups/getSwaggerServer.ts @@ -7,7 +7,7 @@ function getSwaggerServer (): string { return process.env.SWAGGER_SERVER; } - return 'http://localhost:7000/api/v1'; + return `http://localhost:${process.env.PORT}/api/v1`; } export { getSwaggerServer }; diff --git a/src/utils/cloudinary.ts b/src/utils/cloudinary.ts new file mode 100644 index 0000000..18b8db3 --- /dev/null +++ b/src/utils/cloudinary.ts @@ -0,0 +1,13 @@ +/* eslint-disable camelcase */ +import { v2 as cloudinary } from 'cloudinary'; +import dotenv from 'dotenv'; + +dotenv.config(); + +cloudinary.config({ + cloud_name: process.env.CLOUDINARY_CLOUD_NAME, + api_key: process.env.CLOUDNARY_API_KEY, + api_secret: process.env.CLOUDINARY_API_SECRET, +}); + +export default cloudinary; diff --git a/src/utils/logger.ts b/src/utils/logger.ts index e537ca6..d9c996a 100644 --- a/src/utils/logger.ts +++ b/src/utils/logger.ts @@ -1,5 +1,4 @@ import { createLogger, format, transports } from 'winston'; -// import winston, { createLogger, transports, format } from 'winston'; // Define custom logging levels and colors const logLevels = { diff --git a/src/utils/response.utils.ts b/src/utils/response.utils.ts index 3be109b..3fd1ce5 100644 --- a/src/utils/response.utils.ts +++ b/src/utils/response.utils.ts @@ -17,7 +17,7 @@ export const responseSuccess = ( jsend.success({ code: statusCode, message, - data, + ...data, }) ); }; diff --git a/src/utils/sendStatusMail.ts b/src/utils/sendStatusMail.ts index 34f547a..0f363ac 100644 --- a/src/utils/sendStatusMail.ts +++ b/src/utils/sendStatusMail.ts @@ -13,7 +13,7 @@ const EMAIL = process.env.AUTH_EMAIL; const PASSWORD = process.env.AUTH_PASSWORD; export const sendEmail = async (type: string, data: IData) => { - if(EMAIL && PASSWORD){ + if (EMAIL && PASSWORD) { try { const mailGenerator = new Mailgen({ theme: 'default', @@ -22,7 +22,7 @@ export const sendEmail = async (type: string, data: IData) => { link: 'https://mailgen.js/', }, }); - + const transporter = nodemailer.createTransport({ service: 'gmail', auth: { @@ -30,7 +30,7 @@ export const sendEmail = async (type: string, data: IData) => { pass: PASSWORD, }, }); - + let email; let subject; switch (type) { @@ -73,23 +73,22 @@ export const sendEmail = async (type: string, data: IData) => { default: throw new Error('Invalid email type'); } - + const html = mailGenerator.generate(email); - + const mailOptions = { from: EMAIL, to: data.email, subject: subject, html: html, }; - + const info = await transporter.sendMail(mailOptions); } catch (error) { console.error('Error sending email:', error); } - } - else { + } else { console.error('Email or password for mail server not configured'); - return -} -}; \ No newline at end of file + return; + } +}; diff --git a/tsconfig.json b/tsconfig.json index 88326b4..d58c75f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -31,7 +31,9 @@ // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ "types": [ "node", - "jest" + "jest", + "express", + "joi" ] /* Specify type package names to be included without being referenced in a source file. */, // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ From 6cfbf9d0d61570cad80a35c4302c5f6d71d62624 Mon Sep 17 00:00:00 2001 From: Mc-Knight Date: Thu, 9 May 2024 05:39:40 +0200 Subject: [PATCH 04/20] feat(product managment) add product managment this commit adds product entity with its relation of a vendor. it is used to implement product managment for vendor. Resolves: #48 --- src/__test__/isAllowed.test.ts | 1 + src/services/productServices/updateProduct.ts | 166 +++++++++--------- 2 files changed, 88 insertions(+), 79 deletions(-) diff --git a/src/__test__/isAllowed.test.ts b/src/__test__/isAllowed.test.ts index 81c70b5..2eb18a8 100644 --- a/src/__test__/isAllowed.test.ts +++ b/src/__test__/isAllowed.test.ts @@ -50,6 +50,7 @@ afterAll(async () => { const connection = getConnection(); const userRepository = connection.getRepository(User); + // Delete all records from the User await userRepository.delete({}); diff --git a/src/services/productServices/updateProduct.ts b/src/services/productServices/updateProduct.ts index 580adda..409dd48 100644 --- a/src/services/productServices/updateProduct.ts +++ b/src/services/productServices/updateProduct.ts @@ -5,6 +5,7 @@ import { validateProduct } from '../../helper/productValidator'; import cloudinary from '../../utils/cloudinary'; import { User } from '../../entities/User'; import { Category } from '../../entities/Category'; +import { responseError } from '../../utils/response.utils'; declare module 'express' { interface Request { @@ -13,97 +14,104 @@ declare module 'express' { } export const updateProductService = async (req: Request, res: Response) => { - const { error } = validateProduct(req.body); - if (error !== undefined) { - return res.status(400).json({ status: 'error', error: error?.details[0].message }); - } - - const { id } = req.params; - const productRepository = getRepository(Product); - const product = await productRepository.findOne({ - where: { - id, - vendor: { - id: req.user?.id - } - }, - relations: ['vendor'], - }); + try { + const { error } = validateProduct(req.body); + if (error !== undefined) { + return res.status(400).json({ status: 'error', error: error?.details[0].message }); + } - if (!product) { - return res.status(404).json({ status: 'error', error: 'Product not found' }); - } + const { id } = req.params; + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ + where: { + id, + vendor: { + id: req.user?.id, + }, + }, + relations: ['vendor'], + }); - product.name = req.body.name; - product.description = req.body.description; - product.newPrice = req.body.newPrice; + if (!product) { + return res.status(404).json({ status: 'error', error: 'Product not found' }); + } - if (parseInt(req.body.quantity) === 0) { - product.isAvailable = false; - product.quantity = req.body.quantity; - } else { - product.isAvailable = true; - product.quantity = req.body.quantity; - } + product.name = req.body.name; + product.description = req.body.description; + product.newPrice = req.body.newPrice; - if (req.files) { - if (product.images.length + req.files.length > 6) { - return res.status(400).json({ status: 'error', error: 'Product cannot have more than 6 images' }); + if (parseInt(req.body.quantity) === 0) { + product.isAvailable = false; + product.quantity = req.body.quantity; + } else { + product.isAvailable = true; + product.quantity = req.body.quantity; } - const imageUrls: string[] = []; - for (const image of req.files) { - const link = await cloudinary.uploader.upload(image.path); - imageUrls.push(link.secure_url); - } - product.images = [...product.images, ...imageUrls]; - } + if (req.files) { + if (product.images.length + req.files.length > 6) { + return res.status(400).json({ status: 'error', error: 'Product cannot have more than 6 images' }); + } - if (req.body.expirationDate) { - product.expirationDate = req.body.expirationDate; - } + const imageUrls: string[] = []; + for (const image of req.files) { + const link = await cloudinary.uploader.upload(image.path); + imageUrls.push(link.secure_url); + } + product.images = [...product.images, ...imageUrls]; + } - if (req.body.oldPrice) { - product.oldPrice = req.body.oldPrice; - } + if (req.body.expirationDate) { + product.expirationDate = req.body.expirationDate; + } + if (req.body.oldPrice) { + product.oldPrice = req.body.oldPrice; + } - const categoryRepository = getRepository(Category); - let categories = []; - if (typeof req.body.categories === 'string') { - let category = await categoryRepository.findOne({ - where: { name: req.body.categories.toLowerCase() } - }); - if (!category) { - category = new Category(); - category.name = req.body.categories.toLowerCase(); - category = await categoryRepository.save(category); + const categoryRepository = getRepository(Category); + let categories = []; + if (typeof req.body.categories === 'string') { + let category = await categoryRepository.findOne({ + where: { name: req.body.categories.toLowerCase() }, + }); + if (!category) { + category = new Category(); + category.name = req.body.categories.toLowerCase(); + category = await categoryRepository.save(category); + } + categories.push(category); + } else { + categories = await Promise.all( + req.body.categories.map(async (categoryName: string) => { + let category = await categoryRepository.findOne({ where: { name: categoryName.toLowerCase() } }); + if (!category) { + category = new Category(); + category.name = categoryName.toLowerCase(); + await categoryRepository.save(category); + } + return category; + }) + ); } - categories.push(category); - } else { - categories = await Promise.all( - req.body.categories.map(async (categoryName: string) => { - let category = await categoryRepository.findOne({ where: { name: categoryName.toLowerCase() } }); - if (!category) { - category = new Category(); - category.name = categoryName.toLowerCase(); - await categoryRepository.save(category); - } - return category; - }) - ); - } - product.categories = categories; + product.categories = categories; + + await productRepository.save(product); - await productRepository.save(product); + product.vendor = { + id: product.vendor.id, + name: product.vendor.firstName + ' ' + product.vendor.lastName, + } as unknown as User; - product.vendor = product.vendor.id as unknown as User; - return res.status(200).json({ - status: 'success', - data: { - message: 'Product updated successfully', - product, - }, - }); + return res.status(200).json({ + status: 'success', + data: { + message: 'Product updated successfully', + product, + }, + }); + } catch (error) { + responseError(res, 400, (error as Error).message); + } }; From aa3e1c1c78391609a61858e8560f03e0c7a9db93 Mon Sep 17 00:00:00 2001 From: Ndevu12 Date: Wed, 15 May 2024 07:30:19 +0200 Subject: [PATCH 05/20] ft enable vendor to update product availability status --- src/__test__/productStatus.test.ts | 231 ++++++ src/__test__/vendorProduct.test.ts | 663 +++++++++--------- src/controllers/productController.ts | 15 +- src/routes/ProductRoutes.ts | 10 +- src/services/index.ts | 1 + src/services/productServices/productStatus.ts | 69 ++ tsconfig.json | 214 +++--- 7 files changed, 754 insertions(+), 449 deletions(-) create mode 100644 src/__test__/productStatus.test.ts create mode 100644 src/services/productServices/productStatus.ts diff --git a/src/__test__/productStatus.test.ts b/src/__test__/productStatus.test.ts new file mode 100644 index 0000000..f7af7b5 --- /dev/null +++ b/src/__test__/productStatus.test.ts @@ -0,0 +1,231 @@ +import request from 'supertest'; +import jwt from 'jsonwebtoken'; +import { app, server } from '../index'; +import { getConnection } from 'typeorm'; +import { dbConnection } from '../startups/dbConnection'; +import { User } from '../entities/User'; +import { v4 as uuid } from 'uuid'; +import { Product } from '../entities/Product'; +import { Category } from '../entities/Category'; + +const vendor1Id = uuid(); +const vendor2Id = uuid(); +const vendor3Id = uuid(); +const product1Id = uuid(); +const product2Id = uuid(); +const product3Id = uuid(); +const product4Id = uuid(); +const product5Id = uuid(); +const catId = uuid(); + +const jwtSecretKey = process.env.JWT_SECRET || ''; + +const getAccessToken = (id: string, email: string) => { + return jwt.sign( + { + id: id, + email: email, + }, + jwtSecretKey + ); +}; + +const sampleVendor1 = new User(); +sampleVendor1.id = vendor1Id; +sampleVendor1.firstName = 'vendor1'; +sampleVendor1.lastName = 'user'; +sampleVendor1.email = 'vendor1@example.com'; +sampleVendor1.password = 'password'; +sampleVendor1.userType = 'Vendor'; +sampleVendor1.gender = 'Male'; +sampleVendor1.phoneNumber = '126380996347'; +sampleVendor1.photoUrl = 'https://example.com/photo.jpg'; +sampleVendor1.role = 'VENDOR'; + +const sampleVendor2 = new User(); +sampleVendor2.id = vendor2Id; +sampleVendor2.firstName = 'vendor2'; +sampleVendor2.lastName = 'user'; +sampleVendor2.email = 'vendor2@example.com'; +sampleVendor2.password = 'password'; +sampleVendor2.userType = 'Vendor'; +sampleVendor2.gender = 'Male'; +sampleVendor2.phoneNumber = '1638099634'; +sampleVendor2.photoUrl = 'https://example.com/photo.jpg'; +sampleVendor2.role = 'VENDOR'; + +const sampleVendor3 = new User(); +sampleVendor3.id = vendor3Id; +sampleVendor3.firstName = 'vendor3 ddss'; +sampleVendor3.lastName = 'user'; +sampleVendor3.email = 'vendor2@example.com'; +sampleVendor3.password = 'password'; +sampleVendor3.userType = 'Vendor'; +sampleVendor3.gender = 'Male'; +sampleVendor3.phoneNumber = '1638099634'; +sampleVendor3.photoUrl = 'https://example.com/photo.jpg'; +sampleVendor3.role = 'VENDOR'; + +const sampleCat = new Category(); +sampleCat.id = catId; +sampleCat.name = 'accessories'; + +const sampleProduct1 = new Product(); +sampleProduct1.id = product1Id; +sampleProduct1.name = 'test product'; +sampleProduct1.description = 'amazing product'; +sampleProduct1.images = ['photo1.jpg', 'photo2.jpg', 'photo3.jpg']; +sampleProduct1.newPrice = 200; +sampleProduct1.quantity = 10; +sampleProduct1.vendor = sampleVendor1; +sampleProduct1.categories = [sampleCat]; + +const sampleProduct2 = new Product(); +sampleProduct2.id = product2Id; +sampleProduct2.name = 'test product2'; +sampleProduct2.description = 'amazing product2'; +sampleProduct2.images = ['photo1.jpg', 'photo2.jpg', 'photo3.jpg', 'photo4.jpg', 'photo5.jpg']; +sampleProduct2.newPrice = 200; +sampleProduct2.quantity = 10; +sampleProduct2.vendor = sampleVendor1; +sampleProduct2.categories = [sampleCat]; + +const sampleProduct3 = new Product(); +sampleProduct3.id = product3Id; +sampleProduct3.name = 'testing product3'; +sampleProduct3.description = 'amazing product3'; +sampleProduct3.images = ['photo1.jpg', 'photo2.jpg', 'photo3.jpg', 'photo4.jpg', 'photo5.jpg']; +sampleProduct3.newPrice = 200; +sampleProduct3.quantity = 10; +sampleProduct3.vendor = sampleVendor2; +sampleProduct3.categories = [sampleCat]; + +const sampleProduct4 = new Product(); +sampleProduct4.id = product4Id; +sampleProduct4.name = 'testingmkknkkji product4'; +sampleProduct4.description = 'amazing product4'; +sampleProduct4.images = ['photo1.jpg', 'photo2.jpg', 'photo3.jpg', 'photo4.jpg', 'photo5.jpg']; +sampleProduct4.newPrice = 200; +sampleProduct4.quantity = 10; +sampleProduct4.vendor = sampleVendor2; +sampleProduct4.categories = [sampleCat]; + +const sampleProduct5 = new Product(); +sampleProduct5.id = product5Id; +sampleProduct5.name = 'Here is testing with product5'; +sampleProduct5.description = 'amazing product5'; +sampleProduct5.images = ['photo1.jpg', 'photo2.jpg', 'photo3.jpg', 'photo4.jpg', 'photo5.jpg']; +sampleProduct5.newPrice = 20; +sampleProduct5.quantity = 10; +sampleProduct5.vendor = sampleVendor1; +sampleProduct5.categories = [sampleCat]; +beforeAll(async () => { + const connection = await dbConnection(); + + const categoryRepository = connection?.getRepository(Category); + const savedCategory = await categoryRepository?.save({ ...sampleCat }); + + const userRepository = connection?.getRepository(User); + const savedVendor1 = await userRepository?.save({ ...sampleVendor1 }); + const savedVendor2 = await userRepository?.save({ ...sampleVendor2 }); + + const productRepository = connection?.getRepository(Product); + await productRepository?.save({ ...sampleProduct1, vendor: savedVendor1, categories: [savedCategory as Category] }); + await productRepository?.save({ ...sampleProduct2, vendor: savedVendor1, categories: [savedCategory as Category] }); + await productRepository?.save({ ...sampleProduct3, vendor: savedVendor2, categories: [savedCategory as Category] }); + await productRepository?.save({ ...sampleProduct5, vendor: savedVendor1, categories: [savedCategory as Category] }); + + sampleProduct2.expirationDate = new Date(2020 - 3 - 24); + productRepository?.save(sampleProduct2); + + sampleProduct5.quantity = 0; + productRepository?.save(sampleProduct5); +}); + +afterAll(async () => { + const connection = getConnection(); + const userRepository = connection.getRepository(User); + const categoryRepository = connection.getRepository(Category); + + const productRepository = await connection.getRepository(Product).delete({}); + if (productRepository) { + await userRepository.delete({}); + await categoryRepository.delete({}); + } + + await connection.close(); + server.close(); +}); + +describe('Vendor product availability status management tests', () => { + it('Should update product availability status', async () => { + const response = await request(app) + .put(`/product/availability/${product1Id}`) + .send({ + isAvailable: false, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.statusCode).toBe(200); + expect(response.body.data.message).toBe('Product status updated successfully'); + }, 10000); + + it('should auto update product status to false if product is expired', async () => { + const response = await request(app) + .put(`/product/availability/${product2Id}`) + .send({ + isAvailable: true, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.statusCode).toBe(201); + expect(response.body.data.message).toBe('Product status is set to false because it is expired.'); + }); + + it('should update product status to false if product is out of stock', async () => { + const response = await request(app) + .put(`/product/availability/${product5Id}`) + .send({ + isAvailable: true, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.statusCode).toBe(202); + expect(response.body.data.message).toBe('Product status is set to false because it is out of stock.'); + }); + + it('should not update product status if it is already updated', async () => { + const response = await request(app) + .put(`/product/availability/${product1Id}`) + .send({ + isAvailable: false, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.statusCode).toBe(400); + }); + + it("should not update product status if it doesn't exists", async () => { + const response = await request(app) + .put(`/product/availability/${product4Id}`) + .send({ + isAvailable: true, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.statusCode).toBe(404); + expect(response.body.message).toBe('Product not found'); + }); + + it('should not update product which is not in VENDOR s stock', async () => { + const response = await request(app) + .put(`/product/availability/${product3Id}`) + .send({ + isAvailable: true, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.statusCode).toBe(404); + expect(response.body.message).toBe('Product not found in your stock'); + }); +}); diff --git a/src/__test__/vendorProduct.test.ts b/src/__test__/vendorProduct.test.ts index d355df1..a074706 100644 --- a/src/__test__/vendorProduct.test.ts +++ b/src/__test__/vendorProduct.test.ts @@ -18,13 +18,13 @@ const catId = uuid(); const jwtSecretKey = process.env.JWT_SECRET || ''; const getAccessToken = (id: string, email: string) => { - return jwt.sign( - { - id: id, - email: email - }, - jwtSecretKey - ); + return jwt.sign( + { + id: id, + email: email, + }, + jwtSecretKey + ); }; const sampleVendor1: UserInterface = { @@ -53,383 +53,378 @@ const sampleBuyer1: UserInterface = { }; const sampleVendor2: UserInterface = { - id: vendor2Id, - firstName: 'vendor2', - lastName: 'user', - email: 'vendor2@example.com', - password: 'password', - userType: 'Vendor', - gender: 'Male', - phoneNumber: '1638099634', - photoUrl: 'https://example.com/photo.jpg', - role: 'VENDOR' + id: vendor2Id, + firstName: 'vendor2', + lastName: 'user', + email: 'vendor2@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '1638099634', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', }; const sampleCat = { - id: catId, - name: 'accessories', + id: catId, + name: 'accessories', }; const sampleProduct1 = { - id: product1Id, - name: 'test product', - description: 'amazing product', - images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], - newPrice: 200, - quantity: 10, - vendor: sampleVendor1, - categories: [sampleCat] + id: product1Id, + name: 'test product', + description: 'amazing product', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor1, + categories: [sampleCat], }; const sampleProduct2 = { - id: product2Id, - name: 'test product2', - description: 'amazing product2', - images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg', 'photo4.jpg', 'photo5.jpg'], - newPrice: 200, - quantity: 10, - vendor: sampleVendor1, - categories: [sampleCat] + id: product2Id, + name: 'test product2', + description: 'amazing product2', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg', 'photo4.jpg', 'photo5.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor1, + categories: [sampleCat], }; - beforeAll(async () => { - const connection = await dbConnection(); + const connection = await dbConnection(); - const categoryRepository = connection?.getRepository(Category); - await categoryRepository?.save({ ...sampleCat }); + const categoryRepository = connection?.getRepository(Category); + await categoryRepository?.save({ ...sampleCat }); const userRepository = connection?.getRepository(User); await userRepository?.save({ ...sampleVendor1 }); await userRepository?.save({ ...sampleVendor2 }); await userRepository?.save({ ...sampleBuyer1 }); - const productRepository = connection?.getRepository(Product); - await productRepository?.save({ ...sampleProduct1 }); - await productRepository?.save({ ...sampleProduct2 }); - + const productRepository = connection?.getRepository(Product); + await productRepository?.save({ ...sampleProduct1 }); + await productRepository?.save({ ...sampleProduct2 }); }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } - - // Close the connection to the test database - await connection.close(); - server.close(); + const connection = getConnection(); + const userRepository = connection.getRepository(User); + const categoryRepository = connection.getRepository(Category); + + const productRepository = await connection.getRepository(Product).delete({}); + if (productRepository) { + await userRepository.delete({}); + await categoryRepository.delete({}); + } + + // Close the connection to the test database + await connection.close(); + server.close(); }); describe('Vendor product management tests', () => { - describe('Creating new product', () => { - it("should create new product", async () => { - const response = await request(app) - .post('/product') - .field('name', 'test product3') - .field('description', 'amazing product3') - .field('newPrice', 200) - .field('quantity', 10) - .field('expirationDate', '10-2-2023') - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(201); - expect(response.body.data.product).toBeDefined; - }, 10000); - - it("return an error if the number of product images exceeds 6", async () => { - const response = await request(app) - .post(`/product/`) - .field('name', 'test-product-images') - .field('description', 'amazing product3') - .field('newPrice', 200) - .field('quantity', 10) - .field('expirationDate', '10-2-2023') - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(400); - expect(response.body.error).toBe('Product cannot have more than 6 images'); - }); - - it("should not create new product it already exist", async () => { - const response = await request(app) - .post('/product') - .field('name', 'test product3') - .field('description', 'amazing product3') - .field('newPrice', 200) - .field('quantity', 10) - .field('categories', sampleCat.name) - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(409); - }); - - it("should not create new product, if there are missing field data", async () => { - const response = await request(app) - .post('/product') - .field('description', 'amazing product3') - .field('newPrice', 200) - .field('quantity', 10) - .field('categories', sampleCat.name) - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(400); - }); - - it("should not create new product, images are not at least more than 1", async () => { - const response = await request(app) - .post('/product') - .field('name', 'test-product-image') - .field('description', 'amazing product3') - .field('newPrice', 200) - .field('quantity', 10) - .field('categories', sampleCat.name) - .attach('images', `${__dirname}/test-assets/photo1.png`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(400); - }); + describe('Creating new product', () => { + it('should create new product', async () => { + const response = await request(app) + .post('/product') + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.product).toBeDefined; + }, 20000); + + it('return an error if the number of product images exceeds 6', async () => { + const response = await request(app) + .post(`/product/`) + .field('name', 'test-product-images') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.error).toBe('Product cannot have more than 6 images'); }); - describe('Updating existing product', () => { - it("return error, if there are missing field data", async () => { - const response = await request(app) - .put(`/product/${sampleProduct2.id}`) - .field('newPrice', 200) - .field('quantity', 10) - .field('expirationDate', '10-2-2023') - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(400); - }); - - it("return error, if product do not exist", async () => { - const response = await request(app) - .put(`/product/${uuid()}`) - .field('name', 'test product3') - .field('description', 'amazing product3') - .field('newPrice', 200) - .field('quantity', 10) - .field('expirationDate', '10-2-2023') - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(404); - expect(response.body.error).toBe('Product not found'); - }); - - it("return an error if the number of product images exceeds 6", async () => { - const response = await request(app) - .put(`/product/${sampleProduct2.id}`) - .field('name', 'test product3') - .field('description', 'amazing product3') - .field('newPrice', 200) - .field('quantity', 0) - .field('expirationDate', '10-2-2023') - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(400); - expect(response.body.error).toBe('Product cannot have more than 6 images'); - }); - - it("should update the product", async () => { - const response = await request(app) - .put(`/product/${sampleProduct2.id}`) - .field('name', 'test product3 updated') - .field('description', 'amazing product3') - .field('newPrice', 200) - .field('oldPrice', 100) - .field('quantity', 10) - .field('expirationDate', '10-2-2023') - .field('categories', 'tech') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(200); - }); + it('should not create new product it already exist', async () => { + const response = await request(app) + .post('/product') + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('categories', sampleCat.name) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(409); }); - describe('Retrieving all vendor product', () => { - it('should retrieve all product belong to logged vendor', async () => { - const response = await request(app) - .get('/product/collection') - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(200); - expect(response.body.products).toBeDefined; - }); - - it('should not return any product for a vendor with zero product in stock', async () => { - const response = await request(app) - .get(`/product/collection`) - .set('Authorization', `Bearer ${getAccessToken(vendor2Id, sampleVendor2.email)}`); - - expect(response.status).toBe(200); - expect(response.body.products).toBeUndefined; - }); - - it('should not return any product for incorrect syntax of input', async () => { - const response = await request(app) - .get(`/product/collection?page=sdfsd`) - .set('Authorization', `Bearer ${getAccessToken(vendor2Id, sampleVendor2.email)}`); - - expect(response.status).toBe(400); - expect(response.body).toBeUndefined; - }); + it('should not create new product, if there are missing field data', async () => { + const response = await request(app) + .post('/product') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('categories', sampleCat.name) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); }); - describe('Retrieving single vendor product', () => { + it('should not create new product, images are not at least more than 1', async () => { + const response = await request(app) + .post('/product') + .field('name', 'test-product-image') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('categories', sampleCat.name) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - it('should retrieve single product for the user', async () => { - const response = await request(app) - .get(`/product/collection/${product1Id}`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + expect(response.status).toBe(400); + }); + }); - expect(response.status).toBe(200); - expect(response.body.product).toBeDefined; - }); + describe('Updating existing product', () => { + it('return error, if there are missing field data', async () => { + const response = await request(app) + .put(`/product/${sampleProduct2.id}`) + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - it('should not return any product if product1Id do not exist', async () => { - const response = await request(app) - .get(`/product/collection/${uuid()}`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + expect(response.status).toBe(400); + }); - expect(response.status).toBe(404); - expect(response.body.product).toBeUndefined; - }); + it('return error, if product do not exist', async () => { + const response = await request(app) + .put(`/product/${uuid()}`) + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.error).toBe('Product not found'); + }); - it('should not return any product for incorrect syntax of input', async () => { - const response = await request(app) - .get(`/product/collection/id`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + it('return an error if the number of product images exceeds 6', async () => { + const response = await request(app) + .put(`/product/${sampleProduct2.id}`) + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 0) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - expect(response.status).toBe(400); - expect(response.body.product).toBeUndefined; - }); + expect(response.status).toBe(400); + expect(response.body.error).toBe('Product cannot have more than 6 images'); }); - describe('Removing product image', () => { - it('should remove one image', async () => { - const response = await request(app) - .delete(`/product/images/${sampleProduct1.id}`) - .send({ - image: sampleProduct1.images[2] - }) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(200); - }); - - it('return error, if no image to remove provided', async () => { - const response = await request(app) - .delete(`/product/images/${sampleProduct1.id}`) - - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(400); - expect(response.body.error).toBe('Please provide an image to remove'); - }); - - it('return error, if product doesn\'t exist', async () => { - const response = await request(app) - .delete(`/product/images/${uuid()}`) - .send({ - image: sampleProduct1.images[2] - }) - - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(404); - expect(response.body.error).toBe('Product not found'); - }); - - it('return error, if product has only 2 images', async () => { - const response = await request(app) - .delete(`/product/images/${sampleProduct1.id}`) - .send({ - image: sampleProduct1.images[0] - }) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(400); - expect(response.body.error).toBe('Product must have at least two image'); - }); - - it('return error, if image to remove deosn\'t exist', async () => { - const response = await request(app) - .delete(`/product/images/${sampleProduct1.id}`) - .send({ - image: 'image' - }) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(404); - expect(response.body.error).toBe('Image not found'); - }); + it('should update the product', async () => { + const response = await request(app) + .put(`/product/${sampleProduct2.id}`) + .field('name', 'test product3 updated') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('oldPrice', 100) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'tech') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); }); + }); - describe('Deleting a vendor product', () => { + describe('Retrieving all vendor product', () => { + it('should retrieve all product belong to logged vendor', async () => { + const response = await request(app) + .get('/product/collection') + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.products).toBeDefined; + }); - it('should delete a product for the vendor', async () => { - const response = await request(app) - .delete(`/product/${product2Id}`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + it('should not return any product for a vendor with zero product in stock', async () => { + const response = await request(app) + .get(`/product/collection`) + .set('Authorization', `Bearer ${getAccessToken(vendor2Id, sampleVendor2.email)}`); - expect(response.status).toBe(200); - }); + expect(response.status).toBe(200); + expect(response.body.products).toBeUndefined; + }); - it('should return error for non existing products', async () => { - const response = await request(app) - .delete(`/product/${uuid()}`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + it('should not return any product for incorrect syntax of input', async () => { + const response = await request(app) + .get(`/product/collection?page=sdfsd`) + .set('Authorization', `Bearer ${getAccessToken(vendor2Id, sampleVendor2.email)}`); - expect(response.status).toBe(404); - }); + expect(response.status).toBe(400); + expect(response.body).toBeUndefined; + }); + }); - it('should return error for invalid input syntax', async () => { - const response = await request(app) - .delete(`/product/product2Id`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + describe('Retrieving single vendor product', () => { + it('should retrieve single product for the user', async () => { + const response = await request(app) + .get(`/product/collection/${product1Id}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.product).toBeDefined; + }); + + it('should not return any product if product1Id do not exist', async () => { + const response = await request(app) + .get(`/product/collection/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.product).toBeUndefined; + }); + + it('should not return any product for incorrect syntax of input', async () => { + const response = await request(app) + .get(`/product/collection/id`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.product).toBeUndefined; + }); + }); + + describe('Removing product image', () => { + it('should remove one image', async () => { + const response = await request(app) + .delete(`/product/images/${sampleProduct1.id}`) + .send({ + image: sampleProduct1.images[2], + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + }); + + it('return error, if no image to remove provided', async () => { + const response = await request(app) + .delete(`/product/images/${sampleProduct1.id}`) + + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.error).toBe('Please provide an image to remove'); + }); + + it("return error, if product doesn't exist", async () => { + const response = await request(app) + .delete(`/product/images/${uuid()}`) + .send({ + image: sampleProduct1.images[2], + }) + + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.error).toBe('Product not found'); + }); + + it('return error, if product has only 2 images', async () => { + const response = await request(app) + .delete(`/product/images/${sampleProduct1.id}`) + .send({ + image: sampleProduct1.images[0], + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); expect(response.status).toBe(400); + expect(response.body.error).toBe('Product must have at least two image'); + }); + + it("return error, if image to remove deosn't exist", async () => { + const response = await request(app) + .delete(`/product/images/${sampleProduct1.id}`) + .send({ + image: 'image', + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.error).toBe('Image not found'); }); }); + describe('Deleting a vendor product', () => { + it('should delete a product for the vendor', async () => { + const response = await request(app) + .delete(`/product/${product2Id}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + }); + + it('should return error for non existing products', async () => { + const response = await request(app) + .delete(`/product/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + }); + + it('should return error for invalid input syntax', async () => { + const response = await request(app) + .delete(`/product/product2Id`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + }); + }); describe('Retrieving recommended products', () => { it('should retrieve products', async () => { @@ -458,4 +453,4 @@ describe('Vendor product management tests', () => { expect(response.body).toBeUndefined; }); }); -}); \ No newline at end of file +}); diff --git a/src/controllers/productController.ts b/src/controllers/productController.ts index 4676c31..9982028 100644 --- a/src/controllers/productController.ts +++ b/src/controllers/productController.ts @@ -1,5 +1,14 @@ import { Request, Response } from 'express'; -import { createProductService, updateProductService, removeProductImageService, readProductService, readProductsService, deleteProductService , getRecommendedProductsService} from '../services'; +import { + createProductService, + updateProductService, + removeProductImageService, + readProductService, + readProductsService, + deleteProductService, + getRecommendedProductsService, + productStatusServices, +} from '../services'; export const readProduct = async (req: Request, res: Response) => { await readProductService(req, res); @@ -25,8 +34,10 @@ export const deleteProduct = async (req: Request, res: Response) => { await deleteProductService(req, res); }; - export const getRecommendedProducts = async (req: Request, res: Response) => { await getRecommendedProductsService(req, res); }; +export const productStatus = async (req: Request, res: Response) => { + await productStatusServices(req, res); +}; diff --git a/src/routes/ProductRoutes.ts b/src/routes/ProductRoutes.ts index d8ff799..58e631e 100644 --- a/src/routes/ProductRoutes.ts +++ b/src/routes/ProductRoutes.ts @@ -1,9 +1,6 @@ import { Router } from 'express'; - - - -import { } from '../controllers/index'; +import { productStatus } from '../controllers/index'; import { hasRole } from '../middlewares/roleCheck'; import upload from '../middlewares/multer'; import { authMiddleware } from '../middlewares/verifyToken'; @@ -15,11 +12,11 @@ import { readProducts, readProduct, deleteProduct, - getRecommendedProducts + getRecommendedProducts, } from '../controllers'; const router = Router(); -router.get('/recommended', authMiddleware, hasRole("BUYER"), getRecommendedProducts); +router.get('/recommended', authMiddleware, hasRole('BUYER'), getRecommendedProducts); router.get('/collection', authMiddleware, hasRole('VENDOR'), readProducts); router.get('/', authMiddleware, hasRole('BUYER'), readProducts); router.get('/collection/:id', authMiddleware, hasRole('VENDOR'), readProduct); @@ -27,5 +24,6 @@ router.post('/', authMiddleware, hasRole('VENDOR'), upload.array('images', 10), router.put('/:id', authMiddleware, hasRole('VENDOR'), upload.array('images', 10), updateProduct); router.delete('/images/:id', authMiddleware, hasRole('VENDOR'), removeProductImage); router.delete('/:id', authMiddleware, hasRole('VENDOR'), deleteProduct); +router.put('/availability/:id', authMiddleware, hasRole('VENDOR'), productStatus); export default router; diff --git a/src/services/index.ts b/src/services/index.ts index 8deb195..752bca8 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -17,3 +17,4 @@ export * from './productServices/removeProductImage'; export * from './productServices/readProduct'; export * from './productServices/deleteProduct'; export * from './productServices/getRecommendedProductsService'; +export * from './productServices/productStatus'; diff --git a/src/services/productServices/productStatus.ts b/src/services/productServices/productStatus.ts new file mode 100644 index 0000000..16509c3 --- /dev/null +++ b/src/services/productServices/productStatus.ts @@ -0,0 +1,69 @@ +import { Request, Response } from 'express'; +import { User } from '../../entities/User'; +import { Product } from '../../entities/Product'; +import { getRepository } from 'typeorm'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; + +export const productStatusServices = async (req: Request, res: Response) => { + try { + const { isAvailable } = req.body; + const availability = isAvailable; + const { id } = req.params; + + if (availability === undefined) { + console.log('Error: Please fill all the required fields'); + return responseError(res, 401, 'Please fill all t he required fields'); + } + + const userRepository = getRepository(User); + const user = await userRepository.findOne({ where: { id: req.user?.id } }); + + if (!user) { + responseError(res, 404, 'User not found'); + return; + } + + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ where: { id: id } }); + + if (!product) return responseError(res, 404, 'Product not found'); + + const hasProduct = await productRepository.findOne({ + where: { + id, + vendor: { + id: req.user?.id, + }, + }, + relations: ['vendor'], + }); + + if (!hasProduct) { + return responseError(res, 404, 'Product not found in your stock'); + } + + if (hasProduct.expirationDate && hasProduct.expirationDate < new Date()) { + hasProduct.isAvailable = false; + await productRepository.save(hasProduct); + return responseSuccess(res, 201, 'Product status is set to false because it is expired.'); + } else if (hasProduct.quantity < 1) { + product.isAvailable = false; + await productRepository.save(hasProduct); + return responseSuccess(res, 202, 'Product status is set to false because it is out of stock.'); + } + + if (hasProduct.isAvailable === isAvailable) { + console.log('Error: Product status is already updated'); + responseError(res, 400, 'Product status is already up to date'); + return; + } + + hasProduct.isAvailable = isAvailable; + await productRepository.save(hasProduct); + + return responseSuccess(res, 200, 'Product status updated successfully'); + } catch (error) { + console.log('Error: Product status is not update due to this error:\n', error); + return responseServerError(res, 'Sorry, Something went wrong. Try again later.'); + } +}; diff --git a/tsconfig.json b/tsconfig.json index d58c75f..4665a6d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,108 +1,108 @@ { - "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - /* Language and Environment */ - "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - "experimentalDecorators": true /* Enable experimental support for legacy experimental decorators. */, - "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */, - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - /* Modules */ - "module": "commonjs" /* Specify what module code is generated. */, - "rootDir": "./src" /* Specify the root folder within your source files. */, - // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - "types": [ - "node", - "jest", - "express", - "joi" - ] /* Specify type package names to be included without being referenced in a source file. */, - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ - // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ - // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ - // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - /* JavaScript Support */ - "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */, - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./dist" /* Specify an output folder for all emitted files. */, - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, - /* Type Checking */ - "strict": true /* Enable all strict type-checking options. */, - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ - }, - "include": ["src/**/*.ts"], - "exclude": ["node_modules"] -} + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + /* Language and Environment */ + "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + "experimentalDecorators": true /* Enable experimental support for legacy experimental decorators. */, + "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */, + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + /* Modules */ + "module": "commonjs" /* Specify what module code is generated. */, + "rootDir": "./src" /* Specify the root folder within your source files. */, + // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + "types": [ + "node", + "jest", + "express", + "joi" + ] /* Specify type package names to be included without being referenced in a source file. */, + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + /* JavaScript Support */ + "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */, + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + "outDir": "./dist" /* Specify an output folder for all emitted files. */, + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, + /* Type Checking */ + "strict": true /* Enable all strict type-checking options. */, + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + }, + "include": ["src/**/*.ts"], + "exclude": ["node_modules"] + } \ No newline at end of file From 8f1e4bdb94da5c08bc6f62249d666c1294b6835e Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 14 May 2024 17:32:44 +0200 Subject: [PATCH 06/20] removing console and sensitive data in reponse --- src/__test__/productStatus.test.ts | 4 +-- .../getRecommendedProductsService.ts | 25 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/__test__/productStatus.test.ts b/src/__test__/productStatus.test.ts index f7af7b5..bb666cb 100644 --- a/src/__test__/productStatus.test.ts +++ b/src/__test__/productStatus.test.ts @@ -34,7 +34,7 @@ const sampleVendor1 = new User(); sampleVendor1.id = vendor1Id; sampleVendor1.firstName = 'vendor1'; sampleVendor1.lastName = 'user'; -sampleVendor1.email = 'vendor1@example.com'; +sampleVendor1.email = 'vendora1@example.com'; sampleVendor1.password = 'password'; sampleVendor1.userType = 'Vendor'; sampleVendor1.gender = 'Male'; @@ -46,7 +46,7 @@ const sampleVendor2 = new User(); sampleVendor2.id = vendor2Id; sampleVendor2.firstName = 'vendor2'; sampleVendor2.lastName = 'user'; -sampleVendor2.email = 'vendor2@example.com'; +sampleVendor2.email = 'vendora2@example.com'; sampleVendor2.password = 'password'; sampleVendor2.userType = 'Vendor'; sampleVendor2.gender = 'Male'; diff --git a/src/services/productServices/getRecommendedProductsService.ts b/src/services/productServices/getRecommendedProductsService.ts index c75d7be..19368e1 100644 --- a/src/services/productServices/getRecommendedProductsService.ts +++ b/src/services/productServices/getRecommendedProductsService.ts @@ -22,7 +22,6 @@ export const getRecommendedProductsService = async (req: Request, res: Response) if (req.query.categories) { const categoryIds = Array.isArray(req.query.categories) ? req.query.categories : [req.query.categories]; -console.log(categoryIds) condition.categories = categoryIds; }; if (req.query.vendor) condition.vendor = req.query.vendor; @@ -33,7 +32,6 @@ console.log(categoryIds) .leftJoinAndSelect("product.vendor", "vendor") .where("1 = 1"); - // Apply conditions if available if (condition.categories && condition.categories.length > 0) { productsQuery.andWhere("category.id IN (:...categories)", { categories: condition.categories }); } @@ -41,23 +39,24 @@ console.log(categoryIds) productsQuery.andWhere("vendor.id = :vendorId", { vendorId: condition.vendor }); } - console.log("+++++++++++++++++++++++++++++"); - console.log(condition); - console.log("+++++++++++++++++++++++++++++"); const products = await productsQuery .skip(skip) .take(limit) .getMany(); if (products.length < 1) { - return responseSuccess(res, 200, `No products found for the specified ${ condition.vendor ? 'vendor' : 'category'}`); + return responseSuccess(res, 200, `No products found for the specified ${condition.vendor ? 'vendor' : 'category'}`); } - // { categories: null, vendor: 'e8150556-8737-47dd-a365-da3e82fa84be' } - return responseSuccess(res, 200, 'Products retrieved', {products}); + const sanitizedProducts = products.map(product => ({ + ...product, + vendor: { + firstName: product.vendor.firstName, + lastName: product.vendor.lastName, + phoneNumber: product.vendor.phoneNumber, + photoUrl: product.vendor.photoUrl + } + })); + return responseSuccess(res, 200, 'Products retrieved', { products: sanitizedProducts }); } catch (error) { - console.log("**************"); - console.log(error); - console.log("**************"); return responseError(res, 400, (error as Error).message); } -}; - +}; \ No newline at end of file From d33ff42061e7f57b1fece0cc2dfaabdf51b5fb09 Mon Sep 17 00:00:00 2001 From: "Gisa M. Caleb Pacifique" Date: Thu, 16 May 2024 11:06:12 +0200 Subject: [PATCH 07/20] Ft-implment-wish list-functionalites --- src/__test__/errorHandler.test.ts | 47 ++++ src/__test__/wishList.test.ts | 238 ++++++++++++++++++ src/controllers/wishListController.ts | 23 ++ src/entities/wishList.ts | 26 ++ src/middlewares/errorHandler.ts | 1 - src/routes/index.ts | 2 + src/routes/wishListRoute.ts | 14 ++ src/services/index.ts | 6 + src/services/wishListServices/addProduct.ts | 60 +++++ src/services/wishListServices/clearAll.ts | 20 ++ src/services/wishListServices/getProducts.ts | 38 +++ .../wishListServices/removeProducts.ts | 23 ++ 12 files changed, 497 insertions(+), 1 deletion(-) create mode 100644 src/__test__/errorHandler.test.ts create mode 100644 src/__test__/wishList.test.ts create mode 100644 src/controllers/wishListController.ts create mode 100644 src/entities/wishList.ts create mode 100644 src/routes/wishListRoute.ts create mode 100644 src/services/wishListServices/addProduct.ts create mode 100644 src/services/wishListServices/clearAll.ts create mode 100644 src/services/wishListServices/getProducts.ts create mode 100644 src/services/wishListServices/removeProducts.ts diff --git a/src/__test__/errorHandler.test.ts b/src/__test__/errorHandler.test.ts new file mode 100644 index 0000000..fb1437c --- /dev/null +++ b/src/__test__/errorHandler.test.ts @@ -0,0 +1,47 @@ +import { Request, Response } from 'express'; +import { CustomError, errorHandler } from '../middlewares/errorHandler' + +describe('CustomError', () => { + it('should create a CustomError object with statusCode and status properties', () => { + const message = 'Test error message'; + const statusCode = 404; + const customError = new CustomError(message, statusCode); + expect(customError.message).toBe(message); + expect(customError.statusCode).toBe(statusCode); + expect(customError.status).toBe('fail'); + }); + }); + + describe('errorHandler', () => { + it('should send correct response with status code and message', () => { + const err = new CustomError('Test error message', 404); + const req = {} as Request; + const res = { + status: jest.fn().mockReturnThis(), + json: jest.fn(), + } as unknown as Response; + const next = jest.fn(); + errorHandler(err, req, res, next); + expect(res.status).toHaveBeenCalledWith(404); + expect(res.json).toHaveBeenCalledWith({ + status: 404, + message: 'Test error message', + }); + }); + it('should handle errors with status code 500', () => { + const err = new CustomError('something went wrong', 500); + const req = {} as Request; + const res = { + status: jest.fn().mockReturnThis(), + json: jest.fn(), + } as unknown as Response; + const next = jest.fn(); + errorHandler(err, req, res, next); + + expect(res.status).toHaveBeenCalledWith(500); + expect(res.json).toHaveBeenCalledWith({ + status: 500, + message: 'something went wrong', + }); + }); + }); \ No newline at end of file diff --git a/src/__test__/wishList.test.ts b/src/__test__/wishList.test.ts new file mode 100644 index 0000000..2b2f120 --- /dev/null +++ b/src/__test__/wishList.test.ts @@ -0,0 +1,238 @@ +import request from 'supertest'; +import jwt from 'jsonwebtoken'; +import { app, server } from '../index'; +import { getConnection } from 'typeorm'; +import { dbConnection } from '../startups/dbConnection'; +import { v4 as uuid } from 'uuid'; +import { Product } from '../entities/Product'; +import { Category } from '../entities/Category'; +import { wishList } from '../entities/wishList'; +import { User, UserInterface } from '../entities/User'; + +const buyer1Id = uuid(); +const buyer2Id = uuid(); +let product1Id: string; +let product2Id: string; +const catId = uuid(); +const vendor2Id = uuid(); + +const sampleBuyer1: UserInterface = { + id: buyer1Id, + firstName: 'buyer1', + lastName: 'user', + email: 'buyer1@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', + }; + const sampleBuyer2: UserInterface = { + id: buyer2Id, + firstName: 'buyer2', + lastName: 'use', + email: 'buyer2@example.com', + password: 'passwo', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '1638099347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', + }; + const sampleVendor1: UserInterface = { + id: vendor2Id, + firstName: 'vendor1', + lastName: 'user', + email: 'vendor11@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '12638090347', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', + }; + +let productInWishList: number; + +beforeAll(async () => { + const connection = await dbConnection(); + const userRepository = connection?.getRepository(User); + await userRepository?.save({ ...sampleBuyer1 }); + await userRepository?.save({ ...sampleBuyer2 }); + await userRepository?.save({...sampleVendor1}) + }); + + afterAll(async () => { + const connection = getConnection(); + const userRepository = connection.getRepository(User); + const categoryRepository = connection.getRepository(Category); + const wishListRepository = connection.getRepository(wishList) + + // Delete all records + const productRepository = await connection.getRepository(Product).delete({}); + if (productRepository) { + await userRepository.delete({}); + await categoryRepository.delete({}); + } + await userRepository.delete({}); + await wishListRepository.delete({}) + + // Close the connection to the test database + await connection.close(); + server.close(); + }); + const data1 = { + id: buyer1Id, + email: sampleBuyer1.email + }; + const data2 = { + id: buyer2Id, + email: sampleBuyer2.email + } + const vendorData = { + id: vendor2Id, + email: sampleVendor1.email + } + + +const jwtSecretKey = process.env.JWT_SECRET || ''; +describe('Wish list management tests', () => { + + describe('Add product to wish list', () => { + it('should return 404 when product is not found', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .post( `/wish-list/add/${uuid()}`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body).toEqual({ message: 'Product not found' }); + }) + + it('should add a new product to wish list', async () =>{ + const vendorToken = jwt.sign(vendorData, jwtSecretKey); + const prod1Response = await request(app) + .post('/product') + .field('name', 'test product12') + .field('description', 'amazing product3') + .field('newPrice', 2000) + .field('quantity', 10) + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${vendorToken}`); + + product1Id = prod1Response.body.data.product.id; + + const prod2Response = await request(app) + .post('/product') + .field('name', 'more product2') + .field('description', 'food product3') + .field('newPrice', 2000) + .field('quantity', 10) + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${vendorToken}`); + + product2Id = prod2Response.body.data.product.id; + + const token = jwt.sign(data1, jwtSecretKey); + const response1 = await request(app) + .post( `/wish-list/add/${product1Id}`) + .set('Authorization', `Bearer ${token}`); + expect(response1.status).toBe(201); + expect(response1.body.data.message).toBe('Product Added to wish list'); + productInWishList = response1.body.data.wishlistAdded.id; + + await request(app) + .post( `/wish-list/add/${product2Id}`) + .set('Authorization', `Bearer ${token}`); + }) + + it('should tell if there is the product is already in the wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .post( `/wish-list/add/${product1Id}`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(401); + expect(response.body.data.message).toBe('Product Already in the wish list'); + }) + it('should return 500 when the ID is not valid', async() => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .post( `/wish-list/add/kjwxq-wbjk2-2bwqs-21`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(500); + }) + }) + + describe('Get products in wishList', () => { + it('Returns 404 when buyer has no product in wish list', async () => { + const token = jwt.sign(data2, jwtSecretKey); + const response = await request(app) + .get('/wish-list') + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('No products in wish list'); + }) + + it('Returns products in the wish list for a buyer ', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .get('/wish-list') + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(200); + expect(response.body.message).toBe('Products retrieved'); + }) + }) + + describe('Remove a product from wish lsit', () => { + it('should return 404 when product is not found in wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .delete( `/wish-list/delete/${28}`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('Product not found in wish list'); + }) + + it('should delete a product from wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .delete( `/wish-list/delete/${productInWishList}`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(200); + expect(response.body.message).toBe('Product removed from wish list'); + }) + it('should return 500 when the ID is not valid', async() => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .delete( `/wish-list/delete/kjwxq-wbjk2-2bwqs-21`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(500); + }) + }) + + describe('Clear all products in wish for a user', () => { + it('Returns 404 when buyer has no product in wish list', async () => { + const token = jwt.sign(data2, jwtSecretKey); + const response = await request(app) + .delete( '/wish-list/clearAll') + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('No products in wish list'); + }) + + it('should delete all products for a nuyer in wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .delete( '/wish-list/clearAll') + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(200); + expect(response.body.message).toBe('All products removed successfully'); + }) + }) +}) \ No newline at end of file diff --git a/src/controllers/wishListController.ts b/src/controllers/wishListController.ts new file mode 100644 index 0000000..e0cd1bd --- /dev/null +++ b/src/controllers/wishListController.ts @@ -0,0 +1,23 @@ +import { Request, Response } from 'express'; +import{ + addProductService, + getProductsService, + removeProductService, + clearAllProductService +} from '../services' + +export const wishlistAddProduct = async (req: Request, res: Response) => { + await addProductService(req, res); + }; + + export const wishlistRemoveProduct = async (req: Request, res:Response) => { + await removeProductService(req, res); + } + + export const wishlistGetProducts = async (req: Request, res:Response) => { + await getProductsService(req, res); + } + + export const wishlistClearAllProducts = async (req: Request, res:Response) => { + await clearAllProductService(req, res); + } \ No newline at end of file diff --git a/src/entities/wishList.ts b/src/entities/wishList.ts new file mode 100644 index 0000000..69dbebd --- /dev/null +++ b/src/entities/wishList.ts @@ -0,0 +1,26 @@ +import { Entity, PrimaryGeneratedColumn, BaseEntity,Column, Unique, ManyToOne, CreateDateColumn, UpdateDateColumn,} from "typeorm"; +import { IsNotEmpty, IsString } from 'class-validator'; +import { User } from './User'; + +@Entity("wishlist") +@Unique(['id']) +export class wishList extends BaseEntity{ + @PrimaryGeneratedColumn() + @IsNotEmpty() + id!: number; + + @Column() + @IsNotEmpty() + @IsString() + productId!: string; + + @ManyToOne(() => User) + @IsNotEmpty() + buyer!: User; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} \ No newline at end of file diff --git a/src/middlewares/errorHandler.ts b/src/middlewares/errorHandler.ts index 5e25feb..d028c83 100644 --- a/src/middlewares/errorHandler.ts +++ b/src/middlewares/errorHandler.ts @@ -19,7 +19,6 @@ const errorHandler = (err: CustomError, req: Request, res: Response, next: NextF status: err.statusCode, message: err.message, }); - console.error(err.stack); }; export { CustomError, errorHandler }; diff --git a/src/routes/index.ts b/src/routes/index.ts index faa2456..bf38aab 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -2,6 +2,7 @@ import { Request, Response, Router } from 'express'; import { responseSuccess } from '../utils/response.utils'; import userRoutes from './UserRoutes'; import productRoutes from './ProductRoutes'; +import wishListRoutes from './wishListRoute' const router = Router(); @@ -11,5 +12,6 @@ router.get('/', (req: Request, res: Response) => { router.use('/user', userRoutes); router.use('/product', productRoutes); +router.use('/wish-list',wishListRoutes); export default router; diff --git a/src/routes/wishListRoute.ts b/src/routes/wishListRoute.ts new file mode 100644 index 0000000..ae92553 --- /dev/null +++ b/src/routes/wishListRoute.ts @@ -0,0 +1,14 @@ +import { Router } from 'express'; +import { authMiddleware } from '../middlewares/verifyToken'; +import { hasRole } from '../middlewares'; +import { checkUserStatus } from '../middlewares/isAllowed'; +import { wishlistAddProduct,wishlistRemoveProduct,wishlistGetProducts,wishlistClearAllProducts } from '../controllers/wishListController'; + +const router = Router(); + +router.post('/add/:id', authMiddleware, checkUserStatus, hasRole('BUYER'), wishlistAddProduct); +router.get('/',authMiddleware, checkUserStatus, hasRole('BUYER'),wishlistGetProducts); +router.delete('/delete/:id',authMiddleware, checkUserStatus, hasRole('BUYER'),wishlistRemoveProduct); +router.delete('/clearAll',authMiddleware, checkUserStatus, hasRole('BUYER'),wishlistClearAllProducts); + +export default router; \ No newline at end of file diff --git a/src/services/index.ts b/src/services/index.ts index 752bca8..7e32521 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -18,3 +18,9 @@ export * from './productServices/readProduct'; export * from './productServices/deleteProduct'; export * from './productServices/getRecommendedProductsService'; export * from './productServices/productStatus'; + +// Buyer wishlist services +export * from './wishListServices/addProduct'; +export * from './wishListServices/getProducts'; +export * from './wishListServices/removeProducts'; +export * from './wishListServices/clearAll'; \ No newline at end of file diff --git a/src/services/wishListServices/addProduct.ts b/src/services/wishListServices/addProduct.ts new file mode 100644 index 0000000..da3db89 --- /dev/null +++ b/src/services/wishListServices/addProduct.ts @@ -0,0 +1,60 @@ +import { Request, Response } from 'express'; +import { User } from '../../entities/User'; +import { getRepository } from 'typeorm'; +import { wishList } from '../../entities/wishList'; +import { Product } from '../../entities/Product'; + +export const addProductService = async (req:Request,res:Response)=>{ + try { + + const id = req.params.id; + const wishListRepository = getRepository(wishList); + const productRepository = getRepository(Product); + + + const product = await productRepository.findOne({where: { id }}); + + if(!product){ + return res.status(404).json({message: "Product not found"}); + } + + const productDetails = { + productId: product.id, + name: product.name, + image: product.images, + newPrice: product.newPrice, + vendorId: product.vendor + } + + const alreadyIn = await wishListRepository.findOne({where: {productId: id, buyer:{ id: req.user?.id} }}) + + if(alreadyIn){ + return res.status(401).json({ + data: { + message: 'Product Already in the wish list', + wishlistAdded: alreadyIn, + product: productDetails, + }, + }) + } + + const addNewProduct = new wishList(); + addNewProduct.productId = id; + addNewProduct.buyer = req.user as User; + + await wishListRepository.save(addNewProduct); + + addNewProduct.buyer = { id: addNewProduct.buyer.id } as unknown as User; + + return res.status(201).json({ + data: { + message: 'Product Added to wish list', + wishlistAdded: addNewProduct, + product: productDetails, + }, + }); + + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +} \ No newline at end of file diff --git a/src/services/wishListServices/clearAll.ts b/src/services/wishListServices/clearAll.ts new file mode 100644 index 0000000..88af3c6 --- /dev/null +++ b/src/services/wishListServices/clearAll.ts @@ -0,0 +1,20 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { wishList } from '../../entities/wishList'; + +export const clearAllProductService = async (req:Request,res:Response)=>{ + try { + const wishListRepository = getRepository(wishList); + const productsForBuyer = await wishListRepository.find({where: { buyer:{ id: req.user?.id} }}); + + if (productsForBuyer.length === 0) { + return res.status(404).json({ message: 'No products in wish list' }); + } + + await wishListRepository.remove(productsForBuyer); + return res.status(200).json({ message: 'All products removed successfully'}); + + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +} \ No newline at end of file diff --git a/src/services/wishListServices/getProducts.ts b/src/services/wishListServices/getProducts.ts new file mode 100644 index 0000000..107f3aa --- /dev/null +++ b/src/services/wishListServices/getProducts.ts @@ -0,0 +1,38 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { wishList } from '../../entities/wishList'; +import { Product } from '../../entities/Product'; + +export const getProductsService = async (req:Request,res:Response)=>{ + try { + const wishListRepository = getRepository(wishList); + const productRepository =getRepository(Product); + + const productsForBuyer = await wishListRepository.find({where: { buyer:{ id: req.user?.id} }}); + + if (productsForBuyer.length === 0) { + return res.status(404).json({ message: 'No products in wish list', products: productsForBuyer }); + } + + const buyerWishProducts = await Promise.all(productsForBuyer.map(async (product) => { + const productDetails = await productRepository.findOne({ where: { id: product.productId } }); + if(productDetails){ + return { + wishListDetails: product, + productInfo: { + productId: productDetails.id, + name: productDetails.name, + image: productDetails.images, + newPrice: productDetails.newPrice, + vendorId: productDetails.vendor + } + }; + } + })); + + return res.status(200).json({ message: 'Products retrieved', productsForBuyer: buyerWishProducts }); + + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +} \ No newline at end of file diff --git a/src/services/wishListServices/removeProducts.ts b/src/services/wishListServices/removeProducts.ts new file mode 100644 index 0000000..cb99c0f --- /dev/null +++ b/src/services/wishListServices/removeProducts.ts @@ -0,0 +1,23 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { wishList } from '../../entities/wishList'; + +export const removeProductService = async (req:Request,res:Response)=>{ + try { + + const id = parseInt(req.params.id); + const wishListRepository = getRepository(wishList); + + const product = await wishListRepository.findOne({where: { id }}); + + if(!product){ + return res.status(404).json({message: "Product not found in wish list"}); + } + + await wishListRepository.remove(product); + return res.status(200).json({ message: "Product removed from wish list" }); + + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +} \ No newline at end of file From 7bbdc4ed03d4f2ce20f079c77d8914ffa9791e1e Mon Sep 17 00:00:00 2001 From: maxCastro1 Date: Thu, 16 May 2024 13:13:01 +0200 Subject: [PATCH 08/20] Implementation of view a single product function --- src/__test__/getProduct.test.ts | 135 ++++++++++++++++++ src/controllers/productController.ts | 4 + src/routes/ProductRoutes.ts | 3 + src/services/index.ts | 1 + .../productServices/viewSingleProduct.ts | 38 +++++ 5 files changed, 181 insertions(+) create mode 100644 src/__test__/getProduct.test.ts create mode 100644 src/services/productServices/viewSingleProduct.ts diff --git a/src/__test__/getProduct.test.ts b/src/__test__/getProduct.test.ts new file mode 100644 index 0000000..ffcb6c4 --- /dev/null +++ b/src/__test__/getProduct.test.ts @@ -0,0 +1,135 @@ +import request from 'supertest'; +import jwt from 'jsonwebtoken'; +import { app, server } from '../index'; +import { getConnection } from 'typeorm'; +import { dbConnection } from '../startups/dbConnection'; +import { User, UserInterface } from '../entities/User'; +import { v4 as uuid } from 'uuid'; +import { Product } from '../entities/Product'; +import { Category } from '../entities/Category'; + +const vendor1Id = uuid(); +const product1Id = uuid(); +const Invalidproduct = "11278df2-d026-457a-9471-4749f038df68"; +const catId = uuid(); + +const jwtSecretKey = process.env.JWT_SECRET || ''; + +const getAccessToken = (id: string, email: string) => { + return jwt.sign( + { + id: id, + email: email, + }, + jwtSecretKey + ); +}; +const sampleVendor1: UserInterface = { + id: vendor1Id, + firstName: 'vendor1o', + lastName: 'user', + email: 'vendor10@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '126380996348', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', + }; + + const sampleCat = { + id: catId, + name: 'accessories', + }; + +const sampleProduct1 = { + id: product1Id, + name: 'test product single', + description: 'amazing product', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor1, + categories: [sampleCat], + }; + +beforeAll(async () => { + const connection = await dbConnection(); + + const categoryRepository = connection?.getRepository(Category); + await categoryRepository?.save({ ...sampleCat }); + + const userRepository = connection?.getRepository(User); + await userRepository?.save({ ...sampleVendor1 }); + + + const productRepository = connection?.getRepository(Product); + await productRepository?.save({ ...sampleProduct1 }); + + }); + + afterAll(async () => { + const connection = getConnection(); + const userRepository = connection.getRepository(User); + const categoryRepository = connection.getRepository(Category); + + const productRepository = await connection.getRepository(Product).delete({}); + if (productRepository) { + await userRepository.delete({}); + await categoryRepository.delete({}); + } + await connection.close(); + server.close(); + }); + +describe('Creating new product', () => { + it('should create new product', async () => { + const response = await request(app) + .post('/product') + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.product).toBeDefined; + }, 10000); +}) +describe('Get single product', () => { + it('should get a single product', async () => { + const response = await request(app) + .get(`/product/${product1Id}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + expect(response.body.product).toBeDefined; + expect(response.body.product.id).toBe(product1Id); + }, 10000); + + it('should return 400 for invalid product Id', async () => { + const response = await request(app) + .get(`/product/non-existing-id`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.status).toBe('error'); + expect(response.body.message).toBe('Invalid product ID'); + }, 10000); + it('should return 404 for product not found', async () => { + const response = await request(app) + .get(`/product/${Invalidproduct}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.status).toBe('error'); + expect(response.body.message).toBe('Product not found'); + }, 10000); + }); + \ No newline at end of file diff --git a/src/controllers/productController.ts b/src/controllers/productController.ts index 9982028..069bce4 100644 --- a/src/controllers/productController.ts +++ b/src/controllers/productController.ts @@ -8,6 +8,7 @@ import { deleteProductService, getRecommendedProductsService, productStatusServices, + viewSingleProduct } from '../services'; export const readProduct = async (req: Request, res: Response) => { @@ -41,3 +42,6 @@ export const getRecommendedProducts = async (req: Request, res: Response) => { export const productStatus = async (req: Request, res: Response) => { await productStatusServices(req, res); }; +export const singleProduct = async (req: Request, res: Response) => { + await viewSingleProduct(req, res); +}; \ No newline at end of file diff --git a/src/routes/ProductRoutes.ts b/src/routes/ProductRoutes.ts index 58e631e..b8829d4 100644 --- a/src/routes/ProductRoutes.ts +++ b/src/routes/ProductRoutes.ts @@ -13,12 +13,14 @@ import { readProduct, deleteProduct, getRecommendedProducts, + singleProduct, } from '../controllers'; const router = Router(); router.get('/recommended', authMiddleware, hasRole('BUYER'), getRecommendedProducts); router.get('/collection', authMiddleware, hasRole('VENDOR'), readProducts); router.get('/', authMiddleware, hasRole('BUYER'), readProducts); +router.get('/:id', singleProduct) router.get('/collection/:id', authMiddleware, hasRole('VENDOR'), readProduct); router.post('/', authMiddleware, hasRole('VENDOR'), upload.array('images', 10), createProduct); router.put('/:id', authMiddleware, hasRole('VENDOR'), upload.array('images', 10), updateProduct); @@ -26,4 +28,5 @@ router.delete('/images/:id', authMiddleware, hasRole('VENDOR'), removeProductIma router.delete('/:id', authMiddleware, hasRole('VENDOR'), deleteProduct); router.put('/availability/:id', authMiddleware, hasRole('VENDOR'), productStatus); + export default router; diff --git a/src/services/index.ts b/src/services/index.ts index 7e32521..3b9ae41 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -18,6 +18,7 @@ export * from './productServices/readProduct'; export * from './productServices/deleteProduct'; export * from './productServices/getRecommendedProductsService'; export * from './productServices/productStatus'; +export * from './productServices/viewSingleProduct'; // Buyer wishlist services export * from './wishListServices/addProduct'; diff --git a/src/services/productServices/viewSingleProduct.ts b/src/services/productServices/viewSingleProduct.ts new file mode 100644 index 0000000..f956625 --- /dev/null +++ b/src/services/productServices/viewSingleProduct.ts @@ -0,0 +1,38 @@ +import { Request, Response } from 'express'; +import { Product } from '../../entities/Product'; +import { getRepository } from 'typeorm'; +import { responseError } from '../../utils/response.utils'; +import { validate } from 'uuid'; + + + +export const viewSingleProduct = async (req: Request, res: Response) => { + try { + const productId = req.params.id; + + if (!validate(productId)) { + return res.status(400).json({ status: 'error', message: 'Invalid product ID' }); + + } + if(productId){ + const products = getRepository(Product); + const product = await products.findOneBy({ id: productId }); + + + if (!product) { + return res.status(404).send({status:'error', message: 'Product not found'}); + + } + + if (product.expirationDate && new Date(product.expirationDate) < new Date()) { + return res.status(400).json({ status: 'error', message: 'Product expired' }); + + } + res.status(200).json({ status: 'success', product: product }); + } + + } catch (error) { + console.error('Error handling request:', error); + res.status(500).send('Error fetching product details'); + } +} \ No newline at end of file From 26255bcc15e953dbd5540df31af95bd1b906a5f6 Mon Sep 17 00:00:00 2001 From: Icyeza Date: Tue, 14 May 2024 17:10:44 +0200 Subject: [PATCH 09/20] Implement buyer able to list all products --- src/__test__/vendorProduct.test.ts | 30 ++++++++++++- src/controllers/productController.ts | 20 +++++++-- src/routes/ProductRoutes.ts | 2 + src/services/index.ts | 1 + .../productServices/listAllProductsService.ts | 42 +++++++++++++++++++ 5 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 src/services/productServices/listAllProductsService.ts diff --git a/src/__test__/vendorProduct.test.ts b/src/__test__/vendorProduct.test.ts index a074706..dfa96c4 100644 --- a/src/__test__/vendorProduct.test.ts +++ b/src/__test__/vendorProduct.test.ts @@ -142,7 +142,7 @@ describe('Vendor product management tests', () => { expect(response.status).toBe(201); expect(response.body.data.product).toBeDefined; - }, 20000); + }, 60000); it('return an error if the number of product images exceeds 6', async () => { const response = await request(app) @@ -453,4 +453,32 @@ describe('Vendor product management tests', () => { expect(response.body).toBeUndefined; }); }); + + describe('List all products service', () => { + it('should return all products for a given category', async () => { + const response = await request(app) + .get('/product/all') + + expect(response.status).toBe(200); + expect(response.body.data.products).toBeDefined(); + }); + + it('should return no products for a non-existent category', async () => { + const response = await request(app) + .get('/product/all') + .query({ page: 1, limit: 10, category: 'nonexistentcategory' }) + + expect(response.status).toBe(200); + expect(response.body.data.products).toBeUndefined(); + }); + + it('should return an error for invalid input syntax', async () => { + const response = await request(app) + .get('/product/all') + .query({ page: 'invalid', limit: 'limit', category: 'technology' }) + + expect(response.status).toBe(400); + }); + }); + }); diff --git a/src/controllers/productController.ts b/src/controllers/productController.ts index 069bce4..ad38233 100644 --- a/src/controllers/productController.ts +++ b/src/controllers/productController.ts @@ -1,15 +1,24 @@ import { Request, Response } from 'express'; import { + createProductService, + updateProductService, - removeProductImageService, + + removeProductImageService, + readProductService, - readProductsService, + readProductsService, + deleteProductService, + getRecommendedProductsService, productStatusServices, viewSingleProduct -} from '../services'; +, + listAllProductsService} +from '../services'; + export const readProduct = async (req: Request, res: Response) => { await readProductService(req, res); @@ -39,7 +48,10 @@ export const getRecommendedProducts = async (req: Request, res: Response) => { await getRecommendedProductsService(req, res); }; -export const productStatus = async (req: Request, res: Response) => { + +export const listAllProducts = async (req: Request, res: Response) => { + await listAllProductsService(req, res); +};export const productStatus = async (req: Request, res: Response) => { await productStatusServices(req, res); }; export const singleProduct = async (req: Request, res: Response) => { diff --git a/src/routes/ProductRoutes.ts b/src/routes/ProductRoutes.ts index b8829d4..98c0a50 100644 --- a/src/routes/ProductRoutes.ts +++ b/src/routes/ProductRoutes.ts @@ -13,10 +13,12 @@ import { readProduct, deleteProduct, getRecommendedProducts, + listAllProducts, singleProduct, } from '../controllers'; const router = Router(); +router.get('/all', listAllProducts); router.get('/recommended', authMiddleware, hasRole('BUYER'), getRecommendedProducts); router.get('/collection', authMiddleware, hasRole('VENDOR'), readProducts); router.get('/', authMiddleware, hasRole('BUYER'), readProducts); diff --git a/src/services/index.ts b/src/services/index.ts index 3b9ae41..cffe7f7 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -17,6 +17,7 @@ export * from './productServices/removeProductImage'; export * from './productServices/readProduct'; export * from './productServices/deleteProduct'; export * from './productServices/getRecommendedProductsService'; +export * from './productServices/listAllProductsService'; export * from './productServices/productStatus'; export * from './productServices/viewSingleProduct'; diff --git a/src/services/productServices/listAllProductsService.ts b/src/services/productServices/listAllProductsService.ts new file mode 100644 index 0000000..8950abd --- /dev/null +++ b/src/services/productServices/listAllProductsService.ts @@ -0,0 +1,42 @@ +import { Request, Response } from 'express'; +import { Product } from '../../entities/Product'; +import { getRepository } from 'typeorm'; +import { responseError, responseSuccess } from '../../utils/response.utils'; +import { validate } from 'uuid'; + +export const listAllProductsService = async (req: Request, res: Response) => { + try { + const page = req.query.page ? Number(req.query.page) : 1; + const limit = req.query.limit ? Number(req.query.limit) : 10; + const skip = (page - 1) * limit; + const category = req.query.category ; + + + const productRepository = getRepository(Product); + const products = await productRepository.find({ + where: { + categories: { + name: category as string + } + }, + skip, + take: limit, + relations: ["categories","vendor"], + select: { + vendor: { + id: true, firstName: true, lastName: true, + email: true, phoneNumber: true, photoUrl: true + } + } + } + ); + + if (products.length < 1) { + return responseSuccess(res, 200, 'No products found'); + } + + return responseSuccess(res, 200, 'Products retrieved', { products }); + } catch (error) { + responseError(res, 400, (error as Error).message); + } +}; From c833a1f57f51d158bc1b7f40efe95e042c2e9d73 Mon Sep 17 00:00:00 2001 From: GSinseswa721 Date: Thu, 16 May 2024 01:23:23 +0300 Subject: [PATCH 10/20] google authentication --- .github/workflows/ci.yml | 3 ++ package.json | 5 +++ src/__test__/oauth.test.ts | 37 +++++++++++++++++++ src/index.ts | 7 ++++ src/routes/ProductRoutes.ts | 24 ++++++------- src/routes/UserRoutes.ts | 39 +++++++++++++++++++- src/routes/wishListRoute.ts | 10 +++--- src/utils/auth.ts | 72 +++++++++++++++++++++++++++++++++++++ 8 files changed, 178 insertions(+), 19 deletions(-) create mode 100644 src/__test__/oauth.test.ts create mode 100644 src/utils/auth.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e078f9b..e0c5f52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,9 @@ env: CLOUDNARY_API_KEY: ${{secrets.CLOUDNARY_API_KEY}} CLOUDINARY_CLOUD_NAME: ${{secrets.CLOUDINARY_CLOUD_NAME}} CLOUDINARY_API_SECRET: ${{secrets.CLOUDINARY_API_SECRET}} + GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} + GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} + jobs: build-lint-test-coverage: diff --git a/package.json b/package.json index 9851474..06e7e40 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "cross-env": "^7.0.3", "dotenv": "^16.4.5", "express": "^4.19.2", + "express-session": "^1.18.0", "express-winston": "^4.2.0", "highlight.js": "^11.9.0", "joi": "^17.13.1", @@ -43,6 +44,8 @@ "multer": "^1.4.5-lts.1", "nodemailer": "^6.9.13", "nodemon": "^3.1.0", + "passport": "^0.7.0", + "passport-google-oauth20": "^2.0.0", "pg": "^8.11.5", "reflect-metadata": "^0.2.2", "source-map-support": "^0.5.21", @@ -66,12 +69,14 @@ "@types/eslint": "^8.56.10", "@types/eslint__js": "^8.42.3", "@types/express": "^4.17.21", + "@types/express-session": "^1.18.0", "@types/jest": "^29.5.12", "@types/jsend": "^1.0.32", "@types/jsonwebtoken": "^9.0.6", "@types/morgan": "^1.9.9", "@types/node": "^20.12.7", "@types/nodemailer": "^6.4.15", + "@types/passport-google-oauth20": "^2.0.16", "@types/reflect-metadata": "^0.1.0", "@types/supertest": "^6.0.2", "@types/uuid": "^9.0.8", diff --git a/src/__test__/oauth.test.ts b/src/__test__/oauth.test.ts new file mode 100644 index 0000000..7723cb4 --- /dev/null +++ b/src/__test__/oauth.test.ts @@ -0,0 +1,37 @@ +import request from 'supertest'; +import { app, server } from '../index'; +import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; +import { User } from '../entities/User'; + +beforeAll(async () => { + // Connect to the test database + const connectionOptions = await getConnectionOptions(); + + await createConnection({ ...connectionOptions, name: 'testConnection' }); +}); + +afterAll(async () => { + const connection = getConnection('testConnection'); + const userRepository = connection.getRepository(User); + + // Delete all records from the User + await userRepository.delete({}); + + // Close the connection to the test database + await connection.close(); + + server.close(); +}); +describe('authentication routes test',() => { + it('should redirect to the google authentication page',async() => { + const response = await request(app) + .get('/user/google-auth'); + expect(response.statusCode).toBe(302) + }) + it('should redirect after google authentication', async() => { + const response = await request(app) + .get('/user/auth/google/callback'); + expect(response.statusCode).toBe(302) + }) +}); + diff --git a/src/index.ts b/src/index.ts index fb60cd4..07efd39 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,6 +5,8 @@ import router from './routes'; import { addDocumentation } from './startups/docs'; import 'reflect-metadata'; import cookieParser from 'cookie-parser'; +import session from "express-session"; +import passport from 'passport'; import { CustomError, errorHandler } from './middlewares/errorHandler'; import morgan from 'morgan'; @@ -13,6 +15,11 @@ dotenv.config(); export const app = express(); const port = process.env.PORT || 8000; +app.use(session({ + secret: 'keyboard cat' +})) +app.use(passport.initialize()) +app.use(passport.session()) app.use(express.json()); app.use(cookieParser()); app.use(cors({ origin: '*' })); diff --git a/src/routes/ProductRoutes.ts b/src/routes/ProductRoutes.ts index 98c0a50..10e5be7 100644 --- a/src/routes/ProductRoutes.ts +++ b/src/routes/ProductRoutes.ts @@ -1,4 +1,4 @@ -import { Router } from 'express'; +import { RequestHandler, Router } from 'express'; import { productStatus } from '../controllers/index'; import { hasRole } from '../middlewares/roleCheck'; @@ -17,18 +17,16 @@ import { singleProduct, } from '../controllers'; const router = Router(); - router.get('/all', listAllProducts); -router.get('/recommended', authMiddleware, hasRole('BUYER'), getRecommendedProducts); -router.get('/collection', authMiddleware, hasRole('VENDOR'), readProducts); -router.get('/', authMiddleware, hasRole('BUYER'), readProducts); -router.get('/:id', singleProduct) -router.get('/collection/:id', authMiddleware, hasRole('VENDOR'), readProduct); -router.post('/', authMiddleware, hasRole('VENDOR'), upload.array('images', 10), createProduct); -router.put('/:id', authMiddleware, hasRole('VENDOR'), upload.array('images', 10), updateProduct); -router.delete('/images/:id', authMiddleware, hasRole('VENDOR'), removeProductImage); -router.delete('/:id', authMiddleware, hasRole('VENDOR'), deleteProduct); -router.put('/availability/:id', authMiddleware, hasRole('VENDOR'), productStatus); - +router.get('/recommended', authMiddleware as RequestHandler, hasRole('BUYER'), getRecommendedProducts); +router.get('/collection', authMiddleware as RequestHandler, hasRole('VENDOR'), readProducts); +router.get('/', authMiddleware as RequestHandler, hasRole('BUYER'), readProducts); +router.get('/:id', singleProduct); +router.get('/collection/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), readProduct); +router.post('/', authMiddleware as RequestHandler, hasRole('VENDOR'), upload.array('images', 10), createProduct); +router.put('/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), upload.array('images', 10), updateProduct); +router.delete('/images/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), removeProductImage); +router.delete('/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), deleteProduct); +router.put('/availability/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), productStatus); export default router; diff --git a/src/routes/UserRoutes.ts b/src/routes/UserRoutes.ts index 2175d84..50bb4ca 100644 --- a/src/routes/UserRoutes.ts +++ b/src/routes/UserRoutes.ts @@ -1,4 +1,7 @@ import { Router } from 'express'; +import { responseError } from '../utils/response.utils'; +import { UserInterface } from '../entities/User'; +import jwt from 'jsonwebtoken' import { disable2FA, enable2FA, @@ -15,7 +18,8 @@ import { import { activateUser, disactivateUser, userProfileUpdate } from '../controllers/index'; import { hasRole } from '../middlewares/roleCheck'; import { isTokenValide } from '../middlewares/isValid'; - +import passport from 'passport'; +import "../utils/auth"; const router = Router(); router.post('/register', userRegistration); @@ -32,4 +36,37 @@ router.post('/password/reset', userPasswordReset); router.post('/password/reset/link', sendPasswordResetLink); router.put('/update', userProfileUpdate); +router.get('/google-auth', passport.authenticate('google', { scope: ['profile', 'email'] })); +router.get("/auth/google/callback", + passport.authenticate("google", { + successRedirect: "/user/login/success", + failureRedirect: "/user/login/failed" + }) +); +router.get("/login/success", async (req, res) => { + const user = req.user as UserInterface; + if(!user){ + responseError(res, 404, 'user not found') + } + const payload = { + id: user?.id, + email: user?.email, + role: user?.role + } + const token = jwt.sign(payload, process.env.JWT_SECRET as string,{expiresIn: '24h'}) + res.status(200).json({ + status: 'success', + data:{ + token: token, + message: "Login success" + } + }) +}); +router.get("/login/failed", async (req, res) => { + res.status(401).json({ + status: false, + message: "Login failed" + }); +}); + export default router; diff --git a/src/routes/wishListRoute.ts b/src/routes/wishListRoute.ts index ae92553..d5ac6fb 100644 --- a/src/routes/wishListRoute.ts +++ b/src/routes/wishListRoute.ts @@ -1,4 +1,4 @@ -import { Router } from 'express'; +import { RequestHandler, Router } from 'express'; import { authMiddleware } from '../middlewares/verifyToken'; import { hasRole } from '../middlewares'; import { checkUserStatus } from '../middlewares/isAllowed'; @@ -6,9 +6,9 @@ import { wishlistAddProduct,wishlistRemoveProduct,wishlistGetProducts,wishlistCl const router = Router(); -router.post('/add/:id', authMiddleware, checkUserStatus, hasRole('BUYER'), wishlistAddProduct); -router.get('/',authMiddleware, checkUserStatus, hasRole('BUYER'),wishlistGetProducts); -router.delete('/delete/:id',authMiddleware, checkUserStatus, hasRole('BUYER'),wishlistRemoveProduct); -router.delete('/clearAll',authMiddleware, checkUserStatus, hasRole('BUYER'),wishlistClearAllProducts); +router.post('/add/:id', authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'), wishlistAddProduct); +router.get('/',authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'),wishlistGetProducts); +router.delete('/delete/:id',authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'),wishlistRemoveProduct); +router.delete('/clearAll',authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'),wishlistClearAllProducts); export default router; \ No newline at end of file diff --git a/src/utils/auth.ts b/src/utils/auth.ts new file mode 100644 index 0000000..91874e3 --- /dev/null +++ b/src/utils/auth.ts @@ -0,0 +1,72 @@ +/* eslint-disable camelcase */ +import passport from 'passport'; +import { Strategy } from "passport-google-oauth20"; +import { User } from '../entities/User'; +import { getRepository } from 'typeorm'; +import bcrypt from 'bcrypt'; +import "../utils/auth"; +passport.use( + new Strategy( + { + clientID: process.env.GOOGLE_CLIENT_ID as string, + clientSecret: process.env.GOOGLE_CLIENT_SECRET as string, + callbackURL: 'http://localhost:6890/user/auth/google/callback/', + scope: ['email', 'profile'], + }, + async (accessToken: any, refreshToken: any, profile: any, cb: any) => { + const userRepository = getRepository(User); + const { family_name, + name, + picture, + email, + email_verified + + } = profile._json; + const { familyName, givenName } = profile.name; + + if (email || givenName || family_name || picture) { + try { + // Check for existing user + const existingUser = await userRepository.findOneBy({ email }); + + if (existingUser) { + return await cb(null, existingUser); + } + const saltRounds = 10; + const hashedPassword = await bcrypt.hash("password", saltRounds); + const newUser = new User(); + newUser.firstName = givenName; + newUser.lastName = family_name ?? familyName ?? "undefined"; + newUser.email = email; + newUser.userType = 'Buyer'; + newUser.photoUrl = picture; + newUser.gender = "Not specified"; + newUser.phoneNumber = "Not specified"; + newUser.password = hashedPassword; + newUser.verified = email_verified; + + await userRepository.save(newUser); + return await cb(null, newUser); + } catch (error) { + console.error(error); + return await cb(error, null); + } + } + return await cb(null, profile, { message: 'Missing required profile information' }); + } + ) +); + +passport.serializeUser((user: any, cb) => { + cb(null, user.id); +}); + +passport.deserializeUser(async (id: any, cb) => { + const userRepository = getRepository(User); + try { + const user = await userRepository.findOneBy({id}); + cb(null, user); + } catch (error) { + cb(error); + } +}); From 4604f39f8150940a3026ebde16ebe906428050f9 Mon Sep 17 00:00:00 2001 From: GSinseswa721 Date: Thu, 16 May 2024 13:19:19 +0300 Subject: [PATCH 11/20] product search feature --- src/__test__/productStatus.test.ts | 22 ++++++++- src/controllers/productController.ts | 26 ++++++++++- src/entities/Product.ts | 3 ++ src/routes/ProductRoutes.ts | 4 +- src/services/index.ts | 1 + src/services/productServices/createProduct.ts | 6 +++ src/services/productServices/searchProduct.ts | 45 +++++++++++++++++++ 7 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 src/services/productServices/searchProduct.ts diff --git a/src/__test__/productStatus.test.ts b/src/__test__/productStatus.test.ts index bb666cb..a770020 100644 --- a/src/__test__/productStatus.test.ts +++ b/src/__test__/productStatus.test.ts @@ -102,7 +102,7 @@ sampleProduct3.categories = [sampleCat]; const sampleProduct4 = new Product(); sampleProduct4.id = product4Id; -sampleProduct4.name = 'testingmkknkkji product4'; +sampleProduct4.name = 'testingmkknkkjiproduct4'; sampleProduct4.description = 'amazing product4'; sampleProduct4.images = ['photo1.jpg', 'photo2.jpg', 'photo3.jpg', 'photo4.jpg', 'photo5.jpg']; sampleProduct4.newPrice = 200; @@ -229,3 +229,23 @@ describe('Vendor product availability status management tests', () => { expect(response.body.message).toBe('Product not found in your stock'); }); }); + + +describe('search product by name availability tests', () => { + it('Should search product by name', async () => { + const response = await request(app) + .get(`/product/search?name=testingmkknkkjiproduct4`) + expect(response.body.data).toBeDefined; + }, 10000); + + it('should return empty array if there is product is not found in the database', async () => { + const response = await request(app) + .put(`/product/search?name=home`) + + + expect(response.statusCode).toBe(401); + expect(response.body.data).toBeUndefined; + }); + + }); + diff --git a/src/controllers/productController.ts b/src/controllers/productController.ts index ad38233..11caddd 100644 --- a/src/controllers/productController.ts +++ b/src/controllers/productController.ts @@ -14,7 +14,9 @@ import { getRecommendedProductsService, productStatusServices, - viewSingleProduct + viewSingleProduct, + searchProductService + , listAllProductsService} from '../services'; @@ -56,4 +58,24 @@ export const listAllProducts = async (req: Request, res: Response) => { }; export const singleProduct = async (req: Request, res: Response) => { await viewSingleProduct(req, res); -}; \ No newline at end of file +}; +export const searchProduct = async (req: Request, res: Response) => { + const { name, sortBy, sortOrder, page, limit } = req.query; + + try { + const searchParams = { + name: name as string, + sortBy: sortBy as string, + sortOrder: sortOrder as 'ASC' | 'DESC', + page: parseInt(page as string, 10) || 1, + limit: parseInt(limit as string, 10) || 10, + }; + + const result = await searchProductService(searchParams); + + res.json(result); + } catch (error) { + console.error('Error searching products:', error); + res.status(500).json({ error: 'Internal Server Error' }); + } +}; diff --git a/src/entities/Product.ts b/src/entities/Product.ts index e541efe..537b838 100644 --- a/src/entities/Product.ts +++ b/src/entities/Product.ts @@ -18,6 +18,9 @@ import { Order } from './Order'; @Entity() @Unique(['id']) export class Product { + static query() { + throw new Error('Method not implemented.'); + } @PrimaryGeneratedColumn('uuid') @IsNotEmpty() id!: string; diff --git a/src/routes/ProductRoutes.ts b/src/routes/ProductRoutes.ts index 10e5be7..16dcd69 100644 --- a/src/routes/ProductRoutes.ts +++ b/src/routes/ProductRoutes.ts @@ -1,6 +1,6 @@ import { RequestHandler, Router } from 'express'; -import { productStatus } from '../controllers/index'; +import { productStatus, searchProduct } from '../controllers/index'; import { hasRole } from '../middlewares/roleCheck'; import upload from '../middlewares/multer'; import { authMiddleware } from '../middlewares/verifyToken'; @@ -14,7 +14,7 @@ import { deleteProduct, getRecommendedProducts, listAllProducts, - singleProduct, + singleProduct } from '../controllers'; const router = Router(); router.get('/all', listAllProducts); diff --git a/src/services/index.ts b/src/services/index.ts index cffe7f7..589286c 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -20,6 +20,7 @@ export * from './productServices/getRecommendedProductsService'; export * from './productServices/listAllProductsService'; export * from './productServices/productStatus'; export * from './productServices/viewSingleProduct'; +export * from './productServices/searchProduct' // Buyer wishlist services export * from './wishListServices/addProduct'; diff --git a/src/services/productServices/createProduct.ts b/src/services/productServices/createProduct.ts index dbee172..34c79bf 100644 --- a/src/services/productServices/createProduct.ts +++ b/src/services/productServices/createProduct.ts @@ -12,7 +12,9 @@ declare module 'express' { } } + export const createProductService = async (req: Request, res: Response) => { + try{ const { error } = validateProduct(req.body); if (error !== undefined) { return res.status(400).json({ status: 'error', error: error?.details[0].message }); @@ -98,4 +100,8 @@ export const createProductService = async (req: Request, res: Response) => { product: { ...savedProduct } }, }); +} + catch(error){ + res.status(400).json({'message':(error as Error).message}) + } }; diff --git a/src/services/productServices/searchProduct.ts b/src/services/productServices/searchProduct.ts new file mode 100644 index 0000000..765f431 --- /dev/null +++ b/src/services/productServices/searchProduct.ts @@ -0,0 +1,45 @@ +import { Request, Response } from "express"; +import { getRepository, Like } from 'typeorm'; +import { Product } from '../../entities/Product'; + +interface SearchProductParams { + name?: string; + sortBy?: string; + sortOrder?: 'ASC' | 'DESC'; + page?: number; + limit?: number; +} + +export const searchProductService = async (params: SearchProductParams) => { + const { name, sortBy, sortOrder, page = 1, limit = 10 } = params; + + const productRepository = getRepository(Product); + let query = productRepository.createQueryBuilder('product'); + + if (name) { + query = query.where('product.name LIKE :name', { name: `%${name}%` }); + } + + if (sortBy && sortOrder) { + query = query.orderBy(`product.${sortBy}`, sortOrder as 'ASC' | 'DESC'); + } + + const skip = (page - 1) * limit; + + const [products, total] = await query + .skip(skip) + .take(limit) + .getManyAndCount(); + + const totalPages = Math.ceil(total / limit); + + return { + data: products, + pagination: { + totalItems: total, + currentPage: page, + totalPages, + itemsPerPage: limit, + }, + }; +}; From 57538b3ead576b383ac861634a6443b82cb301dc Mon Sep 17 00:00:00 2001 From: Mc-Knight Date: Thu, 23 May 2024 02:04:48 +0200 Subject: [PATCH 12/20] feat(cart managment) add cart managment this commit adds cart entity, cart item entity with its relation of a guest/buyer user and product. it is used to implement cart managment for guest/buyer. Resolves: #88 --- src/__test__/cart.test.test.ts | 524 ++++++++++++++++++ src/controllers/cartController.ts | 18 + src/docs/cartDocs.yml | 103 ++++ src/entities/Cart.ts | 50 ++ src/entities/CartItem.ts | 53 ++ src/entities/Product.ts | 4 +- src/entities/User.ts | 2 - src/helper/cartItemValidator.ts | 19 + src/middlewares/optionalAuthorization.ts | 51 ++ src/routes/CartRoutes.ts | 12 + src/routes/index.ts | 6 +- src/services/cartServices/clearCart.ts | 60 ++ src/services/cartServices/createCart.ts | 152 +++++ src/services/cartServices/readCart.ts | 58 ++ .../cartServices/removeProductInCart.ts | 109 ++++ src/services/index.ts | 10 +- src/services/productServices/createProduct.ts | 155 +++--- 17 files changed, 1299 insertions(+), 87 deletions(-) create mode 100644 src/__test__/cart.test.test.ts create mode 100644 src/controllers/cartController.ts create mode 100644 src/docs/cartDocs.yml create mode 100644 src/entities/Cart.ts create mode 100644 src/entities/CartItem.ts create mode 100644 src/helper/cartItemValidator.ts create mode 100644 src/middlewares/optionalAuthorization.ts create mode 100644 src/routes/CartRoutes.ts create mode 100644 src/services/cartServices/clearCart.ts create mode 100644 src/services/cartServices/createCart.ts create mode 100644 src/services/cartServices/readCart.ts create mode 100644 src/services/cartServices/removeProductInCart.ts diff --git a/src/__test__/cart.test.test.ts b/src/__test__/cart.test.test.ts new file mode 100644 index 0000000..feb3798 --- /dev/null +++ b/src/__test__/cart.test.test.ts @@ -0,0 +1,524 @@ +import request from 'supertest'; +import jwt from 'jsonwebtoken'; +import { app, server } from '../index'; +import { getConnection } from 'typeorm'; +import { dbConnection } from '../startups/dbConnection'; +import { v4 as uuid } from 'uuid'; +import { User, UserInterface } from '../entities/User'; +import { Product } from '../entities/Product'; +import { Category } from '../entities/Category'; +import { Cart } from '../entities/Cart'; +import { CartItem } from '../entities/CartItem'; + +const vendor1Id = uuid(); +const buyer1Id = uuid(); +const buyer2Id = uuid(); +const product1Id = uuid(); +const product2Id = uuid(); +const catId = uuid(); +const cart1Id = uuid(); +const cartItemId = uuid(); +const sampleCartId = uuid(); +const sampleCartItemId = uuid(); +const samplecartItem3Id = uuid(); + +const jwtSecretKey = process.env.JWT_SECRET || ''; + +const getAccessToken = (id: string, email: string) => { + return jwt.sign( + { + id: id, + email: email, + }, + jwtSecretKey + ); +}; + +const sampleVendor1: UserInterface = { + id: vendor1Id, + firstName: 'vendor1', + lastName: 'user', + email: 'vendor1@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', +}; + +const sampleBuyer1: UserInterface = { + id: buyer1Id, + firstName: 'buyer1', + lastName: 'user', + email: 'buyer1@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; + +const sampleBuyer2: UserInterface = { + id: buyer2Id, + firstName: 'buyer1', + lastName: 'user', + email: 'buyer12@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '126380996348', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; + +const sampleCat = { + id: catId, + name: 'accessories', +}; + +const sampleProduct1 = { + id: product1Id, + name: 'test product', + description: 'amazing product', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor1, + categories: [sampleCat], +}; + +const sampleProduct2 = { + id: product2Id, + name: 'test product2', + description: 'amazing product2', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg', 'photo4.jpg', 'photo5.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor1, + categories: [sampleCat], +}; + +const sampleCart1 = { + id: cart1Id, + user: sampleBuyer1, + totalAmount: 200, +}; + +const sampleCart2 = { + id: sampleCartId, + totalAmount: 200, +}; + +const sampleCartItem1 = { + id: cartItemId, + product: sampleProduct1, + cart: sampleCart1, + quantity: 2, + newPrice: 200, + total: 400, +}; + +const sampleCartItem2 = { + id: sampleCartItemId, + product: sampleProduct2, + cart: sampleCart1, + quantity: 2, + newPrice: 200, + total: 400, +}; + +const sampleCartItem3 = { + id: samplecartItem3Id, + product: sampleProduct2, + cart: sampleCart2, + quantity: 2, + newPrice: 200, + total: 400, +}; + +const bodyTosend = { + productId: product1Id, + quantity: 2, +}; + +beforeAll(async () => { + const connection = await dbConnection(); + + const categoryRepository = connection?.getRepository(Category); + await categoryRepository?.save({ ...sampleCat }); + + const userRepository = connection?.getRepository(User); + await userRepository?.save({ ...sampleVendor1 }); + await userRepository?.save({ ...sampleBuyer1 }); + await userRepository?.save({ ...sampleBuyer2 }); + + const productRepository = connection?.getRepository(Product); + await productRepository?.save({ ...sampleProduct1 }); + await productRepository?.save({ ...sampleProduct2 }); + + const cartRepository = connection?.getRepository(Cart); + await cartRepository?.save({ ...sampleCart1 }); + await cartRepository?.save({ ...sampleCart2 }); + + const cartItemRepository = connection?.getRepository(CartItem); + await cartItemRepository?.save({ ...sampleCartItem1 }); + await cartItemRepository?.save({ ...sampleCartItem2 }); + await cartItemRepository?.save({ ...sampleCartItem3 }); +}); + +afterAll(async () => { + const connection = getConnection(); + + const userRepository = connection.getRepository(User); + const categoryRepository = connection.getRepository(Category); + const productRepository = connection.getRepository(Product); + const cartRepository = connection.getRepository(Cart); + + await cartRepository.delete({}); + await productRepository.delete({}); + await categoryRepository.delete({}); + await userRepository.delete({}); + + // Close the connection to the test database + await connection.close(); + server.close(); +}); + +describe('Cart management for guest/buyer', () => { + describe('Creating new product', () => { + it('should create new product', async () => { + const response = await request(app) + .post('/product') + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.product).toBeDefined; + }, 60000); + + it('return an error if the number of product images exceeds 6', async () => { + const response = await request(app) + .post(`/product/`) + .field('name', 'test-product-images') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.error).toBe('Product cannot have more than 6 images'); + }); + + it('should not create new product it already exist', async () => { + const response = await request(app) + .post('/product') + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('categories', sampleCat.name) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(409); + }); + + it('should not create new product, if there are missing field data', async () => { + const response = await request(app) + .post('/product') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('categories', sampleCat.name) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + }); + + it('should not create new product, images are not at least more than 1', async () => { + const response = await request(app) + .post('/product') + .field('name', 'test-product-image') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('categories', sampleCat.name) + .attach('images', `${__dirname}/test-assets/photo1.png`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + }); + }); + + describe('Adding product to cart on guest/buyer', () => { + it('should get cart items of authenticated user', async () => { + const response = await request(app) + .get('/cart') + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('Cart retrieved successfully'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should get cart items of authenticated user', async () => { + const response = await request(app) + .get('/cart') + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('Cart is empty'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should add product to cart as authenticated buyer', async () => { + const response = await request(app) + .post(`/cart`) + .send(bodyTosend) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.message).toBe('cart updated successfully'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should add product to cart as guest', async () => { + const response = await request(app).post(`/cart`).send(bodyTosend); + + expect(response.status).toBe(201); + expect(response.body.data.message).toBe('cart updated successfully'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should get cart items of guest user', async () => { + const response = await request(app).get('/cart'); + + expect(response.status).toBe(200); + expect(response.body.data.cart).toBeDefined; + }); + + it('should return 400 if you do not send proper request body', async () => { + const response = await request(app).post(`/cart`); + + expect(response.status).toBe(400); + }); + + it('should not add product to cart if product does not exist', async () => { + const response = await request(app) + .post(`/cart`) + .send({ productId: uuid(), quantity: 2 }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Product not found, try again.'); + }); + + it('should not add product to cart if quantity is less than 1', async () => { + const response = await request(app) + .post(`/cart`) + .send({ productId: product1Id, quantity: 0 }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBe('Quantity must be greater than 0'); + }); + + it('should chnage quantity of product in cart if it is already there', async () => { + const response = await request(app) + .post(`/cart`) + .send({ productId: product1Id, quantity: 3 }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.message).toBe('cart updated successfully'); + expect(response.body.data.cart).toBeDefined; + }); + }); + + describe('Getting cart items', () => { + it('should get cart items of authenticated user', async () => { + const response = await request(app) + .get('/cart') + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('Cart retrieved successfully'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should get cart items of guest user', async () => { + const response = await request(app).get('/cart'); + + expect(response.status).toBe(200); + expect(response.body.data.cart).toBeDefined; + }); + + it('should get cart items of guest user as empty with wrong cartId', async () => { + const response = await request(app) + .get('/cart') + .set('Cookie', [`cartId=${uuid()}`]); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('Cart is empty'); + expect(response.body.data.cart).toBeDefined; + }); + }); + + describe('Deleting product from cart', () => { + it('should return 404 if product does not exist in cart', async () => { + const response = await request(app) + .delete(`/cart/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Cart item not found'); + }); + + it('should return 401 if you try to delete item not in your cart', async () => { + const response = await request(app) + .delete(`/cart/${cartItemId}`) + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + + expect(response.status).toBe(401); + expect(response.body.message).toBe('You are not authorized to perform this action'); + }); + + it('should delete product from cart', async () => { + const response = await request(app) + .delete(`/cart/${sampleCartItemId}`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('Product removed from cart successfully'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should delete product from cart', async () => { + const response = await request(app) + .delete(`/cart/${cartItemId}`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('cart removed successfully'); + }); + + it('should add product to cart as authenticated buyer', async () => { + const response = await request(app) + .post(`/cart`) + .send(bodyTosend) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.message).toBe('cart updated successfully'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should add product to cart as authenticated buyer', async () => { + const response = await request(app) + .post(`/cart`) + .send({ productId: product2Id, quantity: 2 }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.message).toBe('cart updated successfully'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should return 404 if product does not exist in guest cart', async () => { + const response = await request(app).delete(`/cart/${uuid()}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Cart item not found'); + }); + + it('should return 404 if product does not exist in guest cart', async () => { + const response = await request(app).delete(`/cart/${samplecartItem3Id}`); + + expect(response.status).toBe(200); + }); + }); + + describe('Clearing cart', () => { + it('should return 200 as authenticated buyer does not have a cart', async () => { + const response = await request(app) + .delete(`/cart`) + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('Cart is empty'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should add product to cart as authenticated buyer', async () => { + const response = await request(app) + .post(`/cart`) + .send(bodyTosend) + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.message).toBe('cart updated successfully'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should clear cart as authenticated buyer', async () => { + const response = await request(app) + .delete(`/cart`) + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('Cart cleared successfully'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should return 200 as guest does not have a cart', async () => { + const response = await request(app).delete(`/cart`); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('Cart is empty'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should get cart items of guest user as empty with wrong cartId', async () => { + const response = await request(app) + .get('/cart') + .set('Cookie', [`cartId=${uuid()}`]); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('Cart is empty'); + expect(response.body.data.cart).toBeDefined; + }); + + it('should delete cart items of guest user as empty with wrong cartId', async () => { + const response = await request(app) + .delete('/cart') + .set('Cookie', [`cartId=${sampleCartId}`]); + + expect(response.status).toBe(200); + expect(response.body.data.message).toBe('Cart is empty'); + expect(response.body.data.cart).toBeDefined; + }); + }); +}); diff --git a/src/controllers/cartController.ts b/src/controllers/cartController.ts new file mode 100644 index 0000000..3411103 --- /dev/null +++ b/src/controllers/cartController.ts @@ -0,0 +1,18 @@ +import { Request, Response } from 'express'; +import { createCartService, readCartService, removeProductInCartService, clearCartService } from '../services'; + +export const createCart = async (req: Request, res: Response) => { + await createCartService(req, res); +}; + +export const readCart = async (req: Request, res: Response) => { + await readCartService(req, res); +}; + +export const removeProductInCart = async (req: Request, res: Response) => { + await removeProductInCartService(req, res); +}; + +export const clearCart = async (req: Request, res: Response) => { + await clearCartService(req, res); +}; diff --git a/src/docs/cartDocs.yml b/src/docs/cartDocs.yml new file mode 100644 index 0000000..9962129 --- /dev/null +++ b/src/docs/cartDocs.yml @@ -0,0 +1,103 @@ +/cart: + get: + tags: + - Cart + summary: Get all products in cart + description: Return all products in cart for either guest user or authenticated user + security: + - bearerAuth: [] + responses: + '200': + description: Return all products in cart for the user or return empty cart if no product available + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + + post: + tags: + - Cart + summary: Add product to cart or updates its quantity + description: Add product to cart or updates its quantity for either guest user or authenticated user + security: + - bearerAuth: [] + consumes: + - application/json + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + productId: + type: string + description: The id of product + quantity: + type: integer + description: The quantity of product + responses: + '200': + description: Product added to cart + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found + '500': + description: Internal server error + + delete: + tags: + - Cart + summary: Clear entire cart + description: Clears entire cart for either guest user or authenticated user + security: + - bearerAuth: [] + responses: + '200': + description: Cart cleared + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + +/cart/{id}: + delete: + tags: + - Cart + summary: Remove cart item from cart + description: Remove cart item from cart for either guest user or authenticated user + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of cart item + responses: + '200': + description: Product removed from cart + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found + '500': + description: Internal server error diff --git a/src/entities/Cart.ts b/src/entities/Cart.ts new file mode 100644 index 0000000..0ba44a6 --- /dev/null +++ b/src/entities/Cart.ts @@ -0,0 +1,50 @@ +import { + Entity, + PrimaryGeneratedColumn, + Column, + ManyToOne, + OneToMany, + CreateDateColumn, + UpdateDateColumn, +} from 'typeorm'; +import { IsNotEmpty, IsBoolean } from 'class-validator'; +import { User } from './User'; +import { CartItem } from './CartItem'; + +@Entity() +export class Cart { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => User) + user!: User; + + @OneToMany(() => CartItem, (cartItem: any) => cartItem.cart) + items!: CartItem[]; + + @Column('decimal') + totalAmount: number = 0; + + @Column({ default: false }) + @IsBoolean() + isCheckedOut: boolean = false; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; + + updateTotal(): void { + if (this.items) { + let total: number = 0; + for (let i = 0; i < this.items.length; i++) { + total += Number(this.items[i].total); + } + this.totalAmount = total; + } else { + this.totalAmount = 0; + } + } +} diff --git a/src/entities/CartItem.ts b/src/entities/CartItem.ts new file mode 100644 index 0000000..107170c --- /dev/null +++ b/src/entities/CartItem.ts @@ -0,0 +1,53 @@ +import { + Entity, + PrimaryGeneratedColumn, + Column, + ManyToOne, + CreateDateColumn, + UpdateDateColumn, + BeforeInsert, + BeforeUpdate, +} from 'typeorm'; +import { IsNotEmpty, IsNumber } from 'class-validator'; +import { Product } from './Product'; +import { Cart } from './Cart'; + +@Entity() +export class CartItem { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => Cart, cart => cart.items, { onDelete: 'CASCADE' }) + @IsNotEmpty() + cart!: Cart; + + @ManyToOne(() => Product) + @IsNotEmpty() + product!: Product; + + @Column('decimal') + @IsNotEmpty() + @IsNumber() + newPrice!: number; + + @Column('int') + @IsNotEmpty() + @IsNumber() + quantity!: number; + + @Column('decimal') + total!: number; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; + + @BeforeInsert() + @BeforeUpdate() + updateTotal(): void { + this.total = this.newPrice * this.quantity; + } +} diff --git a/src/entities/Product.ts b/src/entities/Product.ts index 537b838..82603a4 100644 --- a/src/entities/Product.ts +++ b/src/entities/Product.ts @@ -10,7 +10,7 @@ import { OneToMany, JoinTable, } from 'typeorm'; -import { IsNotEmpty, IsString, IsBoolean, ArrayNotEmpty, IsArray, MaxLength } from 'class-validator'; +import { IsNotEmpty, IsString, IsBoolean, ArrayNotEmpty, IsArray, MaxLength } from 'class-validator'; import { User } from './User'; import { Category } from './Category'; import { Order } from './Order'; @@ -19,7 +19,7 @@ import { Order } from './Order'; @Unique(['id']) export class Product { static query() { - throw new Error('Method not implemented.'); + throw new Error('Method not implemented.'); } @PrimaryGeneratedColumn('uuid') @IsNotEmpty() diff --git a/src/entities/User.ts b/src/entities/User.ts index 71b323e..2f55da0 100644 --- a/src/entities/User.ts +++ b/src/entities/User.ts @@ -12,7 +12,6 @@ import { IsEmail, IsNotEmpty, IsString, IsBoolean, IsIn } from 'class-validator' import { roles } from '../utils/roles'; import { Order } from './Order'; - export interface UserInterface { id?: string; firstName: string; @@ -99,7 +98,6 @@ export class User { @OneToMany(() => Order, (order: any) => order.buyer) orders!: Order[]; - @CreateDateColumn() createdAt!: Date; diff --git a/src/helper/cartItemValidator.ts b/src/helper/cartItemValidator.ts new file mode 100644 index 0000000..c8de0e8 --- /dev/null +++ b/src/helper/cartItemValidator.ts @@ -0,0 +1,19 @@ +import Joi from 'joi'; + +interface CartItem { + productId: string; + quantity: number; +} + +export const validateCartItem = (product: CartItem): Joi.ValidationResult => { + const schema = Joi.object({ + productId: Joi.string().min(3).required().messages({ + 'any.required': 'id is required.', + }), + quantity: Joi.number().required().messages({ + 'any.required': 'quantity is required.', + }), + }); + + return schema.validate(product); +}; diff --git a/src/middlewares/optionalAuthorization.ts b/src/middlewares/optionalAuthorization.ts new file mode 100644 index 0000000..0024ee1 --- /dev/null +++ b/src/middlewares/optionalAuthorization.ts @@ -0,0 +1,51 @@ +import { Request, Response, NextFunction } from 'express'; +import { User, UserInterface } from '../entities/User'; +import { getRepository } from 'typeorm'; +import jwt, { type JwtPayload, type Secret } from 'jsonwebtoken'; +import { responseError } from '../utils/response.utils'; +import dotenv from 'dotenv'; + +dotenv.config(); + +interface AuthRequest extends Request { + user?: UserInterface; +} + +export const optinalAuthMiddleware = async (req: AuthRequest, res: Response, next: NextFunction) => { + const authHeader = req.headers.authorization; + + if (authHeader !== undefined) { + const [bearer, token] = authHeader.split(' '); + + if (bearer !== 'Bearer' || token === undefined) { + responseError(res, 401, 'Please login'); + } + + if (token !== undefined) { + try { + jwt.verify(token, process.env.JWT_SECRET as Secret, async (err, decodedToken) => { + if (err !== null) { + responseError(res, 403, 'Access denied'); + } + + if (decodedToken !== undefined) { + const { email } = decodedToken as JwtPayload; + const userRepository = getRepository(User); + const user = await userRepository.findOneBy({ email }); + + if (!user) { + responseError(res, 401, 'You are not Authorized'); + } + + req.user = user as UserInterface; + next(); + } + }); + } catch (error) { + responseError(res, 401, 'Invalid token'); + } + } + } else { + next(); + } +}; diff --git a/src/routes/CartRoutes.ts b/src/routes/CartRoutes.ts new file mode 100644 index 0000000..ca74292 --- /dev/null +++ b/src/routes/CartRoutes.ts @@ -0,0 +1,12 @@ +import { RequestHandler, Router } from 'express'; +import { createCart, readCart, removeProductInCart, clearCart } from '../controllers/cartController'; +import { optinalAuthMiddleware } from '../middlewares/optionalAuthorization'; + +const router = Router(); + +router.post('/', optinalAuthMiddleware as RequestHandler, createCart); +router.get('/', optinalAuthMiddleware as RequestHandler, readCart); +router.delete('/:id', optinalAuthMiddleware as RequestHandler, removeProductInCart); +router.delete('/', optinalAuthMiddleware as RequestHandler, clearCart); + +export default router; diff --git a/src/routes/index.ts b/src/routes/index.ts index bf38aab..3c6edec 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -2,7 +2,8 @@ import { Request, Response, Router } from 'express'; import { responseSuccess } from '../utils/response.utils'; import userRoutes from './UserRoutes'; import productRoutes from './ProductRoutes'; -import wishListRoutes from './wishListRoute' +import wishListRoutes from './wishListRoute'; +import cartRoutes from './CartRoutes'; const router = Router(); @@ -12,6 +13,7 @@ router.get('/', (req: Request, res: Response) => { router.use('/user', userRoutes); router.use('/product', productRoutes); -router.use('/wish-list',wishListRoutes); +router.use('/wish-list', wishListRoutes); +router.use('/cart', cartRoutes); export default router; diff --git a/src/services/cartServices/clearCart.ts b/src/services/cartServices/clearCart.ts new file mode 100644 index 0000000..4806e01 --- /dev/null +++ b/src/services/cartServices/clearCart.ts @@ -0,0 +1,60 @@ +import { Request, Response } from 'express'; +import { Cart } from '../../entities/Cart'; +import { responseSuccess, responseError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; + +export const clearCartService = async (req: Request, res: Response) => { + try { + const cartRepository = getRepository(Cart); + + if (req.user) { + const cart = await cartRepository.findOne({ + where: { + user: { + id: req.user.id, + }, + isCheckedOut: false, + }, + relations: ['items', 'items.product', 'user'], + }); + + if (!cart) { + responseSuccess(res, 200, 'Cart is empty', { cart: [] }); + return; + } + + await cartRepository.remove(cart as Cart); + + responseSuccess(res, 200, 'Cart cleared successfully', { cart: [] }); + return; + } + + if (!req.user) { + if (!req.cookies.cartId) { + responseSuccess(res, 200, 'Cart is empty', { cart: [] }); + return; + } + + const cart = await cartRepository.findOne({ + where: { + id: req.cookies.cartId, + isCheckedOut: false, + }, + relations: ['items', 'items.product'], + }); + + if (!cart) { + responseSuccess(res, 200, 'Cart is empty', { cart: [] }); + return; + } + + await cartRepository.remove(cart as Cart); + + responseSuccess(res, 200, 'Cart cleared successfully', { cart: [] }); + return; + } + } catch (error) { + responseError(res, 400, (error as Error).message); + return; + } +}; diff --git a/src/services/cartServices/createCart.ts b/src/services/cartServices/createCart.ts new file mode 100644 index 0000000..4fa3646 --- /dev/null +++ b/src/services/cartServices/createCart.ts @@ -0,0 +1,152 @@ +import { Request, Response } from 'express'; +import { CartItem } from '../../entities/CartItem'; +import { Cart } from '../../entities/Cart'; +import { Product } from '../../entities/Product'; +import { User } from '../../entities/User'; +import { getRepository } from 'typeorm'; +import { validateCartItem } from '../../helper/cartItemValidator'; +import { responseSuccess, responseError } from '../../utils/response.utils'; + +export const createCartService = async (req: Request, res: Response) => { + try { + const { error } = validateCartItem(req.body); + if (error) { + responseError(res, 400, error.details[0].message); + return; + } + + if (req.body.quantity < 1) { + responseError(res, 400, 'Quantity must be greater than 0'); + return; + } + + const product = await getRepository(Product).findOne({ + where: { id: req.body.productId }, + }); + + if (!product) { + responseError(res, 404, 'Product not found, try again.'); + return; + } + + if (req.user) { + const cartRepository = getRepository(Cart); + const cartItemRepository = getRepository(CartItem); + + let cart = await cartRepository.findOne({ + where: { + user: { id: req.user.id }, + isCheckedOut: false, + }, + relations: ['items', 'items.product'], + }); + + if (!cart) { + cart = new Cart(); + cart.user = req.user as User; + await cartRepository.save(cart); + } + + let cartItem = await cartItemRepository.findOne({ + where: { + cart: { id: cart.id }, + product: { id: req.body.productId }, + }, + }); + + if (cartItem) { + cartItem.quantity = req.body.quantity; + cartItem.newPrice = product.newPrice; + await cartItemRepository.save(cartItem); + } else { + cartItem = new CartItem(); + cartItem.cart = cart; + cartItem.product = product; + cartItem.newPrice = product.newPrice; + cartItem.quantity = req.body.quantity; + await cartItemRepository.save(cartItem); + } + + // Fetch the updated cart with items and user + cart = await cartRepository.findOne({ + where: { id: cart.id }, + relations: ['items', 'items.product', 'user'], + }); + + if (cart) { + // Update the total amount in the cart + cart.updateTotal(); + await cartRepository.save(cart); + + const responseCart = { + ...cart, + user: cart?.user.id, + }; + + responseSuccess(res, 201, 'cart updated successfully', { cart: responseCart }); + return; + } + } + + if (!req.user) { + // guest user + const cartRepository = getRepository(Cart); + const cartItemRepository = getRepository(CartItem); + + let cart; + if (req.cookies.cartId) { + cart = await cartRepository.findOne({ + where: { + id: req.cookies?.cartId, + isCheckedOut: false, + }, + relations: ['items', 'items.product'], + }); + } + + if (!cart) { + cart = new Cart(); + await cartRepository.save(cart); + } + + let cartItem = await cartItemRepository.findOne({ + where: { + cart: { id: cart.id }, + product: { id: req.body.productId }, + }, + }); + + if (cartItem) { + cartItem.quantity = req.body.quantity; + cartItem.newPrice = product.newPrice; + await cartItemRepository.save(cartItem); + } else { + cartItem = new CartItem(); + cartItem.cart = cart; + cartItem.product = product; + cartItem.newPrice = product.newPrice; + cartItem.quantity = req.body.quantity; + await cartItemRepository.save(cartItem); + } + + // Fetch the updated cart with items and user + cart = await cartRepository.findOne({ + where: { id: cart.id }, + relations: ['items', 'items.product', 'user'], + }); + + if (cart) { + // Update the total amount in the cart + cart.updateTotal(); + await cartRepository.save(cart); + + res.cookie('cartId', cart.id); + responseSuccess(res, 201, 'cart updated successfully', { cart }); + return; + } + } + } catch (error) { + responseError(res, 400, (error as Error).message); + return; + } +}; diff --git a/src/services/cartServices/readCart.ts b/src/services/cartServices/readCart.ts new file mode 100644 index 0000000..71d7a4d --- /dev/null +++ b/src/services/cartServices/readCart.ts @@ -0,0 +1,58 @@ +import { Request, Response } from 'express'; +import { Cart } from '../../entities/Cart'; +import { User } from '../../entities/User'; +import { getRepository } from 'typeorm'; +import { responseSuccess, responseError } from '../../utils/response.utils'; + +export const readCartService = async (req: Request, res: Response) => { + try { + const cartRepository = getRepository(Cart); + + if (req.user) { + const cart = await cartRepository.findOne({ + where: { + user: { + id: req.user.id, + }, + isCheckedOut: false, + }, + relations: ['items', 'items.product', 'user'], + }); + + if (!cart) { + responseSuccess(res, 200, 'Cart is empty', { cart: [] }); + return; + } + + cart.user = cart.user.id as unknown as User; + responseSuccess(res, 200, 'Cart retrieved successfully', { cart }); + return; + } + + if (!req.user) { + if (!req.cookies.cartId) { + responseSuccess(res, 200, 'Cart is empty', { cart: [] }); + return; + } + + const cart = await cartRepository.findOne({ + where: { + id: req.cookies.cartId, + isCheckedOut: false, + }, + relations: ['items', 'items.product'], + }); + + if (!cart) { + responseSuccess(res, 200, 'Cart is empty', { cart: [] }); + return; + } + + responseSuccess(res, 200, 'Cart retrieved successfully', { cart }); + return; + } + } catch (error) { + responseError(res, 400, (error as Error).message); + return; + } +}; diff --git a/src/services/cartServices/removeProductInCart.ts b/src/services/cartServices/removeProductInCart.ts new file mode 100644 index 0000000..25bfe13 --- /dev/null +++ b/src/services/cartServices/removeProductInCart.ts @@ -0,0 +1,109 @@ +import { Request, Response } from 'express'; +import { CartItem } from '../../entities/CartItem'; +import { Cart } from '../../entities/Cart'; +import { User } from '../../entities/User'; +import { getRepository } from 'typeorm'; +import { responseSuccess, responseError } from '../../utils/response.utils'; + +export const removeProductInCartService = async (req: Request, res: Response) => { + try { + const cartItemRepository = getRepository(CartItem); + const cartRepository = getRepository(Cart); + + if (!req.params.id) { + responseError(res, 400, 'Cart item id is required'); + return; + } + + const cartItem = await cartItemRepository.findOne({ + where: { + id: req.params.id, + }, + relations: ['cart', 'cart.user'], + }); + + if (!cartItem) { + responseError(res, 404, 'Cart item not found'); + return; + } + + if (req.user) { + if (cartItem?.cart.user.id !== req.user.id) { + responseError(res, 401, 'You are not authorized to perform this action'); + return; + } + + await cartItemRepository.remove(cartItem as CartItem); + + const cart = await cartRepository.findOne({ + where: { + id: cartItem?.cart.id, + }, + relations: ['items', 'items.product', 'user'], + }); + + if (cart) { + if (cart.items.length === 0) { + await cartRepository.remove(cart as Cart); + + responseSuccess(res, 200, 'cart removed successfully', { cart: [] }); + return; + } + + cart.updateTotal(); + await cartRepository.save(cart as Cart); + + cart.user = cart?.user.id as unknown as User; + + responseSuccess(res, 200, 'Product removed from cart successfully', { cart }); + return; + } + } + + if (!req.user) { + if (!req.params.id) { + responseError(res, 400, 'Cart item id is required'); + return; + } + + const cartItem = await cartItemRepository.findOne({ + where: { + id: req.params.id, + }, + relations: ['cart'], + }); + + if (!cartItem) { + responseError(res, 404, 'Cart item not found'); + return; + } + + await cartItemRepository.remove(cartItem); + + const cart = await cartRepository.findOne({ + where: { + id: cartItem.cart.id, + }, + relations: ['items', 'items.product'], + }); + + if (cart) { + if (cart.items.length === 0) { + await cartRepository.remove(cart); + + responseSuccess(res, 200, 'cart removed successfully', { cart: [] }); + return; + } + + cart.updateTotal(); + await cartRepository.save(cart); + + responseSuccess(res, 200, 'Product removed from cart successfully', { cart }); + return; + } + } + } catch (error) { + responseError(res, 400, (error as Error).message); + return; + } +}; diff --git a/src/services/index.ts b/src/services/index.ts index 589286c..8f560c3 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -20,10 +20,16 @@ export * from './productServices/getRecommendedProductsService'; export * from './productServices/listAllProductsService'; export * from './productServices/productStatus'; export * from './productServices/viewSingleProduct'; -export * from './productServices/searchProduct' +export * from './productServices/searchProduct'; // Buyer wishlist services export * from './wishListServices/addProduct'; export * from './wishListServices/getProducts'; export * from './wishListServices/removeProducts'; -export * from './wishListServices/clearAll'; \ No newline at end of file +export * from './wishListServices/clearAll'; + +// cart managment +export * from './cartServices/createCart'; +export * from './cartServices/readCart'; +export * from './cartServices/removeProductInCart'; +export * from './cartServices/clearCart'; diff --git a/src/services/productServices/createProduct.ts b/src/services/productServices/createProduct.ts index 34c79bf..668ddd2 100644 --- a/src/services/productServices/createProduct.ts +++ b/src/services/productServices/createProduct.ts @@ -12,96 +12,93 @@ declare module 'express' { } } - export const createProductService = async (req: Request, res: Response) => { - try{ - const { error } = validateProduct(req.body); - if (error !== undefined) { - return res.status(400).json({ status: 'error', error: error?.details[0].message }); - } - - const existingProduct = await getRepository(Product).findOne({ - where: { - name: req.body.name, - vendor: { - id: req.user?.id - } - }, - }); + try { + const { error } = validateProduct(req.body); + if (error !== undefined) { + return res.status(400).json({ status: 'error', error: error?.details[0].message }); + } - if (existingProduct) { - return res.status(409).json({ status: 'error', error: 'Its looks like Product already exists' }); - } + const existingProduct = await getRepository(Product).findOne({ + where: { + name: req.body.name, + vendor: { + id: req.user?.id, + }, + }, + }); - const files: any = req.files; + if (existingProduct) { + return res.status(409).json({ status: 'error', error: 'Its looks like Product already exists' }); + } - if (files.length < 2) { - return res.status(400).json({ status: 'error', error: 'Please upload more than one image' }); - } - if (files.length > 6) { - return res.status(400).json({ status: 'error', error: 'Product cannot have more than 6 images' }); - } + const files: any = req.files; - const imageUrls: string[] = []; - for (const file of files) { - const image = file.path; - const link = await cloudinary.uploader.upload(image); - imageUrls.push(link.secure_url); - } + if (files.length < 2) { + return res.status(400).json({ status: 'error', error: 'Please upload more than one image' }); + } + if (files.length > 6) { + return res.status(400).json({ status: 'error', error: 'Product cannot have more than 6 images' }); + } - const product = new Product(); - product.name = req.body.name; - product.description = req.body.description; - product.newPrice = req.body.newPrice; - product.quantity = req.body.quantity; - product.images = imageUrls; + const imageUrls: string[] = []; + for (const file of files) { + const image = file.path; + const link = await cloudinary.uploader.upload(image); + imageUrls.push(link.secure_url); + } - if (req.body.expirationDate) { - product.expirationDate = req.body.expirationDate; - } - product.vendor = req.user as User; + const product = new Product(); + product.name = req.body.name; + product.description = req.body.description; + product.newPrice = req.body.newPrice; + product.quantity = req.body.quantity; + product.images = imageUrls; + if (req.body.expirationDate) { + product.expirationDate = req.body.expirationDate; + } + product.vendor = req.user as User; - const categoryRepository = getRepository(Category); - let categories = []; - if (typeof req.body.categories === 'string') { - let category = await categoryRepository.findOne({ - where: { name: req.body.categories.toLowerCase() } - }); - if (!category) { - category = new Category(); - category.name = req.body.categories.toLowerCase(); - category = await categoryRepository.save(category); + const categoryRepository = getRepository(Category); + let categories = []; + if (typeof req.body.categories === 'string') { + let category = await categoryRepository.findOne({ + where: { name: req.body.categories.toLowerCase() }, + }); + if (!category) { + category = new Category(); + category.name = req.body.categories.toLowerCase(); + category = await categoryRepository.save(category); + } + categories.push(category); + } else { + categories = await Promise.all( + req.body.categories.map(async (categoryName: string) => { + let category = await categoryRepository.findOne({ where: { name: categoryName.toLowerCase() } }); + if (!category) { + category = new Category(); + category.name = categoryName.toLowerCase(); + await categoryRepository.save(category); + } + return category; + }) + ); } - categories.push(category); - } else { - categories = await Promise.all( - req.body.categories.map(async (categoryName: string) => { - let category = await categoryRepository.findOne({ where: { name: categoryName.toLowerCase() } }); - if (!category) { - category = new Category(); - category.name = categoryName.toLowerCase(); - await categoryRepository.save(category); - } - return category; - }) - ); - } - product.categories = categories; + product.categories = categories; - const productRepository = getRepository(Product); - const savedProduct = await productRepository.save(product); + const productRepository = getRepository(Product); + const savedProduct = await productRepository.save(product); - product.vendor = product.vendor.id as unknown as User; - return res.status(201).json({ - status: 'success', - data: { - message: 'Product created successfully', - product: { ...savedProduct } - }, - }); -} - catch(error){ - res.status(400).json({'message':(error as Error).message}) + product.vendor = product.vendor.id as unknown as User; + return res.status(201).json({ + status: 'success', + data: { + message: 'Product created successfully', + product: { ...savedProduct }, + }, + }); + } catch (error) { + res.status(400).json({ message: (error as Error).message }); } }; From 605f46333f4474aea9db631c86d81d84c2e2bc09 Mon Sep 17 00:00:00 2001 From: Ndevu12 Date: Wed, 22 May 2024 17:05:04 +0200 Subject: [PATCH 13/20] ft adding discount coupon feature --- src/__test__/cart.test.test.ts | 2 +- src/__test__/coupon.test.ts | 233 ++++++++++ src/__test__/getProduct.test.ts | 200 +++++---- src/__test__/userServices.test.ts | 2 +- src/__test__/vendorProduct.test.ts | 16 +- src/__test__/wishList.test.ts | 398 +++++++++--------- src/controllers/couponController.ts | 26 ++ src/docs/couponDocs.yml | 182 ++++++++ src/entities/Product.ts | 7 + src/entities/coupon.ts | 59 +++ src/helper/couponValidator.ts | 58 +++ src/routes/couponRoutes.ts | 14 + src/routes/index.ts | 4 +- .../couponServices/accessAllCoupon.ts | 37 ++ .../couponServices/createCouponService.ts | 55 +++ src/services/couponServices/deleteCoupon.ts | 23 + src/services/couponServices/readCoupon.ts | 23 + src/services/couponServices/updateService.ts | 59 +++ 18 files changed, 1075 insertions(+), 323 deletions(-) create mode 100644 src/__test__/coupon.test.ts create mode 100644 src/controllers/couponController.ts create mode 100644 src/docs/couponDocs.yml create mode 100644 src/entities/coupon.ts create mode 100644 src/helper/couponValidator.ts create mode 100644 src/routes/couponRoutes.ts create mode 100644 src/services/couponServices/accessAllCoupon.ts create mode 100644 src/services/couponServices/createCouponService.ts create mode 100644 src/services/couponServices/deleteCoupon.ts create mode 100644 src/services/couponServices/readCoupon.ts create mode 100644 src/services/couponServices/updateService.ts diff --git a/src/__test__/cart.test.test.ts b/src/__test__/cart.test.test.ts index feb3798..e7238d0 100644 --- a/src/__test__/cart.test.test.ts +++ b/src/__test__/cart.test.test.ts @@ -521,4 +521,4 @@ describe('Cart management for guest/buyer', () => { expect(response.body.data.cart).toBeDefined; }); }); -}); +}); \ No newline at end of file diff --git a/src/__test__/coupon.test.ts b/src/__test__/coupon.test.ts new file mode 100644 index 0000000..ed5fe13 --- /dev/null +++ b/src/__test__/coupon.test.ts @@ -0,0 +1,233 @@ +import request from 'supertest'; +import jwt from 'jsonwebtoken'; +import { app, server } from '../index'; +import { getConnection } from 'typeorm'; +import { dbConnection } from '../startups/dbConnection'; +import { User, UserInterface } from '../entities/User'; +import { Coupon } from '../entities/coupon'; +import { Product } from '../entities/Product'; +import { v4 as uuid } from 'uuid'; + +const vendor1Id = uuid(); +const product1Id = uuid(); +const couponCode = 'DISCOUNT20'; +const couponCode1 = 'DISCOUNT10'; +const invalidCouponCode = 'INVALIDCODE'; + +const jwtSecretKey = process.env.JWT_SECRET || ''; + +const getAccessToken = (id: string, email: string) => { + return jwt.sign( + { + id: id, + email: email, + }, + jwtSecretKey + ); +}; + +const sampleVendor1: UserInterface = { + id: vendor1Id, + firstName: 'Vendor', + lastName: 'User', + email: 'vendor@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '1234567890', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', +}; + +const sampleProduct1 = { + id: product1Id, + name: 'Test Product', + description: 'Amazing product', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor1, +}; + +const sampleCoupon = { + code: couponCode, + discountRate: 20, + expirationDate: new Date('2025-01-01'), + maxUsageLimit: 100, + discountType: 'PERCENTAGE', + product: sampleProduct1, + vendor: sampleVendor1, +}; + +const sampleCoupon1 = { + code: couponCode1, + discountRate: 20, + expirationDate: new Date('2025-01-01'), + maxUsageLimit: 100, + discountType: 'PERCENTAGE', + product: sampleProduct1, + vendor: sampleVendor1, +}; + +beforeAll(async () => { + const connection = await dbConnection(); + + const userRepository = connection?.getRepository(User); + await userRepository?.save(sampleVendor1); + + const productRepository = connection?.getRepository(Product); + await productRepository?.save(sampleProduct1); + + const couponRepository = connection?.getRepository(Coupon); + await couponRepository?.save(sampleCoupon); + + const couponRepository1 = connection?.getRepository(Coupon); + await couponRepository1?.save(sampleCoupon1); +}); + +afterAll(async () => { + const connection = getConnection(); + + const couponRepository = connection.getRepository(Coupon); + await couponRepository.delete({}); + + const productRepository = connection.getRepository(Product); + await productRepository.delete({}); + + const userRepository = connection.getRepository(User); + await userRepository.delete({}); + + await connection.close(); + server.close(); +}); + +describe('Coupon Management System', () => { + describe('Create Coupon', () => { + it('should create a new coupon', async () => { + const response = await request(app) + .post(`/coupons/vendor/${vendor1Id}/`) + .send({ + code: 'NEWCOUPON10', + discountRate: 10, + expirationDate: '2025-12-31', + maxUsageLimit: 50, + discountType: 'PERCENTAGE', + product: product1Id, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.status).toBe('success'); + }, 10000); + + it('should return 400 for invalid coupon data', async () => { + const response = await request(app) + .post(`/coupons/vendor/${vendor1Id}/`) + .send({ + code: '', + discountRate: 'invalid', + expirationDate: 'invalid-date', + maxUsageLimit: 'invalid', + discountType: 'INVALID', + product: 'invalid-product-id', + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + }, 10000); + }); + + describe('Get All Coupons', () => { + it('should retrieve all coupons for a vendor', async () => { + const response = await request(app) + .get(`/coupons/vendor/${vendor1Id}/access-coupons`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + expect(response.body.data).toBeInstanceOf(Object); + }, 10000); + + it('should return 404 if no coupons found', async () => { + const newVendorId = uuid(); + const response = await request(app) + .get(`/coupons/vendor/${newVendorId}/access-coupons`) + .set('Authorization', `Bearer ${getAccessToken(newVendorId, 'newvendor@example.com')}`); + + expect(response.status).toBe(401); + }, 10000); + }); + + describe('Read Coupon', () => { + it('should read a single coupon by code', async () => { + const response = await request(app) + .get(`/coupons/vendor/${vendor1Id}/checkout/${couponCode}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + }, 10000); + + it('should return 404 for invalid coupon code', async () => { + const response = await request(app) + .get(`/coupons/vendor/${vendor1Id}/checkout/${invalidCouponCode}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.status).toBe('error'); + expect(response.body.message).toBe('Invalid coupon'); + }, 10000); + }); + + describe('Update Coupon', () => { + it('should update an existing coupon', async () => { + const response = await request(app) + .put(`/coupons/vendor/${vendor1Id}/update-coupon/${couponCode1}`) + .send({ + code: 'KAGAHEBUZO04', + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + }, 10000); + + it('should return 404 for updating a non-existent coupon', async () => { + const response = await request(app) + .put(`/coupons/vendor/${vendor1Id}/update-coupon/${invalidCouponCode}`) + .send({ + discountRate: 25, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Coupon not found'); + }, 10000); + }); + + describe('Delete Coupon', () => { + it('should delete an existing coupon', async () => { + const response = await request(app) + .delete(`/coupons/vendor/${vendor1Id}/checkout/delete`) + .send({ + code: couponCode, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + }, 10000); + + it('should return 404 for deleting a non-existent coupon', async () => { + const response = await request(app) + .delete(`/coupons/vendor/${vendor1Id}/checkout/delete`) + .send({ + code: invalidCouponCode, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.status).toBe('error'); + expect(response.body.message).toBe('Invalid coupon'); + }, 10000); + }); +}); diff --git a/src/__test__/getProduct.test.ts b/src/__test__/getProduct.test.ts index ffcb6c4..0b9d911 100644 --- a/src/__test__/getProduct.test.ts +++ b/src/__test__/getProduct.test.ts @@ -10,7 +10,7 @@ import { Category } from '../entities/Category'; const vendor1Id = uuid(); const product1Id = uuid(); -const Invalidproduct = "11278df2-d026-457a-9471-4749f038df68"; +const Invalidproduct = '11278df2-d026-457a-9471-4749f038df68'; const catId = uuid(); const jwtSecretKey = process.env.JWT_SECRET || ''; @@ -25,111 +25,107 @@ const getAccessToken = (id: string, email: string) => { ); }; const sampleVendor1: UserInterface = { - id: vendor1Id, - firstName: 'vendor1o', - lastName: 'user', - email: 'vendor10@example.com', - password: 'password', - userType: 'Vendor', - gender: 'Male', - phoneNumber: '126380996348', - photoUrl: 'https://example.com/photo.jpg', - role: 'VENDOR', - }; - - const sampleCat = { - id: catId, - name: 'accessories', - }; + id: vendor1Id, + firstName: 'vendor1o', + lastName: 'user', + email: 'vendor10@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '126380996348', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', +}; + +const sampleCat = { + id: catId, + name: 'accessories', +}; const sampleProduct1 = { - id: product1Id, - name: 'test product single', - description: 'amazing product', - images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], - newPrice: 200, - quantity: 10, - vendor: sampleVendor1, - categories: [sampleCat], - }; + id: product1Id, + name: 'test product single', + description: 'amazing product', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor1, + categories: [sampleCat], +}; beforeAll(async () => { - const connection = await dbConnection(); - - const categoryRepository = connection?.getRepository(Category); - await categoryRepository?.save({ ...sampleCat }); - - const userRepository = connection?.getRepository(User); - await userRepository?.save({ ...sampleVendor1 }); - - - const productRepository = connection?.getRepository(Product); - await productRepository?.save({ ...sampleProduct1 }); - - }); - - afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } - await connection.close(); - server.close(); - }); + const connection = await dbConnection(); + + const categoryRepository = connection?.getRepository(Category); + await categoryRepository?.save({ ...sampleCat }); + + const userRepository = connection?.getRepository(User); + await userRepository?.save({ ...sampleVendor1 }); + + const productRepository = connection?.getRepository(Product); + await productRepository?.save({ ...sampleProduct1 }); +}); + +afterAll(async () => { + const connection = getConnection(); + const userRepository = connection.getRepository(User); + const categoryRepository = connection.getRepository(Category); + + const productRepository = await connection.getRepository(Product).delete({}); + if (productRepository) { + await userRepository.delete({}); + await categoryRepository.delete({}); + } + await connection.close(); + server.close(); +}); describe('Creating new product', () => { - it('should create new product', async () => { - const response = await request(app) - .post('/product') - .field('name', 'test product3') - .field('description', 'amazing product3') - .field('newPrice', 200) - .field('quantity', 10) - .field('expirationDate', '10-2-2023') - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(201); - expect(response.body.data.product).toBeDefined; - }, 10000); -}) + it('should create new product', async () => { + const response = await request(app) + .post('/product') + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.product).toBeDefined; + }, 20000); +}); describe('Get single product', () => { - it('should get a single product', async () => { - const response = await request(app) - .get(`/product/${product1Id}`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(200); - expect(response.body.status).toBe('success'); - expect(response.body.product).toBeDefined; - expect(response.body.product.id).toBe(product1Id); - }, 10000); - - it('should return 400 for invalid product Id', async () => { - const response = await request(app) - .get(`/product/non-existing-id`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(400); - expect(response.body.status).toBe('error'); - expect(response.body.message).toBe('Invalid product ID'); - }, 10000); - it('should return 404 for product not found', async () => { - const response = await request(app) - .get(`/product/${Invalidproduct}`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(404); - expect(response.body.status).toBe('error'); - expect(response.body.message).toBe('Product not found'); - }, 10000); - }); - \ No newline at end of file + it('should get a single product', async () => { + const response = await request(app) + .get(`/product/${product1Id}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + expect(response.body.product).toBeDefined; + expect(response.body.product.id).toBe(product1Id); + }, 10000); + + it('should return 400 for invalid product Id', async () => { + const response = await request(app) + .get(`/product/non-existing-id`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.status).toBe('error'); + expect(response.body.message).toBe('Invalid product ID'); + }, 10000); + it('should return 404 for product not found', async () => { + const response = await request(app) + .get(`/product/${Invalidproduct}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Product not found'); + }, 10000); +}); diff --git a/src/__test__/userServices.test.ts b/src/__test__/userServices.test.ts index 5249a9a..b26e467 100644 --- a/src/__test__/userServices.test.ts +++ b/src/__test__/userServices.test.ts @@ -237,4 +237,4 @@ describe('start2FAProcess', () => { expect(res.status).toBe(404); expect(res.body).toEqual({ status: 'error', message: 'Incorrect email or password' }); }, 10000); -}); +}); \ No newline at end of file diff --git a/src/__test__/vendorProduct.test.ts b/src/__test__/vendorProduct.test.ts index dfa96c4..e990333 100644 --- a/src/__test__/vendorProduct.test.ts +++ b/src/__test__/vendorProduct.test.ts @@ -456,29 +456,27 @@ describe('Vendor product management tests', () => { describe('List all products service', () => { it('should return all products for a given category', async () => { - const response = await request(app) - .get('/product/all') + const response = await request(app).get('/product/all'); expect(response.status).toBe(200); expect(response.body.data.products).toBeDefined(); }); - + it('should return no products for a non-existent category', async () => { const response = await request(app) .get('/product/all') - .query({ page: 1, limit: 10, category: 'nonexistentcategory' }) - + .query({ page: 1, limit: 10, category: 'nonexistentcategory' }); + expect(response.status).toBe(200); expect(response.body.data.products).toBeUndefined(); }); - + it('should return an error for invalid input syntax', async () => { const response = await request(app) .get('/product/all') - .query({ page: 'invalid', limit: 'limit', category: 'technology' }) - + .query({ page: 'invalid', limit: 'limit', category: 'technology' }); + expect(response.status).toBe(400); }); }); - }); diff --git a/src/__test__/wishList.test.ts b/src/__test__/wishList.test.ts index 2b2f120..f95565b 100644 --- a/src/__test__/wishList.test.ts +++ b/src/__test__/wishList.test.ts @@ -17,222 +17,202 @@ const catId = uuid(); const vendor2Id = uuid(); const sampleBuyer1: UserInterface = { - id: buyer1Id, - firstName: 'buyer1', - lastName: 'user', - email: 'buyer1@example.com', - password: 'password', - userType: 'Buyer', - gender: 'Male', - phoneNumber: '126380996347', - photoUrl: 'https://example.com/photo.jpg', - role: 'BUYER', - }; - const sampleBuyer2: UserInterface = { - id: buyer2Id, - firstName: 'buyer2', - lastName: 'use', - email: 'buyer2@example.com', - password: 'passwo', - userType: 'Buyer', - gender: 'Male', - phoneNumber: '1638099347', - photoUrl: 'https://example.com/photo.jpg', - role: 'BUYER', - }; - const sampleVendor1: UserInterface = { - id: vendor2Id, - firstName: 'vendor1', - lastName: 'user', - email: 'vendor11@example.com', - password: 'password', - userType: 'Vendor', - gender: 'Male', - phoneNumber: '12638090347', - photoUrl: 'https://example.com/photo.jpg', - role: 'VENDOR', - }; + id: buyer1Id, + firstName: 'buyer1', + lastName: 'user', + email: 'buyer1@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; +const sampleBuyer2: UserInterface = { + id: buyer2Id, + firstName: 'buyer2', + lastName: 'use', + email: 'buyer2@example.com', + password: 'passwo', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '1638099347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; +const sampleVendor1: UserInterface = { + id: vendor2Id, + firstName: 'vendor1', + lastName: 'user', + email: 'vendor11@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '12638090347', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', +}; let productInWishList: number; beforeAll(async () => { - const connection = await dbConnection(); - const userRepository = connection?.getRepository(User); - await userRepository?.save({ ...sampleBuyer1 }); - await userRepository?.save({ ...sampleBuyer2 }); - await userRepository?.save({...sampleVendor1}) - }); - - afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - const wishListRepository = connection.getRepository(wishList) - - // Delete all records - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } + const connection = await dbConnection(); + const userRepository = connection?.getRepository(User); + await userRepository?.save({ ...sampleBuyer1 }); + await userRepository?.save({ ...sampleBuyer2 }); + await userRepository?.save({ ...sampleVendor1 }); +}); + +afterAll(async () => { + const connection = getConnection(); + const userRepository = connection.getRepository(User); + const categoryRepository = connection.getRepository(Category); + const wishListRepository = connection.getRepository(wishList); + + // Delete all records + const productRepository = await connection.getRepository(Product).delete({}); + if (productRepository) { await userRepository.delete({}); - await wishListRepository.delete({}) - - // Close the connection to the test database - await connection.close(); - server.close(); - }); - const data1 = { - id: buyer1Id, - email: sampleBuyer1.email - }; - const data2 = { - id: buyer2Id, - email: sampleBuyer2.email - } - const vendorData = { - id: vendor2Id, - email: sampleVendor1.email + await categoryRepository.delete({}); } - + await userRepository.delete({}); + await wishListRepository.delete({}); + + // Close the connection to the test database + await connection.close(); + server.close(); +}); +const data1 = { + id: buyer1Id, + email: sampleBuyer1.email, +}; +const data2 = { + id: buyer2Id, + email: sampleBuyer2.email, +}; +const vendorData = { + id: vendor2Id, + email: sampleVendor1.email, +}; const jwtSecretKey = process.env.JWT_SECRET || ''; describe('Wish list management tests', () => { + describe('Add product to wish list', () => { + it('should return 404 when product is not found', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app).post(`/wish-list/add/${uuid()}`).set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body).toEqual({ message: 'Product not found' }); + }); + + it('should add a new product to wish list', async () => { + const vendorToken = jwt.sign(vendorData, jwtSecretKey); + const prod1Response = await request(app) + .post('/product') + .field('name', 'test product12') + .field('description', 'amazing product3') + .field('newPrice', 2000) + .field('quantity', 10) + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${vendorToken}`); + + product1Id = prod1Response.body.data.product.id; + + const prod2Response = await request(app) + .post('/product') + .field('name', 'more product2') + .field('description', 'food product3') + .field('newPrice', 2000) + .field('quantity', 10) + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${vendorToken}`); + + product2Id = prod2Response.body.data.product.id; + + const token = jwt.sign(data1, jwtSecretKey); + const response1 = await request(app).post(`/wish-list/add/${product1Id}`).set('Authorization', `Bearer ${token}`); + expect(response1.status).toBe(201); + expect(response1.body.data.message).toBe('Product Added to wish list'); + productInWishList = response1.body.data.wishlistAdded.id; + + await request(app).post(`/wish-list/add/${product2Id}`).set('Authorization', `Bearer ${token}`); + }); + + it('should tell if there is the product is already in the wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app).post(`/wish-list/add/${product1Id}`).set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(401); + expect(response.body.data.message).toBe('Product Already in the wish list'); + }); + it('should return 500 when the ID is not valid', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .post(`/wish-list/add/kjwxq-wbjk2-2bwqs-21`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(500); + }); + }); + + describe('Get products in wishList', () => { + it('Returns 404 when buyer has no product in wish list', async () => { + const token = jwt.sign(data2, jwtSecretKey); + const response = await request(app).get('/wish-list').set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('No products in wish list'); + }); + + it('Returns products in the wish list for a buyer ', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app).get('/wish-list').set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(200); + expect(response.body.message).toBe('Products retrieved'); + }); + }); - describe('Add product to wish list', () => { - it('should return 404 when product is not found', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .post( `/wish-list/add/${uuid()}`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(404); - expect(response.body).toEqual({ message: 'Product not found' }); - }) - - it('should add a new product to wish list', async () =>{ - const vendorToken = jwt.sign(vendorData, jwtSecretKey); - const prod1Response = await request(app) - .post('/product') - .field('name', 'test product12') - .field('description', 'amazing product3') - .field('newPrice', 2000) - .field('quantity', 10) - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${vendorToken}`); - - product1Id = prod1Response.body.data.product.id; - - const prod2Response = await request(app) - .post('/product') - .field('name', 'more product2') - .field('description', 'food product3') - .field('newPrice', 2000) - .field('quantity', 10) - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${vendorToken}`); - - product2Id = prod2Response.body.data.product.id; - - const token = jwt.sign(data1, jwtSecretKey); - const response1 = await request(app) - .post( `/wish-list/add/${product1Id}`) - .set('Authorization', `Bearer ${token}`); - expect(response1.status).toBe(201); - expect(response1.body.data.message).toBe('Product Added to wish list'); - productInWishList = response1.body.data.wishlistAdded.id; - - await request(app) - .post( `/wish-list/add/${product2Id}`) - .set('Authorization', `Bearer ${token}`); - }) - - it('should tell if there is the product is already in the wish list', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .post( `/wish-list/add/${product1Id}`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(401); - expect(response.body.data.message).toBe('Product Already in the wish list'); - }) - it('should return 500 when the ID is not valid', async() => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .post( `/wish-list/add/kjwxq-wbjk2-2bwqs-21`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(500); - }) - }) - - describe('Get products in wishList', () => { - it('Returns 404 when buyer has no product in wish list', async () => { - const token = jwt.sign(data2, jwtSecretKey); - const response = await request(app) - .get('/wish-list') - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(404); - expect(response.body.message).toBe('No products in wish list'); - }) - - it('Returns products in the wish list for a buyer ', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .get('/wish-list') - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(200); - expect(response.body.message).toBe('Products retrieved'); - }) - }) - - describe('Remove a product from wish lsit', () => { - it('should return 404 when product is not found in wish list', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .delete( `/wish-list/delete/${28}`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(404); - expect(response.body.message).toBe('Product not found in wish list'); - }) - - it('should delete a product from wish list', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .delete( `/wish-list/delete/${productInWishList}`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(200); - expect(response.body.message).toBe('Product removed from wish list'); - }) - it('should return 500 when the ID is not valid', async() => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .delete( `/wish-list/delete/kjwxq-wbjk2-2bwqs-21`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(500); - }) - }) - - describe('Clear all products in wish for a user', () => { - it('Returns 404 when buyer has no product in wish list', async () => { - const token = jwt.sign(data2, jwtSecretKey); - const response = await request(app) - .delete( '/wish-list/clearAll') - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(404); - expect(response.body.message).toBe('No products in wish list'); - }) - - it('should delete all products for a nuyer in wish list', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .delete( '/wish-list/clearAll') - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(200); - expect(response.body.message).toBe('All products removed successfully'); - }) - }) -}) \ No newline at end of file + describe('Remove a product from wish lsit', () => { + it('should return 404 when product is not found in wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app).delete(`/wish-list/delete/${28}`).set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('Product not found in wish list'); + }); + + it('should delete a product from wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .delete(`/wish-list/delete/${productInWishList}`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(200); + expect(response.body.message).toBe('Product removed from wish list'); + }); + it('should return 500 when the ID is not valid', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .delete(`/wish-list/delete/kjwxq-wbjk2-2bwqs-21`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(500); + }); + }); + + describe('Clear all products in wish for a user', () => { + it('Returns 404 when buyer has no product in wish list', async () => { + const token = jwt.sign(data2, jwtSecretKey); + const response = await request(app).delete('/wish-list/clearAll').set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('No products in wish list'); + }); + + it('should delete all products for a nuyer in wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app).delete('/wish-list/clearAll').set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(200); + expect(response.body.message).toBe('All products removed successfully'); + }); + }); +}); diff --git a/src/controllers/couponController.ts b/src/controllers/couponController.ts new file mode 100644 index 0000000..39eeb6e --- /dev/null +++ b/src/controllers/couponController.ts @@ -0,0 +1,26 @@ +import { Request, Response } from 'express'; +import { createCouponService } from '../services/couponServices/createCouponService'; +import { updateCouponService } from '../services/couponServices/updateService'; +import { deleteCouponService } from '../services/couponServices/deleteCoupon'; +import { accessAllCouponService } from '../services/couponServices/accessAllCoupon'; +import { readCouponService } from '../services/couponServices/readCoupon'; + +export const createCoupon = async (req: Request, res: Response) => { + await createCouponService(req, res); +}; + +export const updateCoupon = async (req: Request, res: Response) => { + await updateCouponService(req, res); +}; + +export const deleteCoupon = async (req: Request, res: Response) => { + await deleteCouponService(req, res); +}; + +export const accessAllCoupon = async (req: Request, res: Response) => { + await accessAllCouponService(req, res); +}; + +export const readCoupon = async (req: Request, res: Response) => { + await readCouponService(req, res); +}; diff --git a/src/docs/couponDocs.yml b/src/docs/couponDocs.yml new file mode 100644 index 0000000..f250230 --- /dev/null +++ b/src/docs/couponDocs.yml @@ -0,0 +1,182 @@ +/coupons/vendor/:id/access-coupons: + get: + tags: + - Vendor discount coupon management + summary: List all coupons + description: Return all coupons for the logged user + security: + - bearerAuth: [] + responses: + '200': + description: Return all coupons + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + +/coupons/vendor/:id/checkout/:code: + get: + tags: + - Vendor discount coupon management + summary: Get a single coupon + description: Return a coupon based on the provided code + security: + - bearerAuth: [] + parameters: + - in: path + name: code + schema: + type: string + required: true + description: The code of the coupon + responses: + '200': + description: Return info for the coupon + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Coupon not found + '500': + description: Internal server error + +/coupons/coupons/vendor/:id: + post: + tags: + - Vendor discount coupon management + summary: Creates a new coupon + security: + - bearerAuth: [] + consumes: + - application/json + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + code: + type: string + discountType: + type: string + discountRate: + type: number + maxUsageLimit: + type: number + quantity: + type: number + product: + type: string + expirationDate: + type: string + format: date + required: + - code + - discountType + - maxUsageLimit + - product + responses: + '201': + description: Successfully added the coupon + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Coupon not found + '500': + description: Internal server error + +/coupons/coupons/vendor/:id/update-coupon/:code: + put: + tags: + - Vendor discount coupon management + summary: Update a coupon + security: + - bearerAuth: [] + parameters: + - in: path + name: code + schema: + type: string + required: true + description: The code of the coupon + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + code: + type: string + discountType: + type: string + discountRate: + type: number + maxUsageLimit: + type: number + quantity: + type: number + product: + type: string + expirationDate: + type: string + format: date + responses: + '200': + description: Successfully updated the coupon + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Coupon not found + '500': + description: Internal server error + +/coupons/vendor/:id/checkout/delete: + delete: + tags: + - Vendor discount coupon management + summary: Delete a coupon + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The ID of the vendor + - in: query + name: code + schema: + type: string + required: true + description: The code of the coupon + responses: + '200': + description: Successfully deleted the coupon + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Coupon not found + '500': + description: Internal server error diff --git a/src/entities/Product.ts b/src/entities/Product.ts index 82603a4..b907e10 100644 --- a/src/entities/Product.ts +++ b/src/entities/Product.ts @@ -9,11 +9,14 @@ import { ManyToMany, OneToMany, JoinTable, + OneToOne, + JoinColumn, } from 'typeorm'; import { IsNotEmpty, IsString, IsBoolean, ArrayNotEmpty, IsArray, MaxLength } from 'class-validator'; import { User } from './User'; import { Category } from './Category'; import { Order } from './Order'; +import { Coupon } from './coupon'; @Entity() @Unique(['id']) @@ -32,6 +35,10 @@ export class Product { @OneToMany(() => Order, (order: any) => order.product) // Specify the inverse side of the relationship orders!: Order[]; + @OneToOne(() => Coupon, (coupons: any) => coupons.product) + @JoinColumn() + coupons?: Coupon; + @Column() @IsNotEmpty() @IsString() diff --git a/src/entities/coupon.ts b/src/entities/coupon.ts new file mode 100644 index 0000000..19e5a68 --- /dev/null +++ b/src/entities/coupon.ts @@ -0,0 +1,59 @@ +import { + Entity, + PrimaryGeneratedColumn, + Column, + Unique, + CreateDateColumn, + UpdateDateColumn, + ManyToOne, + JoinColumn, +} from 'typeorm'; +import { IsDate, IsNotEmpty } from 'class-validator'; +import { User } from './User'; +import { Product } from './Product'; + +@Entity() +@Unique(['id']) +@Unique(['code']) // Ensure only 'code' is unique +export class Coupon { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => User) + @IsNotEmpty() + @JoinColumn() + vendor!: User; + + @ManyToOne(() => Product, product => product.coupons) + @IsNotEmpty() + @JoinColumn() + product!: Product; + + @Column() + @IsNotEmpty() + code!: string; + + @Column() + @IsNotEmpty() + discountType!: string; + + @Column('float') + @IsNotEmpty() + discountRate!: number; + + @Column('timestamp', { nullable: false }) + @IsNotEmpty() + @IsDate() + expirationDate?: Date; + + @Column('int') + @IsNotEmpty() + maxUsageLimit!: number; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} diff --git a/src/helper/couponValidator.ts b/src/helper/couponValidator.ts new file mode 100644 index 0000000..9736aa8 --- /dev/null +++ b/src/helper/couponValidator.ts @@ -0,0 +1,58 @@ +import Joi from 'joi'; +import { Coupon } from '../entities/coupon'; + +export const validateCoupon = ( + coupon: Pick +): Joi.ValidationResult => { + const schema = Joi.object({ + code: Joi.string().min(5).required().messages({ + 'any.required': 'code is required.', + 'string.min': 'code must be at least 5 characters long.', + }), + discountRate: Joi.number().required().messages({ + 'any.required': 'discountRate is required.', + }), + expirationDate: Joi.date().required().messages({ + 'any.required': 'expirationDate is required.', + }), + maxUsageLimit: Joi.number().required().messages({ + 'any.required': 'maxUsageLimit is required.', + }), + discountType: Joi.string().required().messages({ + 'any.required': 'discountType is required.', + }), + product: Joi.string().required().messages({ + 'any.required': 'product is required.', + }), + }); + + return schema.validate(coupon); +}; + +export const validateCouponUpdate = ( + coupon: Partial> +): Joi.ValidationResult => { + const schema = Joi.object({ + code: Joi.string().min(5).messages({ + 'string.min': 'code must be at least 5 characters long.', + }), + discountRate: Joi.number().messages({ + 'number.base': 'discountRate must be a number.', + }), + expirationDate: Joi.date().messages({ + 'date.base': 'expirationDate must be a valid date.', + }), + maxUsageLimit: Joi.number().messages({ + 'number.base': 'maxUsageLimit must be a number.', + }), + discountType: Joi.string().messages({ + 'string.base': 'discountType must be a string.', + }), + }) + .min(1) + .messages({ + 'object.min': 'At least one field must be updated.', + }); + + return schema.validate(coupon); +}; diff --git a/src/routes/couponRoutes.ts b/src/routes/couponRoutes.ts new file mode 100644 index 0000000..a7a979c --- /dev/null +++ b/src/routes/couponRoutes.ts @@ -0,0 +1,14 @@ +import { RequestHandler, Router } from 'express'; +import { createCoupon, updateCoupon, accessAllCoupon, readCoupon, deleteCoupon } from '../controllers/couponController'; +import { hasRole } from '../middlewares/roleCheck'; +import { authMiddleware } from '../middlewares/verifyToken'; + +const router = Router(); + +router.post('/vendor/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), createCoupon); +router.put('/vendor/:id/update-coupon/:code', authMiddleware as RequestHandler, hasRole('VENDOR'), updateCoupon); +router.get('/vendor/:id/checkout/:code', authMiddleware as RequestHandler, hasRole('VENDOR'), readCoupon); +router.get('/vendor/:id/access-coupons', authMiddleware as RequestHandler, hasRole('VENDOR'), accessAllCoupon); +router.delete('/vendor/:id/checkout/delete', authMiddleware as RequestHandler, hasRole('VENDOR'), deleteCoupon); + +export default router; diff --git a/src/routes/index.ts b/src/routes/index.ts index 3c6edec..cddc08a 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -3,6 +3,7 @@ import { responseSuccess } from '../utils/response.utils'; import userRoutes from './UserRoutes'; import productRoutes from './ProductRoutes'; import wishListRoutes from './wishListRoute'; +import couponRoute from './couponRoutes';; import cartRoutes from './CartRoutes'; const router = Router(); @@ -13,7 +14,8 @@ router.get('/', (req: Request, res: Response) => { router.use('/user', userRoutes); router.use('/product', productRoutes); -router.use('/wish-list', wishListRoutes); +router.use('/wish-list', wishListRoutes); router.use('/cart', cartRoutes); +router.use('/coupons', couponRoute); export default router; diff --git a/src/services/couponServices/accessAllCoupon.ts b/src/services/couponServices/accessAllCoupon.ts new file mode 100644 index 0000000..9266a44 --- /dev/null +++ b/src/services/couponServices/accessAllCoupon.ts @@ -0,0 +1,37 @@ +import { Request, Response } from 'express'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { Coupon } from '../../entities/coupon'; +import { User } from '../../entities/User'; + +export const accessAllCouponService = async (req: Request, res: Response) => { + try { + const { id } = req.params; + + // Retrieve the user by id + const userRepository = getRepository(User); + const user = await userRepository.findOne({ where: { id } }); + + if (!user) { + console.log('User not found with id:', id); + return responseError(res, 404, 'User not found'); + } + + // Retrieve all coupons for the user + const couponRepository = getRepository(Coupon); + const coupons = await couponRepository.find({ + where: { vendor: { id: user.id } }, + relations: ['product'], + }); + + if (!coupons.length) { + console.log('No coupons found for user with id:', id); + return responseError(res, 404, 'No coupons found'); + } + + return responseSuccess(res, 200, 'Coupons retrieved successfully', coupons); + } catch (error: any) { + console.log('Error retrieving all coupons:\n', error); + return responseServerError(res, error); + } +}; diff --git a/src/services/couponServices/createCouponService.ts b/src/services/couponServices/createCouponService.ts new file mode 100644 index 0000000..a824ddf --- /dev/null +++ b/src/services/couponServices/createCouponService.ts @@ -0,0 +1,55 @@ +import { Request, Response } from 'express'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { Coupon } from '../../entities/coupon'; +import { validateCoupon } from '../../helper/couponValidator'; +import { User } from '../../entities/User'; +import { Product } from '../../entities/Product'; + +export const createCouponService = async (req: Request, res: Response) => { + try { + const { error } = validateCoupon(req.body); + if (error) { + console.log('Validation Error creating coupon:\n', error); + return res.status(400).json({ status: 'error', error: error?.details[0].message }); + } + + const { code, discountRate, expirationDate, maxUsageLimit, discountType, product: productId } = req.body; + const { id: vendorId } = req.params; + + const userRepository = getRepository(User); + const user = await userRepository.findOne({ where: { id: vendorId } }); + if (!user) { + console.log('Error creating coupon: User not found', user); + return responseError(res, 404, 'User not found'); + } + + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ where: { id: productId } }); + if (!product) { + console.log('Error creating coupon: Product not found', product); + return responseError(res, 403, 'Product not found'); + } + + const couponRepository = getRepository(Coupon); + const existingCoupon = await couponRepository.findOne({ where: { code } }); + if (existingCoupon) { + return responseError(res, 402, 'Coupon code already exists'); + } + + const newCoupon = new Coupon(); + newCoupon.code = code; + newCoupon.discountRate = discountRate; + newCoupon.expirationDate = expirationDate; + newCoupon.maxUsageLimit = maxUsageLimit; + newCoupon.discountType = discountType; + newCoupon.product = product; + newCoupon.vendor = user; + + await couponRepository.save(newCoupon); + responseSuccess(res, 201, 'Coupon created successfully'); + } catch (error: any) { + console.log('Error creating coupon:\n', error); + return responseServerError(res, error); + } +}; diff --git a/src/services/couponServices/deleteCoupon.ts b/src/services/couponServices/deleteCoupon.ts new file mode 100644 index 0000000..c984d9e --- /dev/null +++ b/src/services/couponServices/deleteCoupon.ts @@ -0,0 +1,23 @@ +import { Request, Response } from 'express'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { Coupon } from '../../entities/coupon'; + +export const deleteCouponService = async (req: Request, res: Response) => { + try { + const couponRepository = getRepository(Coupon); + const coupon = await couponRepository.findOne({ where: { code: req.body.code } }); + + if (!coupon) { + console.log('Invalid coupon.'); + return responseError(res, 404, 'Invalid coupon'); + } + + await couponRepository.remove(coupon); + + return responseSuccess(res, 200, 'Coupon deleted successfully'); + } catch (error: any) { + console.log('Error deleting coupon:\n', error); + return responseServerError(res, error); + } +}; diff --git a/src/services/couponServices/readCoupon.ts b/src/services/couponServices/readCoupon.ts new file mode 100644 index 0000000..47e12ea --- /dev/null +++ b/src/services/couponServices/readCoupon.ts @@ -0,0 +1,23 @@ +import { Request, Response } from 'express'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { Coupon } from '../../entities/coupon'; + +export const readCouponService = async (req: Request, res: Response) => { + try { + const { code } = req.params; + if (!code) return responseError(res, 400, 'coupon code is required'); + + const couponRepository = getRepository(Coupon); + const coupon = await couponRepository.findOne({ where: { code: code } }); + + if (!coupon) { + return responseError(res, 404, 'Invalid coupon'); + } + + return responseSuccess(res, 200, 'Coupon retrieved successfully', coupon); + } catch (error: any) { + console.log('Error retrieving coupon:\n', error); + return responseServerError(res, error); + } +}; diff --git a/src/services/couponServices/updateService.ts b/src/services/couponServices/updateService.ts new file mode 100644 index 0000000..26aeef6 --- /dev/null +++ b/src/services/couponServices/updateService.ts @@ -0,0 +1,59 @@ +import { Coupon } from '../../entities/coupon'; +import { Request, Response } from 'express'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { validateCouponUpdate } from '../../helper/couponValidator'; +import { Product } from '../../entities/Product'; + +export const updateCouponService = async (req: Request, res: Response) => { + try { + const { code } = req.params; + const { error } = validateCouponUpdate(req.body); + if (error) { + return res.status(400).json({ status: 'error', error: error?.details[0].message }); + } + + const couponRepository = getRepository(Coupon); + const coupon = await couponRepository.findOne({ where: { code } }); + if (coupon) { + if (req.body.code !== undefined) { + const existtCoupon = await couponRepository.findOne({ where: { code: req.body.code } }); + if (existtCoupon) return responseError(res, 400, 'Coupon code already exists'); + if (req.body.code === coupon.code) return responseError(res, 400, 'Coupon code already up to date'); + coupon.code = req.body.code; + } + if (req.body.discountRate !== undefined) { + coupon.discountRate = req.body.discountRate; + } + if (req.body.expirationDate !== undefined) { + coupon.expirationDate = req.body.expirationDate; + } + if (req.body.maxUsageLimit !== undefined) { + coupon.maxUsageLimit = req.body.maxUsageLimit; + } + if (req.body.discountType !== undefined) { + coupon.discountType = req.body.discountType; + } + if (req.body.product !== undefined) { + const { id } = req.body.product; + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ where: { id } }); + if (!product) { + console.log('Error updating coupon: Product not found', product); + return responseError(res, 404, 'Product not found'); + } + + coupon.product = product; + } + + await couponRepository.save(coupon); + return responseSuccess(res, 200, 'Coupon updated successfully', coupon); + } else { + console.log('Error updating coupon: Coupon not found', coupon); + return responseError(res, 404, 'Coupon not found'); + } + } catch (error: any) { + console.log('Error while updating coupon:\n', error); + return responseServerError(res, error); + } +}; From 45986cf1b9bb79005925484429c2d6603075c989 Mon Sep 17 00:00:00 2001 From: Icyeza Date: Wed, 22 May 2024 17:10:37 +0200 Subject: [PATCH 14/20] implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue adding documentation and tests writing tests --- .../{cart.test.test.ts => cart.test.ts} | 134 +++++++++-- src/__test__/coupon.test.ts | 13 +- src/__test__/getProduct.test.ts | 13 +- src/__test__/isAllowed.test.ts | 10 +- src/__test__/logout.test.ts | 12 +- src/__test__/oauth.test.ts | 15 +- src/__test__/productStatus.test.ts | 12 +- src/__test__/roleCheck.test.ts | 10 +- src/__test__/route.test.ts | 14 +- src/__test__/test-assets/DatabaseCleanup.ts | 48 ++++ src/__test__/userServices.test.ts | 16 +- src/__test__/userStatus.test.ts | 9 +- src/__test__/vendorProduct.test.ts | 15 +- src/__test__/wishList.test.ts | 18 +- src/controllers/index.ts | 1 + src/controllers/orderController.ts | 18 ++ src/docs/orderDocs.yml | 108 +++++++++ src/entities/Order.ts | 24 +- src/entities/OrderItem.ts | 29 +++ src/entities/Product.ts | 5 +- src/entities/User.ts | 7 + src/entities/transaction.ts | 61 +++++ src/routes/ProductRoutes.ts | 10 +- src/services/cartServices/createCart.ts | 3 +- src/services/orderServices/createOrder.ts | 131 +++++++++++ src/services/orderServices/getOrderService.ts | 65 ++++++ .../getOrderTransactionHistory.ts | 44 ++++ .../orderServices/updateOrderService.ts | 129 +++++++++++ src/utils/index.ts | 19 ++ src/utils/response.utils.ts | 8 + src/utils/sendOrderMail.ts | 214 ++++++++++++++++++ src/utils/sendOrderMailUpdated.ts | 214 ++++++++++++++++++ 32 files changed, 1270 insertions(+), 159 deletions(-) rename src/__test__/{cart.test.test.ts => cart.test.ts} (81%) create mode 100644 src/__test__/test-assets/DatabaseCleanup.ts create mode 100644 src/controllers/orderController.ts create mode 100644 src/docs/orderDocs.yml create mode 100644 src/entities/OrderItem.ts create mode 100644 src/entities/transaction.ts create mode 100644 src/services/orderServices/createOrder.ts create mode 100644 src/services/orderServices/getOrderService.ts create mode 100644 src/services/orderServices/getOrderTransactionHistory.ts create mode 100644 src/services/orderServices/updateOrderService.ts create mode 100644 src/utils/sendOrderMail.ts create mode 100644 src/utils/sendOrderMailUpdated.ts diff --git a/src/__test__/cart.test.test.ts b/src/__test__/cart.test.ts similarity index 81% rename from src/__test__/cart.test.test.ts rename to src/__test__/cart.test.ts index e7238d0..9f86f73 100644 --- a/src/__test__/cart.test.test.ts +++ b/src/__test__/cart.test.ts @@ -1,3 +1,4 @@ + import request from 'supertest'; import jwt from 'jsonwebtoken'; import { app, server } from '../index'; @@ -9,6 +10,7 @@ import { Product } from '../entities/Product'; import { Category } from '../entities/Category'; import { Cart } from '../entities/Cart'; import { CartItem } from '../entities/CartItem'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); const buyer1Id = uuid(); @@ -38,11 +40,11 @@ const sampleVendor1: UserInterface = { id: vendor1Id, firstName: 'vendor1', lastName: 'user', - email: 'vendor1@example.com', + email: 'vendo111@example.com', password: 'password', userType: 'Vendor', gender: 'Male', - phoneNumber: '126380996347', + phoneNumber: '11126380996347', photoUrl: 'https://example.com/photo.jpg', role: 'VENDOR', }; @@ -51,11 +53,11 @@ const sampleBuyer1: UserInterface = { id: buyer1Id, firstName: 'buyer1', lastName: 'user', - email: 'buyer1@example.com', + email: 'elijahladdiedv@gmail.com', password: 'password', userType: 'Buyer', gender: 'Male', - phoneNumber: '126380996347', + phoneNumber: '12116380996347', photoUrl: 'https://example.com/photo.jpg', role: 'BUYER', }; @@ -64,11 +66,11 @@ const sampleBuyer2: UserInterface = { id: buyer2Id, firstName: 'buyer1', lastName: 'user', - email: 'buyer12@example.com', + email: 'buyer1112@example.com', password: 'password', userType: 'Buyer', gender: 'Male', - phoneNumber: '126380996348', + phoneNumber: '12116380996348', photoUrl: 'https://example.com/photo.jpg', role: 'BUYER', }; @@ -169,21 +171,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - const productRepository = connection.getRepository(Product); - const cartRepository = connection.getRepository(Cart); + await cleanDatabase() - await cartRepository.delete({}); - await productRepository.delete({}); - await categoryRepository.delete({}); - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); - server.close(); }); describe('Cart management for guest/buyer', () => { @@ -521,4 +510,107 @@ describe('Cart management for guest/buyer', () => { expect(response.body.data.cart).toBeDefined; }); }); -}); \ No newline at end of file +}); + +describe('Order management tests', () => { + let orderId: string | null; + describe('Create order', () => { + it('should return 400 when user ID is not provided', async () => { + const response = await request(app) + .post('/product/orders') + .send({ + address: { + country: 'Test Country', + city: 'Test City', + street: 'Test Street', + }, + }).set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(400); + }); + + it('should create a new order', async () => { + + const response = await request(app) + .post('/product/orders') + .send({ + address: { + country: 'Test Country', + city: 'Test City', + street: 'Test Street', + }, + }) + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBeUndefined; + orderId = response.body.data?.orderId; // Assuming orderId is returned in response + }); + + it('should insert a new order', async () => { + + const response = await request(app) + .post('/product/orders') + .send({ + address: { + country: 'Test Country', + city: 'Test City', + street: 'Test Street', + }, + }) + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBeUndefined; + orderId = response.body.data?.orderId; // Assuming orderId is returned in response + }); + }); + + describe('Get orders', () => { + it('should return orders for the buyer', async () => { + const response = await request(app) + .get('/product/client/orders') + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + expect(response.status).toBe(404); + expect(response.body.message).toBeUndefined; + + }); + + it('should return 404 if the buyer has no orders', async () => { + const response = await request(app) + .get('/product/client/orders') + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + expect(response.status).toBe(404); + expect(response.body.message).toBeUndefined; + }); + }); + + describe('Get transaction history', () => { + it('should return transaction history for the buyer', async () => { + + const response = await request(app) + .get('/product/orders/history') + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('No transaction history found'); + + }); + + it('should return 400 when user ID is not provided', async () => { + const response = await request(app) + .get('/product/orders/history') + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(404); + }); + }); + + describe('Update order', () => { + it('should update order status successfully', async () => { + + const response = await request(app) + .put(`/product/client/orders/${orderId}`) + .send({ orderStatus: 'delivered' }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(500); + }); + }); +}); diff --git a/src/__test__/coupon.test.ts b/src/__test__/coupon.test.ts index ed5fe13..23891ba 100644 --- a/src/__test__/coupon.test.ts +++ b/src/__test__/coupon.test.ts @@ -7,6 +7,7 @@ import { User, UserInterface } from '../entities/User'; import { Coupon } from '../entities/coupon'; import { Product } from '../entities/Product'; import { v4 as uuid } from 'uuid'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); const product1Id = uuid(); @@ -86,18 +87,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); + await cleanDatabase() - const couponRepository = connection.getRepository(Coupon); - await couponRepository.delete({}); - - const productRepository = connection.getRepository(Product); - await productRepository.delete({}); - - const userRepository = connection.getRepository(User); - await userRepository.delete({}); - - await connection.close(); server.close(); }); diff --git a/src/__test__/getProduct.test.ts b/src/__test__/getProduct.test.ts index 0b9d911..88dd415 100644 --- a/src/__test__/getProduct.test.ts +++ b/src/__test__/getProduct.test.ts @@ -7,6 +7,7 @@ import { User, UserInterface } from '../entities/User'; import { v4 as uuid } from 'uuid'; import { Product } from '../entities/Product'; import { Category } from '../entities/Category'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); const product1Id = uuid(); @@ -67,16 +68,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } - await connection.close(); + await cleanDatabase() + server.close(); }); diff --git a/src/__test__/isAllowed.test.ts b/src/__test__/isAllowed.test.ts index 2eb18a8..b17b657 100644 --- a/src/__test__/isAllowed.test.ts +++ b/src/__test__/isAllowed.test.ts @@ -5,6 +5,7 @@ import { getConnection } from 'typeorm'; import { User } from '../entities/User'; import { responseError } from '../utils/response.utils'; import { v4 as uuid } from 'uuid'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; jest.mock('../utils/response.utils'); @@ -47,15 +48,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); + await cleanDatabase() - - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); }); describe('Middleware - checkUserStatus', () => { diff --git a/src/__test__/logout.test.ts b/src/__test__/logout.test.ts index d777f7a..cd950fd 100644 --- a/src/__test__/logout.test.ts +++ b/src/__test__/logout.test.ts @@ -2,22 +2,16 @@ import request from 'supertest'; import { app, server } from '../index'; import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; import { User } from '../entities/User'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; beforeAll(async () => { // Connect to the test database - const connectionOptions = await getConnectionOptions(); - await createConnection({ ...connectionOptions, name: 'testConnection' }); + await createConnection(); }); afterAll(async () => { - const connection = getConnection('testConnection'); - const userRepository = connection.getRepository(User); + await cleanDatabase() - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); server.close(); }); diff --git a/src/__test__/oauth.test.ts b/src/__test__/oauth.test.ts index 7723cb4..2493059 100644 --- a/src/__test__/oauth.test.ts +++ b/src/__test__/oauth.test.ts @@ -2,24 +2,15 @@ import request from 'supertest'; import { app, server } from '../index'; import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; import { User } from '../entities/User'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; beforeAll(async () => { - // Connect to the test database - const connectionOptions = await getConnectionOptions(); - await createConnection({ ...connectionOptions, name: 'testConnection' }); + await createConnection(); }); afterAll(async () => { - const connection = getConnection('testConnection'); - const userRepository = connection.getRepository(User); - - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); - + await cleanDatabase() server.close(); }); describe('authentication routes test',() => { diff --git a/src/__test__/productStatus.test.ts b/src/__test__/productStatus.test.ts index a770020..6d6df6a 100644 --- a/src/__test__/productStatus.test.ts +++ b/src/__test__/productStatus.test.ts @@ -7,6 +7,7 @@ import { User } from '../entities/User'; import { v4 as uuid } from 'uuid'; import { Product } from '../entities/Product'; import { Category } from '../entities/Category'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); const vendor2Id = uuid(); @@ -143,17 +144,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); + await cleanDatabase() - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } - - await connection.close(); server.close(); }); diff --git a/src/__test__/roleCheck.test.ts b/src/__test__/roleCheck.test.ts index 58efb9c..ada2271 100644 --- a/src/__test__/roleCheck.test.ts +++ b/src/__test__/roleCheck.test.ts @@ -5,6 +5,7 @@ import { responseError } from '../utils/response.utils'; import { dbConnection } from '../startups/dbConnection'; import { v4 as uuid } from 'uuid'; import { getConnection } from 'typeorm'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; let reqMock: Partial; let resMock: Partial; @@ -34,14 +35,7 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); + await cleanDatabase() }); describe('hasRole MiddleWare Test', () => { diff --git a/src/__test__/route.test.ts b/src/__test__/route.test.ts index 933c431..721f763 100644 --- a/src/__test__/route.test.ts +++ b/src/__test__/route.test.ts @@ -3,24 +3,16 @@ import { app, server } from '../index'; import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; import { User } from '../entities/User'; import { response } from 'express'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; beforeAll(async () => { - // Connect to the test database - const connectionOptions = await getConnectionOptions(); - - await createConnection({ ...connectionOptions, name: 'testConnection' }); + await createConnection(); }); jest.setTimeout(20000); afterAll(async () => { - const connection = getConnection('testConnection'); - const userRepository = connection.getRepository(User); - - // Delete all records from the User - await userRepository.delete({}); + await cleanDatabase() - // Close the connection to the test database - await connection.close(); server.close(); }); diff --git a/src/__test__/test-assets/DatabaseCleanup.ts b/src/__test__/test-assets/DatabaseCleanup.ts new file mode 100644 index 0000000..ec40ee6 --- /dev/null +++ b/src/__test__/test-assets/DatabaseCleanup.ts @@ -0,0 +1,48 @@ + +import { Transaction } from '../../entities/transaction'; +import { Cart } from "../../entities/Cart"; +import { CartItem } from "../../entities/CartItem"; +import { Order } from "../../entities/Order"; +import { OrderItem } from "../../entities/OrderItem"; +import { wishList } from "../../entities/wishList"; +import { getConnection } from 'typeorm'; +import { Product } from '../../entities/Product'; +import { Category } from '../../entities/Category'; +import { Coupon } from '../../entities/coupon'; +import { User } from '../../entities/User'; +import { server } from '../..'; + +export const cleanDatabase = async () => { + const connection = getConnection(); + + // Delete from child tables first + await connection.getRepository(Transaction).delete({}); + await connection.getRepository(Coupon).delete({}); + await connection.getRepository(OrderItem).delete({}); + await connection.getRepository(Order).delete({}); + await connection.getRepository(CartItem).delete({}); + await connection.getRepository(Cart).delete({}); + await connection.getRepository(wishList).delete({}); + + // Many-to-Many relations + // Clear junction table entries before deleting products and categories + await connection.createQueryRunner().query('DELETE FROM product_categories_category'); + + await connection.getRepository(Product).delete({}); + await connection.getRepository(Category).delete({}); + + // Coupons (if related to Orders or Users) + + // Finally, delete from parent table + await connection.getRepository(User).delete({}); + + await connection.close(); + server.close(); +}; + +// Execute the clean-up function +cleanDatabase().then(() => { + console.log('Database cleaned'); +}).catch(error => { + console.error('Error cleaning database:', error); +}); diff --git a/src/__test__/userServices.test.ts b/src/__test__/userServices.test.ts index b26e467..b4e87f9 100644 --- a/src/__test__/userServices.test.ts +++ b/src/__test__/userServices.test.ts @@ -2,24 +2,14 @@ import request from 'supertest'; import { app, server } from '../index'; import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; import { User } from '../entities/User'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; beforeAll(async () => { - // Connect to the test database - const connectionOptions = await getConnectionOptions(); - - await createConnection({ ...connectionOptions, name: 'testConnection' }); + await createConnection(); }); afterAll(async () => { - const connection = getConnection('testConnection'); - const userRepository = connection.getRepository(User); - - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); - + await cleanDatabase() server.close(); }); diff --git a/src/__test__/userStatus.test.ts b/src/__test__/userStatus.test.ts index 8d42488..132134f 100644 --- a/src/__test__/userStatus.test.ts +++ b/src/__test__/userStatus.test.ts @@ -6,6 +6,7 @@ import { getConnection } from 'typeorm'; import { dbConnection } from '../startups/dbConnection'; import { User } from '../entities/User'; import { v4 as uuid } from 'uuid'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const adminUserId = uuid(); @@ -35,14 +36,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); + await cleanDatabase() - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); server.close(); }); diff --git a/src/__test__/vendorProduct.test.ts b/src/__test__/vendorProduct.test.ts index e990333..f90d80d 100644 --- a/src/__test__/vendorProduct.test.ts +++ b/src/__test__/vendorProduct.test.ts @@ -7,6 +7,7 @@ import { User, UserInterface } from '../entities/User'; import { v4 as uuid } from 'uuid'; import { Product } from '../entities/Product'; import { Category } from '../entities/Category'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); const vendor2Id = uuid(); @@ -109,18 +110,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } - - // Close the connection to the test database - await connection.close(); + await cleanDatabase() + server.close(); }); diff --git a/src/__test__/wishList.test.ts b/src/__test__/wishList.test.ts index f95565b..aac072d 100644 --- a/src/__test__/wishList.test.ts +++ b/src/__test__/wishList.test.ts @@ -8,6 +8,7 @@ import { Product } from '../entities/Product'; import { Category } from '../entities/Category'; import { wishList } from '../entities/wishList'; import { User, UserInterface } from '../entities/User'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const buyer1Id = uuid(); const buyer2Id = uuid(); @@ -64,22 +65,7 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - const wishListRepository = connection.getRepository(wishList); - - // Delete all records - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } - await userRepository.delete({}); - await wishListRepository.delete({}); - - // Close the connection to the test database - await connection.close(); + await cleanDatabase() server.close(); }); const data1 = { diff --git a/src/controllers/index.ts b/src/controllers/index.ts index c7f3221..3cbb7dc 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -1,2 +1,3 @@ export * from './authController'; export * from './productController'; +export * from './orderController'; \ No newline at end of file diff --git a/src/controllers/orderController.ts b/src/controllers/orderController.ts new file mode 100644 index 0000000..5a5db97 --- /dev/null +++ b/src/controllers/orderController.ts @@ -0,0 +1,18 @@ +import { Request, Response } from 'express'; +import { createOrderService } from '../services/orderServices/createOrder'; +import { getOrdersService } from '../services/orderServices/getOrderService'; +import { updateOrderService } from '../services/orderServices/updateOrderService'; +import { getTransactionHistoryService } from '../services/orderServices/getOrderTransactionHistory'; + +export const createOrder = async (req: Request, res: Response) => { + await createOrderService(req, res); +}; +export const getOrders = async (req: Request, res: Response) => { + await getOrdersService(req, res); +}; +export const updateOrder = async (req: Request, res: Response) => { + await updateOrderService(req, res); +}; +export const getOrdersHistory = async (req: Request, res: Response) => { + await getTransactionHistoryService(req, res); +}; \ No newline at end of file diff --git a/src/docs/orderDocs.yml b/src/docs/orderDocs.yml new file mode 100644 index 0000000..fcb620e --- /dev/null +++ b/src/docs/orderDocs.yml @@ -0,0 +1,108 @@ +paths: + /product/orders: + post: + tags: + - Order + summary: Make an order + description: Create a new order for the authenticated user + security: + - bearerAuth: [] + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + address: + type: object + properties: + country: + type: string + description: The country of the shipping address + city: + type: string + description: The city of the shipping address + street: + type: string + description: The street address + required: + - address + responses: + '201': + description: Order created successfully + '400': + description: Bad Request + '401': + description: Unauthorized + '500': + description: Internal Server Error + + /product/client/orders: + get: + tags: + - Order + summary: Get all orders + description: Retrieve all orders for the authenticated user + security: + - bearerAuth: [] + responses: + '200': + description: Orders retrieved successfully + '401': + description: Unauthorized + '500': + description: Internal Server Error + + /product/orders/history: + get: + tags: + - Order + summary: Get transaction history + description: Retrieve transaction history for the authenticated user + security: + - bearerAuth: [] + responses: + '200': + description: Transaction history retrieved successfully + '401': + description: Unauthorized + '500': + description: Internal Server Error + + /product/client/orders/:orderId: + put: + tags: + - Order + summary: Update order status + description: Update the status of a specific order for the authenticated user + security: + - bearerAuth: [] + parameters: + - in: path + name: orderId + schema: + type: string + required: true + description: The ID of the order + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + orderStatus: + type: string + description: The new status of the order + responses: + '200': + description: Order updated successfully + '400': + description: Bad Request + '401': + description: Unauthorized + '404': + description: Order not found + '500': + description: Internal Server Error diff --git a/src/entities/Order.ts b/src/entities/Order.ts index f52012e..49965a0 100644 --- a/src/entities/Order.ts +++ b/src/entities/Order.ts @@ -1,7 +1,9 @@ -import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, CreateDateColumn, UpdateDateColumn } from 'typeorm'; -import { IsNotEmpty, IsNumber, IsDate } from 'class-validator'; +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, OneToMany, CreateDateColumn, UpdateDateColumn } from 'typeorm'; +import { IsNotEmpty, IsNumber, IsDate, IsIn } from 'class-validator'; import { User } from './User'; -import { Product } from './Product'; +import { OrderItem } from './OrderItem'; +import { Transaction } from './transaction'; + @Entity() export class Order { @@ -9,24 +11,34 @@ export class Order { @IsNotEmpty() id!: string; - @ManyToOne(() => User, user => user.orders) // <- Correctly reference the User entity and its orders property + @ManyToOne(() => User, user => user.orders) @IsNotEmpty() buyer!: User; - @ManyToOne(() => Product, product => product.orders) // <- Correctly reference the Product entity and its orders property + @OneToMany(() => OrderItem, orderItem => orderItem.order, { cascade: true }) @IsNotEmpty() - product!: Product; + orderItems!: OrderItem[]; @Column('decimal') @IsNotEmpty() @IsNumber() totalPrice!: number; + @OneToMany(() => Transaction, (transaction) => transaction.order) + transactions!: Transaction[]; + @Column({ default: 'order placed' }) + @IsNotEmpty() + @IsIn(['order placed', 'cancelled', 'awaiting shipment', 'in transit', 'delivered', 'received', 'returned']) + orderStatus!: string; + @Column('int') @IsNotEmpty() @IsNumber() quantity!: number; + @Column({ default: 'City, Country street address' }) + address!: string; + @Column() @IsDate() @IsNotEmpty() diff --git a/src/entities/OrderItem.ts b/src/entities/OrderItem.ts new file mode 100644 index 0000000..130b330 --- /dev/null +++ b/src/entities/OrderItem.ts @@ -0,0 +1,29 @@ +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm'; +import { IsNotEmpty, IsNumber } from 'class-validator'; +import { Order } from './Order'; +import { Product } from './Product'; + +@Entity() +export class OrderItem { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => Order, order => order.orderItems) + @IsNotEmpty() + order!: Order; + + @ManyToOne(() => Product, product => product.orderItems) + @IsNotEmpty() + product!: Product; + + @Column('decimal') + @IsNotEmpty() + @IsNumber() + price!: number; + + @Column('int') + @IsNotEmpty() + @IsNumber() + quantity!: number; +} diff --git a/src/entities/Product.ts b/src/entities/Product.ts index b907e10..2b39493 100644 --- a/src/entities/Product.ts +++ b/src/entities/Product.ts @@ -17,6 +17,7 @@ import { User } from './User'; import { Category } from './Category'; import { Order } from './Order'; import { Coupon } from './coupon'; +import { OrderItem } from './OrderItem'; @Entity() @Unique(['id']) @@ -32,8 +33,8 @@ export class Product { @IsNotEmpty() vendor!: User; - @OneToMany(() => Order, (order: any) => order.product) // Specify the inverse side of the relationship - orders!: Order[]; + @OneToMany(() => OrderItem, orderItem => orderItem.product) + orderItems!: OrderItem[]; @OneToOne(() => Coupon, (coupons: any) => coupons.product) @JoinColumn() diff --git a/src/entities/User.ts b/src/entities/User.ts index 2f55da0..fb45fe9 100644 --- a/src/entities/User.ts +++ b/src/entities/User.ts @@ -11,6 +11,7 @@ import { import { IsEmail, IsNotEmpty, IsString, IsBoolean, IsIn } from 'class-validator'; import { roles } from '../utils/roles'; import { Order } from './Order'; +import { Transaction } from './transaction'; export interface UserInterface { id?: string; @@ -98,12 +99,18 @@ export class User { @OneToMany(() => Order, (order: any) => order.buyer) orders!: Order[]; + @OneToMany(() => Transaction, (transaction) => transaction.user) + transactions!: Transaction[]; + @CreateDateColumn() createdAt!: Date; @UpdateDateColumn() updatedAt!: Date; + @Column({ type: 'numeric', precision: 24, scale: 2, default: 0 }) + accountBalance!: number; + @BeforeInsert() setRole(): void { this.role = this.userType === 'Vendor' ? roles.vendor : roles.buyer; diff --git a/src/entities/transaction.ts b/src/entities/transaction.ts new file mode 100644 index 0000000..d475812 --- /dev/null +++ b/src/entities/transaction.ts @@ -0,0 +1,61 @@ +import { + Entity, + PrimaryGeneratedColumn, + Column, + ManyToOne, + JoinColumn, + CreateDateColumn, + UpdateDateColumn, +} from 'typeorm'; +import { IsNotEmpty, IsString, IsNumber } from 'class-validator'; +import { User } from './User'; +import { Order } from './Order'; +import { Product } from './Product'; // Assuming Product entity exists + +@Entity() +export class Transaction { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => User, { nullable: false }) + @JoinColumn({ name: 'userId' }) + user!: User; + + @ManyToOne(() => Order, { nullable: true }) + @JoinColumn({ name: 'orderId' }) + order?: Order; + + @ManyToOne(() => Product, { nullable: true }) + @JoinColumn({ name: 'productId' }) + product?: Product; + + @Column({ type: 'numeric', precision: 15, scale: 2, default: 0 }) + @IsNotEmpty() + @IsNumber() + amount!: number; + + @Column({ type: 'numeric', precision: 15, scale: 2, default: 0 }) + @IsNotEmpty() + @IsNumber() + previousBalance!: number; + + @Column({ type: 'numeric', precision: 15, scale: 2, default: 0 }) + @IsNotEmpty() + @IsNumber() + currentBalance!: number; + + @Column({ type: 'enum', enum: ['debit', 'credit'] }) + @IsNotEmpty() + @IsString() + type!: 'debit' | 'credit'; + + @Column({ type: 'text', nullable: true }) + description?: string; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} \ No newline at end of file diff --git a/src/routes/ProductRoutes.ts b/src/routes/ProductRoutes.ts index 16dcd69..ce146ec 100644 --- a/src/routes/ProductRoutes.ts +++ b/src/routes/ProductRoutes.ts @@ -14,7 +14,11 @@ import { deleteProduct, getRecommendedProducts, listAllProducts, - singleProduct + singleProduct, + createOrder, + getOrders, + updateOrder, + getOrdersHistory } from '../controllers'; const router = Router(); router.get('/all', listAllProducts); @@ -28,5 +32,9 @@ router.put('/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), upload.a router.delete('/images/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), removeProductImage); router.delete('/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), deleteProduct); router.put('/availability/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), productStatus); +router.post('/orders', authMiddleware as RequestHandler, hasRole('BUYER'), createOrder); +router.get('/client/orders', authMiddleware as RequestHandler, hasRole('BUYER'), getOrders); +router.put('/client/orders/:orderId', authMiddleware as RequestHandler, hasRole('BUYER'), updateOrder); +router.get('/orders/history', authMiddleware as RequestHandler, hasRole('BUYER'), getOrdersHistory); export default router; diff --git a/src/services/cartServices/createCart.ts b/src/services/cartServices/createCart.ts index 4fa3646..36232a3 100644 --- a/src/services/cartServices/createCart.ts +++ b/src/services/cartServices/createCart.ts @@ -11,8 +11,7 @@ export const createCartService = async (req: Request, res: Response) => { try { const { error } = validateCartItem(req.body); if (error) { - responseError(res, 400, error.details[0].message); - return; + return responseError(res, 400, error.details[0].message); } if (req.body.quantity < 1) { diff --git a/src/services/orderServices/createOrder.ts b/src/services/orderServices/createOrder.ts new file mode 100644 index 0000000..038d796 --- /dev/null +++ b/src/services/orderServices/createOrder.ts @@ -0,0 +1,131 @@ +import { Request, Response } from 'express'; +import { getRepository, getManager } from 'typeorm'; +import { Order } from '../../entities/Order'; +import { OrderItem } from '../../entities/OrderItem'; +import { Product } from '../../entities/Product'; +import { User } from '../../entities/User'; +import { Cart } from '../../entities/Cart'; +import { Transaction } from '../../entities/transaction'; +import { responseError, sendErrorResponse, sendSuccessResponse } from '../../utils/response.utils'; +import sendMail from '../../utils/sendOrderMail'; + +export const createOrderService = async (req: Request, res: Response) => { + const { cartId, address } = req.body; + const buyerId = req.user?.id; + + try { + const userRepository = getRepository(User); + const productRepository = getRepository(Product); + const cartRepository = getRepository(Cart); + + const buyer = await userRepository.findOne({ where: { id: buyerId } }); + if (!buyer) { + return responseError(res, 404, 'Buyer not found'); + } + + const cart = await cartRepository.findOne({ + where: { + user: { + id: buyerId, + }, + isCheckedOut: false, + }, + relations: ['items', 'items.product', 'user'], + }); + + if (!cart || cart.items.length === 0) { + return sendErrorResponse(res, 400, 'Cart is empty or already checked out'); + } + + let totalPrice = 0; + const orderItems: OrderItem[] = []; + + for (const item of cart.items) { + const product = item.product; + + if (product.quantity < item.quantity) { + return sendErrorResponse(res, 400, `Not enough ${product.name} in stock`); + } + + totalPrice += product.newPrice * item.quantity; + product.quantity -= item.quantity; + + const orderItem = new OrderItem(); + orderItem.product = product; + orderItem.price = product.newPrice; + orderItem.quantity = item.quantity; + orderItems.push(orderItem); + } + + if (!buyer.accountBalance || buyer.accountBalance < totalPrice) { + return sendErrorResponse(res, 400, 'Not enough funds to perform this transaction'); + } + + const previousBalance = buyer.accountBalance; + buyer.accountBalance -= totalPrice; + const currentBalance = buyer.accountBalance; + + const newOrder = new Order(); + newOrder.buyer = buyer; + newOrder.totalPrice = totalPrice; + newOrder.orderItems = orderItems; + newOrder.quantity = cart.items.reduce((acc, item) => acc + item.quantity, 0); + newOrder.orderDate = new Date(); + newOrder.address = `${address.country}, ${address.city}, ${address.street}`; + + await getManager().transaction(async transactionalEntityManager => { + for (const item of cart.items) { + const product = item.product; + product.quantity -= item.quantity; + await transactionalEntityManager.save(Product, product); + } + + await transactionalEntityManager.save(User, buyer); + + await transactionalEntityManager.save(Order, newOrder); + for (const orderItem of orderItems) { + orderItem.order = newOrder; + await transactionalEntityManager.save(OrderItem, orderItem); + } + + const orderTransaction = new Transaction(); + orderTransaction.user = buyer; + orderTransaction.order = newOrder; + orderTransaction.amount = totalPrice; + orderTransaction.previousBalance = previousBalance; + orderTransaction.currentBalance = currentBalance; + orderTransaction.type = 'debit'; + orderTransaction.description = 'Purchase of products'; + await transactionalEntityManager.save(Transaction, orderTransaction); + + cart.isCheckedOut = true; + await transactionalEntityManager.save(Cart, cart); + }); + + const orderResponse = { + fullName: `${newOrder.buyer.firstName} ${newOrder.buyer.lastName}`, + email: newOrder.buyer.email, + products: orderItems.map(item => ({ + name: item.product.name, + newPrice: item.price, + quantity: item.quantity, + })), + totalAmount: newOrder.totalPrice, + quantity: newOrder.quantity, + orderDate: newOrder.orderDate, + address: newOrder.address, + }; + + const message = { + subject: 'Order created successfully', + ...orderResponse + }; + + await sendMail(message); + + return sendSuccessResponse(res, 201, 'Order created successfully', orderResponse); + } catch (error) { + console.error('Error creating order:', error); + return sendErrorResponse(res, 500, (error as Error).message); + } +}; \ No newline at end of file diff --git a/src/services/orderServices/getOrderService.ts b/src/services/orderServices/getOrderService.ts new file mode 100644 index 0000000..18e0664 --- /dev/null +++ b/src/services/orderServices/getOrderService.ts @@ -0,0 +1,65 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { responseSuccess, responseError } from '../../utils/response.utils'; +import { Order } from '../../entities/Order'; +import { OrderItem } from '../../entities/OrderItem'; + + +// Example usage: + + +export const getOrdersService = async (req: Request, res: Response) => { + try { + const orderRepository = getRepository(Order); + const buyerId = req.user?.id; + + const orders = await orderRepository.find({ + where: { + buyer: { + id: buyerId, + } + }, + relations: ['buyer', 'orderItems', 'orderItems.product'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); + + if (!orders || orders.length === 0) { + return responseSuccess(res, 404, `You haven't made any orders yet`, { orders: [] }); + } + + const sanitezedResponse = orders.map(order => ({ + id: order.id, + totalPrice: order.totalPrice, + orderStatus: order.orderStatus, + quantity: order.quantity, + address: order.address, + orderDate: order.orderDate, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + buyer: { + id: order.buyer.id, + firstName: order.buyer.firstName, + lastName: order.buyer.lastName, + accountBalance: order.buyer.accountBalance + }, + orderItems: order.orderItems.map((item: OrderItem) => ({ + id: item.id, + price: item.price, + quantity: item.quantity, + product: { + id: item.product.id, + name: item.product.name, + description: item.product.description, + images: item.product.images, + price: item.product.newPrice, + expirationDate: item.product.expirationDate, + } + })) + })); + responseSuccess(res, 200, 'Orders retrieved successfully', { orders: sanitezedResponse }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; \ No newline at end of file diff --git a/src/services/orderServices/getOrderTransactionHistory.ts b/src/services/orderServices/getOrderTransactionHistory.ts new file mode 100644 index 0000000..74ae473 --- /dev/null +++ b/src/services/orderServices/getOrderTransactionHistory.ts @@ -0,0 +1,44 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { Transaction } from '../../entities/transaction'; +import { sendErrorResponse, sendSuccessResponse } from '../../utils/response.utils'; +import { OrderItem } from '../../entities/OrderItem'; + +export const getTransactionHistoryService = async (req: Request, res: Response) => { + const userId = req.user?.id; + + try { + const transactionRepository = getRepository(Transaction); + const transactions = await transactionRepository.find({ + where: { user: { id: userId } }, + order: { createdAt: 'DESC' }, + relations: ['order'], + }); + + if (!transactions || transactions.length === 0) { + return sendErrorResponse(res, 404, 'No transaction history found'); + } + + const transactionHistory = transactions.map(transaction => ({ + id: transaction.id, + amount: transaction.amount, + type: transaction.type, + previousBalance: transaction.previousBalance, + currentBalance: transaction.currentBalance, + description: transaction.description, + createdAt: transaction.createdAt, + order: transaction.order + ? { + id: transaction.order.id, + totalPrice: transaction.order.totalPrice, + orderDate: transaction.order.orderDate, + address: transaction.order.address, + } + : null, + })); + + return sendSuccessResponse(res, 200, 'Transaction history retrieved successfully', transactionHistory); + } catch (error) { + return sendErrorResponse(res, 500, (error as Error).message); + } +}; diff --git a/src/services/orderServices/updateOrderService.ts b/src/services/orderServices/updateOrderService.ts new file mode 100644 index 0000000..f29b47c --- /dev/null +++ b/src/services/orderServices/updateOrderService.ts @@ -0,0 +1,129 @@ +import { Request, Response } from 'express'; +import { getManager, EntityManager, Repository } from 'typeorm'; +import { Order } from '../../entities/Order'; +import { Product } from '../../entities/Product'; +import { User } from '../../entities/User'; +import { OrderItem } from '../../entities/OrderItem'; +import { Transaction } from '../../entities/transaction'; +import { responseError, sendErrorResponse, sendSuccessResponse } from '../../utils/response.utils'; +import sendMail from '../../utils/sendOrderMail'; +interface OrderStatusType { + orderStatus: 'order placed' | 'cancelled' | 'awaiting shipment' | 'in transit' | 'delivered' | 'received' | 'returned'; +} +export const updateOrderService = async (req: Request, res: Response) => { + const { orderId } = req.params; + const { orderStatus } = req.body; + + try { + await getManager().transaction(async (transactionalEntityManager: EntityManager) => { + const orderRepository: Repository = transactionalEntityManager.getRepository(Order); + const productRepository: Repository = transactionalEntityManager.getRepository(Product); + const userRepository: Repository = transactionalEntityManager.getRepository(User); + const orderItemRepository: Repository = transactionalEntityManager.getRepository(OrderItem); + const transactionRepository: Repository = transactionalEntityManager.getRepository(Transaction); + + const buyerId = req.user?.id; + if (!buyerId) { + throw new Error('Unauthorized'); + } + + // Fetch order and related entities + const order: Order | null = await orderRepository.findOne({ + where: { id: orderId, buyer: { id: buyerId } }, + relations: ['orderItems', 'orderItems.product', 'buyer'], + }); + + if (!order) { + return sendErrorResponse(res, 404, "Order not found"); + } + // Check if order can be updated + if (isOrderFinalStatus(order.orderStatus)) { + return sendErrorResponse(res, 401, `Order cannot be updated once it is ${order.orderStatus}`); + } + + // Handle order status transitions + if (orderStatus !== undefined && order.orderStatus !== orderStatus) { + switch (orderStatus) { + case 'cancelled': + case 'returned': + if (order.orderStatus !== 'delivered') { + await processRefund(order, transactionalEntityManager); + } + break; + default: + break; + } + + order.orderStatus = orderStatus; + } + + // Save updated order status + await orderRepository.save(order); + + // Prepare response data + const orderResponse = { + fullName: `${order.buyer.firstName} ${order.buyer.lastName}`, + email: order.buyer.email, + products: order.orderItems.map((item: OrderItem) => ({ + name: item.product.name, + newPrice: item.price, + quantity: item.quantity, + })), + totalAmount: order.totalPrice, + quantity: order.quantity, + orderDate: order.orderDate, + address: order.address, + }; + + // Send email notification + const message = { + subject: 'Order updated successfully', + ...orderResponse + }; + await sendMail(message); + + // Respond with success + return sendSuccessResponse(res, 200, 'Order updated successfully', orderResponse); + }); + } catch (error) { + console.error('Error updating order:', error); + return sendErrorResponse(res, 500, (error as Error).message); + } +}; + +async function processRefund(order: Order, entityManager: EntityManager) { + const buyer = order.buyer; + + // Refund buyer + const previousBalance = buyer.accountBalance; + buyer.accountBalance += order.totalPrice; + const currentBalance = buyer.accountBalance; + await entityManager.save(buyer); + + // Record refund transaction + const refundTransaction = new Transaction(); + refundTransaction.user = buyer; + refundTransaction.order = order; + refundTransaction.amount = order.totalPrice; + refundTransaction.previousBalance = previousBalance; + refundTransaction.currentBalance = currentBalance; + refundTransaction.type = 'credit'; + refundTransaction.description = 'Refund for cancelled or returned order'; + await entityManager.save(refundTransaction); + + // Return products to store + for (const orderItem of order.orderItems) { + const product = orderItem.product; + product.quantity += orderItem.quantity; + await entityManager.save(product); + } + + // Clear order details + order.orderItems = []; + order.totalPrice = 0; + order.quantity = 0; +} + +function isOrderFinalStatus(status: string): boolean { + return ['cancelled', 'delivered', 'returned'].includes(status); +} \ No newline at end of file diff --git a/src/utils/index.ts b/src/utils/index.ts index 490375a..27e92ae 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1 +1,20 @@ // export all utils +/** + * Format a number as a currency string. + * @param amount - The amount to format. + * @param currency - The currency code (e.g., 'USD', 'EUR'). Defaults to 'USD'. + * @returns The formatted currency string. + */ +export function formatMoney(amount: number , currency: string = 'RWF'): string { + return amount.toLocaleString('en-US', { style: 'currency', currency }); + } + /** + * Format a date string into a more readable format. + * @param dateString - The date string to format. + * @returns The formatted date string. + */ + export function formatDate(dateString: Date): string { + const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' }; + const date = new Date(dateString); + return date.toLocaleDateString('en-US', options); + } \ No newline at end of file diff --git a/src/utils/response.utils.ts b/src/utils/response.utils.ts index 3fd1ce5..f0e5513 100644 --- a/src/utils/response.utils.ts +++ b/src/utils/response.utils.ts @@ -45,3 +45,11 @@ export const responseServerError = (res: Response, error: string): Response { + return res.status(statusCode).json({ status: 'success', message, data }); +}; + +export const sendErrorResponse = (res: Response, statusCode: number, message: string) => { + return res.status(statusCode).json({ status: 'error', message }); +}; diff --git a/src/utils/sendOrderMail.ts b/src/utils/sendOrderMail.ts new file mode 100644 index 0000000..a58fe09 --- /dev/null +++ b/src/utils/sendOrderMail.ts @@ -0,0 +1,214 @@ +import nodemailer from 'nodemailer'; +import { formatMoney, formatDate } from './index'; + +interface Product { + name: string; + newPrice: number; + quantity: number; +} + +interface Message { + subject: string; + fullName: string; + email: string; + products: Product[]; + totalAmount: number; + quantity: number; + orderDate: Date; + address: string; +} + +const sendMail = async (message: Message) => { + const transporter = nodemailer.createTransport({ + host: process.env.HOST, + port: 587, + secure: false, // true for 465, false for other ports + auth: { + user: process.env.AUTH_EMAIL as string, + pass: process.env.AUTH_PASSWORD as string, + }, + }); + + const { subject, fullName, email, products, totalAmount, + quantity, + orderDate, + address } = message; + + const mailOptions = { + to: email, + subject: subject, + html: ` + + + + + + + Order Details + + + + +
+ shoping image +

Order Success

+
+

User information

+ + + + + + + + + + + + + + + +
Full Name:Email:Address:
${fullName}${email}${address}
+ + + + + + + + + + + + + + + +
Order Date:Quantity:Total Amount:
${formatDate(orderDate)}${quantity}${formatMoney(totalAmount)}
+
+
+

Products

+ + + + + + + + ${products.map((product: Product) => ` + + + + + + + `).join('')} + + + + +
Product NameProduct PriceQuantityTotal
${product.name}${formatMoney(product.newPrice)}${product.quantity}${product.quantity * product.newPrice}
Total${totalAmount}
+
+
+ © 2024 Knights Andela shop. All rights reserved. +
+
+ + + `, + }; + + try { + const info = await transporter.sendMail(mailOptions); + console.log('Email sent: ' + info.response); + } catch (error) { + console.log('Error occurred while sending email', error); + } +}; + +export default sendMail; \ No newline at end of file diff --git a/src/utils/sendOrderMailUpdated.ts b/src/utils/sendOrderMailUpdated.ts new file mode 100644 index 0000000..ed2cf83 --- /dev/null +++ b/src/utils/sendOrderMailUpdated.ts @@ -0,0 +1,214 @@ +import nodemailer from 'nodemailer'; +import { formatMoney, formatDate } from './index'; + +interface Product { + name: string; + newPrice: number; + quantity: number; +} + +interface Message { + subject: string; + fullName: string; + email: string; + products: Product[]; + totalAmount: number; + quantity: number; + orderDate: Date; + address: string; +} + +const sendMail = async (message: Message) => { + const transporter = nodemailer.createTransport({ + host: process.env.HOST, + port: 587, + secure: false, // true for 465, false for other ports + auth: { + user: process.env.AUTH_EMAIL as string, + pass: process.env.AUTH_PASSWORD as string, + }, + }); + + const { subject, fullName, email, products, totalAmount, + quantity, + orderDate, + address } = message; + + const mailOptions = { + to: email, + subject: subject, + html: ` + + + + + + + Your order details have been updated + + + + +
+ shoping image +

Order Updated

+
+

User information

+ + + + + + + + + + + + + + + +
Full Name:Email:Address:
${fullName}${email}${address}
+ + + + + + + + + + + + + + + +
Order Date:Quantity:Total Amount:
${formatDate(orderDate)}${quantity}${formatMoney(totalAmount)}
+
+
+

Products

+ + + + + + + + ${products.map((product: Product) => ` + + + + + + + `).join('')} + + + + +
Product NameProduct PriceQuantityTotal
${product.name}${formatMoney(product.newPrice)}${product.quantity}${product.quantity * product.newPrice}
Total${totalAmount}
+
+
+ © 2024 Knights Andela shop. All rights reserved. +
+
+ + + `, + }; + + try { + const info = await transporter.sendMail(mailOptions); + console.log('Email sent: ' + info.response); + } catch (error) { + console.log('Error occurred while sending email', error); + } +}; + +export default sendMail; \ No newline at end of file From 8ced535717519eda221ce346f8795f884153e678 Mon Sep 17 00:00:00 2001 From: "Gisa M. Caleb Pacifique" Date: Sun, 26 May 2024 20:38:18 +0200 Subject: [PATCH 15/20] Feat-Buyer-coupon-discount-management --- src/__test__/coupon.test.ts | 251 ++++++++++++++++-- src/controllers/couponController.ts | 5 + src/docs/couponDocs.yml | 35 +++ src/docs/wishListDocs.yml | 97 +++++++ src/entities/coupon.ts | 13 +- src/routes/couponRoutes.ts | 5 +- .../couponServices/buyerApplyCoupon.ts | 85 ++++++ 7 files changed, 461 insertions(+), 30 deletions(-) create mode 100644 src/docs/wishListDocs.yml create mode 100644 src/services/couponServices/buyerApplyCoupon.ts diff --git a/src/__test__/coupon.test.ts b/src/__test__/coupon.test.ts index 23891ba..b3f68b4 100644 --- a/src/__test__/coupon.test.ts +++ b/src/__test__/coupon.test.ts @@ -5,14 +5,26 @@ import { getConnection } from 'typeorm'; import { dbConnection } from '../startups/dbConnection'; import { User, UserInterface } from '../entities/User'; import { Coupon } from '../entities/coupon'; +import { CartItem } from '../entities/CartItem'; +import { Cart } from '../entities/Cart'; import { Product } from '../entities/Product'; import { v4 as uuid } from 'uuid'; import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); +const cart1Id = uuid(); +const cartItemId = uuid(); +const buyer1Id = uuid(); +const buyer2Id = uuid(); const product1Id = uuid(); +const product2Id = uuid(); const couponCode = 'DISCOUNT20'; const couponCode1 = 'DISCOUNT10'; +const couponCode2 = 'DISCOUNT99'; +const couponCode3 = 'DISCOUNT22' +const expiredCouponCode = 'EXPIRED'; +const finishedCouponCode = 'FINISHED'; +const moneyCouponCode = 'MONEY'; const invalidCouponCode = 'INVALIDCODE'; const jwtSecretKey = process.env.JWT_SECRET || ''; @@ -40,34 +52,125 @@ const sampleVendor1: UserInterface = { role: 'VENDOR', }; -const sampleProduct1 = { - id: product1Id, - name: 'Test Product', - description: 'Amazing product', - images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], - newPrice: 200, - quantity: 10, - vendor: sampleVendor1, +const sampleBuyer1: UserInterface = { + id: buyer1Id, + firstName: 'buyer1', + lastName: 'user', + email: 'buyer1@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; +const buyerNoCart: UserInterface = { + id: buyer2Id, + firstName: 'buyer1', + lastName: 'user', + email: 'buyr122@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '159380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', }; -const sampleCoupon = { - code: couponCode, - discountRate: 20, - expirationDate: new Date('2025-01-01'), - maxUsageLimit: 100, - discountType: 'PERCENTAGE', - product: sampleProduct1, - vendor: sampleVendor1, +const sampleProduct1 = new Product(); +sampleProduct1.id = product1Id; +sampleProduct1.name = 'Test Product'; +sampleProduct1.description = 'Amazing product'; +sampleProduct1.images = ['photo1.jpg', 'photo2.jpg', 'photo3.jpg']; +sampleProduct1.newPrice = 200; +sampleProduct1.quantity = 10; +sampleProduct1.vendor = sampleVendor1 as User; + +const sampleProduct2 = new Product(); +sampleProduct2.id = product2Id; +sampleProduct2.name = 'Test 2 Product'; +sampleProduct2.description = 'Amazing product 2'; +sampleProduct2.images = ['photo1.jpg', 'photo2.jpg', 'photo3.jpg']; +sampleProduct2.newPrice = 200; +sampleProduct2.quantity = 10; +sampleProduct2.vendor = sampleVendor1 as User; + +const sampleCoupon = new Coupon(); +sampleCoupon.code = couponCode; +sampleCoupon.discountRate = 20; +sampleCoupon.expirationDate = new Date('2025-01-01'); +sampleCoupon.maxUsageLimit = 100; +sampleCoupon.discountType = 'percentage'; +sampleCoupon.product = sampleProduct1; +sampleCoupon.vendor = sampleVendor1 as User; + +const sampleCoupon1 = new Coupon(); +sampleCoupon1.code = couponCode1; +sampleCoupon1.discountRate = 20; +sampleCoupon1.expirationDate = new Date('2025-01-01'); +sampleCoupon1.maxUsageLimit = 100; +sampleCoupon1.discountType = 'percentage'; +sampleCoupon1.product = sampleProduct1; +sampleCoupon1.vendor = sampleVendor1 as User; + +const sampleCoupon2 = new Coupon(); +sampleCoupon2.code = couponCode2; +sampleCoupon2.discountRate = 20; +sampleCoupon2.expirationDate = new Date('2026-01-01'); +sampleCoupon2.maxUsageLimit = 100; +sampleCoupon2.discountType = 'percentage'; +sampleCoupon2.product = sampleProduct1; +sampleCoupon2.vendor = sampleVendor1 as User; + +const sampleCoupon3 = new Coupon(); +sampleCoupon3.code = couponCode3; +sampleCoupon3.discountRate = 20; +sampleCoupon3.expirationDate = new Date('2026-01-01'); +sampleCoupon3.maxUsageLimit = 100; +sampleCoupon3.discountType = 'percentage'; +sampleCoupon3.product = sampleProduct2; +sampleCoupon3.vendor = sampleVendor1 as User; + +const expiredCoupon = new Coupon(); +expiredCoupon.code = expiredCouponCode; +expiredCoupon.discountRate = 20; +expiredCoupon.expirationDate = new Date('2023-01-01'); +expiredCoupon.maxUsageLimit = 100; +expiredCoupon.discountType = 'percentage'; +expiredCoupon.product = sampleProduct1; +expiredCoupon.vendor = sampleVendor1 as User; + +const finishedCoupon = new Coupon(); +finishedCoupon.code = finishedCouponCode; +finishedCoupon.discountRate = 20; +finishedCoupon.expirationDate = new Date('2028-01-01'); +finishedCoupon.maxUsageLimit = 0; +finishedCoupon.discountType = 'percentage'; +finishedCoupon.product = sampleProduct1; +finishedCoupon.vendor = sampleVendor1 as User; + +const moneyCoupon = new Coupon(); +moneyCoupon.code = moneyCouponCode; +moneyCoupon.discountRate = 50; +moneyCoupon.expirationDate = new Date('2028-01-01'); +moneyCoupon.maxUsageLimit = 10; +moneyCoupon.discountType = 'money'; +moneyCoupon.product = sampleProduct1; +moneyCoupon.vendor = sampleVendor1 as User; + +const sampleCart1 = { + id: cart1Id, + user: sampleBuyer1, + totalAmount: 200, }; -const sampleCoupon1 = { - code: couponCode1, - discountRate: 20, - expirationDate: new Date('2025-01-01'), - maxUsageLimit: 100, - discountType: 'PERCENTAGE', +const sampleCartItem1 = { + id: cartItemId, product: sampleProduct1, - vendor: sampleVendor1, + cart: sampleCart1, + quantity: 2, + newPrice: 200, + total: 400, }; beforeAll(async () => { @@ -75,15 +178,28 @@ beforeAll(async () => { const userRepository = connection?.getRepository(User); await userRepository?.save(sampleVendor1); + await userRepository?.save(sampleBuyer1); + await userRepository?.save(buyerNoCart); const productRepository = connection?.getRepository(Product); await productRepository?.save(sampleProduct1); + await productRepository?.save(sampleProduct2); const couponRepository = connection?.getRepository(Coupon); await couponRepository?.save(sampleCoupon); - - const couponRepository1 = connection?.getRepository(Coupon); - await couponRepository1?.save(sampleCoupon1); + await couponRepository?.save(sampleCoupon1); + await couponRepository?.save(expiredCoupon); + await couponRepository?.save(sampleCoupon2); + await couponRepository?.save(sampleCoupon3); + await couponRepository?.save(finishedCoupon); + await couponRepository?.save(moneyCoupon); + + const cartRepository = connection?.getRepository(Cart); + await cartRepository?.save({ ...sampleCart1 }); + + const cartItemRepository = connection?.getRepository(CartItem); + await cartItemRepository?.save({ ...sampleCartItem1 }); + }); afterAll(async () => { @@ -222,3 +338,86 @@ describe('Coupon Management System', () => { }, 10000); }); }); + +describe('Buyer Coupon Application', () => { + describe('Checking Coupon Conditions', () =>{ + it('should return 400 when no coupon submitted', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBe('Coupon Code is required'); + }) + it('should return 404 if coupon code is not found in the database', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: "InvalidCode", + }); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Invalid Coupon Code'); + }) + it('should not allow use of expired tokens', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: expiredCoupon.code, + }); + + expect(response.status).toBe(400); + expect(response.body.message).toBe('Coupon is expired'); + }) + it('should not allow use of coupon that reach maximum users', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: finishedCoupon.code, + }); + + expect(response.status).toBe(400); + expect(response.body.message).toBe('Coupon Discount Ended'); + }) + it('Should not work when the product is not in cart', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: sampleCoupon3.code, + }); + + expect(response.status).toBe(404); + expect(response.body.message).toBe("No product in Cart with that coupon code"); + }) + }) + + describe("Giving discount according the the product coupon", () => { + it('Should give discont when discount-type is percentage', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: sampleCoupon2.code, + }); + + expect(response.status).toBe(200); + expect(response.body.message).toBe(`Coupon Code successfully activated discount on product: ${sampleProduct1.name}`); + }) + it('Should give discont when discount-type is money', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: moneyCoupon.code, + }); + + expect(response.status).toBe(200); + expect(response.body.message).toBe(`Coupon Code successfully activated discount on product: ${sampleProduct1.name}`); + }) + }) + +}) diff --git a/src/controllers/couponController.ts b/src/controllers/couponController.ts index 39eeb6e..dd7e19f 100644 --- a/src/controllers/couponController.ts +++ b/src/controllers/couponController.ts @@ -4,6 +4,7 @@ import { updateCouponService } from '../services/couponServices/updateService'; import { deleteCouponService } from '../services/couponServices/deleteCoupon'; import { accessAllCouponService } from '../services/couponServices/accessAllCoupon'; import { readCouponService } from '../services/couponServices/readCoupon'; +import { buyerApplyCouponService } from '../services/couponServices/buyerApplyCoupon' export const createCoupon = async (req: Request, res: Response) => { await createCouponService(req, res); @@ -24,3 +25,7 @@ export const accessAllCoupon = async (req: Request, res: Response) => { export const readCoupon = async (req: Request, res: Response) => { await readCouponService(req, res); }; + +export const buyerApplyCoupon = async (req: Request, res: Response) => { + await buyerApplyCouponService(req, res); +}; \ No newline at end of file diff --git a/src/docs/couponDocs.yml b/src/docs/couponDocs.yml index f250230..fb0a49a 100644 --- a/src/docs/couponDocs.yml +++ b/src/docs/couponDocs.yml @@ -180,3 +180,38 @@ description: Coupon not found '500': description: Internal server error + +/coupons/apply: + post: + tags: + - Buyer Coupon Discount Management + summary: Give discount according to coupon code + description: Buyer gets discount on a product when all the checks pass + security: + - bearerAuth: [] + consumes: + - application/json + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + couponCode: + type: string + required: + - couponCode + responses: + '200': + description: Successfully Got Discount + '400': + description: Bad Request (Syntax error, No coupon code provide, Coupon is expired, Coupon Discount Ended,etc) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Coupon not found, No cart or product with that coupon is not in cart + '500': + description: Internal server error diff --git a/src/docs/wishListDocs.yml b/src/docs/wishListDocs.yml new file mode 100644 index 0000000..df3c72c --- /dev/null +++ b/src/docs/wishListDocs.yml @@ -0,0 +1,97 @@ +/wish-list: + get: + tags: + - Wish list + summary: Get all products in wishlist + description: Return all products in wish list for authenticated buyer + security: + - bearerAuth: [] + responses: + '200': + description: Return all products in wish list for a buyer + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + +/wish-list/add/{id}: + post: + tags: + - Wish list + summary: Add product to wish list + description: Adds selected product (product id) to the wish list + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: Product id + responses: + '201': + description: Product Added to wish list + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found in wish list + '500': + description: Internal server error + +/wish-list/delete/{id}: + delete: + tags: + - Wish list + summary: Remove product from wish list + description: Remove product from wish list for an authenticated buyer + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: Product id + responses: + '200': + description: Product removed from wish list + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found in wish list + '500': + description: Internal server error + +/wish-list/clearAll: + delete: + tags: + - Wish list + summary: Clear entire wish list + description: Clears entire wish list for authenticated buyer + security: + - bearerAuth: [] + responses: + '200': + description: All products removed successfully + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error \ No newline at end of file diff --git a/src/entities/coupon.ts b/src/entities/coupon.ts index 19e5a68..39631c3 100644 --- a/src/entities/coupon.ts +++ b/src/entities/coupon.ts @@ -8,7 +8,7 @@ import { ManyToOne, JoinColumn, } from 'typeorm'; -import { IsDate, IsNotEmpty } from 'class-validator'; +import { IsDate, IsNotEmpty, IsArray, IsIn } from 'class-validator'; import { User } from './User'; import { Product } from './Product'; @@ -36,7 +36,8 @@ export class Coupon { @Column() @IsNotEmpty() - discountType!: string; + @IsIn(['percentage', 'money']) + discountType!: 'percentage' | 'money'; @Column('float') @IsNotEmpty() @@ -47,10 +48,18 @@ export class Coupon { @IsDate() expirationDate?: Date; + @Column('int', { default: 0 }) + @IsNotEmpty() + usageTimes!: number; + @Column('int') @IsNotEmpty() maxUsageLimit!: number; + @Column('simple-array', { nullable: true, default: '' }) + @IsArray() + usedBy!: string[]; + @CreateDateColumn() createdAt!: Date; diff --git a/src/routes/couponRoutes.ts b/src/routes/couponRoutes.ts index a7a979c..c315ab8 100644 --- a/src/routes/couponRoutes.ts +++ b/src/routes/couponRoutes.ts @@ -1,5 +1,5 @@ import { RequestHandler, Router } from 'express'; -import { createCoupon, updateCoupon, accessAllCoupon, readCoupon, deleteCoupon } from '../controllers/couponController'; +import { createCoupon, updateCoupon, accessAllCoupon, readCoupon, deleteCoupon, buyerApplyCoupon } from '../controllers/couponController'; import { hasRole } from '../middlewares/roleCheck'; import { authMiddleware } from '../middlewares/verifyToken'; @@ -10,5 +10,6 @@ router.put('/vendor/:id/update-coupon/:code', authMiddleware as RequestHandler, router.get('/vendor/:id/checkout/:code', authMiddleware as RequestHandler, hasRole('VENDOR'), readCoupon); router.get('/vendor/:id/access-coupons', authMiddleware as RequestHandler, hasRole('VENDOR'), accessAllCoupon); router.delete('/vendor/:id/checkout/delete', authMiddleware as RequestHandler, hasRole('VENDOR'), deleteCoupon); +router.post('/apply', authMiddleware as RequestHandler, hasRole('BUYER'),buyerApplyCoupon); -export default router; +export default router; \ No newline at end of file diff --git a/src/services/couponServices/buyerApplyCoupon.ts b/src/services/couponServices/buyerApplyCoupon.ts new file mode 100644 index 0000000..12da4e1 --- /dev/null +++ b/src/services/couponServices/buyerApplyCoupon.ts @@ -0,0 +1,85 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { Coupon } from '../../entities/coupon'; +import { Cart } from '../../entities/Cart'; +import { CartItem } from '../../entities/CartItem'; + +export const buyerApplyCouponService = async (req: Request, res: Response) => { + try { + const {couponCode} = req.body + + if (!couponCode) return res.status(400).json({ message: 'Coupon Code is required' }); + + const couponRepository = getRepository(Coupon); + const coupon = await couponRepository.findOne({ + where: { code: couponCode }, + relations: ['product'], + }); + + if(!coupon) return res.status(404).json({message: 'Invalid Coupon Code'}); + + if(coupon){ + if(coupon.expirationDate && coupon.expirationDate < new Date()){ + return res.status(400).json({message: 'Coupon is expired'}); + } + + if(coupon.usageTimes == coupon.maxUsageLimit){ + return res.status(400).json({message: 'Coupon Discount Ended'}); + } + } + const couponProductId = coupon.product.id; + + const cartRepository = getRepository(Cart) + let cart = await cartRepository.findOne({where: { user: { id: req.user?.id },isCheckedOut: false }, + relations: ['items', 'items.product'], + }); + + if(!cart) return res.status(400).json({message: "You don't have a product in cart"}); + + const cartItemRepository = getRepository(CartItem); + const couponCartItem = await cartItemRepository.findOne({ + where: { + cart: { id: cart.id }, + product: { id: couponProductId }, + }, + relations: ['product'], + }); + + if(!couponCartItem) return res.status(404).json({message: 'No product in Cart with that coupon code'}); + + let amountReducted; + if(coupon.discountType === 'percentage'){ + const reduction = (couponCartItem.product.newPrice * coupon.discountRate)/ 100; + amountReducted = reduction; + couponCartItem.newPrice = couponCartItem.product.newPrice - reduction; + + await cartItemRepository.save(couponCartItem) + } + else { + amountReducted = coupon.discountRate; + couponCartItem.newPrice = couponCartItem.product.newPrice - amountReducted; + await cartItemRepository.save(couponCartItem) + } + + cart = await cartRepository.findOne({where: { id: cart.id}, + relations: ['items', 'items.product'], + }); + if(cart){ + cart.updateTotal(); + await cartRepository.save(cart); + } + + coupon.usageTimes +=1; + + if(req.user?.id){ + coupon.usedBy.push(req.user?.id); + } + + await couponRepository.save(coupon); + + return (res.status(200).json({message: `Coupon Code successfully activated discount on product: ${couponCartItem.product.name}`, amountDiscounted: amountReducted })); + + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } + }; \ No newline at end of file From 31e7653081d5ee6b6b5ed96d2df4c5c0daa6ebad Mon Sep 17 00:00:00 2001 From: Icyeza Date: Wed, 22 May 2024 17:10:37 +0200 Subject: [PATCH 16/20] implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue adding documentation and tests writing tests --- .github/workflows/ci.yml | 1 - package.json | 2 + src/__test__/cart.test.ts | 17 +- src/__test__/coupon.test.ts | 80 ++-- src/__test__/errorHandler.test.ts | 78 ++-- src/__test__/getProduct.test.ts | 2 +- src/__test__/isAllowed.test.ts | 29 +- src/__test__/logout.test.ts | 3 +- src/__test__/oauth.test.ts | 24 +- src/__test__/orderManagement.test.ts | 390 ++++++++++++++++++ src/__test__/productStatus.test.ts | 14 +- src/__test__/roleCheck.test.ts | 2 +- src/__test__/route.test.ts | 3 +- src/__test__/test-assets/DatabaseCleanup.ts | 28 +- src/__test__/userServices.test.ts | 6 +- src/__test__/userStatus.test.ts | 2 +- src/__test__/vendorProduct.test.ts | 2 +- src/__test__/wishList.test.ts | 2 +- src/controllers/adminOrdercontroller.ts | 18 + src/controllers/couponController.ts | 4 +- src/controllers/index.ts | 4 +- src/controllers/orderController.ts | 2 +- src/controllers/productController.ts | 23 +- src/controllers/vendorOrderController.ts | 14 + src/controllers/wishListController.ts | 29 +- src/docs/adminOrderManagement.yml | 80 ++++ src/docs/couponDocs.yml | 2 +- src/docs/vendorOrderManagement.yml | 93 +++++ src/docs/vendorProduct.yml | 14 +- src/docs/wishListDocs.yml | 2 +- src/entities/Cart.ts | 2 +- src/entities/CartItem.ts | 2 +- src/entities/Order.ts | 24 +- src/entities/Product.ts | 6 +- src/entities/User.ts | 4 +- src/entities/VendorOrderItem.ts | 30 ++ src/entities/transaction.ts | 2 +- src/entities/vendorOrders.ts | 49 +++ src/entities/wishList.ts | 17 +- src/index.ts | 29 +- src/routes/ProductRoutes.ts | 20 +- src/routes/UserRoutes.ts | 39 +- src/routes/couponRoutes.ts | 13 +- src/routes/index.ts | 4 +- src/routes/wishListRoute.ts | 27 +- src/services/adminOrderServices/readOrder.ts | 158 +++++++ .../adminOrderServices/updateOrder.ts | 107 +++++ .../couponServices/buyerApplyCoupon.ts | 134 +++--- src/services/index.ts | 8 + src/services/orderServices/createOrder.ts | 63 ++- src/services/orderServices/getOrderService.ts | 104 +++-- .../orderServices/updateOrderService.ts | 231 ++++++----- src/services/productServices/deleteProduct.ts | 40 +- .../getRecommendedProductsService.ts | 105 ++--- .../productServices/listAllProductsService.ts | 64 +-- src/services/productServices/readProduct.ts | 116 +++--- .../productServices/removeProductImage.ts | 2 +- src/services/productServices/searchProduct.ts | 7 +- .../productServices/viewSingleProduct.ts | 45 +- .../vendorOrderServices/readVendorOrder.ts | 119 ++++++ .../vendorOrderServices/updateVendorOrder.ts | 87 ++++ src/services/wishListServices/addProduct.ts | 89 ++-- src/services/wishListServices/clearAll.ts | 27 +- src/services/wishListServices/getProducts.ts | 59 +-- .../wishListServices/removeProducts.ts | 30 +- src/startups/getSwaggerServer.ts | 2 +- src/utils/auth.ts | 104 +++-- src/utils/index.ts | 26 +- src/utils/sendOrderMail.ts | 15 +- src/utils/sendOrderMailUpdated.ts | 15 +- src/utils/socket.ts | 21 + tsconfig.json | 214 +++++----- 72 files changed, 2260 insertions(+), 970 deletions(-) create mode 100644 src/__test__/orderManagement.test.ts create mode 100644 src/controllers/adminOrdercontroller.ts create mode 100644 src/controllers/vendorOrderController.ts create mode 100644 src/docs/adminOrderManagement.yml create mode 100644 src/docs/vendorOrderManagement.yml create mode 100644 src/entities/VendorOrderItem.ts create mode 100644 src/entities/vendorOrders.ts create mode 100644 src/services/adminOrderServices/readOrder.ts create mode 100644 src/services/adminOrderServices/updateOrder.ts create mode 100644 src/services/vendorOrderServices/readVendorOrder.ts create mode 100644 src/services/vendorOrderServices/updateVendorOrder.ts create mode 100644 src/utils/socket.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0c5f52..224592b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,6 @@ env: CLOUDINARY_API_SECRET: ${{secrets.CLOUDINARY_API_SECRET}} GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} - jobs: build-lint-test-coverage: diff --git a/package.json b/package.json index 06e7e40..ef7acc5 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "passport-google-oauth20": "^2.0.0", "pg": "^8.11.5", "reflect-metadata": "^0.2.2", + "socket.io": "^4.7.5", "source-map-support": "^0.5.21", "superagent": "^9.0.1", "swagger-jsdoc": "^6.2.8", @@ -78,6 +79,7 @@ "@types/nodemailer": "^6.4.15", "@types/passport-google-oauth20": "^2.0.16", "@types/reflect-metadata": "^0.1.0", + "@types/socket.io": "^3.0.2", "@types/supertest": "^6.0.2", "@types/uuid": "^9.0.8", "@types/winston": "^2.4.4", diff --git a/src/__test__/cart.test.ts b/src/__test__/cart.test.ts index 9f86f73..4d6d1f0 100644 --- a/src/__test__/cart.test.ts +++ b/src/__test__/cart.test.ts @@ -1,4 +1,3 @@ - import request from 'supertest'; import jwt from 'jsonwebtoken'; import { app, server } from '../index'; @@ -171,8 +170,9 @@ beforeAll(async () => { }); afterAll(async () => { - await cleanDatabase() + await cleanDatabase(); + server.close(); }); describe('Cart management for guest/buyer', () => { @@ -524,12 +524,12 @@ describe('Order management tests', () => { city: 'Test City', street: 'Test Street', }, - }).set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); expect(response.status).toBe(400); }); it('should create a new order', async () => { - const response = await request(app) .post('/product/orders') .send({ @@ -547,7 +547,6 @@ describe('Order management tests', () => { }); it('should insert a new order', async () => { - const response = await request(app) .post('/product/orders') .send({ @@ -570,9 +569,8 @@ describe('Order management tests', () => { const response = await request(app) .get('/product/client/orders') .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); - expect(response.status).toBe(404); + expect(response.status).toBe(404); expect(response.body.message).toBeUndefined; - }); it('should return 404 if the buyer has no orders', async () => { @@ -586,13 +584,11 @@ describe('Order management tests', () => { describe('Get transaction history', () => { it('should return transaction history for the buyer', async () => { - const response = await request(app) .get('/product/orders/history') .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); expect(response.status).toBe(404); expect(response.body.message).toBe('No transaction history found'); - }); it('should return 400 when user ID is not provided', async () => { @@ -605,12 +601,11 @@ describe('Order management tests', () => { describe('Update order', () => { it('should update order status successfully', async () => { - const response = await request(app) .put(`/product/client/orders/${orderId}`) .send({ orderStatus: 'delivered' }) .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); - expect(response.status).toBe(500); + expect(response.status).toBe(500); }); }); }); diff --git a/src/__test__/coupon.test.ts b/src/__test__/coupon.test.ts index b3f68b4..269e95e 100644 --- a/src/__test__/coupon.test.ts +++ b/src/__test__/coupon.test.ts @@ -21,7 +21,7 @@ const product2Id = uuid(); const couponCode = 'DISCOUNT20'; const couponCode1 = 'DISCOUNT10'; const couponCode2 = 'DISCOUNT99'; -const couponCode3 = 'DISCOUNT22' +const couponCode3 = 'DISCOUNT22'; const expiredCouponCode = 'EXPIRED'; const finishedCouponCode = 'FINISHED'; const moneyCouponCode = 'MONEY'; @@ -199,11 +199,10 @@ beforeAll(async () => { const cartItemRepository = connection?.getRepository(CartItem); await cartItemRepository?.save({ ...sampleCartItem1 }); - }); afterAll(async () => { - await cleanDatabase() + await cleanDatabase(); server.close(); }); @@ -340,84 +339,87 @@ describe('Coupon Management System', () => { }); describe('Buyer Coupon Application', () => { - describe('Checking Coupon Conditions', () =>{ + describe('Checking Coupon Conditions', () => { it('should return 400 when no coupon submitted', async () => { const response = await request(app) .post(`/coupons/apply`) .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); - expect(response.status).toBe(400); - expect(response.body.message).toBe('Coupon Code is required'); - }) + expect(response.status).toBe(400); + expect(response.body.message).toBe('Coupon Code is required'); + }); it('should return 404 if coupon code is not found in the database', async () => { const response = await request(app) .post(`/coupons/apply`) .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) .send({ - couponCode: "InvalidCode", + couponCode: 'InvalidCode', }); - expect(response.status).toBe(404); - expect(response.body.message).toBe('Invalid Coupon Code'); - }) + expect(response.status).toBe(404); + expect(response.body.message).toBe('Invalid Coupon Code'); + }); it('should not allow use of expired tokens', async () => { const response = await request(app) - .post(`/coupons/apply`) + .post(`/coupons/apply`) .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) .send({ couponCode: expiredCoupon.code, }); - expect(response.status).toBe(400); - expect(response.body.message).toBe('Coupon is expired'); - }) + expect(response.status).toBe(400); + expect(response.body.message).toBe('Coupon is expired'); + }); it('should not allow use of coupon that reach maximum users', async () => { const response = await request(app) - .post(`/coupons/apply`) + .post(`/coupons/apply`) .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) .send({ couponCode: finishedCoupon.code, }); - expect(response.status).toBe(400); - expect(response.body.message).toBe('Coupon Discount Ended'); - }) + expect(response.status).toBe(400); + expect(response.body.message).toBe('Coupon Discount Ended'); + }); it('Should not work when the product is not in cart', async () => { const response = await request(app) - .post(`/coupons/apply`) - .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) - .send({ + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ couponCode: sampleCoupon3.code, }); expect(response.status).toBe(404); - expect(response.body.message).toBe("No product in Cart with that coupon code"); - }) - }) + expect(response.body.message).toBe('No product in Cart with that coupon code'); + }); + }); - describe("Giving discount according the the product coupon", () => { + describe('Giving discount according the the product coupon', () => { it('Should give discont when discount-type is percentage', async () => { const response = await request(app) - .post(`/coupons/apply`) - .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) - .send({ + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ couponCode: sampleCoupon2.code, }); expect(response.status).toBe(200); - expect(response.body.message).toBe(`Coupon Code successfully activated discount on product: ${sampleProduct1.name}`); - }) + expect(response.body.message).toBe( + `Coupon Code successfully activated discount on product: ${sampleProduct1.name}` + ); + }); it('Should give discont when discount-type is money', async () => { const response = await request(app) - .post(`/coupons/apply`) - .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) - .send({ + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ couponCode: moneyCoupon.code, }); expect(response.status).toBe(200); - expect(response.body.message).toBe(`Coupon Code successfully activated discount on product: ${sampleProduct1.name}`); - }) - }) - -}) + expect(response.body.message).toBe( + `Coupon Code successfully activated discount on product: ${sampleProduct1.name}` + ); + }); + }); +}); diff --git a/src/__test__/errorHandler.test.ts b/src/__test__/errorHandler.test.ts index fb1437c..cf079f0 100644 --- a/src/__test__/errorHandler.test.ts +++ b/src/__test__/errorHandler.test.ts @@ -1,47 +1,47 @@ import { Request, Response } from 'express'; -import { CustomError, errorHandler } from '../middlewares/errorHandler' +import { CustomError, errorHandler } from '../middlewares/errorHandler'; describe('CustomError', () => { - it('should create a CustomError object with statusCode and status properties', () => { - const message = 'Test error message'; - const statusCode = 404; - const customError = new CustomError(message, statusCode); - expect(customError.message).toBe(message); - expect(customError.statusCode).toBe(statusCode); - expect(customError.status).toBe('fail'); - }); + it('should create a CustomError object with statusCode and status properties', () => { + const message = 'Test error message'; + const statusCode = 404; + const customError = new CustomError(message, statusCode); + expect(customError.message).toBe(message); + expect(customError.statusCode).toBe(statusCode); + expect(customError.status).toBe('fail'); }); +}); - describe('errorHandler', () => { - it('should send correct response with status code and message', () => { - const err = new CustomError('Test error message', 404); - const req = {} as Request; - const res = { - status: jest.fn().mockReturnThis(), - json: jest.fn(), - } as unknown as Response; - const next = jest.fn(); - errorHandler(err, req, res, next); - expect(res.status).toHaveBeenCalledWith(404); - expect(res.json).toHaveBeenCalledWith({ - status: 404, - message: 'Test error message', - }); +describe('errorHandler', () => { + it('should send correct response with status code and message', () => { + const err = new CustomError('Test error message', 404); + const req = {} as Request; + const res = { + status: jest.fn().mockReturnThis(), + json: jest.fn(), + } as unknown as Response; + const next = jest.fn(); + errorHandler(err, req, res, next); + expect(res.status).toHaveBeenCalledWith(404); + expect(res.json).toHaveBeenCalledWith({ + status: 404, + message: 'Test error message', }); - it('should handle errors with status code 500', () => { - const err = new CustomError('something went wrong', 500); - const req = {} as Request; - const res = { - status: jest.fn().mockReturnThis(), - json: jest.fn(), - } as unknown as Response; - const next = jest.fn(); - errorHandler(err, req, res, next); + }); + it('should handle errors with status code 500', () => { + const err = new CustomError('something went wrong', 500); + const req = {} as Request; + const res = { + status: jest.fn().mockReturnThis(), + json: jest.fn(), + } as unknown as Response; + const next = jest.fn(); + errorHandler(err, req, res, next); - expect(res.status).toHaveBeenCalledWith(500); - expect(res.json).toHaveBeenCalledWith({ - status: 500, - message: 'something went wrong', - }); + expect(res.status).toHaveBeenCalledWith(500); + expect(res.json).toHaveBeenCalledWith({ + status: 500, + message: 'something went wrong', }); - }); \ No newline at end of file + }); +}); diff --git a/src/__test__/getProduct.test.ts b/src/__test__/getProduct.test.ts index 88dd415..ecd2281 100644 --- a/src/__test__/getProduct.test.ts +++ b/src/__test__/getProduct.test.ts @@ -68,7 +68,7 @@ beforeAll(async () => { }); afterAll(async () => { - await cleanDatabase() + await cleanDatabase(); server.close(); }); diff --git a/src/__test__/isAllowed.test.ts b/src/__test__/isAllowed.test.ts index b17b657..471a950 100644 --- a/src/__test__/isAllowed.test.ts +++ b/src/__test__/isAllowed.test.ts @@ -48,24 +48,23 @@ beforeAll(async () => { }); afterAll(async () => { - await cleanDatabase() - + await cleanDatabase(); }); describe('Middleware - checkUserStatus', () => { - beforeEach(() => { - reqMock = {}; - resMock = { - status: jest.fn().mockReturnThis(), - json: jest.fn() - }; - nextMock = jest.fn(); - }); - - it('should return 401 if user is not authenticated', async () => { - await checkUserStatus(reqMock as Request, resMock as Response, nextMock); - expect(responseError).toHaveBeenCalledWith(resMock, 401, 'Authentication required'); - }); + beforeEach(() => { + reqMock = {}; + resMock = { + status: jest.fn().mockReturnThis(), + json: jest.fn(), + }; + nextMock = jest.fn(); + }); + + it('should return 401 if user is not authenticated', async () => { + await checkUserStatus(reqMock as Request, resMock as Response, nextMock); + expect(responseError).toHaveBeenCalledWith(resMock, 401, 'Authentication required'); + }); it('should return 401 if user is not found', async () => { reqMock = { user: { id: uuid() } }; diff --git a/src/__test__/logout.test.ts b/src/__test__/logout.test.ts index cd950fd..ac9eefa 100644 --- a/src/__test__/logout.test.ts +++ b/src/__test__/logout.test.ts @@ -10,8 +10,7 @@ beforeAll(async () => { }); afterAll(async () => { - await cleanDatabase() - + await cleanDatabase(); server.close(); }); diff --git a/src/__test__/oauth.test.ts b/src/__test__/oauth.test.ts index 2493059..877d63b 100644 --- a/src/__test__/oauth.test.ts +++ b/src/__test__/oauth.test.ts @@ -5,24 +5,20 @@ import { User } from '../entities/User'; import { cleanDatabase } from './test-assets/DatabaseCleanup'; beforeAll(async () => { - await createConnection(); }); afterAll(async () => { - await cleanDatabase() + await cleanDatabase(); server.close(); }); -describe('authentication routes test',() => { - it('should redirect to the google authentication page',async() => { - const response = await request(app) - .get('/user/google-auth'); - expect(response.statusCode).toBe(302) - }) - it('should redirect after google authentication', async() => { - const response = await request(app) - .get('/user/auth/google/callback'); - expect(response.statusCode).toBe(302) - }) +describe('authentication routes test', () => { + it('should redirect to the google authentication page', async () => { + const response = await request(app).get('/user/google-auth'); + expect(response.statusCode).toBe(302); + }); + it('should redirect after google authentication', async () => { + const response = await request(app).get('/user/auth/google/callback'); + expect(response.statusCode).toBe(302); + }); }); - diff --git a/src/__test__/orderManagement.test.ts b/src/__test__/orderManagement.test.ts new file mode 100644 index 0000000..846b9d8 --- /dev/null +++ b/src/__test__/orderManagement.test.ts @@ -0,0 +1,390 @@ +import request from 'supertest'; +import jwt from 'jsonwebtoken'; +import { app, server } from '../index'; +import { getConnection } from 'typeorm'; +import { dbConnection } from '../startups/dbConnection'; +import { User, UserInterface } from '../entities/User'; +import { v4 as uuid } from 'uuid'; +import { Product } from '../entities/Product'; +import { Category } from '../entities/Category'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; +import { Order } from '../entities/Order'; +import { OrderItem } from '../entities/OrderItem'; +import { VendorOrders } from '../entities/vendorOrders'; +import { VendorOrderItem } from '../entities/VendorOrderItem'; + +const adminId = uuid(); +const vendorId = uuid(); +const vendor2Id = uuid(); +const buyerId = uuid(); + +const productId = uuid(); +const product2Id = uuid(); + +const orderId = uuid(); +const orderItemId = uuid(); +const order2Id = uuid(); +const order2ItemId = uuid(); + +const vendorOrderId = uuid(); +const vendorOrderItemId = uuid(); +const vendorOrder2Id = uuid(); +const vendorOrder2ItemId = uuid(); +const catId = uuid(); + +console.log(adminId, vendorId, buyerId); + +const jwtSecretKey = process.env.JWT_SECRET || ''; + +const getAccessToken = (id: string, email: string) => { + return jwt.sign( + { + id: id, + email: email, + }, + jwtSecretKey + ); +}; + +const sampleAdmin: UserInterface = { + id: adminId, + firstName: 'admin', + lastName: 'user', + email: 'admin@example.com', + password: 'password', + userType: 'Admin', + gender: 'Male', + phoneNumber: '126380997', + photoUrl: 'https://example.com/photo.jpg', + verified: true, + role: 'ADMIN', +}; +const sampleVendor: UserInterface = { + id: vendorId, + firstName: 'vendor', + lastName: 'user', + email: 'vendor@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + verified: true, + role: 'VENDOR', +}; +const sampleVendor2: UserInterface = { + id: vendor2Id, + firstName: 'vendor', + lastName: 'user', + email: 'vendor2@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '18090296347', + photoUrl: 'https://example.com/photo.jpg', + verified: true, + role: 'VENDOR', +}; +const sampleBuyer: UserInterface = { + id: buyerId, + firstName: 'buyer', + lastName: 'user', + email: 'buyer@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '6380996347', + photoUrl: 'https://example.com/photo.jpg', + verified: true, + role: 'BUYER', +}; + +const sampleCat = { + id: catId, + name: 'accessories', +}; + +const sampleProduct = { + id: productId, + name: 'test product', + description: 'amazing product', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor, + categories: [sampleCat], +}; +const sampleProduct2 = { + id: product2Id, + name: 'test product2', + description: 'amazing products', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor, + categories: [sampleCat], +}; + +const sampleOrder = { + id: orderId, + totalPrice: 400, + quantity: 2, + orderDate: new Date(), + buyer: sampleBuyer, + orderStatus: 'received', + address: 'Rwanda, Kigali, KK20st', +}; +const sampleOrder2 = { + id: order2Id, + totalPrice: 400, + quantity: 2, + orderDate: new Date(), + buyer: sampleBuyer, + orderStatus: 'order placed', + address: 'Rwanda, Kigali, KK20st', +}; + +const sampleOrderItem = { + id: orderItemId, + price: 200, + quantity: 2, + order: sampleOrder, + product: sampleProduct, +}; + +const sampleVendorOrder = { + id: vendorOrderId, + totalPrice: 400, + quantity: 2, + vendor: sampleVendor, + order: sampleOrder, + buyer: sampleBuyer, + orderStatus: 'pending', +}; + +const sampleVendorOrderItem = { + 'id': vendorOrderItemId, + 'price/unit': 200, + 'quantity': 2, + 'order': sampleVendorOrder, + 'product': sampleProduct, +}; + +beforeAll(async () => { + const connection = await dbConnection(); + + const categoryRepository = connection?.getRepository(Category); + await categoryRepository?.save({ ...sampleCat }); + + const userRepository = connection?.getRepository(User); + await userRepository?.save([sampleAdmin, sampleVendor, sampleVendor2, sampleBuyer]); + + const productRepository = connection?.getRepository(Product); + await productRepository?.save({ ...sampleProduct }); + + // Order Management + const orderRepository = connection?.getRepository(Order); + await orderRepository?.save([sampleOrder, sampleOrder2]); + + const orderItemRepository = connection?.getRepository(OrderItem); + await orderItemRepository?.save({ ...sampleOrderItem }); + + const vendorOrderRepository = connection?.getRepository(VendorOrders); + await vendorOrderRepository?.save({ ...sampleVendorOrder }); + + const vendorOrderItemRepository = connection?.getRepository(VendorOrderItem); + await vendorOrderItemRepository?.save({ ...sampleVendorOrderItem }); +}); + +afterAll(async () => { + await cleanDatabase(); + server.close(); +}); + +describe('Vendor Order Management', () => { + describe('Fetching vendor Order(s)', () => { + it('Should return all vendor orders', async () => { + const response = await request(app) + .get('/product/vendor/orders') + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.orders).toBeDefined(); + }); + + it("Should return empty array if vendor don't have any order for buyer", async () => { + const response = await request(app) + .get('/product/vendor/orders') + .set('Authorization', `Bearer ${getAccessToken(vendor2Id, sampleVendor2.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.orders).toEqual([]); + }); + + it('Should return single vendor order', async () => { + const response = await request(app) + .get(`/product/vendor/orders/${vendorOrderId}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.order).toBeDefined(); + }); + + it('return 404, for non existing vendor order', async () => { + const response = await request(app) + .get(`/product/vendor/orders/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Order Not Found.'); + }); + + it('return 400, for invalid vendor order id ', async () => { + const response = await request(app) + .get(`/product/vendor/orders/32df3`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBe(`invalid input syntax for type uuid: "32df3"`); + }); + }); + describe('Updating vendor order', () => { + it('should update the order', async () => { + const response = await request(app) + .put(`/product/vendor/orders/${vendorOrderId}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`) + .send({ + orderStatus: 'delivered', + }); + + expect(response.statusCode).toBe(200); + }); + it('should not update if orderStatus in not among defined ones', async () => { + const response = await request(app) + .put(`/product/vendor/orders/${vendorOrderId}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`) + .send({ + orderStatus: 'fakeOrderStatus', + }); + + expect(response.statusCode).toBe(400); + expect(response.body.message).toBe('Please provide one of defined statuses.'); + }); + it('should not update, return 404 for non existing vendor order', async () => { + const response = await request(app) + .put(`/product/vendor/orders/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`) + .send({ + orderStatus: 'is-accepted', + }); + + expect(response.statusCode).toBe(404); + expect(response.body.message).toBe('Order Not Found.'); + }); + it('should not update, if the order has already been cancelled or completed', async () => { + const response = await request(app) + .put(`/product/vendor/orders/${vendorOrderId}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`) + .send({ + orderStatus: 'is-accepted', + }); + + expect(response.statusCode).toBe(409); + }); + it('return 400, for invalid vendor order id ', async () => { + const response = await request(app) + .put(`/product/vendor/orders/32df3`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`) + .send({ + orderStatus: 'is-accepted', + }); + + expect(response.status).toBe(400); + expect(response.body.message).toBe(`invalid input syntax for type uuid: "32df3"`); + }); + }); +}); + +describe('Admin Order Management', () => { + describe('Fetching buyer and vendor Order(s)', () => { + it("Should return all orders with it's buyer and related vendors", async () => { + const response = await request(app) + .get('/product/admin/orders') + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.orders).toBeDefined(); + }); + + it('Should return single order details', async () => { + const response = await request(app) + .get(`/product/admin/orders/${orderId}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.order).toBeDefined(); + }); + + it('return 404, for non existing order', async () => { + const response = await request(app) + .get(`/product/admin/orders/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Order Not Found.'); + }); + + it('return 400, for invalid order id ', async () => { + const response = await request(app) + .get(`/product/admin/orders/32df3`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBe(`invalid input syntax for type uuid: "32df3"`); + }); + }); + describe('Updating buyer and vendor order', () => { + it('should not update, return 404 for non existing order', async () => { + const response = await request(app) + .put(`/product/admin/orders/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.statusCode).toBe(404); + expect(response.body.message).toBe('Order Not Found.'); + }); + it('should update the order', async () => { + const response = await request(app) + .put(`/product/admin/orders/${orderId}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.statusCode).toBe(200); + expect(response.body.data.order).toBeDefined(); + }); + it('should not update if it has already been completed(closed)', async () => { + const response = await request(app) + .put(`/product/admin/orders/${orderId}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.statusCode).toBe(409); + expect(response.body.message).toBe('The order has already been completed.'); + }); + + it('should not update, if the order has not been marked as received by buyer', async () => { + const response = await request(app) + .put(`/product/admin/orders/${order2Id}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.statusCode).toBe(409); + expect(response.body.message).toBe('Order closure failed: The buyer has not received the item yet.'); + }); + + it('return 400, for invalid order id ', async () => { + const response = await request(app) + .put(`/product/admin/orders/32df3`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBe(`invalid input syntax for type uuid: "32df3"`); + }); + }); +}); diff --git a/src/__test__/productStatus.test.ts b/src/__test__/productStatus.test.ts index 6d6df6a..8e8b42a 100644 --- a/src/__test__/productStatus.test.ts +++ b/src/__test__/productStatus.test.ts @@ -144,7 +144,7 @@ beforeAll(async () => { }); afterAll(async () => { - await cleanDatabase() + await cleanDatabase(); server.close(); }); @@ -222,22 +222,16 @@ describe('Vendor product availability status management tests', () => { }); }); - describe('search product by name availability tests', () => { it('Should search product by name', async () => { - const response = await request(app) - .get(`/product/search?name=testingmkknkkjiproduct4`) + const response = await request(app).get(`/product/search?name=testingmkknkkjiproduct4`); expect(response.body.data).toBeDefined; }, 10000); it('should return empty array if there is product is not found in the database', async () => { - const response = await request(app) - .put(`/product/search?name=home`) - + const response = await request(app).put(`/product/search?name=home`); expect(response.statusCode).toBe(401); expect(response.body.data).toBeUndefined; }); - - }); - +}); diff --git a/src/__test__/roleCheck.test.ts b/src/__test__/roleCheck.test.ts index ada2271..32df044 100644 --- a/src/__test__/roleCheck.test.ts +++ b/src/__test__/roleCheck.test.ts @@ -35,7 +35,7 @@ beforeAll(async () => { }); afterAll(async () => { - await cleanDatabase() + await cleanDatabase(); }); describe('hasRole MiddleWare Test', () => { diff --git a/src/__test__/route.test.ts b/src/__test__/route.test.ts index 721f763..ac704b5 100644 --- a/src/__test__/route.test.ts +++ b/src/__test__/route.test.ts @@ -11,8 +11,7 @@ beforeAll(async () => { jest.setTimeout(20000); afterAll(async () => { - await cleanDatabase() - + await cleanDatabase(); server.close(); }); diff --git a/src/__test__/test-assets/DatabaseCleanup.ts b/src/__test__/test-assets/DatabaseCleanup.ts index ec40ee6..3674dfb 100644 --- a/src/__test__/test-assets/DatabaseCleanup.ts +++ b/src/__test__/test-assets/DatabaseCleanup.ts @@ -1,16 +1,17 @@ - import { Transaction } from '../../entities/transaction'; -import { Cart } from "../../entities/Cart"; -import { CartItem } from "../../entities/CartItem"; -import { Order } from "../../entities/Order"; -import { OrderItem } from "../../entities/OrderItem"; -import { wishList } from "../../entities/wishList"; +import { Cart } from '../../entities/Cart'; +import { CartItem } from '../../entities/CartItem'; +import { Order } from '../../entities/Order'; +import { OrderItem } from '../../entities/OrderItem'; +import { wishList } from '../../entities/wishList'; import { getConnection } from 'typeorm'; import { Product } from '../../entities/Product'; import { Category } from '../../entities/Category'; import { Coupon } from '../../entities/coupon'; import { User } from '../../entities/User'; import { server } from '../..'; +import { VendorOrderItem } from '../../entities/VendorOrderItem'; +import { VendorOrders } from '../../entities/vendorOrders'; export const cleanDatabase = async () => { const connection = getConnection(); @@ -18,6 +19,8 @@ export const cleanDatabase = async () => { // Delete from child tables first await connection.getRepository(Transaction).delete({}); await connection.getRepository(Coupon).delete({}); + await connection.getRepository(VendorOrderItem).delete({}); + await connection.getRepository(VendorOrders).delete({}); await connection.getRepository(OrderItem).delete({}); await connection.getRepository(Order).delete({}); await connection.getRepository(CartItem).delete({}); @@ -37,12 +40,11 @@ export const cleanDatabase = async () => { await connection.getRepository(User).delete({}); await connection.close(); - server.close(); }; -// Execute the clean-up function -cleanDatabase().then(() => { - console.log('Database cleaned'); -}).catch(error => { - console.error('Error cleaning database:', error); -}); +// // Execute the clean-up function +// cleanDatabase().then(() => { +// console.log('Database cleaned'); +// }).catch(error => { +// console.error('Error cleaning database:', error); +// }); diff --git a/src/__test__/userServices.test.ts b/src/__test__/userServices.test.ts index b4e87f9..29a2e7c 100644 --- a/src/__test__/userServices.test.ts +++ b/src/__test__/userServices.test.ts @@ -1,6 +1,6 @@ import request from 'supertest'; import { app, server } from '../index'; -import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; +import { createConnection, getRepository } from 'typeorm'; import { User } from '../entities/User'; import { cleanDatabase } from './test-assets/DatabaseCleanup'; @@ -9,7 +9,7 @@ beforeAll(async () => { }); afterAll(async () => { - await cleanDatabase() + await cleanDatabase(); server.close(); }); @@ -227,4 +227,4 @@ describe('start2FAProcess', () => { expect(res.status).toBe(404); expect(res.body).toEqual({ status: 'error', message: 'Incorrect email or password' }); }, 10000); -}); \ No newline at end of file +}); diff --git a/src/__test__/userStatus.test.ts b/src/__test__/userStatus.test.ts index 132134f..69e892a 100644 --- a/src/__test__/userStatus.test.ts +++ b/src/__test__/userStatus.test.ts @@ -36,7 +36,7 @@ beforeAll(async () => { }); afterAll(async () => { - await cleanDatabase() + await cleanDatabase(); server.close(); }); diff --git a/src/__test__/vendorProduct.test.ts b/src/__test__/vendorProduct.test.ts index f90d80d..d8fc0a5 100644 --- a/src/__test__/vendorProduct.test.ts +++ b/src/__test__/vendorProduct.test.ts @@ -110,7 +110,7 @@ beforeAll(async () => { }); afterAll(async () => { - await cleanDatabase() + await cleanDatabase(); server.close(); }); diff --git a/src/__test__/wishList.test.ts b/src/__test__/wishList.test.ts index aac072d..6658853 100644 --- a/src/__test__/wishList.test.ts +++ b/src/__test__/wishList.test.ts @@ -65,7 +65,7 @@ beforeAll(async () => { }); afterAll(async () => { - await cleanDatabase() + await cleanDatabase(); server.close(); }); const data1 = { diff --git a/src/controllers/adminOrdercontroller.ts b/src/controllers/adminOrdercontroller.ts new file mode 100644 index 0000000..388220d --- /dev/null +++ b/src/controllers/adminOrdercontroller.ts @@ -0,0 +1,18 @@ +import { Request, Response } from 'express'; +import { + getSingleBuyerVendorOrderService, + getBuyerVendorOrdersService, + updateBuyerVendorOrderService, +} from '../services'; + +export const getBuyerVendorOrders = async (req: Request, res: Response) => { + await getBuyerVendorOrdersService(req, res); +}; + +export const getSingleBuyerVendorOrder = async (req: Request, res: Response) => { + await getSingleBuyerVendorOrderService(req, res); +}; + +export const updateBuyerVendorOrder = async (req: Request, res: Response) => { + await updateBuyerVendorOrderService(req, res); +}; diff --git a/src/controllers/couponController.ts b/src/controllers/couponController.ts index dd7e19f..e5a6804 100644 --- a/src/controllers/couponController.ts +++ b/src/controllers/couponController.ts @@ -4,7 +4,7 @@ import { updateCouponService } from '../services/couponServices/updateService'; import { deleteCouponService } from '../services/couponServices/deleteCoupon'; import { accessAllCouponService } from '../services/couponServices/accessAllCoupon'; import { readCouponService } from '../services/couponServices/readCoupon'; -import { buyerApplyCouponService } from '../services/couponServices/buyerApplyCoupon' +import { buyerApplyCouponService } from '../services/couponServices/buyerApplyCoupon'; export const createCoupon = async (req: Request, res: Response) => { await createCouponService(req, res); @@ -28,4 +28,4 @@ export const readCoupon = async (req: Request, res: Response) => { export const buyerApplyCoupon = async (req: Request, res: Response) => { await buyerApplyCouponService(req, res); -}; \ No newline at end of file +}; diff --git a/src/controllers/index.ts b/src/controllers/index.ts index 3cbb7dc..70dea3b 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -1,3 +1,5 @@ export * from './authController'; export * from './productController'; -export * from './orderController'; \ No newline at end of file +export * from './orderController'; +export * from './vendorOrderController'; +export * from './adminOrdercontroller'; diff --git a/src/controllers/orderController.ts b/src/controllers/orderController.ts index 5a5db97..d4ac5fc 100644 --- a/src/controllers/orderController.ts +++ b/src/controllers/orderController.ts @@ -15,4 +15,4 @@ export const updateOrder = async (req: Request, res: Response) => { }; export const getOrdersHistory = async (req: Request, res: Response) => { await getTransactionHistoryService(req, res); -}; \ No newline at end of file +}; diff --git a/src/controllers/productController.ts b/src/controllers/productController.ts index 11caddd..1cd895a 100644 --- a/src/controllers/productController.ts +++ b/src/controllers/productController.ts @@ -1,26 +1,17 @@ import { Request, Response } from 'express'; import { - createProductService, - updateProductService, - - removeProductImageService, - + removeProductImageService, readProductService, - readProductsService, - + readProductsService, deleteProductService, - getRecommendedProductsService, productStatusServices, viewSingleProduct, - searchProductService - -, - listAllProductsService} -from '../services'; - + searchProductService, + listAllProductsService, +} from '../services'; export const readProduct = async (req: Request, res: Response) => { await readProductService(req, res); @@ -50,10 +41,10 @@ export const getRecommendedProducts = async (req: Request, res: Response) => { await getRecommendedProductsService(req, res); }; - export const listAllProducts = async (req: Request, res: Response) => { await listAllProductsService(req, res); -};export const productStatus = async (req: Request, res: Response) => { +}; +export const productStatus = async (req: Request, res: Response) => { await productStatusServices(req, res); }; export const singleProduct = async (req: Request, res: Response) => { diff --git a/src/controllers/vendorOrderController.ts b/src/controllers/vendorOrderController.ts new file mode 100644 index 0000000..955b01c --- /dev/null +++ b/src/controllers/vendorOrderController.ts @@ -0,0 +1,14 @@ +import { Request, Response } from 'express'; +import { getVendorOrdersService, getSingleVendorOrderService, updateVendorOrderService } from '../services'; + +export const getVendorOrders = async (req: Request, res: Response) => { + await getVendorOrdersService(req, res); +}; + +export const getSingleVendorOrder = async (req: Request, res: Response) => { + await getSingleVendorOrderService(req, res); +}; + +export const updateVendorOrder = async (req: Request, res: Response) => { + await updateVendorOrderService(req, res); +}; diff --git a/src/controllers/wishListController.ts b/src/controllers/wishListController.ts index e0cd1bd..23fa03f 100644 --- a/src/controllers/wishListController.ts +++ b/src/controllers/wishListController.ts @@ -1,23 +1,18 @@ import { Request, Response } from 'express'; -import{ - addProductService, - getProductsService, - removeProductService, - clearAllProductService -} from '../services' +import { addProductService, getProductsService, removeProductService, clearAllProductService } from '../services'; export const wishlistAddProduct = async (req: Request, res: Response) => { - await addProductService(req, res); - }; + await addProductService(req, res); +}; - export const wishlistRemoveProduct = async (req: Request, res:Response) => { - await removeProductService(req, res); - } +export const wishlistRemoveProduct = async (req: Request, res: Response) => { + await removeProductService(req, res); +}; - export const wishlistGetProducts = async (req: Request, res:Response) => { - await getProductsService(req, res); - } +export const wishlistGetProducts = async (req: Request, res: Response) => { + await getProductsService(req, res); +}; - export const wishlistClearAllProducts = async (req: Request, res:Response) => { - await clearAllProductService(req, res); - } \ No newline at end of file +export const wishlistClearAllProducts = async (req: Request, res: Response) => { + await clearAllProductService(req, res); +}; diff --git a/src/docs/adminOrderManagement.yml b/src/docs/adminOrderManagement.yml new file mode 100644 index 0000000..e8d6ed6 --- /dev/null +++ b/src/docs/adminOrderManagement.yml @@ -0,0 +1,80 @@ +/product/admin/orders: + get: + tags: + - Admin Order Manangement + summary: Fetches all buyer and vendor orders + description: Return all order including details for buyer and vendors of products in that order + security: + - bearerAuth: [] + responses: + '200': + description: Return all order + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + +/product/admin/orders/{id}: + get: + tags: + - Admin Order Manangement + summary: Fetch details for single buyer and vendor order + description: + Fetch details for single order using buyer id, if successful return order details with it's corresponding vendor + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of a buyer order + responses: + '200': + description: Order details retrieved successfully + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Order not found + '500': + description: Internal server error + put: + tags: + - Admin Order Manangement + summary: Updates order status for both buyer and vendor order + description: Updates orderStatus field of order, if successful returns updated order. + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of a buyer order + consumes: + - application/json + responses: + '200': + description: Order was successfully updated, return updated order + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Order not found + '409': + description: Order can not be updated because (it has already been completed(close), delivered, cancelled) + '500': + description: Internal server error diff --git a/src/docs/couponDocs.yml b/src/docs/couponDocs.yml index fb0a49a..fefa829 100644 --- a/src/docs/couponDocs.yml +++ b/src/docs/couponDocs.yml @@ -35,7 +35,7 @@ description: The code of the coupon responses: '200': - description: Return info for the coupon + description: Return info for the coupon '400': description: Bad Request (syntax error, incorrect input format, etc..) '401': diff --git a/src/docs/vendorOrderManagement.yml b/src/docs/vendorOrderManagement.yml new file mode 100644 index 0000000..5873717 --- /dev/null +++ b/src/docs/vendorOrderManagement.yml @@ -0,0 +1,93 @@ +/product/vendor/orders: + get: + tags: + - Vendor Order Manangement + summary: Fetches all vendor orders + description: Return all order for authenticated vendor + security: + - bearerAuth: [] + responses: + '200': + description: Return all order for vendor requested from buyer + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + +/product/vendor/orders/{id}: + get: + tags: + - Vendor Order Manangement + summary: Fetch details for single vendor order + description: + Fetch details for single order for authenticated vendor, order that include only his/her product which a buyer has + requested in his order. + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of a vendor order + responses: + '200': + description: Order details retrieved successfully + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Order not found + '500': + description: Internal server error + put: + tags: + - Vendor Order Manangement + summary: Updates order status for vendor order + description: + Updates orderStatus field of vendor order for authenticated vendor, it order that include only his/her product + which a buyer has request in his order. + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of a vendor order + consumes: + - application/json + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + orderStatus: + type: string + example: "'is-accepted', 'in-transit', 'cancelled', 'delivered'" + responses: + '200': + description: Order was successfully updated, return updated order + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Order not found + '409': + description: Order can not be updated because (it has already been completed(close), delivered, cancelled) + '500': + description: Internal server error diff --git a/src/docs/vendorProduct.yml b/src/docs/vendorProduct.yml index 937b097..3830bf4 100644 --- a/src/docs/vendorProduct.yml +++ b/src/docs/vendorProduct.yml @@ -35,7 +35,7 @@ description: The id of product responses: '200': - description: Return info for the product + description: Return info for the product '400': description: Bad Request (syntax error, incorrect input format, etc..) '401': @@ -59,7 +59,7 @@ requestBody: required: true content: - application/json: + application/json: schema: type: object properties: @@ -75,10 +75,10 @@ type: file categories: oneOf: - - type: string - - type: array - items: - type: string + - type: string + - type: array + items: + type: string example: "'category' or ['category1', 'category2', ...]" expirationDate: type: string @@ -159,7 +159,7 @@ description: Product not found '500': description: Internal server error - + /product/images/{id}: delete: tags: diff --git a/src/docs/wishListDocs.yml b/src/docs/wishListDocs.yml index df3c72c..7f705f7 100644 --- a/src/docs/wishListDocs.yml +++ b/src/docs/wishListDocs.yml @@ -94,4 +94,4 @@ '403': description: Forbidden (Unauthorized action) '500': - description: Internal server error \ No newline at end of file + description: Internal server error diff --git a/src/entities/Cart.ts b/src/entities/Cart.ts index 0ba44a6..fda1e15 100644 --- a/src/entities/Cart.ts +++ b/src/entities/Cart.ts @@ -36,7 +36,7 @@ export class Cart { @UpdateDateColumn() updatedAt!: Date; - updateTotal(): void { + updateTotal (): void { if (this.items) { let total: number = 0; for (let i = 0; i < this.items.length; i++) { diff --git a/src/entities/CartItem.ts b/src/entities/CartItem.ts index 107170c..d651adf 100644 --- a/src/entities/CartItem.ts +++ b/src/entities/CartItem.ts @@ -47,7 +47,7 @@ export class CartItem { @BeforeInsert() @BeforeUpdate() - updateTotal(): void { + updateTotal (): void { this.total = this.newPrice * this.quantity; } } diff --git a/src/entities/Order.ts b/src/entities/Order.ts index 49965a0..47649a7 100644 --- a/src/entities/Order.ts +++ b/src/entities/Order.ts @@ -1,10 +1,17 @@ -import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, OneToMany, CreateDateColumn, UpdateDateColumn } from 'typeorm'; +import { + Entity, + PrimaryGeneratedColumn, + Column, + ManyToOne, + OneToMany, + CreateDateColumn, + UpdateDateColumn, +} from 'typeorm'; import { IsNotEmpty, IsNumber, IsDate, IsIn } from 'class-validator'; import { User } from './User'; import { OrderItem } from './OrderItem'; import { Transaction } from './transaction'; - @Entity() export class Order { @PrimaryGeneratedColumn('uuid') @@ -24,11 +31,20 @@ export class Order { @IsNumber() totalPrice!: number; - @OneToMany(() => Transaction, (transaction) => transaction.order) + @OneToMany(() => Transaction, transaction => transaction.order) transactions!: Transaction[]; @Column({ default: 'order placed' }) @IsNotEmpty() - @IsIn(['order placed', 'cancelled', 'awaiting shipment', 'in transit', 'delivered', 'received', 'returned']) + @IsIn([ + 'order placed', + 'cancelled', + 'awaiting shipment', + 'in transit', + 'delivered', + 'received', + 'returned', + 'completed', + ]) orderStatus!: string; @Column('int') diff --git a/src/entities/Product.ts b/src/entities/Product.ts index 2b39493..e144a04 100644 --- a/src/entities/Product.ts +++ b/src/entities/Product.ts @@ -18,11 +18,12 @@ import { Category } from './Category'; import { Order } from './Order'; import { Coupon } from './coupon'; import { OrderItem } from './OrderItem'; +import { VendorOrderItem } from './VendorOrderItem'; @Entity() @Unique(['id']) export class Product { - static query() { + static query () { throw new Error('Method not implemented.'); } @PrimaryGeneratedColumn('uuid') @@ -36,6 +37,9 @@ export class Product { @OneToMany(() => OrderItem, orderItem => orderItem.product) orderItems!: OrderItem[]; + @OneToMany(() => VendorOrderItem, vendorOrderItems => vendorOrderItems.product) + vendorOrderItems!: VendorOrderItem[]; + @OneToOne(() => Coupon, (coupons: any) => coupons.product) @JoinColumn() coupons?: Coupon; diff --git a/src/entities/User.ts b/src/entities/User.ts index fb45fe9..eebd104 100644 --- a/src/entities/User.ts +++ b/src/entities/User.ts @@ -99,7 +99,7 @@ export class User { @OneToMany(() => Order, (order: any) => order.buyer) orders!: Order[]; - @OneToMany(() => Transaction, (transaction) => transaction.user) + @OneToMany(() => Transaction, transaction => transaction.user) transactions!: Transaction[]; @CreateDateColumn() @@ -112,7 +112,7 @@ export class User { accountBalance!: number; @BeforeInsert() - setRole(): void { + setRole (): void { this.role = this.userType === 'Vendor' ? roles.vendor : roles.buyer; } } diff --git a/src/entities/VendorOrderItem.ts b/src/entities/VendorOrderItem.ts new file mode 100644 index 0000000..9137f6d --- /dev/null +++ b/src/entities/VendorOrderItem.ts @@ -0,0 +1,30 @@ +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm'; +import { IsNotEmpty, IsNumber } from 'class-validator'; +import { Order } from './Order'; +import { Product } from './Product'; +import { VendorOrders } from './vendorOrders'; + +@Entity() +export class VendorOrderItem { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + 'id'!: string; + + @ManyToOne(() => VendorOrders, order => order.vendorOrderItems) + @IsNotEmpty() + 'order'!: VendorOrders; + + @ManyToOne(() => Product, product => product.vendorOrderItems) + @IsNotEmpty() + 'product'!: Product; + + @Column('decimal') + @IsNotEmpty() + @IsNumber() + 'price/unit'!: number; + + @Column('int') + @IsNotEmpty() + @IsNumber() + 'quantity'!: number; +} diff --git a/src/entities/transaction.ts b/src/entities/transaction.ts index d475812..0f7b0ea 100644 --- a/src/entities/transaction.ts +++ b/src/entities/transaction.ts @@ -58,4 +58,4 @@ export class Transaction { @UpdateDateColumn() updatedAt!: Date; -} \ No newline at end of file +} diff --git a/src/entities/vendorOrders.ts b/src/entities/vendorOrders.ts new file mode 100644 index 0000000..38269e6 --- /dev/null +++ b/src/entities/vendorOrders.ts @@ -0,0 +1,49 @@ +import { + Entity, + PrimaryGeneratedColumn, + Column, + ManyToOne, + OneToMany, + CreateDateColumn, + UpdateDateColumn, +} from 'typeorm'; +import { IsNotEmpty, IsNumber, IsDate, IsIn, isNotEmpty } from 'class-validator'; +import { User } from './User'; +import { OrderItem } from './OrderItem'; +import { Transaction } from './transaction'; +import { Order } from './Order'; +import { VendorOrderItem } from './VendorOrderItem'; + +@Entity() +export class VendorOrders { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => User) + @IsNotEmpty() + vendor!: User; + + @OneToMany(() => VendorOrderItem, vendorOrderItems => vendorOrderItems.order, { cascade: true }) + @IsNotEmpty() + vendorOrderItems!: VendorOrderItem[]; + + @ManyToOne(() => Order) + @IsNotEmpty() + order!: Order; + + @Column('decimal') + @IsNotEmpty() + @IsNumber() + totalPrice!: number; + + @Column({ default: 'pending' }) + @IsIn(['pending', 'is-accepted', 'in-transit', 'cancelled', 'delivered', 'completed']) + orderStatus!: string; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} diff --git a/src/entities/wishList.ts b/src/entities/wishList.ts index 69dbebd..7f74023 100644 --- a/src/entities/wishList.ts +++ b/src/entities/wishList.ts @@ -1,10 +1,19 @@ -import { Entity, PrimaryGeneratedColumn, BaseEntity,Column, Unique, ManyToOne, CreateDateColumn, UpdateDateColumn,} from "typeorm"; +import { + Entity, + PrimaryGeneratedColumn, + BaseEntity, + Column, + Unique, + ManyToOne, + CreateDateColumn, + UpdateDateColumn, +} from 'typeorm'; import { IsNotEmpty, IsString } from 'class-validator'; import { User } from './User'; -@Entity("wishlist") +@Entity('wishlist') @Unique(['id']) -export class wishList extends BaseEntity{ +export class wishList extends BaseEntity { @PrimaryGeneratedColumn() @IsNotEmpty() id!: number; @@ -23,4 +32,4 @@ export class wishList extends BaseEntity{ @UpdateDateColumn() updatedAt!: Date; -} \ No newline at end of file +} diff --git a/src/index.ts b/src/index.ts index 07efd39..d689c27 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,21 +5,27 @@ import router from './routes'; import { addDocumentation } from './startups/docs'; import 'reflect-metadata'; import cookieParser from 'cookie-parser'; -import session from "express-session"; +import session from 'express-session'; import passport from 'passport'; import { CustomError, errorHandler } from './middlewares/errorHandler'; import morgan from 'morgan'; import { dbConnection } from './startups/dbConnection'; + +import { Server } from 'socket.io'; +import { init as initSocketIO } from './utils/socket'; + dotenv.config(); export const app = express(); const port = process.env.PORT || 8000; -app.use(session({ - secret: 'keyboard cat' -})) -app.use(passport.initialize()) -app.use(passport.session()) +app.use( + session({ + secret: 'keyboard cat', + }) +); +app.use(passport.initialize()); +app.use(passport.session()); app.use(express.json()); app.use(cookieParser()); app.use(cors({ origin: '*' })); @@ -43,3 +49,14 @@ app.use(morgan(morganFormat)); export const server = app.listen(port, () => { console.log(`[server]: Server is running at http://localhost:${port}`); }); + +// Socket.IO setup +const io = initSocketIO(server); + +io.on('connection', socket => { + console.log('Client connected'); + + socket.on('disconnect', () => { + console.log('Client disconnected'); + }); +}); diff --git a/src/routes/ProductRoutes.ts b/src/routes/ProductRoutes.ts index ce146ec..614eaaf 100644 --- a/src/routes/ProductRoutes.ts +++ b/src/routes/ProductRoutes.ts @@ -18,8 +18,15 @@ import { createOrder, getOrders, updateOrder, - getOrdersHistory + getOrdersHistory, + getSingleVendorOrder, + getVendorOrders, + updateVendorOrder, + getBuyerVendorOrders, + getSingleBuyerVendorOrder, + updateBuyerVendorOrder, } from '../controllers'; + const router = Router(); router.get('/all', listAllProducts); router.get('/recommended', authMiddleware as RequestHandler, hasRole('BUYER'), getRecommendedProducts); @@ -32,9 +39,20 @@ router.put('/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), upload.a router.delete('/images/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), removeProductImage); router.delete('/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), deleteProduct); router.put('/availability/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), productStatus); + router.post('/orders', authMiddleware as RequestHandler, hasRole('BUYER'), createOrder); router.get('/client/orders', authMiddleware as RequestHandler, hasRole('BUYER'), getOrders); router.put('/client/orders/:orderId', authMiddleware as RequestHandler, hasRole('BUYER'), updateOrder); router.get('/orders/history', authMiddleware as RequestHandler, hasRole('BUYER'), getOrdersHistory); +// Vendor order management +router.get('/vendor/orders', authMiddleware as RequestHandler, hasRole('VENDOR'), getVendorOrders); +router.get('/vendor/orders/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), getSingleVendorOrder); +router.put('/vendor/orders/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), updateVendorOrder); + +// Admin order management +router.get('/admin/orders', authMiddleware as RequestHandler, hasRole('ADMIN'), getBuyerVendorOrders); +router.get('/admin/orders/:id', authMiddleware as RequestHandler, hasRole('ADMIN'), getSingleBuyerVendorOrder); +router.put('/admin/orders/:id', authMiddleware as RequestHandler, hasRole('ADMIN'), updateBuyerVendorOrder); + export default router; diff --git a/src/routes/UserRoutes.ts b/src/routes/UserRoutes.ts index 50bb4ca..79b0551 100644 --- a/src/routes/UserRoutes.ts +++ b/src/routes/UserRoutes.ts @@ -1,7 +1,7 @@ import { Router } from 'express'; import { responseError } from '../utils/response.utils'; import { UserInterface } from '../entities/User'; -import jwt from 'jsonwebtoken' +import jwt from 'jsonwebtoken'; import { disable2FA, enable2FA, @@ -19,7 +19,7 @@ import { activateUser, disactivateUser, userProfileUpdate } from '../controllers import { hasRole } from '../middlewares/roleCheck'; import { isTokenValide } from '../middlewares/isValid'; import passport from 'passport'; -import "../utils/auth"; +import '../utils/auth'; const router = Router(); router.post('/register', userRegistration); @@ -37,35 +37,36 @@ router.post('/password/reset/link', sendPasswordResetLink); router.put('/update', userProfileUpdate); router.get('/google-auth', passport.authenticate('google', { scope: ['profile', 'email'] })); -router.get("/auth/google/callback", - passport.authenticate("google", { - successRedirect: "/user/login/success", - failureRedirect: "/user/login/failed" +router.get( + '/auth/google/callback', + passport.authenticate('google', { + successRedirect: '/user/login/success', + failureRedirect: '/user/login/failed', }) ); -router.get("/login/success", async (req, res) => { +router.get('/login/success', async (req, res) => { const user = req.user as UserInterface; - if(!user){ - responseError(res, 404, 'user not found') + if (!user) { + responseError(res, 404, 'user not found'); } const payload = { id: user?.id, email: user?.email, - role: user?.role - } - const token = jwt.sign(payload, process.env.JWT_SECRET as string,{expiresIn: '24h'}) + role: user?.role, + }; + const token = jwt.sign(payload, process.env.JWT_SECRET as string, { expiresIn: '24h' }); res.status(200).json({ status: 'success', - data:{ - token: token, - message: "Login success" - } - }) + data: { + token: token, + message: 'Login success', + }, + }); }); -router.get("/login/failed", async (req, res) => { +router.get('/login/failed', async (req, res) => { res.status(401).json({ status: false, - message: "Login failed" + message: 'Login failed', }); }); diff --git a/src/routes/couponRoutes.ts b/src/routes/couponRoutes.ts index c315ab8..3378fbe 100644 --- a/src/routes/couponRoutes.ts +++ b/src/routes/couponRoutes.ts @@ -1,5 +1,12 @@ import { RequestHandler, Router } from 'express'; -import { createCoupon, updateCoupon, accessAllCoupon, readCoupon, deleteCoupon, buyerApplyCoupon } from '../controllers/couponController'; +import { + createCoupon, + updateCoupon, + accessAllCoupon, + readCoupon, + deleteCoupon, + buyerApplyCoupon, +} from '../controllers/couponController'; import { hasRole } from '../middlewares/roleCheck'; import { authMiddleware } from '../middlewares/verifyToken'; @@ -10,6 +17,6 @@ router.put('/vendor/:id/update-coupon/:code', authMiddleware as RequestHandler, router.get('/vendor/:id/checkout/:code', authMiddleware as RequestHandler, hasRole('VENDOR'), readCoupon); router.get('/vendor/:id/access-coupons', authMiddleware as RequestHandler, hasRole('VENDOR'), accessAllCoupon); router.delete('/vendor/:id/checkout/delete', authMiddleware as RequestHandler, hasRole('VENDOR'), deleteCoupon); -router.post('/apply', authMiddleware as RequestHandler, hasRole('BUYER'),buyerApplyCoupon); +router.post('/apply', authMiddleware as RequestHandler, hasRole('BUYER'), buyerApplyCoupon); -export default router; \ No newline at end of file +export default router; diff --git a/src/routes/index.ts b/src/routes/index.ts index cddc08a..6f632d6 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -3,7 +3,7 @@ import { responseSuccess } from '../utils/response.utils'; import userRoutes from './UserRoutes'; import productRoutes from './ProductRoutes'; import wishListRoutes from './wishListRoute'; -import couponRoute from './couponRoutes';; +import couponRoute from './couponRoutes'; import cartRoutes from './CartRoutes'; const router = Router(); @@ -14,7 +14,7 @@ router.get('/', (req: Request, res: Response) => { router.use('/user', userRoutes); router.use('/product', productRoutes); -router.use('/wish-list', wishListRoutes); +router.use('/wish-list', wishListRoutes); router.use('/cart', cartRoutes); router.use('/coupons', couponRoute); diff --git a/src/routes/wishListRoute.ts b/src/routes/wishListRoute.ts index d5ac6fb..ea96e40 100644 --- a/src/routes/wishListRoute.ts +++ b/src/routes/wishListRoute.ts @@ -2,13 +2,30 @@ import { RequestHandler, Router } from 'express'; import { authMiddleware } from '../middlewares/verifyToken'; import { hasRole } from '../middlewares'; import { checkUserStatus } from '../middlewares/isAllowed'; -import { wishlistAddProduct,wishlistRemoveProduct,wishlistGetProducts,wishlistClearAllProducts } from '../controllers/wishListController'; +import { + wishlistAddProduct, + wishlistRemoveProduct, + wishlistGetProducts, + wishlistClearAllProducts, +} from '../controllers/wishListController'; const router = Router(); router.post('/add/:id', authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'), wishlistAddProduct); -router.get('/',authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'),wishlistGetProducts); -router.delete('/delete/:id',authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'),wishlistRemoveProduct); -router.delete('/clearAll',authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'),wishlistClearAllProducts); +router.get('/', authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'), wishlistGetProducts); +router.delete( + '/delete/:id', + authMiddleware as RequestHandler, + checkUserStatus, + hasRole('BUYER'), + wishlistRemoveProduct +); +router.delete( + '/clearAll', + authMiddleware as RequestHandler, + checkUserStatus, + hasRole('BUYER'), + wishlistClearAllProducts +); -export default router; \ No newline at end of file +export default router; diff --git a/src/services/adminOrderServices/readOrder.ts b/src/services/adminOrderServices/readOrder.ts new file mode 100644 index 0000000..4bb20f0 --- /dev/null +++ b/src/services/adminOrderServices/readOrder.ts @@ -0,0 +1,158 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { responseSuccess, responseError } from '../../utils/response.utils'; +import { VendorOrderItem } from '../../entities/VendorOrderItem'; +import { VendorOrders } from '../../entities/vendorOrders'; +import { Order } from '../../entities/Order'; + +export const getBuyerVendorOrdersService = async (req: Request, res: Response) => { + try { + const vendorOrderRepository = getRepository(VendorOrders); + const orderRepository = getRepository(Order); + + const orders = await orderRepository.find({ + relations: ['buyer', 'orderItems'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); + + if (!orders.length) { + return responseError(res, 200, `There is no pending orders from buyer`, { orders: [] }); + } + + const sanitizedOrdersResponse = []; + + for (const order of orders) { + const vendorOrders = await vendorOrderRepository.find({ + where: { + order: { + id: order.id, + }, + }, + relations: ['vendor', 'vendorOrderItems', 'vendorOrderItems.product'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); + + sanitizedOrdersResponse.push({ + id: order.id, + totalPrice: order.totalPrice, + totalProducts: order.orderItems.length, + orderStatus: order.orderStatus, + address: order.address, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + buyer: { + id: order.buyer.id, + firstName: order.buyer.firstName, + lastName: order.buyer.lastName, + email: order.buyer.lastName, + gender: order.buyer.gender, + phoneNumber: order.buyer.phoneNumber, + photoUrl: order.buyer.photoUrl, + }, + vendors: vendorOrders.map(vendoOrder => ({ + id: vendoOrder.vendor.id, + firstName: vendoOrder.vendor.firstName, + lastName: vendoOrder.vendor.lastName, + email: vendoOrder.vendor.lastName, + gender: vendoOrder.vendor.gender, + phoneNumber: vendoOrder.vendor.phoneNumber, + photoUrl: vendoOrder.vendor.photoUrl, + order: { + id: vendoOrder.id, + totalPrice: vendoOrder.totalPrice, + orderStatus: vendoOrder.orderStatus, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + orderItems: vendoOrder.vendorOrderItems, + }, + })), + }); + } + + responseSuccess(res, 200, 'Orders retrieved successfully', { + totalOrders: orders.length, + orders: sanitizedOrdersResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; + +// Get single vendor order info +export const getSingleBuyerVendorOrderService = async (req: Request, res: Response) => { + try { + const orderId = req.params.id; + + const vendorOrderRepository = getRepository(VendorOrders); + const orderRepository = getRepository(Order); + + const order = await orderRepository.findOne({ + where: { + id: orderId, + }, + relations: ['buyer', 'orderItems'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); + + if (!order) { + return responseError(res, 404, `Order Not Found.`); + } + + const vendorOrders = await vendorOrderRepository.find({ + where: { + order: { + id: order.id, + }, + }, + relations: ['vendor', 'vendorOrderItems', 'vendorOrderItems.product'], + }); + + const sanitizedOrderResponse = { + id: order.id, + totalPrice: order.totalPrice, + totalProducts: order.orderItems.length, + orderStatus: order.orderStatus, + address: order.address, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + buyer: { + id: order.buyer.id, + firstName: order.buyer.firstName, + lastName: order.buyer.lastName, + email: order.buyer.lastName, + gender: order.buyer.gender, + phoneNumber: order.buyer.phoneNumber, + photoUrl: order.buyer.photoUrl, + }, + vendors: vendorOrders.map(vendoOrder => ({ + id: vendoOrder.vendor.id, + firstName: vendoOrder.vendor.firstName, + lastName: vendoOrder.vendor.lastName, + email: vendoOrder.vendor.lastName, + gender: vendoOrder.vendor.gender, + phoneNumber: vendoOrder.vendor.phoneNumber, + photoUrl: vendoOrder.vendor.photoUrl, + order: { + id: vendoOrder.id, + totalPrice: vendoOrder.totalPrice, + orderStatus: vendoOrder.orderStatus, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + orderItems: vendoOrder.vendorOrderItems, + }, + })), + }; + + responseSuccess(res, 200, 'Order retrieved successfully', { + order: sanitizedOrderResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/adminOrderServices/updateOrder.ts b/src/services/adminOrderServices/updateOrder.ts new file mode 100644 index 0000000..876160f --- /dev/null +++ b/src/services/adminOrderServices/updateOrder.ts @@ -0,0 +1,107 @@ +import { Request, Response } from 'express'; +import { Not, getRepository } from 'typeorm'; +import { responseSuccess, responseError } from '../../utils/response.utils'; +import { VendorOrderItem } from '../../entities/VendorOrderItem'; +import { VendorOrders } from '../../entities/vendorOrders'; +import { Order } from '../../entities/Order'; +import { getIO } from '../../utils/socket'; + +export const updateBuyerVendorOrderService = async (req: Request, res: Response) => { + try { + const orderId = req.params.id; + + const vendorOrderRepository = getRepository(VendorOrders); + const orderRepository = getRepository(Order); + + const order = await orderRepository.findOne({ + where: { + id: orderId, + }, + relations: ['buyer', 'orderItems'], + }); + + if (!order) { + return responseError(res, 404, `Order Not Found.`); + } + + if (order.orderStatus === 'completed') { + return responseError(res, 409, 'The order has already been completed.'); + } + + if (order.orderStatus !== 'received') { + return responseError(res, 409, 'Order closure failed: The buyer has not received the item yet.'); + } + + const vendorOrders = await vendorOrderRepository.find({ + where: { + order: { + id: order.id, + }, + }, + relations: ['vendor', 'vendorOrderItems', 'vendorOrderItems.product'], + }); + + for (const order of vendorOrders) { + if (order.orderStatus !== 'delivered') { + return responseError(res, 409, 'Order closure failed: Some vendors have not yet delivered items to the buyer.'); + } + } + + // Update Whole Order + + order.orderStatus = 'completed'; + await orderRepository.save(order); + + const updatedVendorOrder = vendorOrders.map(async order => { + order.orderStatus = 'completed'; + await vendorOrderRepository.save(order); + }); + + const sanitizedOrderResponse = { + id: order.id, + totalPrice: order.totalPrice, + totalProducts: order.orderItems.length, + orderStatus: order.orderStatus, + address: order.address, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + buyer: { + id: order.buyer.id, + firstName: order.buyer.firstName, + lastName: order.buyer.lastName, + email: order.buyer.lastName, + gender: order.buyer.gender, + phoneNumber: order.buyer.phoneNumber, + photoUrl: order.buyer.photoUrl, + }, + vendors: vendorOrders.map(vendoOrder => ({ + id: vendoOrder.vendor.id, + firstName: vendoOrder.vendor.firstName, + lastName: vendoOrder.vendor.lastName, + email: vendoOrder.vendor.lastName, + gender: vendoOrder.vendor.gender, + phoneNumber: vendoOrder.vendor.phoneNumber, + photoUrl: vendoOrder.vendor.photoUrl, + order: { + id: vendoOrder.id, + totalPrice: vendoOrder.totalPrice, + orderStatus: vendoOrder.orderStatus, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + orderItems: vendoOrder.vendorOrderItems, + }, + })), + }; + + getIO().emit('orders', { + action: 'admin update', + order: sanitizedOrderResponse, + }); + + responseSuccess(res, 200, 'Order updated successfully', { + order: sanitizedOrderResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/couponServices/buyerApplyCoupon.ts b/src/services/couponServices/buyerApplyCoupon.ts index 12da4e1..85762f6 100644 --- a/src/services/couponServices/buyerApplyCoupon.ts +++ b/src/services/couponServices/buyerApplyCoupon.ts @@ -5,81 +5,83 @@ import { Cart } from '../../entities/Cart'; import { CartItem } from '../../entities/CartItem'; export const buyerApplyCouponService = async (req: Request, res: Response) => { - try { - const {couponCode} = req.body + try { + const { couponCode } = req.body; - if (!couponCode) return res.status(400).json({ message: 'Coupon Code is required' }); + if (!couponCode) return res.status(400).json({ message: 'Coupon Code is required' }); - const couponRepository = getRepository(Coupon); - const coupon = await couponRepository.findOne({ - where: { code: couponCode }, - relations: ['product'], - }); - - if(!coupon) return res.status(404).json({message: 'Invalid Coupon Code'}); + const couponRepository = getRepository(Coupon); + const coupon = await couponRepository.findOne({ + where: { code: couponCode }, + relations: ['product'], + }); - if(coupon){ - if(coupon.expirationDate && coupon.expirationDate < new Date()){ - return res.status(400).json({message: 'Coupon is expired'}); - } + if (!coupon) return res.status(404).json({ message: 'Invalid Coupon Code' }); - if(coupon.usageTimes == coupon.maxUsageLimit){ - return res.status(400).json({message: 'Coupon Discount Ended'}); - } + if (coupon) { + if (coupon.expirationDate && coupon.expirationDate < new Date()) { + return res.status(400).json({ message: 'Coupon is expired' }); } - const couponProductId = coupon.product.id; - - const cartRepository = getRepository(Cart) - let cart = await cartRepository.findOne({where: { user: { id: req.user?.id },isCheckedOut: false }, - relations: ['items', 'items.product'], - }); - - if(!cart) return res.status(400).json({message: "You don't have a product in cart"}); - const cartItemRepository = getRepository(CartItem); - const couponCartItem = await cartItemRepository.findOne({ - where: { - cart: { id: cart.id }, - product: { id: couponProductId }, - }, - relations: ['product'], - }); - - if(!couponCartItem) return res.status(404).json({message: 'No product in Cart with that coupon code'}); - - let amountReducted; - if(coupon.discountType === 'percentage'){ - const reduction = (couponCartItem.product.newPrice * coupon.discountRate)/ 100; - amountReducted = reduction; - couponCartItem.newPrice = couponCartItem.product.newPrice - reduction; - - await cartItemRepository.save(couponCartItem) - } - else { - amountReducted = coupon.discountRate; - couponCartItem.newPrice = couponCartItem.product.newPrice - amountReducted; - await cartItemRepository.save(couponCartItem) - } - - cart = await cartRepository.findOne({where: { id: cart.id}, - relations: ['items', 'items.product'], - }); - if(cart){ - cart.updateTotal(); - await cartRepository.save(cart); + if (coupon.usageTimes == coupon.maxUsageLimit) { + return res.status(400).json({ message: 'Coupon Discount Ended' }); } + } + const couponProductId = coupon.product.id; + + const cartRepository = getRepository(Cart); + let cart = await cartRepository.findOne({ + where: { user: { id: req.user?.id }, isCheckedOut: false }, + relations: ['items', 'items.product'], + }); + + if (!cart) return res.status(400).json({ message: "You don't have a product in cart" }); + + const cartItemRepository = getRepository(CartItem); + const couponCartItem = await cartItemRepository.findOne({ + where: { + cart: { id: cart.id }, + product: { id: couponProductId }, + }, + relations: ['product'], + }); + + if (!couponCartItem) return res.status(404).json({ message: 'No product in Cart with that coupon code' }); + + let amountReducted; + if (coupon.discountType === 'percentage') { + const reduction = (couponCartItem.product.newPrice * coupon.discountRate) / 100; + amountReducted = reduction; + couponCartItem.newPrice = couponCartItem.product.newPrice - reduction; + + await cartItemRepository.save(couponCartItem); + } else { + amountReducted = coupon.discountRate; + couponCartItem.newPrice = couponCartItem.product.newPrice - amountReducted; + await cartItemRepository.save(couponCartItem); + } - coupon.usageTimes +=1; + cart = await cartRepository.findOne({ where: { id: cart.id }, relations: ['items', 'items.product'] }); + if (cart) { + cart.updateTotal(); + await cartRepository.save(cart); + } - if(req.user?.id){ - coupon.usedBy.push(req.user?.id); - } + coupon.usageTimes += 1; - await couponRepository.save(coupon); + if (req.user?.id) { + coupon.usedBy.push(req.user?.id); + } - return (res.status(200).json({message: `Coupon Code successfully activated discount on product: ${couponCartItem.product.name}`, amountDiscounted: amountReducted })); + await couponRepository.save(coupon); - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); - } - }; \ No newline at end of file + return res + .status(200) + .json({ + message: `Coupon Code successfully activated discount on product: ${couponCartItem.product.name}`, + amountDiscounted: amountReducted, + }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/services/index.ts b/src/services/index.ts index 8f560c3..12d0aa7 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -33,3 +33,11 @@ export * from './cartServices/createCart'; export * from './cartServices/readCart'; export * from './cartServices/removeProductInCart'; export * from './cartServices/clearCart'; + +// vendor order management +export * from './vendorOrderServices/readVendorOrder'; +export * from './vendorOrderServices/updateVendorOrder'; + +// vendor order management +export * from './adminOrderServices/readOrder'; +export * from './adminOrderServices/updateOrder'; diff --git a/src/services/orderServices/createOrder.ts b/src/services/orderServices/createOrder.ts index 038d796..30cbb4a 100644 --- a/src/services/orderServices/createOrder.ts +++ b/src/services/orderServices/createOrder.ts @@ -8,6 +8,9 @@ import { Cart } from '../../entities/Cart'; import { Transaction } from '../../entities/transaction'; import { responseError, sendErrorResponse, sendSuccessResponse } from '../../utils/response.utils'; import sendMail from '../../utils/sendOrderMail'; +import { VendorOrders } from '../../entities/vendorOrders'; +import { CartItem } from '../../entities/CartItem'; +import { VendorOrderItem } from '../../entities/VendorOrderItem'; export const createOrderService = async (req: Request, res: Response) => { const { cartId, address } = req.body; @@ -76,7 +79,6 @@ export const createOrderService = async (req: Request, res: Response) => { await getManager().transaction(async transactionalEntityManager => { for (const item of cart.items) { const product = item.product; - product.quantity -= item.quantity; await transactionalEntityManager.save(Product, product); } @@ -118,14 +120,67 @@ export const createOrderService = async (req: Request, res: Response) => { const message = { subject: 'Order created successfully', - ...orderResponse + ...orderResponse, }; await sendMail(message); + // separate order by each vendor getting order related to his products + await saveVendorRelatedOrder(newOrder, cart.items); + return sendSuccessResponse(res, 201, 'Order created successfully', orderResponse); } catch (error) { - console.error('Error creating order:', error); return sendErrorResponse(res, 500, (error as Error).message); } -}; \ No newline at end of file +}; + +const saveVendorRelatedOrder = async (order: Order, CartItem: CartItem[]) => { + try { + for (const item of CartItem) { + const productRepository = getRepository(Product); + + const product = await productRepository.findOne({ + where: { + id: item.product.id, + }, + relations: ['vendor'], + }); + + if (!product) return; + + const orderItem = new VendorOrderItem(); + orderItem.product = product; + orderItem['price/unit'] = product.newPrice; + orderItem.quantity = item.quantity; + + const vendorOrdersRepository = getRepository(VendorOrders); + let vendorOrders = await vendorOrdersRepository.findOne({ + where: { + vendor: { + id: product.vendor.id, + }, + order: { + id: order.id, + }, + }, + relations: ['vendorOrderItems'], + }); + + if (vendorOrders) { + vendorOrders.totalPrice = Number(vendorOrders.totalPrice) + +product.newPrice * +item.quantity; + vendorOrders.vendorOrderItems = [...vendorOrders.vendorOrderItems, orderItem]; + } else { + const newVendorOrders = new VendorOrders(); + newVendorOrders.vendor = product.vendor; + newVendorOrders.vendorOrderItems = [orderItem]; + newVendorOrders.order = order; + newVendorOrders.totalPrice = +product.newPrice * item.quantity; + vendorOrders = newVendorOrders; + } + + await vendorOrdersRepository.save(vendorOrders); + } + } catch (error) { + console.log((error as Error).message); + } +}; diff --git a/src/services/orderServices/getOrderService.ts b/src/services/orderServices/getOrderService.ts index 18e0664..4208123 100644 --- a/src/services/orderServices/getOrderService.ts +++ b/src/services/orderServices/getOrderService.ts @@ -4,62 +4,60 @@ import { responseSuccess, responseError } from '../../utils/response.utils'; import { Order } from '../../entities/Order'; import { OrderItem } from '../../entities/OrderItem'; - // Example usage: - export const getOrdersService = async (req: Request, res: Response) => { - try { - const orderRepository = getRepository(Order); - const buyerId = req.user?.id; + try { + const orderRepository = getRepository(Order); + const buyerId = req.user?.id; - const orders = await orderRepository.find({ - where: { - buyer: { - id: buyerId, - } - }, - relations: ['buyer', 'orderItems', 'orderItems.product'], - order: { - createdAt: 'DESC', // Order by creation date, most recent first - }, - }); + const orders = await orderRepository.find({ + where: { + buyer: { + id: buyerId, + }, + }, + relations: ['buyer', 'orderItems', 'orderItems.product'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); - if (!orders || orders.length === 0) { - return responseSuccess(res, 404, `You haven't made any orders yet`, { orders: [] }); - } - - const sanitezedResponse = orders.map(order => ({ - id: order.id, - totalPrice: order.totalPrice, - orderStatus: order.orderStatus, - quantity: order.quantity, - address: order.address, - orderDate: order.orderDate, - createdAt: order.createdAt, - updatedAt: order.updatedAt, - buyer: { - id: order.buyer.id, - firstName: order.buyer.firstName, - lastName: order.buyer.lastName, - accountBalance: order.buyer.accountBalance - }, - orderItems: order.orderItems.map((item: OrderItem) => ({ - id: item.id, - price: item.price, - quantity: item.quantity, - product: { - id: item.product.id, - name: item.product.name, - description: item.product.description, - images: item.product.images, - price: item.product.newPrice, - expirationDate: item.product.expirationDate, - } - })) - })); - responseSuccess(res, 200, 'Orders retrieved successfully', { orders: sanitezedResponse }); - } catch (error) { - return responseError(res, 400, (error as Error).message); + if (!orders || orders.length === 0) { + return responseSuccess(res, 404, `You haven't made any orders yet`, { orders: [] }); } -}; \ No newline at end of file + + const sanitezedResponse = orders.map(order => ({ + id: order.id, + totalPrice: order.totalPrice, + orderStatus: order.orderStatus, + quantity: order.quantity, + address: order.address, + orderDate: order.orderDate, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + buyer: { + id: order.buyer.id, + firstName: order.buyer.firstName, + lastName: order.buyer.lastName, + accountBalance: order.buyer.accountBalance, + }, + orderItems: order.orderItems.map((item: OrderItem) => ({ + id: item.id, + price: item.price, + quantity: item.quantity, + product: { + id: item.product.id, + name: item.product.name, + description: item.product.description, + images: item.product.images, + price: item.product.newPrice, + expirationDate: item.product.expirationDate, + }, + })), + })); + responseSuccess(res, 200, 'Orders retrieved successfully', { orders: sanitezedResponse }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/orderServices/updateOrderService.ts b/src/services/orderServices/updateOrderService.ts index f29b47c..82a043a 100644 --- a/src/services/orderServices/updateOrderService.ts +++ b/src/services/orderServices/updateOrderService.ts @@ -8,122 +8,129 @@ import { Transaction } from '../../entities/transaction'; import { responseError, sendErrorResponse, sendSuccessResponse } from '../../utils/response.utils'; import sendMail from '../../utils/sendOrderMail'; interface OrderStatusType { - orderStatus: 'order placed' | 'cancelled' | 'awaiting shipment' | 'in transit' | 'delivered' | 'received' | 'returned'; + orderStatus: + | 'order placed' + | 'cancelled' + | 'awaiting shipment' + | 'in transit' + | 'delivered' + | 'received' + | 'returned'; } export const updateOrderService = async (req: Request, res: Response) => { - const { orderId } = req.params; - const { orderStatus } = req.body; - - try { - await getManager().transaction(async (transactionalEntityManager: EntityManager) => { - const orderRepository: Repository = transactionalEntityManager.getRepository(Order); - const productRepository: Repository = transactionalEntityManager.getRepository(Product); - const userRepository: Repository = transactionalEntityManager.getRepository(User); - const orderItemRepository: Repository = transactionalEntityManager.getRepository(OrderItem); - const transactionRepository: Repository = transactionalEntityManager.getRepository(Transaction); - - const buyerId = req.user?.id; - if (!buyerId) { - throw new Error('Unauthorized'); + const { orderId } = req.params; + const { orderStatus } = req.body; + + try { + await getManager().transaction(async (transactionalEntityManager: EntityManager) => { + const orderRepository: Repository = transactionalEntityManager.getRepository(Order); + const productRepository: Repository = transactionalEntityManager.getRepository(Product); + const userRepository: Repository = transactionalEntityManager.getRepository(User); + const orderItemRepository: Repository = transactionalEntityManager.getRepository(OrderItem); + const transactionRepository: Repository = transactionalEntityManager.getRepository(Transaction); + + const buyerId = req.user?.id; + if (!buyerId) { + throw new Error('Unauthorized'); + } + + // Fetch order and related entities + const order: Order | null = await orderRepository.findOne({ + where: { id: orderId, buyer: { id: buyerId } }, + relations: ['orderItems', 'orderItems.product', 'buyer'], + }); + + if (!order) { + return sendErrorResponse(res, 404, 'Order not found'); + } + // Check if order can be updated + if (isOrderFinalStatus(order.orderStatus)) { + return sendErrorResponse(res, 401, `Order cannot be updated once it is ${order.orderStatus}`); + } + + // Handle order status transitions + if (orderStatus !== undefined && order.orderStatus !== orderStatus) { + switch (orderStatus) { + case 'cancelled': + case 'returned': + if (order.orderStatus !== 'delivered') { + await processRefund(order, transactionalEntityManager); } - - // Fetch order and related entities - const order: Order | null = await orderRepository.findOne({ - where: { id: orderId, buyer: { id: buyerId } }, - relations: ['orderItems', 'orderItems.product', 'buyer'], - }); - - if (!order) { - return sendErrorResponse(res, 404, "Order not found"); - } - // Check if order can be updated - if (isOrderFinalStatus(order.orderStatus)) { - return sendErrorResponse(res, 401, `Order cannot be updated once it is ${order.orderStatus}`); - } - - // Handle order status transitions - if (orderStatus !== undefined && order.orderStatus !== orderStatus) { - switch (orderStatus) { - case 'cancelled': - case 'returned': - if (order.orderStatus !== 'delivered') { - await processRefund(order, transactionalEntityManager); - } - break; - default: - break; - } - - order.orderStatus = orderStatus; - } - - // Save updated order status - await orderRepository.save(order); - - // Prepare response data - const orderResponse = { - fullName: `${order.buyer.firstName} ${order.buyer.lastName}`, - email: order.buyer.email, - products: order.orderItems.map((item: OrderItem) => ({ - name: item.product.name, - newPrice: item.price, - quantity: item.quantity, - })), - totalAmount: order.totalPrice, - quantity: order.quantity, - orderDate: order.orderDate, - address: order.address, - }; - - // Send email notification - const message = { - subject: 'Order updated successfully', - ...orderResponse - }; - await sendMail(message); - - // Respond with success - return sendSuccessResponse(res, 200, 'Order updated successfully', orderResponse); - }); - } catch (error) { - console.error('Error updating order:', error); - return sendErrorResponse(res, 500, (error as Error).message); - } + break; + default: + break; + } + + order.orderStatus = orderStatus; + } + + // Save updated order status + await orderRepository.save(order); + + // Prepare response data + const orderResponse = { + fullName: `${order.buyer.firstName} ${order.buyer.lastName}`, + email: order.buyer.email, + products: order.orderItems.map((item: OrderItem) => ({ + name: item.product.name, + newPrice: item.price, + quantity: item.quantity, + })), + totalAmount: order.totalPrice, + quantity: order.quantity, + orderDate: order.orderDate, + address: order.address, + }; + + // Send email notification + const message = { + subject: 'Order updated successfully', + ...orderResponse, + }; + await sendMail(message); + + // Respond with success + return sendSuccessResponse(res, 200, 'Order updated successfully', orderResponse); + }); + } catch (error) { + console.error('Error updating order:', error); + return sendErrorResponse(res, 500, (error as Error).message); + } }; -async function processRefund(order: Order, entityManager: EntityManager) { - const buyer = order.buyer; - - // Refund buyer - const previousBalance = buyer.accountBalance; - buyer.accountBalance += order.totalPrice; - const currentBalance = buyer.accountBalance; - await entityManager.save(buyer); - - // Record refund transaction - const refundTransaction = new Transaction(); - refundTransaction.user = buyer; - refundTransaction.order = order; - refundTransaction.amount = order.totalPrice; - refundTransaction.previousBalance = previousBalance; - refundTransaction.currentBalance = currentBalance; - refundTransaction.type = 'credit'; - refundTransaction.description = 'Refund for cancelled or returned order'; - await entityManager.save(refundTransaction); - - // Return products to store - for (const orderItem of order.orderItems) { - const product = orderItem.product; - product.quantity += orderItem.quantity; - await entityManager.save(product); - } - - // Clear order details - order.orderItems = []; - order.totalPrice = 0; - order.quantity = 0; +async function processRefund (order: Order, entityManager: EntityManager) { + const buyer = order.buyer; + + // Refund buyer + const previousBalance = buyer.accountBalance; + buyer.accountBalance += order.totalPrice; + const currentBalance = buyer.accountBalance; + await entityManager.save(buyer); + + // Record refund transaction + const refundTransaction = new Transaction(); + refundTransaction.user = buyer; + refundTransaction.order = order; + refundTransaction.amount = order.totalPrice; + refundTransaction.previousBalance = previousBalance; + refundTransaction.currentBalance = currentBalance; + refundTransaction.type = 'credit'; + refundTransaction.description = 'Refund for cancelled or returned order'; + await entityManager.save(refundTransaction); + + // Return products to store + for (const orderItem of order.orderItems) { + const product = orderItem.product; + product.quantity += orderItem.quantity; + await entityManager.save(product); + } + + // Clear order details + order.orderItems = []; + order.totalPrice = 0; + order.quantity = 0; } -function isOrderFinalStatus(status: string): boolean { - return ['cancelled', 'delivered', 'returned'].includes(status); -} \ No newline at end of file +function isOrderFinalStatus (status: string): boolean { + return ['cancelled', 'delivered', 'returned', 'completed'].includes(status); +} diff --git a/src/services/productServices/deleteProduct.ts b/src/services/productServices/deleteProduct.ts index 43ec3d1..068c4c9 100644 --- a/src/services/productServices/deleteProduct.ts +++ b/src/services/productServices/deleteProduct.ts @@ -3,30 +3,28 @@ import { Product } from '../../entities/Product'; import { getRepository } from 'typeorm'; import { responseError, responseSuccess } from '../../utils/response.utils'; - export const deleteProductService = async (req: Request, res: Response) => { - try { - const { id } = req.params; - - const productRepository = getRepository(Product); + try { + const { id } = req.params; - const product = await productRepository.findOne({ - where: { - id: id, - vendor: { - id: req.user?.id - } - } - }); + const productRepository = getRepository(Product); - if (product) { - await productRepository.remove(product); - return responseSuccess(res, 200, 'Product successfully deleted'); - } + const product = await productRepository.findOne({ + where: { + id: id, + vendor: { + id: req.user?.id, + }, + }, + }); - return responseError(res, 404, 'Product not found'); - - } catch (error) { - responseError(res, 400, (error as Error).message); + if (product) { + await productRepository.remove(product); + return responseSuccess(res, 200, 'Product successfully deleted'); } + + return responseError(res, 404, 'Product not found'); + } catch (error) { + responseError(res, 400, (error as Error).message); + } }; diff --git a/src/services/productServices/getRecommendedProductsService.ts b/src/services/productServices/getRecommendedProductsService.ts index 19368e1..fde015d 100644 --- a/src/services/productServices/getRecommendedProductsService.ts +++ b/src/services/productServices/getRecommendedProductsService.ts @@ -1,62 +1,63 @@ -import { Request, Response } from "express"; -import { responseError, responseSuccess } from "../../utils/response.utils"; -import { getRepository } from "typeorm"; -import { Product } from "../../entities/Product"; +import { Request, Response } from 'express'; +import { responseError, responseSuccess } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { Product } from '../../entities/Product'; interface conditionDoc { - categories: any[] | null; - vendor: any | null + categories: any[] | null; + vendor: any | null; } export const getRecommendedProductsService = async (req: Request, res: Response) => { + try { + // Define pagination parameters + const page = req.query.page ? Number(req.query.page) : 1; + const limit = req.query.limit ? Number(req.query.limit) : 10; + const skip = (page - 1) * limit; + const condition: conditionDoc = { + categories: null, + vendor: null, + }; - try { - // Define pagination parameters - const page = req.query.page ? Number(req.query.page) : 1; - const limit = req.query.limit ? Number(req.query.limit) : 10; - const skip = (page - 1) * limit; - const condition: conditionDoc = { - categories: null, - vendor: null - }; - - if (req.query.categories) { - const categoryIds = Array.isArray(req.query.categories) ? req.query.categories : [req.query.categories]; - condition.categories = categoryIds; - }; - if (req.query.vendor) condition.vendor = req.query.vendor; + if (req.query.categories) { + const categoryIds = Array.isArray(req.query.categories) ? req.query.categories : [req.query.categories]; + condition.categories = categoryIds; + } + if (req.query.vendor) condition.vendor = req.query.vendor; - const productRepository = getRepository(Product); - const productsQuery = productRepository.createQueryBuilder("product") - .leftJoinAndSelect("product.categories", "category") - .leftJoinAndSelect("product.vendor", "vendor") - .where("1 = 1"); + const productRepository = getRepository(Product); + const productsQuery = productRepository + .createQueryBuilder('product') + .leftJoinAndSelect('product.categories', 'category') + .leftJoinAndSelect('product.vendor', 'vendor') + .where('1 = 1'); - if (condition.categories && condition.categories.length > 0) { - productsQuery.andWhere("category.id IN (:...categories)", { categories: condition.categories }); - } - if (condition.vendor) { - productsQuery.andWhere("vendor.id = :vendorId", { vendorId: condition.vendor }); - } + if (condition.categories && condition.categories.length > 0) { + productsQuery.andWhere('category.id IN (:...categories)', { categories: condition.categories }); + } + if (condition.vendor) { + productsQuery.andWhere('vendor.id = :vendorId', { vendorId: condition.vendor }); + } - const products = await productsQuery - .skip(skip) - .take(limit) - .getMany(); - if (products.length < 1) { - return responseSuccess(res, 200, `No products found for the specified ${condition.vendor ? 'vendor' : 'category'}`); - } - const sanitizedProducts = products.map(product => ({ - ...product, - vendor: { - firstName: product.vendor.firstName, - lastName: product.vendor.lastName, - phoneNumber: product.vendor.phoneNumber, - photoUrl: product.vendor.photoUrl - } - })); - return responseSuccess(res, 200, 'Products retrieved', { products: sanitizedProducts }); - } catch (error) { - return responseError(res, 400, (error as Error).message); + const products = await productsQuery.skip(skip).take(limit).getMany(); + if (products.length < 1) { + return responseSuccess( + res, + 200, + `No products found for the specified ${condition.vendor ? 'vendor' : 'category'}` + ); } -}; \ No newline at end of file + const sanitizedProducts = products.map(product => ({ + ...product, + vendor: { + firstName: product.vendor.firstName, + lastName: product.vendor.lastName, + phoneNumber: product.vendor.phoneNumber, + photoUrl: product.vendor.photoUrl, + }, + })); + return responseSuccess(res, 200, 'Products retrieved', { products: sanitizedProducts }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/productServices/listAllProductsService.ts b/src/services/productServices/listAllProductsService.ts index 8950abd..f39c7bb 100644 --- a/src/services/productServices/listAllProductsService.ts +++ b/src/services/productServices/listAllProductsService.ts @@ -5,38 +5,40 @@ import { responseError, responseSuccess } from '../../utils/response.utils'; import { validate } from 'uuid'; export const listAllProductsService = async (req: Request, res: Response) => { - try { - const page = req.query.page ? Number(req.query.page) : 1; - const limit = req.query.limit ? Number(req.query.limit) : 10; - const skip = (page - 1) * limit; - const category = req.query.category ; + try { + const page = req.query.page ? Number(req.query.page) : 1; + const limit = req.query.limit ? Number(req.query.limit) : 10; + const skip = (page - 1) * limit; + const category = req.query.category; - - const productRepository = getRepository(Product); - const products = await productRepository.find({ - where: { - categories: { - name: category as string - } - }, - skip, - take: limit, - relations: ["categories","vendor"], - select: { - vendor: { - id: true, firstName: true, lastName: true, - email: true, phoneNumber: true, photoUrl: true - } - } - } - ); + const productRepository = getRepository(Product); + const products = await productRepository.find({ + where: { + categories: { + name: category as string, + }, + }, + skip, + take: limit, + relations: ['categories', 'vendor'], + select: { + vendor: { + id: true, + firstName: true, + lastName: true, + email: true, + phoneNumber: true, + photoUrl: true, + }, + }, + }); - if (products.length < 1) { - return responseSuccess(res, 200, 'No products found'); - } - - return responseSuccess(res, 200, 'Products retrieved', { products }); - } catch (error) { - responseError(res, 400, (error as Error).message); + if (products.length < 1) { + return responseSuccess(res, 200, 'No products found'); } + + return responseSuccess(res, 200, 'Products retrieved', { products }); + } catch (error) { + responseError(res, 400, (error as Error).message); + } }; diff --git a/src/services/productServices/readProduct.ts b/src/services/productServices/readProduct.ts index 5c9257c..b3c244d 100644 --- a/src/services/productServices/readProduct.ts +++ b/src/services/productServices/readProduct.ts @@ -4,67 +4,75 @@ import { getRepository } from 'typeorm'; import { responseError, responseSuccess } from '../../utils/response.utils'; export const readProductsService = async (req: Request, res: Response) => { - try { - // Define pagination parameters - const page = req.query.page ? Number(req.query.page) : 1; - const limit = req.query.limit ? Number(req.query.limit) : 10; - const skip = (page - 1) * limit; + try { + // Define pagination parameters + const page = req.query.page ? Number(req.query.page) : 1; + const limit = req.query.limit ? Number(req.query.limit) : 10; + const skip = (page - 1) * limit; - // Retrieve products - const productRepository = getRepository(Product); - const products = await productRepository.find({ - where: { - vendor: { - id: req.user?.id, - }, - }, - skip, - take: limit, - relations: ['categories', 'vendor'], - select: { - vendor: { - id: true, firstName: true, lastName: true, - email: true, phoneNumber: true, photoUrl: true - } - } - }); + // Retrieve products + const productRepository = getRepository(Product); + const products = await productRepository.find({ + where: { + vendor: { + id: req.user?.id, + }, + }, + skip, + take: limit, + relations: ['categories', 'vendor'], + select: { + vendor: { + id: true, + firstName: true, + lastName: true, + email: true, + phoneNumber: true, + photoUrl: true, + }, + }, + }); - if (products.length < 1) { - return responseSuccess(res, 200, 'You have no products yet'); - } - return responseSuccess(res, 200, 'Products retrieved', { products }); - } catch (error) { - responseError(res, 400, (error as Error).message); + if (products.length < 1) { + return responseSuccess(res, 200, 'You have no products yet'); } + return responseSuccess(res, 200, 'Products retrieved', { products }); + } catch (error) { + responseError(res, 400, (error as Error).message); + } }; export const readProductService = async (req: Request, res: Response) => { - try { - const { id } = req.params; + try { + const { id } = req.params; - const productRepository = getRepository(Product); - const product = await productRepository.findOne({ - where: { - id: id, - vendor: { - id: req.user?.id, - }, - }, - relations: ['categories', 'vendor'], - select: { - vendor: { - id: true, firstName: true, lastName: true, - email: true, phoneNumber: true, photoUrl: true - } - } - }); + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ + where: { + id: id, + vendor: { + id: req.user?.id, + }, + }, + relations: ['categories', 'vendor'], + select: { + vendor: { + id: true, + firstName: true, + lastName: true, + email: true, + phoneNumber: true, + photoUrl: true, + }, + }, + }); - if (!product) { - return responseError(res, 404, 'Product not found'); - } - - return responseSuccess(res, 200, 'Product retrieved', { product }); - } catch (error) { - responseError(res, 400, (error as Error).message); + if (!product) { + return responseError(res, 404, 'Product not found'); } + + return responseSuccess(res, 200, 'Product retrieved', { product }); + } catch (error) { + responseError(res, 400, (error as Error).message); + } }; diff --git a/src/services/productServices/removeProductImage.ts b/src/services/productServices/removeProductImage.ts index 2995593..4424676 100644 --- a/src/services/productServices/removeProductImage.ts +++ b/src/services/productServices/removeProductImage.ts @@ -21,7 +21,7 @@ export const removeProductImageService = async (req: Request, res: Response) => const product = await productRepository.findOne({ where: { id, - vendor: { id: req.user?.id } + vendor: { id: req.user?.id }, }, relations: ['vendor'], }); diff --git a/src/services/productServices/searchProduct.ts b/src/services/productServices/searchProduct.ts index 765f431..9f33b5f 100644 --- a/src/services/productServices/searchProduct.ts +++ b/src/services/productServices/searchProduct.ts @@ -1,4 +1,4 @@ -import { Request, Response } from "express"; +import { Request, Response } from 'express'; import { getRepository, Like } from 'typeorm'; import { Product } from '../../entities/Product'; @@ -26,10 +26,7 @@ export const searchProductService = async (params: SearchProductParams) => { const skip = (page - 1) * limit; - const [products, total] = await query - .skip(skip) - .take(limit) - .getManyAndCount(); + const [products, total] = await query.skip(skip).take(limit).getManyAndCount(); const totalPages = Math.ceil(total / limit); diff --git a/src/services/productServices/viewSingleProduct.ts b/src/services/productServices/viewSingleProduct.ts index f956625..29ac167 100644 --- a/src/services/productServices/viewSingleProduct.ts +++ b/src/services/productServices/viewSingleProduct.ts @@ -4,35 +4,28 @@ import { getRepository } from 'typeorm'; import { responseError } from '../../utils/response.utils'; import { validate } from 'uuid'; - - export const viewSingleProduct = async (req: Request, res: Response) => { - try { - const productId = req.params.id; + try { + const productId = req.params.id; + + if (!validate(productId)) { + return res.status(400).json({ status: 'error', message: 'Invalid product ID' }); + } + if (productId) { + const products = getRepository(Product); + const product = await products.findOneBy({ id: productId }); - if (!validate(productId)) { - return res.status(400).json({ status: 'error', message: 'Invalid product ID' }); - + if (!product) { + return res.status(404).send({ status: 'error', message: 'Product not found' }); } - if(productId){ - const products = getRepository(Product); - const product = await products.findOneBy({ id: productId }); - - if (!product) { - return res.status(404).send({status:'error', message: 'Product not found'}); - - } - - if (product.expirationDate && new Date(product.expirationDate) < new Date()) { - return res.status(400).json({ status: 'error', message: 'Product expired' }); - - } - res.status(200).json({ status: 'success', product: product }); + if (product.expirationDate && new Date(product.expirationDate) < new Date()) { + return res.status(400).json({ status: 'error', message: 'Product expired' }); } - - } catch (error) { - console.error('Error handling request:', error); - res.status(500).send('Error fetching product details'); + res.status(200).json({ status: 'success', product: product }); } -} \ No newline at end of file + } catch (error) { + console.error('Error handling request:', error); + res.status(500).send('Error fetching product details'); + } +}; diff --git a/src/services/vendorOrderServices/readVendorOrder.ts b/src/services/vendorOrderServices/readVendorOrder.ts new file mode 100644 index 0000000..feec0c3 --- /dev/null +++ b/src/services/vendorOrderServices/readVendorOrder.ts @@ -0,0 +1,119 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { responseSuccess, responseError } from '../../utils/response.utils'; +import { VendorOrderItem } from '../../entities/VendorOrderItem'; +import { VendorOrders } from '../../entities/vendorOrders'; + +export const getVendorOrdersService = async (req: Request, res: Response) => { + try { + const vendorOrderRepository = getRepository(VendorOrders); + const vendorId = req.user?.id; + + const vendorOrders = await vendorOrderRepository.find({ + where: { + vendor: { + id: vendorId, + }, + }, + relations: ['vendor', 'order.buyer', 'vendorOrderItems', 'vendorOrderItems.product'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); + + if (!vendorOrders.length) { + return responseError(res, 200, `You don't have any pending orders from buyer`, { orders: [] }); + } + + const sanitizedOrderResponse = vendorOrders.map(order => ({ + id: order.id, + totalPrice: order.totalPrice, + orderStatus: order.orderStatus, + address: order.order.address, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + vendor: { + id: order.vendor.id, + firstName: order.vendor.firstName, + lastName: order.vendor.lastName, + email: order.vendor.email, + gender: order.vendor.gender, + phoneNumber: order.vendor.phoneNumber, + photoUrl: order.vendor.photoUrl, + }, + buyer: { + id: order.order.buyer.id, + firstName: order.order.buyer.firstName, + lastName: order.order.buyer.lastName, + email: order.order.buyer.lastName, + gender: order.order.buyer.gender, + phoneNumber: order.order.buyer.phoneNumber, + photoUrl: order.order.buyer.photoUrl, + }, + vendorOrderItems: order.vendorOrderItems, + })); + responseSuccess(res, 200, 'Orders retrieved successfully', { + orders: sanitizedOrderResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; + +// Get single vendor order info +export const getSingleVendorOrderService = async (req: Request, res: Response) => { + try { + const vendorOrderId = req.params.id; + + const vendorOrderRepository = getRepository(VendorOrders); + const vendorId = req.user?.id; + + const vendorOrder = await vendorOrderRepository.findOne({ + where: { + id: vendorOrderId, + vendor: { + id: vendorId, + }, + }, + relations: ['vendor', 'order.buyer', 'vendorOrderItems', 'vendorOrderItems.product'], + }); + + if (!vendorOrder) { + return responseError(res, 404, `Order Not Found.`); + } + + const sanitizedOrderResponse = { + id: vendorOrder.id, + totalPrice: vendorOrder.totalPrice, + orderStatus: vendorOrder.orderStatus, + address: vendorOrder.order.address, + createdAt: vendorOrder.createdAt, + updatedAt: vendorOrder.updatedAt, + vendor: { + id: vendorOrder.vendor.id, + firstName: vendorOrder.vendor.firstName, + lastName: vendorOrder.vendor.lastName, + email: vendorOrder.vendor.email, + gender: vendorOrder.vendor.gender, + phoneNumber: vendorOrder.vendor.phoneNumber, + photoUrl: vendorOrder.vendor.photoUrl, + }, + buyer: { + id: vendorOrder.order.buyer.id, + firstName: vendorOrder.order.buyer.firstName, + lastName: vendorOrder.order.buyer.lastName, + email: vendorOrder.order.buyer.lastName, + gender: vendorOrder.order.buyer.gender, + phoneNumber: vendorOrder.order.buyer.phoneNumber, + photoUrl: vendorOrder.order.buyer.photoUrl, + }, + vendorOrderItems: vendorOrder.vendorOrderItems, + }; + + responseSuccess(res, 200, 'Order retrieved successfully', { + order: sanitizedOrderResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/vendorOrderServices/updateVendorOrder.ts b/src/services/vendorOrderServices/updateVendorOrder.ts new file mode 100644 index 0000000..cae2c60 --- /dev/null +++ b/src/services/vendorOrderServices/updateVendorOrder.ts @@ -0,0 +1,87 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { OrderItem } from '../../entities/OrderItem'; +import { responseError, responseSuccess } from '../../utils/response.utils'; +import sendMail from '../../utils/sendOrderMail'; +import { VendorOrders } from '../../entities/vendorOrders'; +import { getIO } from '../../utils/socket'; + +export const updateVendorOrderService = async (req: Request, res: Response) => { + try { + const vendorOrderId = req.params.id; + const { orderStatus } = req.body; + if ( + !['pending', 'is-accepted', 'in-transit', 'cancelled', 'delivered'].includes( + (orderStatus as string).toLowerCase() + ) + ) { + return responseError(res, 400, `Please provide one of defined statuses.`); + } + + const vendorOrderRepository = getRepository(VendorOrders); + const vendorId = req.user?.id; + + const vendorOrder = await vendorOrderRepository.findOne({ + where: { + id: vendorOrderId, + vendor: { + id: vendorId, + }, + }, + relations: ['vendor', 'order.buyer', 'vendorOrderItems', 'vendorOrderItems.product'], + }); + + if (!vendorOrder) { + return responseError(res, 404, `Order Not Found.`); + } + + // Check if order can be updated + if (['delivered', 'cancelled', 'completed'].includes(vendorOrder.orderStatus)) { + return responseError(res, 409, `Order cannot be updated once it is marked as ${vendorOrder.orderStatus}`); + } + + vendorOrder.orderStatus = (orderStatus as string).toLowerCase(); + + // Save updated order status + const updatedVendorOrder = await vendorOrderRepository.save(vendorOrder); + + const sanitizedOrderResponse = { + id: updatedVendorOrder.id, + totalPrice: updatedVendorOrder.totalPrice, + orderStatus: updatedVendorOrder.orderStatus, + address: updatedVendorOrder.order.address, + createdAt: updatedVendorOrder.createdAt, + updatedAt: updatedVendorOrder.updatedAt, + vendor: { + id: updatedVendorOrder.vendor.id, + firstName: updatedVendorOrder.vendor.firstName, + lastName: updatedVendorOrder.vendor.lastName, + email: updatedVendorOrder.vendor.email, + gender: updatedVendorOrder.vendor.gender, + phoneNumber: updatedVendorOrder.vendor.phoneNumber, + photoUrl: updatedVendorOrder.vendor.photoUrl, + }, + buyer: { + id: updatedVendorOrder.order.buyer.id, + firstName: updatedVendorOrder.order.buyer.firstName, + lastName: updatedVendorOrder.order.buyer.lastName, + email: updatedVendorOrder.order.buyer.lastName, + gender: updatedVendorOrder.order.buyer.gender, + phoneNumber: updatedVendorOrder.order.buyer.phoneNumber, + photoUrl: updatedVendorOrder.order.buyer.photoUrl, + }, + vendorOrderItems: updatedVendorOrder.vendorOrderItems, + }; + + getIO().emit('orders', { + action: 'vendor update', + order: sanitizedOrderResponse, + }); + + return responseSuccess(res, 200, 'Order updated successfully', { + order: sanitizedOrderResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/wishListServices/addProduct.ts b/src/services/wishListServices/addProduct.ts index da3db89..79d0a38 100644 --- a/src/services/wishListServices/addProduct.ts +++ b/src/services/wishListServices/addProduct.ts @@ -4,57 +4,54 @@ import { getRepository } from 'typeorm'; import { wishList } from '../../entities/wishList'; import { Product } from '../../entities/Product'; -export const addProductService = async (req:Request,res:Response)=>{ - try { +export const addProductService = async (req: Request, res: Response) => { + try { + const id = req.params.id; + const wishListRepository = getRepository(wishList); + const productRepository = getRepository(Product); - const id = req.params.id; - const wishListRepository = getRepository(wishList); - const productRepository = getRepository(Product); + const product = await productRepository.findOne({ where: { id } }); + if (!product) { + return res.status(404).json({ message: 'Product not found' }); + } - const product = await productRepository.findOne({where: { id }}); - - if(!product){ - return res.status(404).json({message: "Product not found"}); - } - - const productDetails = { - productId: product.id, - name: product.name, - image: product.images, - newPrice: product.newPrice, - vendorId: product.vendor - } - - const alreadyIn = await wishListRepository.findOne({where: {productId: id, buyer:{ id: req.user?.id} }}) - - if(alreadyIn){ - return res.status(401).json({ - data: { - message: 'Product Already in the wish list', - wishlistAdded: alreadyIn, - product: productDetails, - }, - }) - } - - const addNewProduct = new wishList(); - addNewProduct.productId = id; - addNewProduct.buyer = req.user as User; - - await wishListRepository.save(addNewProduct); + const productDetails = { + productId: product.id, + name: product.name, + image: product.images, + newPrice: product.newPrice, + vendorId: product.vendor, + }; - addNewProduct.buyer = { id: addNewProduct.buyer.id } as unknown as User; + const alreadyIn = await wishListRepository.findOne({ where: { productId: id, buyer: { id: req.user?.id } } }); - return res.status(201).json({ + if (alreadyIn) { + return res.status(401).json({ data: { - message: 'Product Added to wish list', - wishlistAdded: addNewProduct, + message: 'Product Already in the wish list', + wishlistAdded: alreadyIn, product: productDetails, - }, - }); - - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); + }, + }); } -} \ No newline at end of file + + const addNewProduct = new wishList(); + addNewProduct.productId = id; + addNewProduct.buyer = req.user as User; + + await wishListRepository.save(addNewProduct); + + addNewProduct.buyer = { id: addNewProduct.buyer.id } as unknown as User; + + return res.status(201).json({ + data: { + message: 'Product Added to wish list', + wishlistAdded: addNewProduct, + product: productDetails, + }, + }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/services/wishListServices/clearAll.ts b/src/services/wishListServices/clearAll.ts index 88af3c6..7299454 100644 --- a/src/services/wishListServices/clearAll.ts +++ b/src/services/wishListServices/clearAll.ts @@ -2,19 +2,18 @@ import { Request, Response } from 'express'; import { getRepository } from 'typeorm'; import { wishList } from '../../entities/wishList'; -export const clearAllProductService = async (req:Request,res:Response)=>{ - try { - const wishListRepository = getRepository(wishList); - const productsForBuyer = await wishListRepository.find({where: { buyer:{ id: req.user?.id} }}); +export const clearAllProductService = async (req: Request, res: Response) => { + try { + const wishListRepository = getRepository(wishList); + const productsForBuyer = await wishListRepository.find({ where: { buyer: { id: req.user?.id } } }); - if (productsForBuyer.length === 0) { - return res.status(404).json({ message: 'No products in wish list' }); - } - - await wishListRepository.remove(productsForBuyer); - return res.status(200).json({ message: 'All products removed successfully'}); - - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); + if (productsForBuyer.length === 0) { + return res.status(404).json({ message: 'No products in wish list' }); } -} \ No newline at end of file + + await wishListRepository.remove(productsForBuyer); + return res.status(200).json({ message: 'All products removed successfully' }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/services/wishListServices/getProducts.ts b/src/services/wishListServices/getProducts.ts index 107f3aa..98dc434 100644 --- a/src/services/wishListServices/getProducts.ts +++ b/src/services/wishListServices/getProducts.ts @@ -3,36 +3,37 @@ import { getRepository } from 'typeorm'; import { wishList } from '../../entities/wishList'; import { Product } from '../../entities/Product'; -export const getProductsService = async (req:Request,res:Response)=>{ - try { - const wishListRepository = getRepository(wishList); - const productRepository =getRepository(Product); +export const getProductsService = async (req: Request, res: Response) => { + try { + const wishListRepository = getRepository(wishList); + const productRepository = getRepository(Product); - const productsForBuyer = await wishListRepository.find({where: { buyer:{ id: req.user?.id} }}); + const productsForBuyer = await wishListRepository.find({ where: { buyer: { id: req.user?.id } } }); - if (productsForBuyer.length === 0) { - return res.status(404).json({ message: 'No products in wish list', products: productsForBuyer }); - } - - const buyerWishProducts = await Promise.all(productsForBuyer.map(async (product) => { - const productDetails = await productRepository.findOne({ where: { id: product.productId } }); - if(productDetails){ - return { - wishListDetails: product, - productInfo: { - productId: productDetails.id, - name: productDetails.name, - image: productDetails.images, - newPrice: productDetails.newPrice, - vendorId: productDetails.vendor - } - }; - } - })); + if (productsForBuyer.length === 0) { + return res.status(404).json({ message: 'No products in wish list', products: productsForBuyer }); + } - return res.status(200).json({ message: 'Products retrieved', productsForBuyer: buyerWishProducts }); + const buyerWishProducts = await Promise.all( + productsForBuyer.map(async product => { + const productDetails = await productRepository.findOne({ where: { id: product.productId } }); + if (productDetails) { + return { + wishListDetails: product, + productInfo: { + productId: productDetails.id, + name: productDetails.name, + image: productDetails.images, + newPrice: productDetails.newPrice, + vendorId: productDetails.vendor, + }, + }; + } + }) + ); - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); - } -} \ No newline at end of file + return res.status(200).json({ message: 'Products retrieved', productsForBuyer: buyerWishProducts }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/services/wishListServices/removeProducts.ts b/src/services/wishListServices/removeProducts.ts index cb99c0f..b42052f 100644 --- a/src/services/wishListServices/removeProducts.ts +++ b/src/services/wishListServices/removeProducts.ts @@ -2,22 +2,20 @@ import { Request, Response } from 'express'; import { getRepository } from 'typeorm'; import { wishList } from '../../entities/wishList'; -export const removeProductService = async (req:Request,res:Response)=>{ - try { +export const removeProductService = async (req: Request, res: Response) => { + try { + const id = parseInt(req.params.id); + const wishListRepository = getRepository(wishList); - const id = parseInt(req.params.id); - const wishListRepository = getRepository(wishList); + const product = await wishListRepository.findOne({ where: { id } }); - const product = await wishListRepository.findOne({where: { id }}); - - if(!product){ - return res.status(404).json({message: "Product not found in wish list"}); - } - - await wishListRepository.remove(product); - return res.status(200).json({ message: "Product removed from wish list" }); - - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); + if (!product) { + return res.status(404).json({ message: 'Product not found in wish list' }); } -} \ No newline at end of file + + await wishListRepository.remove(product); + return res.status(200).json({ message: 'Product removed from wish list' }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/startups/getSwaggerServer.ts b/src/startups/getSwaggerServer.ts index efe12fa..6a7416d 100644 --- a/src/startups/getSwaggerServer.ts +++ b/src/startups/getSwaggerServer.ts @@ -7,7 +7,7 @@ function getSwaggerServer (): string { return process.env.SWAGGER_SERVER; } - return `http://localhost:${process.env.PORT}/api/v1`; + return `http://localhost:${process.env.PORT}`; } export { getSwaggerServer }; diff --git a/src/utils/auth.ts b/src/utils/auth.ts index 91874e3..623883f 100644 --- a/src/utils/auth.ts +++ b/src/utils/auth.ts @@ -1,72 +1,66 @@ /* eslint-disable camelcase */ import passport from 'passport'; -import { Strategy } from "passport-google-oauth20"; +import { Strategy } from 'passport-google-oauth20'; import { User } from '../entities/User'; import { getRepository } from 'typeorm'; import bcrypt from 'bcrypt'; -import "../utils/auth"; +import '../utils/auth'; passport.use( - new Strategy( - { - clientID: process.env.GOOGLE_CLIENT_ID as string, - clientSecret: process.env.GOOGLE_CLIENT_SECRET as string, - callbackURL: 'http://localhost:6890/user/auth/google/callback/', - scope: ['email', 'profile'], - }, - async (accessToken: any, refreshToken: any, profile: any, cb: any) => { - const userRepository = getRepository(User); - const { family_name, - name, - picture, - email, - email_verified + new Strategy( + { + clientID: process.env.GOOGLE_CLIENT_ID as string, + clientSecret: process.env.GOOGLE_CLIENT_SECRET as string, + callbackURL: 'http://localhost:6890/user/auth/google/callback/', + scope: ['email', 'profile'], + }, + async (accessToken: any, refreshToken: any, profile: any, cb: any) => { + const userRepository = getRepository(User); + const { family_name, name, picture, email, email_verified } = profile._json; + const { familyName, givenName } = profile.name; - } = profile._json; - const { familyName, givenName } = profile.name; + if (email || givenName || family_name || picture) { + try { + // Check for existing user + const existingUser = await userRepository.findOneBy({ email }); - if (email || givenName || family_name || picture) { - try { - // Check for existing user - const existingUser = await userRepository.findOneBy({ email }); + if (existingUser) { + return await cb(null, existingUser); + } + const saltRounds = 10; + const hashedPassword = await bcrypt.hash('password', saltRounds); + const newUser = new User(); + newUser.firstName = givenName; + newUser.lastName = family_name ?? familyName ?? 'undefined'; + newUser.email = email; + newUser.userType = 'Buyer'; + newUser.photoUrl = picture; + newUser.gender = 'Not specified'; + newUser.phoneNumber = 'Not specified'; + newUser.password = hashedPassword; + newUser.verified = email_verified; - if (existingUser) { - return await cb(null, existingUser); - } - const saltRounds = 10; - const hashedPassword = await bcrypt.hash("password", saltRounds); - const newUser = new User(); - newUser.firstName = givenName; - newUser.lastName = family_name ?? familyName ?? "undefined"; - newUser.email = email; - newUser.userType = 'Buyer'; - newUser.photoUrl = picture; - newUser.gender = "Not specified"; - newUser.phoneNumber = "Not specified"; - newUser.password = hashedPassword; - newUser.verified = email_verified; - - await userRepository.save(newUser); - return await cb(null, newUser); - } catch (error) { - console.error(error); - return await cb(error, null); - } - } - return await cb(null, profile, { message: 'Missing required profile information' }); + await userRepository.save(newUser); + return await cb(null, newUser); + } catch (error) { + console.error(error); + return await cb(error, null); } - ) + } + return await cb(null, profile, { message: 'Missing required profile information' }); + } + ) ); passport.serializeUser((user: any, cb) => { - cb(null, user.id); + cb(null, user.id); }); passport.deserializeUser(async (id: any, cb) => { - const userRepository = getRepository(User); - try { - const user = await userRepository.findOneBy({id}); - cb(null, user); - } catch (error) { - cb(error); - } + const userRepository = getRepository(User); + try { + const user = await userRepository.findOneBy({ id }); + cb(null, user); + } catch (error) { + cb(error); + } }); diff --git a/src/utils/index.ts b/src/utils/index.ts index 27e92ae..fdc7feb 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -5,16 +5,16 @@ * @param currency - The currency code (e.g., 'USD', 'EUR'). Defaults to 'USD'. * @returns The formatted currency string. */ -export function formatMoney(amount: number , currency: string = 'RWF'): string { - return amount.toLocaleString('en-US', { style: 'currency', currency }); - } - /** - * Format a date string into a more readable format. - * @param dateString - The date string to format. - * @returns The formatted date string. - */ - export function formatDate(dateString: Date): string { - const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' }; - const date = new Date(dateString); - return date.toLocaleDateString('en-US', options); - } \ No newline at end of file +export function formatMoney (amount: number, currency: string = 'RWF'): string { + return amount.toLocaleString('en-US', { style: 'currency', currency }); +} +/** + * Format a date string into a more readable format. + * @param dateString - The date string to format. + * @returns The formatted date string. + */ +export function formatDate (dateString: Date): string { + const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' }; + const date = new Date(dateString); + return date.toLocaleDateString('en-US', options); +} diff --git a/src/utils/sendOrderMail.ts b/src/utils/sendOrderMail.ts index a58fe09..72ee5b0 100644 --- a/src/utils/sendOrderMail.ts +++ b/src/utils/sendOrderMail.ts @@ -29,10 +29,7 @@ const sendMail = async (message: Message) => { }, }); - const { subject, fullName, email, products, totalAmount, - quantity, - orderDate, - address } = message; + const { subject, fullName, email, products, totalAmount, quantity, orderDate, address } = message; const mailOptions = { to: email, @@ -180,14 +177,18 @@ const sendMail = async (message: Message) => { Quantity Total - ${products.map((product: Product) => ` + ${products + .map( + (product: Product) => ` ${product.name} ${formatMoney(product.newPrice)} ${product.quantity} ${product.quantity * product.newPrice} - `).join('')} + ` + ) + .join('')} Total ${totalAmount} @@ -211,4 +212,4 @@ const sendMail = async (message: Message) => { } }; -export default sendMail; \ No newline at end of file +export default sendMail; diff --git a/src/utils/sendOrderMailUpdated.ts b/src/utils/sendOrderMailUpdated.ts index ed2cf83..adddc9a 100644 --- a/src/utils/sendOrderMailUpdated.ts +++ b/src/utils/sendOrderMailUpdated.ts @@ -29,10 +29,7 @@ const sendMail = async (message: Message) => { }, }); - const { subject, fullName, email, products, totalAmount, - quantity, - orderDate, - address } = message; + const { subject, fullName, email, products, totalAmount, quantity, orderDate, address } = message; const mailOptions = { to: email, @@ -180,14 +177,18 @@ const sendMail = async (message: Message) => { Quantity Total - ${products.map((product: Product) => ` + ${products + .map( + (product: Product) => ` ${product.name} ${formatMoney(product.newPrice)} ${product.quantity} ${product.quantity * product.newPrice} - `).join('')} + ` + ) + .join('')} Total ${totalAmount} @@ -211,4 +212,4 @@ const sendMail = async (message: Message) => { } }; -export default sendMail; \ No newline at end of file +export default sendMail; diff --git a/src/utils/socket.ts b/src/utils/socket.ts new file mode 100644 index 0000000..e32ae19 --- /dev/null +++ b/src/utils/socket.ts @@ -0,0 +1,21 @@ +import { Server as HTTPServer } from 'http'; +import { Server as SocketIOServer } from 'socket.io'; + +let io: SocketIOServer | undefined; + +export const init = (httpServer: HTTPServer): SocketIOServer => { + io = new SocketIOServer(httpServer, { + cors: { + origin: '*', + methods: ['GET', 'POST', 'DELETE', 'PUT'], + }, + }); + return io; +}; + +export const getIO = (): SocketIOServer => { + if (!io) { + throw new Error('Socket.io not initialized!'); + } + return io; +}; diff --git a/tsconfig.json b/tsconfig.json index 4665a6d..d58c75f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,108 +1,108 @@ { - "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - /* Language and Environment */ - "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - "experimentalDecorators": true /* Enable experimental support for legacy experimental decorators. */, - "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */, - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - /* Modules */ - "module": "commonjs" /* Specify what module code is generated. */, - "rootDir": "./src" /* Specify the root folder within your source files. */, - // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - "types": [ - "node", - "jest", - "express", - "joi" - ] /* Specify type package names to be included without being referenced in a source file. */, - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ - // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ - // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ - // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - /* JavaScript Support */ - "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */, - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./dist" /* Specify an output folder for all emitted files. */, - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, - /* Type Checking */ - "strict": true /* Enable all strict type-checking options. */, - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ - }, - "include": ["src/**/*.ts"], - "exclude": ["node_modules"] - } \ No newline at end of file + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + /* Language and Environment */ + "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + "experimentalDecorators": true /* Enable experimental support for legacy experimental decorators. */, + "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */, + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + /* Modules */ + "module": "commonjs" /* Specify what module code is generated. */, + "rootDir": "./src" /* Specify the root folder within your source files. */, + // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + "types": [ + "node", + "jest", + "express", + "joi" + ] /* Specify type package names to be included without being referenced in a source file. */, + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + /* JavaScript Support */ + "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */, + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + "outDir": "./dist" /* Specify an output folder for all emitted files. */, + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, + /* Type Checking */ + "strict": true /* Enable all strict type-checking options. */, + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + }, + "include": ["src/**/*.ts"], + "exclude": ["node_modules"] +} From 0be0e9ce5d381559cdd15db325b0fe2abcc1fd96 Mon Sep 17 00:00:00 2001 From: Ndevu12 Date: Wed, 22 May 2024 17:05:04 +0200 Subject: [PATCH 17/20] # This is a combination of 2 commits. # This is the 1st commit message: # This is a combination of 4 commits. # This is the 1st commit message: ft adding discount coupon feature # This is the commit message #2: implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue adding documentation and tests writing tests # This is the commit message #3: Feat-Buyer-coupon-discount-management # This is the commit message #4: implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue adding documentation and tests writing tests implementing stripe payment system # This is the commit message #2: implementing stripe payment system --- .github/workflows/ci.yml | 3 +- package.json | 3 + .../{cart.test.test.ts => cart.test.ts} | 125 +++++- src/__test__/coupon.test.ts | 425 ++++++++++++++++++ src/__test__/errorHandler.test.ts | 78 ++-- src/__test__/getProduct.test.ts | 225 +++++----- src/__test__/isAllowed.test.ts | 37 +- src/__test__/logout.test.ts | 13 +- src/__test__/oauth.test.ts | 37 +- src/__test__/orderManagement.test.ts | 390 ++++++++++++++++ src/__test__/productStatus.test.ts | 24 +- src/__test__/roleCheck.test.ts | 10 +- src/__test__/route.test.ts | 15 +- src/__test__/test-assets/DatabaseCleanup.ts | 50 +++ src/__test__/userServices.test.ts | 18 +- src/__test__/userStatus.test.ts | 9 +- src/__test__/vendorProduct.test.ts | 31 +- src/__test__/wishList.test.ts | 386 ++++++++-------- src/controllers/adminOrdercontroller.ts | 18 + src/controllers/couponController.ts | 31 ++ src/controllers/index.ts | 3 + src/controllers/orderController.ts | 18 + src/controllers/productController.ts | 27 +- src/controllers/vendorOrderController.ts | 14 + src/controllers/wishListController.ts | 29 +- src/docs/adminOrderManagement.yml | 80 ++++ src/docs/couponDocs.yml | 217 +++++++++ src/docs/orderDocs.yml | 108 +++++ src/docs/vendorOrderManagement.yml | 93 ++++ src/docs/vendorProduct.yml | 14 +- src/docs/wishListDocs.yml | 97 ++++ src/entities/Cart.ts | 2 +- src/entities/CartItem.ts | 2 +- src/entities/Order.ts | 40 +- src/entities/OrderItem.ts | 29 ++ src/entities/Product.ts | 18 +- src/entities/User.ts | 10 +- src/entities/VendorOrderItem.ts | 30 ++ src/entities/coupon.ts | 68 +++ src/entities/transaction.ts | 61 +++ src/entities/vendorOrders.ts | 49 ++ src/entities/wishList.ts | 17 +- src/helper/couponValidator.ts | 58 +++ src/index.ts | 29 +- src/routes/ProductRoutes.ts | 31 +- src/routes/UserRoutes.ts | 39 +- src/routes/couponRoutes.ts | 22 + src/routes/index.ts | 2 + src/routes/wishListRoute.ts | 27 +- src/services/adminOrderServices/readOrder.ts | 158 +++++++ .../adminOrderServices/updateOrder.ts | 107 +++++ src/services/cartServices/createCart.ts | 3 +- .../couponServices/accessAllCoupon.ts | 37 ++ .../couponServices/buyerApplyCoupon.ts | 87 ++++ .../couponServices/createCouponService.ts | 55 +++ src/services/couponServices/deleteCoupon.ts | 23 + src/services/couponServices/readCoupon.ts | 23 + src/services/couponServices/updateService.ts | 59 +++ src/services/index.ts | 9 + src/services/orderServices/createOrder.ts | 186 ++++++++ src/services/orderServices/getOrderService.ts | 63 +++ .../getOrderTransactionHistory.ts | 42 ++ .../orderServices/updateOrderService.ts | 136 ++++++ src/services/productServices/deleteProduct.ts | 40 +- .../getRecommendedProductsService.ts | 105 ++--- .../productServices/listAllProductsService.ts | 64 +-- src/services/productServices/payment.ts | 52 +++ src/services/productServices/readProduct.ts | 116 ++--- .../productServices/removeProductImage.ts | 2 +- src/services/productServices/searchProduct.ts | 7 +- .../productServices/viewSingleProduct.ts | 45 +- .../vendorOrderServices/readVendorOrder.ts | 119 +++++ .../vendorOrderServices/updateVendorOrder.ts | 87 ++++ src/services/wishListServices/addProduct.ts | 89 ++-- src/services/wishListServices/clearAll.ts | 27 +- src/services/wishListServices/getProducts.ts | 59 +-- .../wishListServices/removeProducts.ts | 30 +- src/startups/getSwaggerServer.ts | 2 +- src/utils/auth.ts | 104 ++--- src/utils/index.ts | 19 + src/utils/response.utils.ts | 8 + src/utils/sendOrderMail.ts | 215 +++++++++ src/utils/sendOrderMailUpdated.ts | 215 +++++++++ src/utils/socket.ts | 21 + tsconfig.json | 214 ++++----- 85 files changed, 4734 insertions(+), 1056 deletions(-) rename src/__test__/{cart.test.test.ts => cart.test.ts} (81%) create mode 100644 src/__test__/coupon.test.ts create mode 100644 src/__test__/orderManagement.test.ts create mode 100644 src/__test__/test-assets/DatabaseCleanup.ts create mode 100644 src/controllers/adminOrdercontroller.ts create mode 100644 src/controllers/couponController.ts create mode 100644 src/controllers/orderController.ts create mode 100644 src/controllers/vendorOrderController.ts create mode 100644 src/docs/adminOrderManagement.yml create mode 100644 src/docs/couponDocs.yml create mode 100644 src/docs/orderDocs.yml create mode 100644 src/docs/vendorOrderManagement.yml create mode 100644 src/docs/wishListDocs.yml create mode 100644 src/entities/OrderItem.ts create mode 100644 src/entities/VendorOrderItem.ts create mode 100644 src/entities/coupon.ts create mode 100644 src/entities/transaction.ts create mode 100644 src/entities/vendorOrders.ts create mode 100644 src/helper/couponValidator.ts create mode 100644 src/routes/couponRoutes.ts create mode 100644 src/services/adminOrderServices/readOrder.ts create mode 100644 src/services/adminOrderServices/updateOrder.ts create mode 100644 src/services/couponServices/accessAllCoupon.ts create mode 100644 src/services/couponServices/buyerApplyCoupon.ts create mode 100644 src/services/couponServices/createCouponService.ts create mode 100644 src/services/couponServices/deleteCoupon.ts create mode 100644 src/services/couponServices/readCoupon.ts create mode 100644 src/services/couponServices/updateService.ts create mode 100644 src/services/orderServices/createOrder.ts create mode 100644 src/services/orderServices/getOrderService.ts create mode 100644 src/services/orderServices/getOrderTransactionHistory.ts create mode 100644 src/services/orderServices/updateOrderService.ts create mode 100644 src/services/productServices/payment.ts create mode 100644 src/services/vendorOrderServices/readVendorOrder.ts create mode 100644 src/services/vendorOrderServices/updateVendorOrder.ts create mode 100644 src/utils/sendOrderMail.ts create mode 100644 src/utils/sendOrderMailUpdated.ts create mode 100644 src/utils/socket.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0c5f52..3170cd8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,9 @@ env: CLOUDINARY_API_SECRET: ${{secrets.CLOUDINARY_API_SECRET}} GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}} GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}} - + STRIPE_SECRET_KEY: ${{secrets.STRIPE_SECRET_KEYT}} + jobs: build-lint-test-coverage: runs-on: ubuntu-latest diff --git a/package.json b/package.json index 06e7e40..53cc5a7 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,9 @@ "passport-google-oauth20": "^2.0.0", "pg": "^8.11.5", "reflect-metadata": "^0.2.2", + "socket.io": "^4.7.5", "source-map-support": "^0.5.21", + "stripe": "^15.8.0", "superagent": "^9.0.1", "swagger-jsdoc": "^6.2.8", "swagger-ui-express": "^5.0.0", @@ -78,6 +80,7 @@ "@types/nodemailer": "^6.4.15", "@types/passport-google-oauth20": "^2.0.16", "@types/reflect-metadata": "^0.1.0", + "@types/socket.io": "^3.0.2", "@types/supertest": "^6.0.2", "@types/uuid": "^9.0.8", "@types/winston": "^2.4.4", diff --git a/src/__test__/cart.test.test.ts b/src/__test__/cart.test.ts similarity index 81% rename from src/__test__/cart.test.test.ts rename to src/__test__/cart.test.ts index feb3798..4d6d1f0 100644 --- a/src/__test__/cart.test.test.ts +++ b/src/__test__/cart.test.ts @@ -9,6 +9,7 @@ import { Product } from '../entities/Product'; import { Category } from '../entities/Category'; import { Cart } from '../entities/Cart'; import { CartItem } from '../entities/CartItem'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); const buyer1Id = uuid(); @@ -38,11 +39,11 @@ const sampleVendor1: UserInterface = { id: vendor1Id, firstName: 'vendor1', lastName: 'user', - email: 'vendor1@example.com', + email: 'vendo111@example.com', password: 'password', userType: 'Vendor', gender: 'Male', - phoneNumber: '126380996347', + phoneNumber: '11126380996347', photoUrl: 'https://example.com/photo.jpg', role: 'VENDOR', }; @@ -51,11 +52,11 @@ const sampleBuyer1: UserInterface = { id: buyer1Id, firstName: 'buyer1', lastName: 'user', - email: 'buyer1@example.com', + email: 'elijahladdiedv@gmail.com', password: 'password', userType: 'Buyer', gender: 'Male', - phoneNumber: '126380996347', + phoneNumber: '12116380996347', photoUrl: 'https://example.com/photo.jpg', role: 'BUYER', }; @@ -64,11 +65,11 @@ const sampleBuyer2: UserInterface = { id: buyer2Id, firstName: 'buyer1', lastName: 'user', - email: 'buyer12@example.com', + email: 'buyer1112@example.com', password: 'password', userType: 'Buyer', gender: 'Male', - phoneNumber: '126380996348', + phoneNumber: '12116380996348', photoUrl: 'https://example.com/photo.jpg', role: 'BUYER', }; @@ -169,20 +170,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); + await cleanDatabase(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - const productRepository = connection.getRepository(Product); - const cartRepository = connection.getRepository(Cart); - - await cartRepository.delete({}); - await productRepository.delete({}); - await categoryRepository.delete({}); - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); server.close(); }); @@ -522,3 +511,101 @@ describe('Cart management for guest/buyer', () => { }); }); }); + +describe('Order management tests', () => { + let orderId: string | null; + describe('Create order', () => { + it('should return 400 when user ID is not provided', async () => { + const response = await request(app) + .post('/product/orders') + .send({ + address: { + country: 'Test Country', + city: 'Test City', + street: 'Test Street', + }, + }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(400); + }); + + it('should create a new order', async () => { + const response = await request(app) + .post('/product/orders') + .send({ + address: { + country: 'Test Country', + city: 'Test City', + street: 'Test Street', + }, + }) + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBeUndefined; + orderId = response.body.data?.orderId; // Assuming orderId is returned in response + }); + + it('should insert a new order', async () => { + const response = await request(app) + .post('/product/orders') + .send({ + address: { + country: 'Test Country', + city: 'Test City', + street: 'Test Street', + }, + }) + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBeUndefined; + orderId = response.body.data?.orderId; // Assuming orderId is returned in response + }); + }); + + describe('Get orders', () => { + it('should return orders for the buyer', async () => { + const response = await request(app) + .get('/product/client/orders') + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + expect(response.status).toBe(404); + expect(response.body.message).toBeUndefined; + }); + + it('should return 404 if the buyer has no orders', async () => { + const response = await request(app) + .get('/product/client/orders') + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + expect(response.status).toBe(404); + expect(response.body.message).toBeUndefined; + }); + }); + + describe('Get transaction history', () => { + it('should return transaction history for the buyer', async () => { + const response = await request(app) + .get('/product/orders/history') + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('No transaction history found'); + }); + + it('should return 400 when user ID is not provided', async () => { + const response = await request(app) + .get('/product/orders/history') + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(404); + }); + }); + + describe('Update order', () => { + it('should update order status successfully', async () => { + const response = await request(app) + .put(`/product/client/orders/${orderId}`) + .send({ orderStatus: 'delivered' }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(500); + }); + }); +}); diff --git a/src/__test__/coupon.test.ts b/src/__test__/coupon.test.ts new file mode 100644 index 0000000..269e95e --- /dev/null +++ b/src/__test__/coupon.test.ts @@ -0,0 +1,425 @@ +import request from 'supertest'; +import jwt from 'jsonwebtoken'; +import { app, server } from '../index'; +import { getConnection } from 'typeorm'; +import { dbConnection } from '../startups/dbConnection'; +import { User, UserInterface } from '../entities/User'; +import { Coupon } from '../entities/coupon'; +import { CartItem } from '../entities/CartItem'; +import { Cart } from '../entities/Cart'; +import { Product } from '../entities/Product'; +import { v4 as uuid } from 'uuid'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; + +const vendor1Id = uuid(); +const cart1Id = uuid(); +const cartItemId = uuid(); +const buyer1Id = uuid(); +const buyer2Id = uuid(); +const product1Id = uuid(); +const product2Id = uuid(); +const couponCode = 'DISCOUNT20'; +const couponCode1 = 'DISCOUNT10'; +const couponCode2 = 'DISCOUNT99'; +const couponCode3 = 'DISCOUNT22'; +const expiredCouponCode = 'EXPIRED'; +const finishedCouponCode = 'FINISHED'; +const moneyCouponCode = 'MONEY'; +const invalidCouponCode = 'INVALIDCODE'; + +const jwtSecretKey = process.env.JWT_SECRET || ''; + +const getAccessToken = (id: string, email: string) => { + return jwt.sign( + { + id: id, + email: email, + }, + jwtSecretKey + ); +}; + +const sampleVendor1: UserInterface = { + id: vendor1Id, + firstName: 'Vendor', + lastName: 'User', + email: 'vendor@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '1234567890', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', +}; + +const sampleBuyer1: UserInterface = { + id: buyer1Id, + firstName: 'buyer1', + lastName: 'user', + email: 'buyer1@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; +const buyerNoCart: UserInterface = { + id: buyer2Id, + firstName: 'buyer1', + lastName: 'user', + email: 'buyr122@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '159380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; + +const sampleProduct1 = new Product(); +sampleProduct1.id = product1Id; +sampleProduct1.name = 'Test Product'; +sampleProduct1.description = 'Amazing product'; +sampleProduct1.images = ['photo1.jpg', 'photo2.jpg', 'photo3.jpg']; +sampleProduct1.newPrice = 200; +sampleProduct1.quantity = 10; +sampleProduct1.vendor = sampleVendor1 as User; + +const sampleProduct2 = new Product(); +sampleProduct2.id = product2Id; +sampleProduct2.name = 'Test 2 Product'; +sampleProduct2.description = 'Amazing product 2'; +sampleProduct2.images = ['photo1.jpg', 'photo2.jpg', 'photo3.jpg']; +sampleProduct2.newPrice = 200; +sampleProduct2.quantity = 10; +sampleProduct2.vendor = sampleVendor1 as User; + +const sampleCoupon = new Coupon(); +sampleCoupon.code = couponCode; +sampleCoupon.discountRate = 20; +sampleCoupon.expirationDate = new Date('2025-01-01'); +sampleCoupon.maxUsageLimit = 100; +sampleCoupon.discountType = 'percentage'; +sampleCoupon.product = sampleProduct1; +sampleCoupon.vendor = sampleVendor1 as User; + +const sampleCoupon1 = new Coupon(); +sampleCoupon1.code = couponCode1; +sampleCoupon1.discountRate = 20; +sampleCoupon1.expirationDate = new Date('2025-01-01'); +sampleCoupon1.maxUsageLimit = 100; +sampleCoupon1.discountType = 'percentage'; +sampleCoupon1.product = sampleProduct1; +sampleCoupon1.vendor = sampleVendor1 as User; + +const sampleCoupon2 = new Coupon(); +sampleCoupon2.code = couponCode2; +sampleCoupon2.discountRate = 20; +sampleCoupon2.expirationDate = new Date('2026-01-01'); +sampleCoupon2.maxUsageLimit = 100; +sampleCoupon2.discountType = 'percentage'; +sampleCoupon2.product = sampleProduct1; +sampleCoupon2.vendor = sampleVendor1 as User; + +const sampleCoupon3 = new Coupon(); +sampleCoupon3.code = couponCode3; +sampleCoupon3.discountRate = 20; +sampleCoupon3.expirationDate = new Date('2026-01-01'); +sampleCoupon3.maxUsageLimit = 100; +sampleCoupon3.discountType = 'percentage'; +sampleCoupon3.product = sampleProduct2; +sampleCoupon3.vendor = sampleVendor1 as User; + +const expiredCoupon = new Coupon(); +expiredCoupon.code = expiredCouponCode; +expiredCoupon.discountRate = 20; +expiredCoupon.expirationDate = new Date('2023-01-01'); +expiredCoupon.maxUsageLimit = 100; +expiredCoupon.discountType = 'percentage'; +expiredCoupon.product = sampleProduct1; +expiredCoupon.vendor = sampleVendor1 as User; + +const finishedCoupon = new Coupon(); +finishedCoupon.code = finishedCouponCode; +finishedCoupon.discountRate = 20; +finishedCoupon.expirationDate = new Date('2028-01-01'); +finishedCoupon.maxUsageLimit = 0; +finishedCoupon.discountType = 'percentage'; +finishedCoupon.product = sampleProduct1; +finishedCoupon.vendor = sampleVendor1 as User; + +const moneyCoupon = new Coupon(); +moneyCoupon.code = moneyCouponCode; +moneyCoupon.discountRate = 50; +moneyCoupon.expirationDate = new Date('2028-01-01'); +moneyCoupon.maxUsageLimit = 10; +moneyCoupon.discountType = 'money'; +moneyCoupon.product = sampleProduct1; +moneyCoupon.vendor = sampleVendor1 as User; + +const sampleCart1 = { + id: cart1Id, + user: sampleBuyer1, + totalAmount: 200, +}; + +const sampleCartItem1 = { + id: cartItemId, + product: sampleProduct1, + cart: sampleCart1, + quantity: 2, + newPrice: 200, + total: 400, +}; + +beforeAll(async () => { + const connection = await dbConnection(); + + const userRepository = connection?.getRepository(User); + await userRepository?.save(sampleVendor1); + await userRepository?.save(sampleBuyer1); + await userRepository?.save(buyerNoCart); + + const productRepository = connection?.getRepository(Product); + await productRepository?.save(sampleProduct1); + await productRepository?.save(sampleProduct2); + + const couponRepository = connection?.getRepository(Coupon); + await couponRepository?.save(sampleCoupon); + await couponRepository?.save(sampleCoupon1); + await couponRepository?.save(expiredCoupon); + await couponRepository?.save(sampleCoupon2); + await couponRepository?.save(sampleCoupon3); + await couponRepository?.save(finishedCoupon); + await couponRepository?.save(moneyCoupon); + + const cartRepository = connection?.getRepository(Cart); + await cartRepository?.save({ ...sampleCart1 }); + + const cartItemRepository = connection?.getRepository(CartItem); + await cartItemRepository?.save({ ...sampleCartItem1 }); +}); + +afterAll(async () => { + await cleanDatabase(); + + server.close(); +}); + +describe('Coupon Management System', () => { + describe('Create Coupon', () => { + it('should create a new coupon', async () => { + const response = await request(app) + .post(`/coupons/vendor/${vendor1Id}/`) + .send({ + code: 'NEWCOUPON10', + discountRate: 10, + expirationDate: '2025-12-31', + maxUsageLimit: 50, + discountType: 'PERCENTAGE', + product: product1Id, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.status).toBe('success'); + }, 10000); + + it('should return 400 for invalid coupon data', async () => { + const response = await request(app) + .post(`/coupons/vendor/${vendor1Id}/`) + .send({ + code: '', + discountRate: 'invalid', + expirationDate: 'invalid-date', + maxUsageLimit: 'invalid', + discountType: 'INVALID', + product: 'invalid-product-id', + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + }, 10000); + }); + + describe('Get All Coupons', () => { + it('should retrieve all coupons for a vendor', async () => { + const response = await request(app) + .get(`/coupons/vendor/${vendor1Id}/access-coupons`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + expect(response.body.data).toBeInstanceOf(Object); + }, 10000); + + it('should return 404 if no coupons found', async () => { + const newVendorId = uuid(); + const response = await request(app) + .get(`/coupons/vendor/${newVendorId}/access-coupons`) + .set('Authorization', `Bearer ${getAccessToken(newVendorId, 'newvendor@example.com')}`); + + expect(response.status).toBe(401); + }, 10000); + }); + + describe('Read Coupon', () => { + it('should read a single coupon by code', async () => { + const response = await request(app) + .get(`/coupons/vendor/${vendor1Id}/checkout/${couponCode}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + }, 10000); + + it('should return 404 for invalid coupon code', async () => { + const response = await request(app) + .get(`/coupons/vendor/${vendor1Id}/checkout/${invalidCouponCode}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.status).toBe('error'); + expect(response.body.message).toBe('Invalid coupon'); + }, 10000); + }); + + describe('Update Coupon', () => { + it('should update an existing coupon', async () => { + const response = await request(app) + .put(`/coupons/vendor/${vendor1Id}/update-coupon/${couponCode1}`) + .send({ + code: 'KAGAHEBUZO04', + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + }, 10000); + + it('should return 404 for updating a non-existent coupon', async () => { + const response = await request(app) + .put(`/coupons/vendor/${vendor1Id}/update-coupon/${invalidCouponCode}`) + .send({ + discountRate: 25, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Coupon not found'); + }, 10000); + }); + + describe('Delete Coupon', () => { + it('should delete an existing coupon', async () => { + const response = await request(app) + .delete(`/coupons/vendor/${vendor1Id}/checkout/delete`) + .send({ + code: couponCode, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + }, 10000); + + it('should return 404 for deleting a non-existent coupon', async () => { + const response = await request(app) + .delete(`/coupons/vendor/${vendor1Id}/checkout/delete`) + .send({ + code: invalidCouponCode, + }) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.status).toBe('error'); + expect(response.body.message).toBe('Invalid coupon'); + }, 10000); + }); +}); + +describe('Buyer Coupon Application', () => { + describe('Checking Coupon Conditions', () => { + it('should return 400 when no coupon submitted', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBe('Coupon Code is required'); + }); + it('should return 404 if coupon code is not found in the database', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: 'InvalidCode', + }); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Invalid Coupon Code'); + }); + it('should not allow use of expired tokens', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: expiredCoupon.code, + }); + + expect(response.status).toBe(400); + expect(response.body.message).toBe('Coupon is expired'); + }); + it('should not allow use of coupon that reach maximum users', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: finishedCoupon.code, + }); + + expect(response.status).toBe(400); + expect(response.body.message).toBe('Coupon Discount Ended'); + }); + it('Should not work when the product is not in cart', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: sampleCoupon3.code, + }); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('No product in Cart with that coupon code'); + }); + }); + + describe('Giving discount according the the product coupon', () => { + it('Should give discont when discount-type is percentage', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: sampleCoupon2.code, + }); + + expect(response.status).toBe(200); + expect(response.body.message).toBe( + `Coupon Code successfully activated discount on product: ${sampleProduct1.name}` + ); + }); + it('Should give discont when discount-type is money', async () => { + const response = await request(app) + .post(`/coupons/apply`) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`) + .send({ + couponCode: moneyCoupon.code, + }); + + expect(response.status).toBe(200); + expect(response.body.message).toBe( + `Coupon Code successfully activated discount on product: ${sampleProduct1.name}` + ); + }); + }); +}); diff --git a/src/__test__/errorHandler.test.ts b/src/__test__/errorHandler.test.ts index fb1437c..cf079f0 100644 --- a/src/__test__/errorHandler.test.ts +++ b/src/__test__/errorHandler.test.ts @@ -1,47 +1,47 @@ import { Request, Response } from 'express'; -import { CustomError, errorHandler } from '../middlewares/errorHandler' +import { CustomError, errorHandler } from '../middlewares/errorHandler'; describe('CustomError', () => { - it('should create a CustomError object with statusCode and status properties', () => { - const message = 'Test error message'; - const statusCode = 404; - const customError = new CustomError(message, statusCode); - expect(customError.message).toBe(message); - expect(customError.statusCode).toBe(statusCode); - expect(customError.status).toBe('fail'); - }); + it('should create a CustomError object with statusCode and status properties', () => { + const message = 'Test error message'; + const statusCode = 404; + const customError = new CustomError(message, statusCode); + expect(customError.message).toBe(message); + expect(customError.statusCode).toBe(statusCode); + expect(customError.status).toBe('fail'); }); +}); - describe('errorHandler', () => { - it('should send correct response with status code and message', () => { - const err = new CustomError('Test error message', 404); - const req = {} as Request; - const res = { - status: jest.fn().mockReturnThis(), - json: jest.fn(), - } as unknown as Response; - const next = jest.fn(); - errorHandler(err, req, res, next); - expect(res.status).toHaveBeenCalledWith(404); - expect(res.json).toHaveBeenCalledWith({ - status: 404, - message: 'Test error message', - }); +describe('errorHandler', () => { + it('should send correct response with status code and message', () => { + const err = new CustomError('Test error message', 404); + const req = {} as Request; + const res = { + status: jest.fn().mockReturnThis(), + json: jest.fn(), + } as unknown as Response; + const next = jest.fn(); + errorHandler(err, req, res, next); + expect(res.status).toHaveBeenCalledWith(404); + expect(res.json).toHaveBeenCalledWith({ + status: 404, + message: 'Test error message', }); - it('should handle errors with status code 500', () => { - const err = new CustomError('something went wrong', 500); - const req = {} as Request; - const res = { - status: jest.fn().mockReturnThis(), - json: jest.fn(), - } as unknown as Response; - const next = jest.fn(); - errorHandler(err, req, res, next); + }); + it('should handle errors with status code 500', () => { + const err = new CustomError('something went wrong', 500); + const req = {} as Request; + const res = { + status: jest.fn().mockReturnThis(), + json: jest.fn(), + } as unknown as Response; + const next = jest.fn(); + errorHandler(err, req, res, next); - expect(res.status).toHaveBeenCalledWith(500); - expect(res.json).toHaveBeenCalledWith({ - status: 500, - message: 'something went wrong', - }); + expect(res.status).toHaveBeenCalledWith(500); + expect(res.json).toHaveBeenCalledWith({ + status: 500, + message: 'something went wrong', }); - }); \ No newline at end of file + }); +}); diff --git a/src/__test__/getProduct.test.ts b/src/__test__/getProduct.test.ts index ffcb6c4..96201dd 100644 --- a/src/__test__/getProduct.test.ts +++ b/src/__test__/getProduct.test.ts @@ -7,10 +7,13 @@ import { User, UserInterface } from '../entities/User'; import { v4 as uuid } from 'uuid'; import { Product } from '../entities/Product'; import { Category } from '../entities/Category'; +import { Cart } from '../entities/Cart'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); +const BuyerID = uuid(); const product1Id = uuid(); -const Invalidproduct = "11278df2-d026-457a-9471-4749f038df68"; +const Invalidproduct = '11278df2-d026-457a-9471-4749f038df68'; const catId = uuid(); const jwtSecretKey = process.env.JWT_SECRET || ''; @@ -25,111 +28,131 @@ const getAccessToken = (id: string, email: string) => { ); }; const sampleVendor1: UserInterface = { - id: vendor1Id, - firstName: 'vendor1o', - lastName: 'user', - email: 'vendor10@example.com', - password: 'password', - userType: 'Vendor', - gender: 'Male', - phoneNumber: '126380996348', - photoUrl: 'https://example.com/photo.jpg', - role: 'VENDOR', - }; - - const sampleCat = { - id: catId, - name: 'accessories', - }; + id: vendor1Id, + firstName: 'vendor1o', + lastName: 'user', + email: 'vendor10@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '126380996348', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', +}; +const sampleBuyer1: UserInterface = { + id: BuyerID, + firstName: 'vendor1o', + lastName: 'user', + email: 'buyer10@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '000380996348', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; -const sampleProduct1 = { - id: product1Id, - name: 'test product single', - description: 'amazing product', - images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], - newPrice: 200, - quantity: 10, - vendor: sampleVendor1, - categories: [sampleCat], - }; +const sampleCat = { + id: catId, + name: 'accessories', +}; +const sampleProduct1 = { + id: product1Id, + name: 'test product single', + description: 'amazing product', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor1, + categories: [sampleCat], +}; +let cardID : string; beforeAll(async () => { - const connection = await dbConnection(); - - const categoryRepository = connection?.getRepository(Category); - await categoryRepository?.save({ ...sampleCat }); - - const userRepository = connection?.getRepository(User); - await userRepository?.save({ ...sampleVendor1 }); - - - const productRepository = connection?.getRepository(Product); - await productRepository?.save({ ...sampleProduct1 }); - - }); - - afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } - await connection.close(); - server.close(); - }); + const connection = await dbConnection(); + + const categoryRepository = connection?.getRepository(Category); + await categoryRepository?.save({ ...sampleCat }); + + const userRepository = connection?.getRepository(User); + await userRepository?.save({ ...sampleVendor1}); + await userRepository?.save({ ...sampleBuyer1 }); + + const productRepository = connection?.getRepository(Product); + await productRepository?.save({ ...sampleProduct1 }); +}); + +afterAll(async () => { + await cleanDatabase(); + server.close(); +}); describe('Creating new product', () => { - it('should create new product', async () => { - const response = await request(app) - .post('/product') - .field('name', 'test product3') - .field('description', 'amazing product3') - .field('newPrice', 200) - .field('quantity', 10) - .field('expirationDate', '10-2-2023') - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(201); - expect(response.body.data.product).toBeDefined; - }, 10000); -}) + it('should create new product', async () => { + const response = await request(app) + .post('/product') + .field('name', 'test product3') + .field('description', 'amazing product3') + .field('newPrice', 200) + .field('quantity', 10) + .field('expirationDate', '10-2-2023') + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(201); + expect(response.body.data.product).toBeDefined; + }, 20000); +}); describe('Get single product', () => { - it('should get a single product', async () => { - const response = await request(app) - .get(`/product/${product1Id}`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(200); - expect(response.body.status).toBe('success'); - expect(response.body.product).toBeDefined; - expect(response.body.product.id).toBe(product1Id); - }, 10000); - - it('should return 400 for invalid product Id', async () => { - const response = await request(app) - .get(`/product/non-existing-id`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); - - expect(response.status).toBe(400); - expect(response.body.status).toBe('error'); - expect(response.body.message).toBe('Invalid product ID'); - }, 10000); - it('should return 404 for product not found', async () => { - const response = await request(app) - .get(`/product/${Invalidproduct}`) - .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + it('should get a single product', async () => { + const response = await request(app) + .get(`/product/${product1Id}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + expect(response.body.product).toBeDefined; + expect(response.body.product.id).toBe(product1Id); + }, 10000); + + it('should return 400 for invalid product Id', async () => { + const response = await request(app) + .get(`/product/non-existing-id`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(400); + expect(response.body.status).toBe('error'); + expect(response.body.message).toBe('Invalid product ID'); + }, 10000); + it('should return 404 for product not found', async () => { + const response = await request(app) + .get(`/product/${Invalidproduct}`) + .set('Authorization', `Bearer ${getAccessToken(vendor1Id, sampleVendor1.email)}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Product not found'); + }, 10000); +}); +describe('Cart Order and payment functionalities', () => { + it('should create a cart for a product', async () => { + const productId = product1Id; + const quantity = 8; + + const token = getAccessToken(BuyerID, sampleBuyer1.email); + + const response = await request(app) + .post('/cart') + .set('Authorization', `Bearer ${token}`) + .send({ productId, quantity }); + - expect(response.status).toBe(404); - expect(response.body.status).toBe('error'); - expect(response.body.message).toBe('Product not found'); - }, 10000); + expect(response.status).toBe(201); + expect(response.body.data.cart).toBeDefined(); + cardID = JSON.stringify(response.body.data.cart.id) }); - \ No newline at end of file + +} +) \ No newline at end of file diff --git a/src/__test__/isAllowed.test.ts b/src/__test__/isAllowed.test.ts index 2eb18a8..471a950 100644 --- a/src/__test__/isAllowed.test.ts +++ b/src/__test__/isAllowed.test.ts @@ -5,6 +5,7 @@ import { getConnection } from 'typeorm'; import { User } from '../entities/User'; import { responseError } from '../utils/response.utils'; import { v4 as uuid } from 'uuid'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; jest.mock('../utils/response.utils'); @@ -47,31 +48,23 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - - - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); + await cleanDatabase(); }); describe('Middleware - checkUserStatus', () => { - beforeEach(() => { - reqMock = {}; - resMock = { - status: jest.fn().mockReturnThis(), - json: jest.fn() - }; - nextMock = jest.fn(); - }); - - it('should return 401 if user is not authenticated', async () => { - await checkUserStatus(reqMock as Request, resMock as Response, nextMock); - expect(responseError).toHaveBeenCalledWith(resMock, 401, 'Authentication required'); - }); + beforeEach(() => { + reqMock = {}; + resMock = { + status: jest.fn().mockReturnThis(), + json: jest.fn(), + }; + nextMock = jest.fn(); + }); + + it('should return 401 if user is not authenticated', async () => { + await checkUserStatus(reqMock as Request, resMock as Response, nextMock); + expect(responseError).toHaveBeenCalledWith(resMock, 401, 'Authentication required'); + }); it('should return 401 if user is not found', async () => { reqMock = { user: { id: uuid() } }; diff --git a/src/__test__/logout.test.ts b/src/__test__/logout.test.ts index d777f7a..ac9eefa 100644 --- a/src/__test__/logout.test.ts +++ b/src/__test__/logout.test.ts @@ -2,22 +2,15 @@ import request from 'supertest'; import { app, server } from '../index'; import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; import { User } from '../entities/User'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; beforeAll(async () => { // Connect to the test database - const connectionOptions = await getConnectionOptions(); - await createConnection({ ...connectionOptions, name: 'testConnection' }); + await createConnection(); }); afterAll(async () => { - const connection = getConnection('testConnection'); - const userRepository = connection.getRepository(User); - - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); + await cleanDatabase(); server.close(); }); diff --git a/src/__test__/oauth.test.ts b/src/__test__/oauth.test.ts index 7723cb4..877d63b 100644 --- a/src/__test__/oauth.test.ts +++ b/src/__test__/oauth.test.ts @@ -2,36 +2,23 @@ import request from 'supertest'; import { app, server } from '../index'; import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; import { User } from '../entities/User'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; beforeAll(async () => { - // Connect to the test database - const connectionOptions = await getConnectionOptions(); - - await createConnection({ ...connectionOptions, name: 'testConnection' }); + await createConnection(); }); afterAll(async () => { - const connection = getConnection('testConnection'); - const userRepository = connection.getRepository(User); - - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); - + await cleanDatabase(); server.close(); }); -describe('authentication routes test',() => { - it('should redirect to the google authentication page',async() => { - const response = await request(app) - .get('/user/google-auth'); - expect(response.statusCode).toBe(302) - }) - it('should redirect after google authentication', async() => { - const response = await request(app) - .get('/user/auth/google/callback'); - expect(response.statusCode).toBe(302) - }) +describe('authentication routes test', () => { + it('should redirect to the google authentication page', async () => { + const response = await request(app).get('/user/google-auth'); + expect(response.statusCode).toBe(302); + }); + it('should redirect after google authentication', async () => { + const response = await request(app).get('/user/auth/google/callback'); + expect(response.statusCode).toBe(302); + }); }); - diff --git a/src/__test__/orderManagement.test.ts b/src/__test__/orderManagement.test.ts new file mode 100644 index 0000000..846b9d8 --- /dev/null +++ b/src/__test__/orderManagement.test.ts @@ -0,0 +1,390 @@ +import request from 'supertest'; +import jwt from 'jsonwebtoken'; +import { app, server } from '../index'; +import { getConnection } from 'typeorm'; +import { dbConnection } from '../startups/dbConnection'; +import { User, UserInterface } from '../entities/User'; +import { v4 as uuid } from 'uuid'; +import { Product } from '../entities/Product'; +import { Category } from '../entities/Category'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; +import { Order } from '../entities/Order'; +import { OrderItem } from '../entities/OrderItem'; +import { VendorOrders } from '../entities/vendorOrders'; +import { VendorOrderItem } from '../entities/VendorOrderItem'; + +const adminId = uuid(); +const vendorId = uuid(); +const vendor2Id = uuid(); +const buyerId = uuid(); + +const productId = uuid(); +const product2Id = uuid(); + +const orderId = uuid(); +const orderItemId = uuid(); +const order2Id = uuid(); +const order2ItemId = uuid(); + +const vendorOrderId = uuid(); +const vendorOrderItemId = uuid(); +const vendorOrder2Id = uuid(); +const vendorOrder2ItemId = uuid(); +const catId = uuid(); + +console.log(adminId, vendorId, buyerId); + +const jwtSecretKey = process.env.JWT_SECRET || ''; + +const getAccessToken = (id: string, email: string) => { + return jwt.sign( + { + id: id, + email: email, + }, + jwtSecretKey + ); +}; + +const sampleAdmin: UserInterface = { + id: adminId, + firstName: 'admin', + lastName: 'user', + email: 'admin@example.com', + password: 'password', + userType: 'Admin', + gender: 'Male', + phoneNumber: '126380997', + photoUrl: 'https://example.com/photo.jpg', + verified: true, + role: 'ADMIN', +}; +const sampleVendor: UserInterface = { + id: vendorId, + firstName: 'vendor', + lastName: 'user', + email: 'vendor@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + verified: true, + role: 'VENDOR', +}; +const sampleVendor2: UserInterface = { + id: vendor2Id, + firstName: 'vendor', + lastName: 'user', + email: 'vendor2@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '18090296347', + photoUrl: 'https://example.com/photo.jpg', + verified: true, + role: 'VENDOR', +}; +const sampleBuyer: UserInterface = { + id: buyerId, + firstName: 'buyer', + lastName: 'user', + email: 'buyer@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '6380996347', + photoUrl: 'https://example.com/photo.jpg', + verified: true, + role: 'BUYER', +}; + +const sampleCat = { + id: catId, + name: 'accessories', +}; + +const sampleProduct = { + id: productId, + name: 'test product', + description: 'amazing product', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor, + categories: [sampleCat], +}; +const sampleProduct2 = { + id: product2Id, + name: 'test product2', + description: 'amazing products', + images: ['photo1.jpg', 'photo2.jpg', 'photo3.jpg'], + newPrice: 200, + quantity: 10, + vendor: sampleVendor, + categories: [sampleCat], +}; + +const sampleOrder = { + id: orderId, + totalPrice: 400, + quantity: 2, + orderDate: new Date(), + buyer: sampleBuyer, + orderStatus: 'received', + address: 'Rwanda, Kigali, KK20st', +}; +const sampleOrder2 = { + id: order2Id, + totalPrice: 400, + quantity: 2, + orderDate: new Date(), + buyer: sampleBuyer, + orderStatus: 'order placed', + address: 'Rwanda, Kigali, KK20st', +}; + +const sampleOrderItem = { + id: orderItemId, + price: 200, + quantity: 2, + order: sampleOrder, + product: sampleProduct, +}; + +const sampleVendorOrder = { + id: vendorOrderId, + totalPrice: 400, + quantity: 2, + vendor: sampleVendor, + order: sampleOrder, + buyer: sampleBuyer, + orderStatus: 'pending', +}; + +const sampleVendorOrderItem = { + 'id': vendorOrderItemId, + 'price/unit': 200, + 'quantity': 2, + 'order': sampleVendorOrder, + 'product': sampleProduct, +}; + +beforeAll(async () => { + const connection = await dbConnection(); + + const categoryRepository = connection?.getRepository(Category); + await categoryRepository?.save({ ...sampleCat }); + + const userRepository = connection?.getRepository(User); + await userRepository?.save([sampleAdmin, sampleVendor, sampleVendor2, sampleBuyer]); + + const productRepository = connection?.getRepository(Product); + await productRepository?.save({ ...sampleProduct }); + + // Order Management + const orderRepository = connection?.getRepository(Order); + await orderRepository?.save([sampleOrder, sampleOrder2]); + + const orderItemRepository = connection?.getRepository(OrderItem); + await orderItemRepository?.save({ ...sampleOrderItem }); + + const vendorOrderRepository = connection?.getRepository(VendorOrders); + await vendorOrderRepository?.save({ ...sampleVendorOrder }); + + const vendorOrderItemRepository = connection?.getRepository(VendorOrderItem); + await vendorOrderItemRepository?.save({ ...sampleVendorOrderItem }); +}); + +afterAll(async () => { + await cleanDatabase(); + server.close(); +}); + +describe('Vendor Order Management', () => { + describe('Fetching vendor Order(s)', () => { + it('Should return all vendor orders', async () => { + const response = await request(app) + .get('/product/vendor/orders') + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.orders).toBeDefined(); + }); + + it("Should return empty array if vendor don't have any order for buyer", async () => { + const response = await request(app) + .get('/product/vendor/orders') + .set('Authorization', `Bearer ${getAccessToken(vendor2Id, sampleVendor2.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.orders).toEqual([]); + }); + + it('Should return single vendor order', async () => { + const response = await request(app) + .get(`/product/vendor/orders/${vendorOrderId}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.order).toBeDefined(); + }); + + it('return 404, for non existing vendor order', async () => { + const response = await request(app) + .get(`/product/vendor/orders/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Order Not Found.'); + }); + + it('return 400, for invalid vendor order id ', async () => { + const response = await request(app) + .get(`/product/vendor/orders/32df3`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBe(`invalid input syntax for type uuid: "32df3"`); + }); + }); + describe('Updating vendor order', () => { + it('should update the order', async () => { + const response = await request(app) + .put(`/product/vendor/orders/${vendorOrderId}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`) + .send({ + orderStatus: 'delivered', + }); + + expect(response.statusCode).toBe(200); + }); + it('should not update if orderStatus in not among defined ones', async () => { + const response = await request(app) + .put(`/product/vendor/orders/${vendorOrderId}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`) + .send({ + orderStatus: 'fakeOrderStatus', + }); + + expect(response.statusCode).toBe(400); + expect(response.body.message).toBe('Please provide one of defined statuses.'); + }); + it('should not update, return 404 for non existing vendor order', async () => { + const response = await request(app) + .put(`/product/vendor/orders/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`) + .send({ + orderStatus: 'is-accepted', + }); + + expect(response.statusCode).toBe(404); + expect(response.body.message).toBe('Order Not Found.'); + }); + it('should not update, if the order has already been cancelled or completed', async () => { + const response = await request(app) + .put(`/product/vendor/orders/${vendorOrderId}`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`) + .send({ + orderStatus: 'is-accepted', + }); + + expect(response.statusCode).toBe(409); + }); + it('return 400, for invalid vendor order id ', async () => { + const response = await request(app) + .put(`/product/vendor/orders/32df3`) + .set('Authorization', `Bearer ${getAccessToken(vendorId, sampleVendor.email)}`) + .send({ + orderStatus: 'is-accepted', + }); + + expect(response.status).toBe(400); + expect(response.body.message).toBe(`invalid input syntax for type uuid: "32df3"`); + }); + }); +}); + +describe('Admin Order Management', () => { + describe('Fetching buyer and vendor Order(s)', () => { + it("Should return all orders with it's buyer and related vendors", async () => { + const response = await request(app) + .get('/product/admin/orders') + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.orders).toBeDefined(); + }); + + it('Should return single order details', async () => { + const response = await request(app) + .get(`/product/admin/orders/${orderId}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.status).toBe(200); + expect(response.body.data.order).toBeDefined(); + }); + + it('return 404, for non existing order', async () => { + const response = await request(app) + .get(`/product/admin/orders/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.status).toBe(404); + expect(response.body.message).toBe('Order Not Found.'); + }); + + it('return 400, for invalid order id ', async () => { + const response = await request(app) + .get(`/product/admin/orders/32df3`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBe(`invalid input syntax for type uuid: "32df3"`); + }); + }); + describe('Updating buyer and vendor order', () => { + it('should not update, return 404 for non existing order', async () => { + const response = await request(app) + .put(`/product/admin/orders/${uuid()}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.statusCode).toBe(404); + expect(response.body.message).toBe('Order Not Found.'); + }); + it('should update the order', async () => { + const response = await request(app) + .put(`/product/admin/orders/${orderId}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.statusCode).toBe(200); + expect(response.body.data.order).toBeDefined(); + }); + it('should not update if it has already been completed(closed)', async () => { + const response = await request(app) + .put(`/product/admin/orders/${orderId}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.statusCode).toBe(409); + expect(response.body.message).toBe('The order has already been completed.'); + }); + + it('should not update, if the order has not been marked as received by buyer', async () => { + const response = await request(app) + .put(`/product/admin/orders/${order2Id}`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.statusCode).toBe(409); + expect(response.body.message).toBe('Order closure failed: The buyer has not received the item yet.'); + }); + + it('return 400, for invalid order id ', async () => { + const response = await request(app) + .put(`/product/admin/orders/32df3`) + .set('Authorization', `Bearer ${getAccessToken(adminId, sampleAdmin.email)}`); + + expect(response.status).toBe(400); + expect(response.body.message).toBe(`invalid input syntax for type uuid: "32df3"`); + }); + }); +}); diff --git a/src/__test__/productStatus.test.ts b/src/__test__/productStatus.test.ts index a770020..8e8b42a 100644 --- a/src/__test__/productStatus.test.ts +++ b/src/__test__/productStatus.test.ts @@ -7,6 +7,7 @@ import { User } from '../entities/User'; import { v4 as uuid } from 'uuid'; import { Product } from '../entities/Product'; import { Category } from '../entities/Category'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); const vendor2Id = uuid(); @@ -143,17 +144,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); + await cleanDatabase(); - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } - - await connection.close(); server.close(); }); @@ -230,22 +222,16 @@ describe('Vendor product availability status management tests', () => { }); }); - describe('search product by name availability tests', () => { it('Should search product by name', async () => { - const response = await request(app) - .get(`/product/search?name=testingmkknkkjiproduct4`) + const response = await request(app).get(`/product/search?name=testingmkknkkjiproduct4`); expect(response.body.data).toBeDefined; }, 10000); it('should return empty array if there is product is not found in the database', async () => { - const response = await request(app) - .put(`/product/search?name=home`) - + const response = await request(app).put(`/product/search?name=home`); expect(response.statusCode).toBe(401); expect(response.body.data).toBeUndefined; }); - - }); - +}); diff --git a/src/__test__/roleCheck.test.ts b/src/__test__/roleCheck.test.ts index 58efb9c..32df044 100644 --- a/src/__test__/roleCheck.test.ts +++ b/src/__test__/roleCheck.test.ts @@ -5,6 +5,7 @@ import { responseError } from '../utils/response.utils'; import { dbConnection } from '../startups/dbConnection'; import { v4 as uuid } from 'uuid'; import { getConnection } from 'typeorm'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; let reqMock: Partial; let resMock: Partial; @@ -34,14 +35,7 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); + await cleanDatabase(); }); describe('hasRole MiddleWare Test', () => { diff --git a/src/__test__/route.test.ts b/src/__test__/route.test.ts index 933c431..ac704b5 100644 --- a/src/__test__/route.test.ts +++ b/src/__test__/route.test.ts @@ -3,24 +3,15 @@ import { app, server } from '../index'; import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; import { User } from '../entities/User'; import { response } from 'express'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; beforeAll(async () => { - // Connect to the test database - const connectionOptions = await getConnectionOptions(); - - await createConnection({ ...connectionOptions, name: 'testConnection' }); + await createConnection(); }); jest.setTimeout(20000); afterAll(async () => { - const connection = getConnection('testConnection'); - const userRepository = connection.getRepository(User); - - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); + await cleanDatabase(); server.close(); }); diff --git a/src/__test__/test-assets/DatabaseCleanup.ts b/src/__test__/test-assets/DatabaseCleanup.ts new file mode 100644 index 0000000..3674dfb --- /dev/null +++ b/src/__test__/test-assets/DatabaseCleanup.ts @@ -0,0 +1,50 @@ +import { Transaction } from '../../entities/transaction'; +import { Cart } from '../../entities/Cart'; +import { CartItem } from '../../entities/CartItem'; +import { Order } from '../../entities/Order'; +import { OrderItem } from '../../entities/OrderItem'; +import { wishList } from '../../entities/wishList'; +import { getConnection } from 'typeorm'; +import { Product } from '../../entities/Product'; +import { Category } from '../../entities/Category'; +import { Coupon } from '../../entities/coupon'; +import { User } from '../../entities/User'; +import { server } from '../..'; +import { VendorOrderItem } from '../../entities/VendorOrderItem'; +import { VendorOrders } from '../../entities/vendorOrders'; + +export const cleanDatabase = async () => { + const connection = getConnection(); + + // Delete from child tables first + await connection.getRepository(Transaction).delete({}); + await connection.getRepository(Coupon).delete({}); + await connection.getRepository(VendorOrderItem).delete({}); + await connection.getRepository(VendorOrders).delete({}); + await connection.getRepository(OrderItem).delete({}); + await connection.getRepository(Order).delete({}); + await connection.getRepository(CartItem).delete({}); + await connection.getRepository(Cart).delete({}); + await connection.getRepository(wishList).delete({}); + + // Many-to-Many relations + // Clear junction table entries before deleting products and categories + await connection.createQueryRunner().query('DELETE FROM product_categories_category'); + + await connection.getRepository(Product).delete({}); + await connection.getRepository(Category).delete({}); + + // Coupons (if related to Orders or Users) + + // Finally, delete from parent table + await connection.getRepository(User).delete({}); + + await connection.close(); +}; + +// // Execute the clean-up function +// cleanDatabase().then(() => { +// console.log('Database cleaned'); +// }).catch(error => { +// console.error('Error cleaning database:', error); +// }); diff --git a/src/__test__/userServices.test.ts b/src/__test__/userServices.test.ts index 5249a9a..29a2e7c 100644 --- a/src/__test__/userServices.test.ts +++ b/src/__test__/userServices.test.ts @@ -1,25 +1,15 @@ import request from 'supertest'; import { app, server } from '../index'; -import { createConnection, getConnection, getConnectionOptions, getRepository } from 'typeorm'; +import { createConnection, getRepository } from 'typeorm'; import { User } from '../entities/User'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; beforeAll(async () => { - // Connect to the test database - const connectionOptions = await getConnectionOptions(); - - await createConnection({ ...connectionOptions, name: 'testConnection' }); + await createConnection(); }); afterAll(async () => { - const connection = getConnection('testConnection'); - const userRepository = connection.getRepository(User); - - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); - + await cleanDatabase(); server.close(); }); diff --git a/src/__test__/userStatus.test.ts b/src/__test__/userStatus.test.ts index 8d42488..69e892a 100644 --- a/src/__test__/userStatus.test.ts +++ b/src/__test__/userStatus.test.ts @@ -6,6 +6,7 @@ import { getConnection } from 'typeorm'; import { dbConnection } from '../startups/dbConnection'; import { User } from '../entities/User'; import { v4 as uuid } from 'uuid'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const adminUserId = uuid(); @@ -35,14 +36,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); + await cleanDatabase(); - // Delete all records from the User - await userRepository.delete({}); - - // Close the connection to the test database - await connection.close(); server.close(); }); diff --git a/src/__test__/vendorProduct.test.ts b/src/__test__/vendorProduct.test.ts index dfa96c4..d8fc0a5 100644 --- a/src/__test__/vendorProduct.test.ts +++ b/src/__test__/vendorProduct.test.ts @@ -7,6 +7,7 @@ import { User, UserInterface } from '../entities/User'; import { v4 as uuid } from 'uuid'; import { Product } from '../entities/Product'; import { Category } from '../entities/Category'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); const vendor2Id = uuid(); @@ -109,18 +110,8 @@ beforeAll(async () => { }); afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } - - // Close the connection to the test database - await connection.close(); + await cleanDatabase(); + server.close(); }); @@ -456,29 +447,27 @@ describe('Vendor product management tests', () => { describe('List all products service', () => { it('should return all products for a given category', async () => { - const response = await request(app) - .get('/product/all') + const response = await request(app).get('/product/all'); expect(response.status).toBe(200); expect(response.body.data.products).toBeDefined(); }); - + it('should return no products for a non-existent category', async () => { const response = await request(app) .get('/product/all') - .query({ page: 1, limit: 10, category: 'nonexistentcategory' }) - + .query({ page: 1, limit: 10, category: 'nonexistentcategory' }); + expect(response.status).toBe(200); expect(response.body.data.products).toBeUndefined(); }); - + it('should return an error for invalid input syntax', async () => { const response = await request(app) .get('/product/all') - .query({ page: 'invalid', limit: 'limit', category: 'technology' }) - + .query({ page: 'invalid', limit: 'limit', category: 'technology' }); + expect(response.status).toBe(400); }); }); - }); diff --git a/src/__test__/wishList.test.ts b/src/__test__/wishList.test.ts index 2b2f120..6658853 100644 --- a/src/__test__/wishList.test.ts +++ b/src/__test__/wishList.test.ts @@ -8,6 +8,7 @@ import { Product } from '../entities/Product'; import { Category } from '../entities/Category'; import { wishList } from '../entities/wishList'; import { User, UserInterface } from '../entities/User'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; const buyer1Id = uuid(); const buyer2Id = uuid(); @@ -17,222 +18,187 @@ const catId = uuid(); const vendor2Id = uuid(); const sampleBuyer1: UserInterface = { - id: buyer1Id, - firstName: 'buyer1', - lastName: 'user', - email: 'buyer1@example.com', - password: 'password', - userType: 'Buyer', - gender: 'Male', - phoneNumber: '126380996347', - photoUrl: 'https://example.com/photo.jpg', - role: 'BUYER', - }; - const sampleBuyer2: UserInterface = { - id: buyer2Id, - firstName: 'buyer2', - lastName: 'use', - email: 'buyer2@example.com', - password: 'passwo', - userType: 'Buyer', - gender: 'Male', - phoneNumber: '1638099347', - photoUrl: 'https://example.com/photo.jpg', - role: 'BUYER', - }; - const sampleVendor1: UserInterface = { - id: vendor2Id, - firstName: 'vendor1', - lastName: 'user', - email: 'vendor11@example.com', - password: 'password', - userType: 'Vendor', - gender: 'Male', - phoneNumber: '12638090347', - photoUrl: 'https://example.com/photo.jpg', - role: 'VENDOR', - }; + id: buyer1Id, + firstName: 'buyer1', + lastName: 'user', + email: 'buyer1@example.com', + password: 'password', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '126380996347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; +const sampleBuyer2: UserInterface = { + id: buyer2Id, + firstName: 'buyer2', + lastName: 'use', + email: 'buyer2@example.com', + password: 'passwo', + userType: 'Buyer', + gender: 'Male', + phoneNumber: '1638099347', + photoUrl: 'https://example.com/photo.jpg', + role: 'BUYER', +}; +const sampleVendor1: UserInterface = { + id: vendor2Id, + firstName: 'vendor1', + lastName: 'user', + email: 'vendor11@example.com', + password: 'password', + userType: 'Vendor', + gender: 'Male', + phoneNumber: '12638090347', + photoUrl: 'https://example.com/photo.jpg', + role: 'VENDOR', +}; let productInWishList: number; beforeAll(async () => { - const connection = await dbConnection(); - const userRepository = connection?.getRepository(User); - await userRepository?.save({ ...sampleBuyer1 }); - await userRepository?.save({ ...sampleBuyer2 }); - await userRepository?.save({...sampleVendor1}) - }); + const connection = await dbConnection(); + const userRepository = connection?.getRepository(User); + await userRepository?.save({ ...sampleBuyer1 }); + await userRepository?.save({ ...sampleBuyer2 }); + await userRepository?.save({ ...sampleVendor1 }); +}); + +afterAll(async () => { + await cleanDatabase(); + server.close(); +}); +const data1 = { + id: buyer1Id, + email: sampleBuyer1.email, +}; +const data2 = { + id: buyer2Id, + email: sampleBuyer2.email, +}; +const vendorData = { + id: vendor2Id, + email: sampleVendor1.email, +}; - afterAll(async () => { - const connection = getConnection(); - const userRepository = connection.getRepository(User); - const categoryRepository = connection.getRepository(Category); - const wishListRepository = connection.getRepository(wishList) - - // Delete all records - const productRepository = await connection.getRepository(Product).delete({}); - if (productRepository) { - await userRepository.delete({}); - await categoryRepository.delete({}); - } - await userRepository.delete({}); - await wishListRepository.delete({}) - - // Close the connection to the test database - await connection.close(); - server.close(); +const jwtSecretKey = process.env.JWT_SECRET || ''; +describe('Wish list management tests', () => { + describe('Add product to wish list', () => { + it('should return 404 when product is not found', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app).post(`/wish-list/add/${uuid()}`).set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body).toEqual({ message: 'Product not found' }); + }); + + it('should add a new product to wish list', async () => { + const vendorToken = jwt.sign(vendorData, jwtSecretKey); + const prod1Response = await request(app) + .post('/product') + .field('name', 'test product12') + .field('description', 'amazing product3') + .field('newPrice', 2000) + .field('quantity', 10) + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${vendorToken}`); + + product1Id = prod1Response.body.data.product.id; + + const prod2Response = await request(app) + .post('/product') + .field('name', 'more product2') + .field('description', 'food product3') + .field('newPrice', 2000) + .field('quantity', 10) + .field('categories', 'technology') + .field('categories', 'sample') + .attach('images', `${__dirname}/test-assets/photo1.png`) + .attach('images', `${__dirname}/test-assets/photo2.webp`) + .set('Authorization', `Bearer ${vendorToken}`); + + product2Id = prod2Response.body.data.product.id; + + const token = jwt.sign(data1, jwtSecretKey); + const response1 = await request(app).post(`/wish-list/add/${product1Id}`).set('Authorization', `Bearer ${token}`); + expect(response1.status).toBe(201); + expect(response1.body.data.message).toBe('Product Added to wish list'); + productInWishList = response1.body.data.wishlistAdded.id; + + await request(app).post(`/wish-list/add/${product2Id}`).set('Authorization', `Bearer ${token}`); + }); + + it('should tell if there is the product is already in the wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app).post(`/wish-list/add/${product1Id}`).set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(401); + expect(response.body.data.message).toBe('Product Already in the wish list'); + }); + it('should return 500 when the ID is not valid', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .post(`/wish-list/add/kjwxq-wbjk2-2bwqs-21`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(500); + }); }); - const data1 = { - id: buyer1Id, - email: sampleBuyer1.email - }; - const data2 = { - id: buyer2Id, - email: sampleBuyer2.email - } - const vendorData = { - id: vendor2Id, - email: sampleVendor1.email - } + describe('Get products in wishList', () => { + it('Returns 404 when buyer has no product in wish list', async () => { + const token = jwt.sign(data2, jwtSecretKey); + const response = await request(app).get('/wish-list').set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('No products in wish list'); + }); + + it('Returns products in the wish list for a buyer ', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app).get('/wish-list').set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(200); + expect(response.body.message).toBe('Products retrieved'); + }); + }); -const jwtSecretKey = process.env.JWT_SECRET || ''; -describe('Wish list management tests', () => { + describe('Remove a product from wish lsit', () => { + it('should return 404 when product is not found in wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app).delete(`/wish-list/delete/${28}`).set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('Product not found in wish list'); + }); + + it('should delete a product from wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .delete(`/wish-list/delete/${productInWishList}`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(200); + expect(response.body.message).toBe('Product removed from wish list'); + }); + it('should return 500 when the ID is not valid', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app) + .delete(`/wish-list/delete/kjwxq-wbjk2-2bwqs-21`) + .set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(500); + }); + }); - describe('Add product to wish list', () => { - it('should return 404 when product is not found', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .post( `/wish-list/add/${uuid()}`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(404); - expect(response.body).toEqual({ message: 'Product not found' }); - }) - - it('should add a new product to wish list', async () =>{ - const vendorToken = jwt.sign(vendorData, jwtSecretKey); - const prod1Response = await request(app) - .post('/product') - .field('name', 'test product12') - .field('description', 'amazing product3') - .field('newPrice', 2000) - .field('quantity', 10) - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${vendorToken}`); - - product1Id = prod1Response.body.data.product.id; - - const prod2Response = await request(app) - .post('/product') - .field('name', 'more product2') - .field('description', 'food product3') - .field('newPrice', 2000) - .field('quantity', 10) - .field('categories', 'technology') - .field('categories', 'sample') - .attach('images', `${__dirname}/test-assets/photo1.png`) - .attach('images', `${__dirname}/test-assets/photo2.webp`) - .set('Authorization', `Bearer ${vendorToken}`); - - product2Id = prod2Response.body.data.product.id; - - const token = jwt.sign(data1, jwtSecretKey); - const response1 = await request(app) - .post( `/wish-list/add/${product1Id}`) - .set('Authorization', `Bearer ${token}`); - expect(response1.status).toBe(201); - expect(response1.body.data.message).toBe('Product Added to wish list'); - productInWishList = response1.body.data.wishlistAdded.id; - - await request(app) - .post( `/wish-list/add/${product2Id}`) - .set('Authorization', `Bearer ${token}`); - }) - - it('should tell if there is the product is already in the wish list', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .post( `/wish-list/add/${product1Id}`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(401); - expect(response.body.data.message).toBe('Product Already in the wish list'); - }) - it('should return 500 when the ID is not valid', async() => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .post( `/wish-list/add/kjwxq-wbjk2-2bwqs-21`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(500); - }) - }) - - describe('Get products in wishList', () => { - it('Returns 404 when buyer has no product in wish list', async () => { - const token = jwt.sign(data2, jwtSecretKey); - const response = await request(app) - .get('/wish-list') - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(404); - expect(response.body.message).toBe('No products in wish list'); - }) - - it('Returns products in the wish list for a buyer ', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .get('/wish-list') - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(200); - expect(response.body.message).toBe('Products retrieved'); - }) - }) - - describe('Remove a product from wish lsit', () => { - it('should return 404 when product is not found in wish list', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .delete( `/wish-list/delete/${28}`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(404); - expect(response.body.message).toBe('Product not found in wish list'); - }) - - it('should delete a product from wish list', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .delete( `/wish-list/delete/${productInWishList}`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(200); - expect(response.body.message).toBe('Product removed from wish list'); - }) - it('should return 500 when the ID is not valid', async() => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .delete( `/wish-list/delete/kjwxq-wbjk2-2bwqs-21`) - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(500); - }) - }) - - describe('Clear all products in wish for a user', () => { - it('Returns 404 when buyer has no product in wish list', async () => { - const token = jwt.sign(data2, jwtSecretKey); - const response = await request(app) - .delete( '/wish-list/clearAll') - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(404); - expect(response.body.message).toBe('No products in wish list'); - }) - - it('should delete all products for a nuyer in wish list', async () => { - const token = jwt.sign(data1, jwtSecretKey); - const response = await request(app) - .delete( '/wish-list/clearAll') - .set('Authorization', `Bearer ${token}`); - expect(response.status).toBe(200); - expect(response.body.message).toBe('All products removed successfully'); - }) - }) -}) \ No newline at end of file + describe('Clear all products in wish for a user', () => { + it('Returns 404 when buyer has no product in wish list', async () => { + const token = jwt.sign(data2, jwtSecretKey); + const response = await request(app).delete('/wish-list/clearAll').set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(404); + expect(response.body.message).toBe('No products in wish list'); + }); + + it('should delete all products for a nuyer in wish list', async () => { + const token = jwt.sign(data1, jwtSecretKey); + const response = await request(app).delete('/wish-list/clearAll').set('Authorization', `Bearer ${token}`); + expect(response.status).toBe(200); + expect(response.body.message).toBe('All products removed successfully'); + }); + }); +}); diff --git a/src/controllers/adminOrdercontroller.ts b/src/controllers/adminOrdercontroller.ts new file mode 100644 index 0000000..388220d --- /dev/null +++ b/src/controllers/adminOrdercontroller.ts @@ -0,0 +1,18 @@ +import { Request, Response } from 'express'; +import { + getSingleBuyerVendorOrderService, + getBuyerVendorOrdersService, + updateBuyerVendorOrderService, +} from '../services'; + +export const getBuyerVendorOrders = async (req: Request, res: Response) => { + await getBuyerVendorOrdersService(req, res); +}; + +export const getSingleBuyerVendorOrder = async (req: Request, res: Response) => { + await getSingleBuyerVendorOrderService(req, res); +}; + +export const updateBuyerVendorOrder = async (req: Request, res: Response) => { + await updateBuyerVendorOrderService(req, res); +}; diff --git a/src/controllers/couponController.ts b/src/controllers/couponController.ts new file mode 100644 index 0000000..e5a6804 --- /dev/null +++ b/src/controllers/couponController.ts @@ -0,0 +1,31 @@ +import { Request, Response } from 'express'; +import { createCouponService } from '../services/couponServices/createCouponService'; +import { updateCouponService } from '../services/couponServices/updateService'; +import { deleteCouponService } from '../services/couponServices/deleteCoupon'; +import { accessAllCouponService } from '../services/couponServices/accessAllCoupon'; +import { readCouponService } from '../services/couponServices/readCoupon'; +import { buyerApplyCouponService } from '../services/couponServices/buyerApplyCoupon'; + +export const createCoupon = async (req: Request, res: Response) => { + await createCouponService(req, res); +}; + +export const updateCoupon = async (req: Request, res: Response) => { + await updateCouponService(req, res); +}; + +export const deleteCoupon = async (req: Request, res: Response) => { + await deleteCouponService(req, res); +}; + +export const accessAllCoupon = async (req: Request, res: Response) => { + await accessAllCouponService(req, res); +}; + +export const readCoupon = async (req: Request, res: Response) => { + await readCouponService(req, res); +}; + +export const buyerApplyCoupon = async (req: Request, res: Response) => { + await buyerApplyCouponService(req, res); +}; diff --git a/src/controllers/index.ts b/src/controllers/index.ts index c7f3221..70dea3b 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -1,2 +1,5 @@ export * from './authController'; export * from './productController'; +export * from './orderController'; +export * from './vendorOrderController'; +export * from './adminOrdercontroller'; diff --git a/src/controllers/orderController.ts b/src/controllers/orderController.ts new file mode 100644 index 0000000..d4ac5fc --- /dev/null +++ b/src/controllers/orderController.ts @@ -0,0 +1,18 @@ +import { Request, Response } from 'express'; +import { createOrderService } from '../services/orderServices/createOrder'; +import { getOrdersService } from '../services/orderServices/getOrderService'; +import { updateOrderService } from '../services/orderServices/updateOrderService'; +import { getTransactionHistoryService } from '../services/orderServices/getOrderTransactionHistory'; + +export const createOrder = async (req: Request, res: Response) => { + await createOrderService(req, res); +}; +export const getOrders = async (req: Request, res: Response) => { + await getOrdersService(req, res); +}; +export const updateOrder = async (req: Request, res: Response) => { + await updateOrderService(req, res); +}; +export const getOrdersHistory = async (req: Request, res: Response) => { + await getTransactionHistoryService(req, res); +}; diff --git a/src/controllers/productController.ts b/src/controllers/productController.ts index 11caddd..05aa5a3 100644 --- a/src/controllers/productController.ts +++ b/src/controllers/productController.ts @@ -1,26 +1,18 @@ import { Request, Response } from 'express'; import { - createProductService, - updateProductService, - - removeProductImageService, - + removeProductImageService, readProductService, - readProductsService, - + readProductsService, deleteProductService, - getRecommendedProductsService, productStatusServices, viewSingleProduct, - searchProductService - -, - listAllProductsService} -from '../services'; - + searchProductService, + listAllProductsService, + confirmPayment, +} from '../services'; export const readProduct = async (req: Request, res: Response) => { await readProductService(req, res); @@ -50,10 +42,10 @@ export const getRecommendedProducts = async (req: Request, res: Response) => { await getRecommendedProductsService(req, res); }; - export const listAllProducts = async (req: Request, res: Response) => { await listAllProductsService(req, res); -};export const productStatus = async (req: Request, res: Response) => { +}; +export const productStatus = async (req: Request, res: Response) => { await productStatusServices(req, res); }; export const singleProduct = async (req: Request, res: Response) => { @@ -79,3 +71,6 @@ export const searchProduct = async (req: Request, res: Response) => { res.status(500).json({ error: 'Internal Server Error' }); } }; +export const Payment = async (req: Request, res: Response) => { + await confirmPayment(req, res); +}; diff --git a/src/controllers/vendorOrderController.ts b/src/controllers/vendorOrderController.ts new file mode 100644 index 0000000..955b01c --- /dev/null +++ b/src/controllers/vendorOrderController.ts @@ -0,0 +1,14 @@ +import { Request, Response } from 'express'; +import { getVendorOrdersService, getSingleVendorOrderService, updateVendorOrderService } from '../services'; + +export const getVendorOrders = async (req: Request, res: Response) => { + await getVendorOrdersService(req, res); +}; + +export const getSingleVendorOrder = async (req: Request, res: Response) => { + await getSingleVendorOrderService(req, res); +}; + +export const updateVendorOrder = async (req: Request, res: Response) => { + await updateVendorOrderService(req, res); +}; diff --git a/src/controllers/wishListController.ts b/src/controllers/wishListController.ts index e0cd1bd..23fa03f 100644 --- a/src/controllers/wishListController.ts +++ b/src/controllers/wishListController.ts @@ -1,23 +1,18 @@ import { Request, Response } from 'express'; -import{ - addProductService, - getProductsService, - removeProductService, - clearAllProductService -} from '../services' +import { addProductService, getProductsService, removeProductService, clearAllProductService } from '../services'; export const wishlistAddProduct = async (req: Request, res: Response) => { - await addProductService(req, res); - }; + await addProductService(req, res); +}; - export const wishlistRemoveProduct = async (req: Request, res:Response) => { - await removeProductService(req, res); - } +export const wishlistRemoveProduct = async (req: Request, res: Response) => { + await removeProductService(req, res); +}; - export const wishlistGetProducts = async (req: Request, res:Response) => { - await getProductsService(req, res); - } +export const wishlistGetProducts = async (req: Request, res: Response) => { + await getProductsService(req, res); +}; - export const wishlistClearAllProducts = async (req: Request, res:Response) => { - await clearAllProductService(req, res); - } \ No newline at end of file +export const wishlistClearAllProducts = async (req: Request, res: Response) => { + await clearAllProductService(req, res); +}; diff --git a/src/docs/adminOrderManagement.yml b/src/docs/adminOrderManagement.yml new file mode 100644 index 0000000..e8d6ed6 --- /dev/null +++ b/src/docs/adminOrderManagement.yml @@ -0,0 +1,80 @@ +/product/admin/orders: + get: + tags: + - Admin Order Manangement + summary: Fetches all buyer and vendor orders + description: Return all order including details for buyer and vendors of products in that order + security: + - bearerAuth: [] + responses: + '200': + description: Return all order + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + +/product/admin/orders/{id}: + get: + tags: + - Admin Order Manangement + summary: Fetch details for single buyer and vendor order + description: + Fetch details for single order using buyer id, if successful return order details with it's corresponding vendor + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of a buyer order + responses: + '200': + description: Order details retrieved successfully + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Order not found + '500': + description: Internal server error + put: + tags: + - Admin Order Manangement + summary: Updates order status for both buyer and vendor order + description: Updates orderStatus field of order, if successful returns updated order. + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of a buyer order + consumes: + - application/json + responses: + '200': + description: Order was successfully updated, return updated order + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Order not found + '409': + description: Order can not be updated because (it has already been completed(close), delivered, cancelled) + '500': + description: Internal server error diff --git a/src/docs/couponDocs.yml b/src/docs/couponDocs.yml new file mode 100644 index 0000000..fefa829 --- /dev/null +++ b/src/docs/couponDocs.yml @@ -0,0 +1,217 @@ +/coupons/vendor/:id/access-coupons: + get: + tags: + - Vendor discount coupon management + summary: List all coupons + description: Return all coupons for the logged user + security: + - bearerAuth: [] + responses: + '200': + description: Return all coupons + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + +/coupons/vendor/:id/checkout/:code: + get: + tags: + - Vendor discount coupon management + summary: Get a single coupon + description: Return a coupon based on the provided code + security: + - bearerAuth: [] + parameters: + - in: path + name: code + schema: + type: string + required: true + description: The code of the coupon + responses: + '200': + description: Return info for the coupon + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Coupon not found + '500': + description: Internal server error + +/coupons/coupons/vendor/:id: + post: + tags: + - Vendor discount coupon management + summary: Creates a new coupon + security: + - bearerAuth: [] + consumes: + - application/json + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + code: + type: string + discountType: + type: string + discountRate: + type: number + maxUsageLimit: + type: number + quantity: + type: number + product: + type: string + expirationDate: + type: string + format: date + required: + - code + - discountType + - maxUsageLimit + - product + responses: + '201': + description: Successfully added the coupon + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Coupon not found + '500': + description: Internal server error + +/coupons/coupons/vendor/:id/update-coupon/:code: + put: + tags: + - Vendor discount coupon management + summary: Update a coupon + security: + - bearerAuth: [] + parameters: + - in: path + name: code + schema: + type: string + required: true + description: The code of the coupon + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + code: + type: string + discountType: + type: string + discountRate: + type: number + maxUsageLimit: + type: number + quantity: + type: number + product: + type: string + expirationDate: + type: string + format: date + responses: + '200': + description: Successfully updated the coupon + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Coupon not found + '500': + description: Internal server error + +/coupons/vendor/:id/checkout/delete: + delete: + tags: + - Vendor discount coupon management + summary: Delete a coupon + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The ID of the vendor + - in: query + name: code + schema: + type: string + required: true + description: The code of the coupon + responses: + '200': + description: Successfully deleted the coupon + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Coupon not found + '500': + description: Internal server error + +/coupons/apply: + post: + tags: + - Buyer Coupon Discount Management + summary: Give discount according to coupon code + description: Buyer gets discount on a product when all the checks pass + security: + - bearerAuth: [] + consumes: + - application/json + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + couponCode: + type: string + required: + - couponCode + responses: + '200': + description: Successfully Got Discount + '400': + description: Bad Request (Syntax error, No coupon code provide, Coupon is expired, Coupon Discount Ended,etc) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Coupon not found, No cart or product with that coupon is not in cart + '500': + description: Internal server error diff --git a/src/docs/orderDocs.yml b/src/docs/orderDocs.yml new file mode 100644 index 0000000..fcb620e --- /dev/null +++ b/src/docs/orderDocs.yml @@ -0,0 +1,108 @@ +paths: + /product/orders: + post: + tags: + - Order + summary: Make an order + description: Create a new order for the authenticated user + security: + - bearerAuth: [] + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + address: + type: object + properties: + country: + type: string + description: The country of the shipping address + city: + type: string + description: The city of the shipping address + street: + type: string + description: The street address + required: + - address + responses: + '201': + description: Order created successfully + '400': + description: Bad Request + '401': + description: Unauthorized + '500': + description: Internal Server Error + + /product/client/orders: + get: + tags: + - Order + summary: Get all orders + description: Retrieve all orders for the authenticated user + security: + - bearerAuth: [] + responses: + '200': + description: Orders retrieved successfully + '401': + description: Unauthorized + '500': + description: Internal Server Error + + /product/orders/history: + get: + tags: + - Order + summary: Get transaction history + description: Retrieve transaction history for the authenticated user + security: + - bearerAuth: [] + responses: + '200': + description: Transaction history retrieved successfully + '401': + description: Unauthorized + '500': + description: Internal Server Error + + /product/client/orders/:orderId: + put: + tags: + - Order + summary: Update order status + description: Update the status of a specific order for the authenticated user + security: + - bearerAuth: [] + parameters: + - in: path + name: orderId + schema: + type: string + required: true + description: The ID of the order + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + orderStatus: + type: string + description: The new status of the order + responses: + '200': + description: Order updated successfully + '400': + description: Bad Request + '401': + description: Unauthorized + '404': + description: Order not found + '500': + description: Internal Server Error diff --git a/src/docs/vendorOrderManagement.yml b/src/docs/vendorOrderManagement.yml new file mode 100644 index 0000000..5873717 --- /dev/null +++ b/src/docs/vendorOrderManagement.yml @@ -0,0 +1,93 @@ +/product/vendor/orders: + get: + tags: + - Vendor Order Manangement + summary: Fetches all vendor orders + description: Return all order for authenticated vendor + security: + - bearerAuth: [] + responses: + '200': + description: Return all order for vendor requested from buyer + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + +/product/vendor/orders/{id}: + get: + tags: + - Vendor Order Manangement + summary: Fetch details for single vendor order + description: + Fetch details for single order for authenticated vendor, order that include only his/her product which a buyer has + requested in his order. + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of a vendor order + responses: + '200': + description: Order details retrieved successfully + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Order not found + '500': + description: Internal server error + put: + tags: + - Vendor Order Manangement + summary: Updates order status for vendor order + description: + Updates orderStatus field of vendor order for authenticated vendor, it order that include only his/her product + which a buyer has request in his order. + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: The id of a vendor order + consumes: + - application/json + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + orderStatus: + type: string + example: "'is-accepted', 'in-transit', 'cancelled', 'delivered'" + responses: + '200': + description: Order was successfully updated, return updated order + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Order not found + '409': + description: Order can not be updated because (it has already been completed(close), delivered, cancelled) + '500': + description: Internal server error diff --git a/src/docs/vendorProduct.yml b/src/docs/vendorProduct.yml index 937b097..3830bf4 100644 --- a/src/docs/vendorProduct.yml +++ b/src/docs/vendorProduct.yml @@ -35,7 +35,7 @@ description: The id of product responses: '200': - description: Return info for the product + description: Return info for the product '400': description: Bad Request (syntax error, incorrect input format, etc..) '401': @@ -59,7 +59,7 @@ requestBody: required: true content: - application/json: + application/json: schema: type: object properties: @@ -75,10 +75,10 @@ type: file categories: oneOf: - - type: string - - type: array - items: - type: string + - type: string + - type: array + items: + type: string example: "'category' or ['category1', 'category2', ...]" expirationDate: type: string @@ -159,7 +159,7 @@ description: Product not found '500': description: Internal server error - + /product/images/{id}: delete: tags: diff --git a/src/docs/wishListDocs.yml b/src/docs/wishListDocs.yml new file mode 100644 index 0000000..7f705f7 --- /dev/null +++ b/src/docs/wishListDocs.yml @@ -0,0 +1,97 @@ +/wish-list: + get: + tags: + - Wish list + summary: Get all products in wishlist + description: Return all products in wish list for authenticated buyer + security: + - bearerAuth: [] + responses: + '200': + description: Return all products in wish list for a buyer + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error + +/wish-list/add/{id}: + post: + tags: + - Wish list + summary: Add product to wish list + description: Adds selected product (product id) to the wish list + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: Product id + responses: + '201': + description: Product Added to wish list + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found in wish list + '500': + description: Internal server error + +/wish-list/delete/{id}: + delete: + tags: + - Wish list + summary: Remove product from wish list + description: Remove product from wish list for an authenticated buyer + security: + - bearerAuth: [] + parameters: + - in: path + name: id + schema: + type: string + required: true + description: Product id + responses: + '200': + description: Product removed from wish list + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '404': + description: Product not found in wish list + '500': + description: Internal server error + +/wish-list/clearAll: + delete: + tags: + - Wish list + summary: Clear entire wish list + description: Clears entire wish list for authenticated buyer + security: + - bearerAuth: [] + responses: + '200': + description: All products removed successfully + '400': + description: Bad Request (syntax error, incorrect input format, etc..) + '401': + description: Unauthorized + '403': + description: Forbidden (Unauthorized action) + '500': + description: Internal server error diff --git a/src/entities/Cart.ts b/src/entities/Cart.ts index 0ba44a6..fda1e15 100644 --- a/src/entities/Cart.ts +++ b/src/entities/Cart.ts @@ -36,7 +36,7 @@ export class Cart { @UpdateDateColumn() updatedAt!: Date; - updateTotal(): void { + updateTotal (): void { if (this.items) { let total: number = 0; for (let i = 0; i < this.items.length; i++) { diff --git a/src/entities/CartItem.ts b/src/entities/CartItem.ts index 107170c..d651adf 100644 --- a/src/entities/CartItem.ts +++ b/src/entities/CartItem.ts @@ -47,7 +47,7 @@ export class CartItem { @BeforeInsert() @BeforeUpdate() - updateTotal(): void { + updateTotal (): void { this.total = this.newPrice * this.quantity; } } diff --git a/src/entities/Order.ts b/src/entities/Order.ts index f52012e..47649a7 100644 --- a/src/entities/Order.ts +++ b/src/entities/Order.ts @@ -1,7 +1,16 @@ -import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, CreateDateColumn, UpdateDateColumn } from 'typeorm'; -import { IsNotEmpty, IsNumber, IsDate } from 'class-validator'; +import { + Entity, + PrimaryGeneratedColumn, + Column, + ManyToOne, + OneToMany, + CreateDateColumn, + UpdateDateColumn, +} from 'typeorm'; +import { IsNotEmpty, IsNumber, IsDate, IsIn } from 'class-validator'; import { User } from './User'; -import { Product } from './Product'; +import { OrderItem } from './OrderItem'; +import { Transaction } from './transaction'; @Entity() export class Order { @@ -9,24 +18,43 @@ export class Order { @IsNotEmpty() id!: string; - @ManyToOne(() => User, user => user.orders) // <- Correctly reference the User entity and its orders property + @ManyToOne(() => User, user => user.orders) @IsNotEmpty() buyer!: User; - @ManyToOne(() => Product, product => product.orders) // <- Correctly reference the Product entity and its orders property + @OneToMany(() => OrderItem, orderItem => orderItem.order, { cascade: true }) @IsNotEmpty() - product!: Product; + orderItems!: OrderItem[]; @Column('decimal') @IsNotEmpty() @IsNumber() totalPrice!: number; + @OneToMany(() => Transaction, transaction => transaction.order) + transactions!: Transaction[]; + @Column({ default: 'order placed' }) + @IsNotEmpty() + @IsIn([ + 'order placed', + 'cancelled', + 'awaiting shipment', + 'in transit', + 'delivered', + 'received', + 'returned', + 'completed', + ]) + orderStatus!: string; + @Column('int') @IsNotEmpty() @IsNumber() quantity!: number; + @Column({ default: 'City, Country street address' }) + address!: string; + @Column() @IsDate() @IsNotEmpty() diff --git a/src/entities/OrderItem.ts b/src/entities/OrderItem.ts new file mode 100644 index 0000000..130b330 --- /dev/null +++ b/src/entities/OrderItem.ts @@ -0,0 +1,29 @@ +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm'; +import { IsNotEmpty, IsNumber } from 'class-validator'; +import { Order } from './Order'; +import { Product } from './Product'; + +@Entity() +export class OrderItem { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => Order, order => order.orderItems) + @IsNotEmpty() + order!: Order; + + @ManyToOne(() => Product, product => product.orderItems) + @IsNotEmpty() + product!: Product; + + @Column('decimal') + @IsNotEmpty() + @IsNumber() + price!: number; + + @Column('int') + @IsNotEmpty() + @IsNumber() + quantity!: number; +} diff --git a/src/entities/Product.ts b/src/entities/Product.ts index 82603a4..e144a04 100644 --- a/src/entities/Product.ts +++ b/src/entities/Product.ts @@ -9,16 +9,21 @@ import { ManyToMany, OneToMany, JoinTable, + OneToOne, + JoinColumn, } from 'typeorm'; import { IsNotEmpty, IsString, IsBoolean, ArrayNotEmpty, IsArray, MaxLength } from 'class-validator'; import { User } from './User'; import { Category } from './Category'; import { Order } from './Order'; +import { Coupon } from './coupon'; +import { OrderItem } from './OrderItem'; +import { VendorOrderItem } from './VendorOrderItem'; @Entity() @Unique(['id']) export class Product { - static query() { + static query () { throw new Error('Method not implemented.'); } @PrimaryGeneratedColumn('uuid') @@ -29,8 +34,15 @@ export class Product { @IsNotEmpty() vendor!: User; - @OneToMany(() => Order, (order: any) => order.product) // Specify the inverse side of the relationship - orders!: Order[]; + @OneToMany(() => OrderItem, orderItem => orderItem.product) + orderItems!: OrderItem[]; + + @OneToMany(() => VendorOrderItem, vendorOrderItems => vendorOrderItems.product) + vendorOrderItems!: VendorOrderItem[]; + + @OneToOne(() => Coupon, (coupons: any) => coupons.product) + @JoinColumn() + coupons?: Coupon; @Column() @IsNotEmpty() diff --git a/src/entities/User.ts b/src/entities/User.ts index 2f55da0..ef256d7 100644 --- a/src/entities/User.ts +++ b/src/entities/User.ts @@ -1,3 +1,4 @@ + import { Entity, PrimaryGeneratedColumn, @@ -11,6 +12,7 @@ import { import { IsEmail, IsNotEmpty, IsString, IsBoolean, IsIn } from 'class-validator'; import { roles } from '../utils/roles'; import { Order } from './Order'; +import { Transaction } from './transaction'; export interface UserInterface { id?: string; @@ -98,14 +100,20 @@ export class User { @OneToMany(() => Order, (order: any) => order.buyer) orders!: Order[]; + @OneToMany(() => Transaction, transaction => transaction.user) + transactions!: Transaction[]; + @CreateDateColumn() createdAt!: Date; @UpdateDateColumn() updatedAt!: Date; + @Column({ type: 'numeric', precision: 24, scale: 2, default: 0 }) + accountBalance!: number; + @BeforeInsert() - setRole(): void { + setRole (): void { this.role = this.userType === 'Vendor' ? roles.vendor : roles.buyer; } } diff --git a/src/entities/VendorOrderItem.ts b/src/entities/VendorOrderItem.ts new file mode 100644 index 0000000..9137f6d --- /dev/null +++ b/src/entities/VendorOrderItem.ts @@ -0,0 +1,30 @@ +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm'; +import { IsNotEmpty, IsNumber } from 'class-validator'; +import { Order } from './Order'; +import { Product } from './Product'; +import { VendorOrders } from './vendorOrders'; + +@Entity() +export class VendorOrderItem { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + 'id'!: string; + + @ManyToOne(() => VendorOrders, order => order.vendorOrderItems) + @IsNotEmpty() + 'order'!: VendorOrders; + + @ManyToOne(() => Product, product => product.vendorOrderItems) + @IsNotEmpty() + 'product'!: Product; + + @Column('decimal') + @IsNotEmpty() + @IsNumber() + 'price/unit'!: number; + + @Column('int') + @IsNotEmpty() + @IsNumber() + 'quantity'!: number; +} diff --git a/src/entities/coupon.ts b/src/entities/coupon.ts new file mode 100644 index 0000000..39631c3 --- /dev/null +++ b/src/entities/coupon.ts @@ -0,0 +1,68 @@ +import { + Entity, + PrimaryGeneratedColumn, + Column, + Unique, + CreateDateColumn, + UpdateDateColumn, + ManyToOne, + JoinColumn, +} from 'typeorm'; +import { IsDate, IsNotEmpty, IsArray, IsIn } from 'class-validator'; +import { User } from './User'; +import { Product } from './Product'; + +@Entity() +@Unique(['id']) +@Unique(['code']) // Ensure only 'code' is unique +export class Coupon { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => User) + @IsNotEmpty() + @JoinColumn() + vendor!: User; + + @ManyToOne(() => Product, product => product.coupons) + @IsNotEmpty() + @JoinColumn() + product!: Product; + + @Column() + @IsNotEmpty() + code!: string; + + @Column() + @IsNotEmpty() + @IsIn(['percentage', 'money']) + discountType!: 'percentage' | 'money'; + + @Column('float') + @IsNotEmpty() + discountRate!: number; + + @Column('timestamp', { nullable: false }) + @IsNotEmpty() + @IsDate() + expirationDate?: Date; + + @Column('int', { default: 0 }) + @IsNotEmpty() + usageTimes!: number; + + @Column('int') + @IsNotEmpty() + maxUsageLimit!: number; + + @Column('simple-array', { nullable: true, default: '' }) + @IsArray() + usedBy!: string[]; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} diff --git a/src/entities/transaction.ts b/src/entities/transaction.ts new file mode 100644 index 0000000..d475812 --- /dev/null +++ b/src/entities/transaction.ts @@ -0,0 +1,61 @@ +import { + Entity, + PrimaryGeneratedColumn, + Column, + ManyToOne, + JoinColumn, + CreateDateColumn, + UpdateDateColumn, +} from 'typeorm'; +import { IsNotEmpty, IsString, IsNumber } from 'class-validator'; +import { User } from './User'; +import { Order } from './Order'; +import { Product } from './Product'; // Assuming Product entity exists + +@Entity() +export class Transaction { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => User, { nullable: false }) + @JoinColumn({ name: 'userId' }) + user!: User; + + @ManyToOne(() => Order, { nullable: true }) + @JoinColumn({ name: 'orderId' }) + order?: Order; + + @ManyToOne(() => Product, { nullable: true }) + @JoinColumn({ name: 'productId' }) + product?: Product; + + @Column({ type: 'numeric', precision: 15, scale: 2, default: 0 }) + @IsNotEmpty() + @IsNumber() + amount!: number; + + @Column({ type: 'numeric', precision: 15, scale: 2, default: 0 }) + @IsNotEmpty() + @IsNumber() + previousBalance!: number; + + @Column({ type: 'numeric', precision: 15, scale: 2, default: 0 }) + @IsNotEmpty() + @IsNumber() + currentBalance!: number; + + @Column({ type: 'enum', enum: ['debit', 'credit'] }) + @IsNotEmpty() + @IsString() + type!: 'debit' | 'credit'; + + @Column({ type: 'text', nullable: true }) + description?: string; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} \ No newline at end of file diff --git a/src/entities/vendorOrders.ts b/src/entities/vendorOrders.ts new file mode 100644 index 0000000..38269e6 --- /dev/null +++ b/src/entities/vendorOrders.ts @@ -0,0 +1,49 @@ +import { + Entity, + PrimaryGeneratedColumn, + Column, + ManyToOne, + OneToMany, + CreateDateColumn, + UpdateDateColumn, +} from 'typeorm'; +import { IsNotEmpty, IsNumber, IsDate, IsIn, isNotEmpty } from 'class-validator'; +import { User } from './User'; +import { OrderItem } from './OrderItem'; +import { Transaction } from './transaction'; +import { Order } from './Order'; +import { VendorOrderItem } from './VendorOrderItem'; + +@Entity() +export class VendorOrders { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @ManyToOne(() => User) + @IsNotEmpty() + vendor!: User; + + @OneToMany(() => VendorOrderItem, vendorOrderItems => vendorOrderItems.order, { cascade: true }) + @IsNotEmpty() + vendorOrderItems!: VendorOrderItem[]; + + @ManyToOne(() => Order) + @IsNotEmpty() + order!: Order; + + @Column('decimal') + @IsNotEmpty() + @IsNumber() + totalPrice!: number; + + @Column({ default: 'pending' }) + @IsIn(['pending', 'is-accepted', 'in-transit', 'cancelled', 'delivered', 'completed']) + orderStatus!: string; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} diff --git a/src/entities/wishList.ts b/src/entities/wishList.ts index 69dbebd..7f74023 100644 --- a/src/entities/wishList.ts +++ b/src/entities/wishList.ts @@ -1,10 +1,19 @@ -import { Entity, PrimaryGeneratedColumn, BaseEntity,Column, Unique, ManyToOne, CreateDateColumn, UpdateDateColumn,} from "typeorm"; +import { + Entity, + PrimaryGeneratedColumn, + BaseEntity, + Column, + Unique, + ManyToOne, + CreateDateColumn, + UpdateDateColumn, +} from 'typeorm'; import { IsNotEmpty, IsString } from 'class-validator'; import { User } from './User'; -@Entity("wishlist") +@Entity('wishlist') @Unique(['id']) -export class wishList extends BaseEntity{ +export class wishList extends BaseEntity { @PrimaryGeneratedColumn() @IsNotEmpty() id!: number; @@ -23,4 +32,4 @@ export class wishList extends BaseEntity{ @UpdateDateColumn() updatedAt!: Date; -} \ No newline at end of file +} diff --git a/src/helper/couponValidator.ts b/src/helper/couponValidator.ts new file mode 100644 index 0000000..9736aa8 --- /dev/null +++ b/src/helper/couponValidator.ts @@ -0,0 +1,58 @@ +import Joi from 'joi'; +import { Coupon } from '../entities/coupon'; + +export const validateCoupon = ( + coupon: Pick +): Joi.ValidationResult => { + const schema = Joi.object({ + code: Joi.string().min(5).required().messages({ + 'any.required': 'code is required.', + 'string.min': 'code must be at least 5 characters long.', + }), + discountRate: Joi.number().required().messages({ + 'any.required': 'discountRate is required.', + }), + expirationDate: Joi.date().required().messages({ + 'any.required': 'expirationDate is required.', + }), + maxUsageLimit: Joi.number().required().messages({ + 'any.required': 'maxUsageLimit is required.', + }), + discountType: Joi.string().required().messages({ + 'any.required': 'discountType is required.', + }), + product: Joi.string().required().messages({ + 'any.required': 'product is required.', + }), + }); + + return schema.validate(coupon); +}; + +export const validateCouponUpdate = ( + coupon: Partial> +): Joi.ValidationResult => { + const schema = Joi.object({ + code: Joi.string().min(5).messages({ + 'string.min': 'code must be at least 5 characters long.', + }), + discountRate: Joi.number().messages({ + 'number.base': 'discountRate must be a number.', + }), + expirationDate: Joi.date().messages({ + 'date.base': 'expirationDate must be a valid date.', + }), + maxUsageLimit: Joi.number().messages({ + 'number.base': 'maxUsageLimit must be a number.', + }), + discountType: Joi.string().messages({ + 'string.base': 'discountType must be a string.', + }), + }) + .min(1) + .messages({ + 'object.min': 'At least one field must be updated.', + }); + + return schema.validate(coupon); +}; diff --git a/src/index.ts b/src/index.ts index 07efd39..d689c27 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,21 +5,27 @@ import router from './routes'; import { addDocumentation } from './startups/docs'; import 'reflect-metadata'; import cookieParser from 'cookie-parser'; -import session from "express-session"; +import session from 'express-session'; import passport from 'passport'; import { CustomError, errorHandler } from './middlewares/errorHandler'; import morgan from 'morgan'; import { dbConnection } from './startups/dbConnection'; + +import { Server } from 'socket.io'; +import { init as initSocketIO } from './utils/socket'; + dotenv.config(); export const app = express(); const port = process.env.PORT || 8000; -app.use(session({ - secret: 'keyboard cat' -})) -app.use(passport.initialize()) -app.use(passport.session()) +app.use( + session({ + secret: 'keyboard cat', + }) +); +app.use(passport.initialize()); +app.use(passport.session()); app.use(express.json()); app.use(cookieParser()); app.use(cors({ origin: '*' })); @@ -43,3 +49,14 @@ app.use(morgan(morganFormat)); export const server = app.listen(port, () => { console.log(`[server]: Server is running at http://localhost:${port}`); }); + +// Socket.IO setup +const io = initSocketIO(server); + +io.on('connection', socket => { + console.log('Client connected'); + + socket.on('disconnect', () => { + console.log('Client disconnected'); + }); +}); diff --git a/src/routes/ProductRoutes.ts b/src/routes/ProductRoutes.ts index 16dcd69..4a72b47 100644 --- a/src/routes/ProductRoutes.ts +++ b/src/routes/ProductRoutes.ts @@ -1,6 +1,6 @@ import { RequestHandler, Router } from 'express'; -import { productStatus, searchProduct } from '../controllers/index'; +import { productStatus, searchProduct, } from '../controllers/index'; import { hasRole } from '../middlewares/roleCheck'; import upload from '../middlewares/multer'; import { authMiddleware } from '../middlewares/verifyToken'; @@ -14,8 +14,19 @@ import { deleteProduct, getRecommendedProducts, listAllProducts, - singleProduct + singleProduct, + createOrder, + getOrders, + updateOrder, + getOrdersHistory,Payment, + getSingleVendorOrder, + getVendorOrders, + updateVendorOrder, + getBuyerVendorOrders, + getSingleBuyerVendorOrder, + updateBuyerVendorOrder, } from '../controllers'; + const router = Router(); router.get('/all', listAllProducts); router.get('/recommended', authMiddleware as RequestHandler, hasRole('BUYER'), getRecommendedProducts); @@ -29,4 +40,20 @@ router.delete('/images/:id', authMiddleware as RequestHandler, hasRole('VENDOR') router.delete('/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), deleteProduct); router.put('/availability/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), productStatus); +router.post('/orders', authMiddleware as RequestHandler, hasRole('BUYER'), createOrder); +router.get('/client/orders', authMiddleware as RequestHandler, hasRole('BUYER'), getOrders); +router.put('/client/orders/:orderId', authMiddleware as RequestHandler, hasRole('BUYER'), updateOrder); +router.get('/orders/history', authMiddleware as RequestHandler, hasRole('BUYER'), getOrdersHistory); + +// Vendor order management +router.get('/vendor/orders', authMiddleware as RequestHandler, hasRole('VENDOR'), getVendorOrders); +router.get('/vendor/orders/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), getSingleVendorOrder); +router.put('/vendor/orders/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), updateVendorOrder); + +// Admin order management +router.get('/admin/orders', authMiddleware as RequestHandler, hasRole('ADMIN'), getBuyerVendorOrders); +router.get('/admin/orders/:id', authMiddleware as RequestHandler, hasRole('ADMIN'), getSingleBuyerVendorOrder); +router.put('/admin/orders/:id', authMiddleware as RequestHandler, hasRole('ADMIN'), updateBuyerVendorOrder); +router.post('/payment/:id', authMiddleware as RequestHandler, hasRole('BUYER'), Payment) + export default router; diff --git a/src/routes/UserRoutes.ts b/src/routes/UserRoutes.ts index 50bb4ca..79b0551 100644 --- a/src/routes/UserRoutes.ts +++ b/src/routes/UserRoutes.ts @@ -1,7 +1,7 @@ import { Router } from 'express'; import { responseError } from '../utils/response.utils'; import { UserInterface } from '../entities/User'; -import jwt from 'jsonwebtoken' +import jwt from 'jsonwebtoken'; import { disable2FA, enable2FA, @@ -19,7 +19,7 @@ import { activateUser, disactivateUser, userProfileUpdate } from '../controllers import { hasRole } from '../middlewares/roleCheck'; import { isTokenValide } from '../middlewares/isValid'; import passport from 'passport'; -import "../utils/auth"; +import '../utils/auth'; const router = Router(); router.post('/register', userRegistration); @@ -37,35 +37,36 @@ router.post('/password/reset/link', sendPasswordResetLink); router.put('/update', userProfileUpdate); router.get('/google-auth', passport.authenticate('google', { scope: ['profile', 'email'] })); -router.get("/auth/google/callback", - passport.authenticate("google", { - successRedirect: "/user/login/success", - failureRedirect: "/user/login/failed" +router.get( + '/auth/google/callback', + passport.authenticate('google', { + successRedirect: '/user/login/success', + failureRedirect: '/user/login/failed', }) ); -router.get("/login/success", async (req, res) => { +router.get('/login/success', async (req, res) => { const user = req.user as UserInterface; - if(!user){ - responseError(res, 404, 'user not found') + if (!user) { + responseError(res, 404, 'user not found'); } const payload = { id: user?.id, email: user?.email, - role: user?.role - } - const token = jwt.sign(payload, process.env.JWT_SECRET as string,{expiresIn: '24h'}) + role: user?.role, + }; + const token = jwt.sign(payload, process.env.JWT_SECRET as string, { expiresIn: '24h' }); res.status(200).json({ status: 'success', - data:{ - token: token, - message: "Login success" - } - }) + data: { + token: token, + message: 'Login success', + }, + }); }); -router.get("/login/failed", async (req, res) => { +router.get('/login/failed', async (req, res) => { res.status(401).json({ status: false, - message: "Login failed" + message: 'Login failed', }); }); diff --git a/src/routes/couponRoutes.ts b/src/routes/couponRoutes.ts new file mode 100644 index 0000000..3378fbe --- /dev/null +++ b/src/routes/couponRoutes.ts @@ -0,0 +1,22 @@ +import { RequestHandler, Router } from 'express'; +import { + createCoupon, + updateCoupon, + accessAllCoupon, + readCoupon, + deleteCoupon, + buyerApplyCoupon, +} from '../controllers/couponController'; +import { hasRole } from '../middlewares/roleCheck'; +import { authMiddleware } from '../middlewares/verifyToken'; + +const router = Router(); + +router.post('/vendor/:id', authMiddleware as RequestHandler, hasRole('VENDOR'), createCoupon); +router.put('/vendor/:id/update-coupon/:code', authMiddleware as RequestHandler, hasRole('VENDOR'), updateCoupon); +router.get('/vendor/:id/checkout/:code', authMiddleware as RequestHandler, hasRole('VENDOR'), readCoupon); +router.get('/vendor/:id/access-coupons', authMiddleware as RequestHandler, hasRole('VENDOR'), accessAllCoupon); +router.delete('/vendor/:id/checkout/delete', authMiddleware as RequestHandler, hasRole('VENDOR'), deleteCoupon); +router.post('/apply', authMiddleware as RequestHandler, hasRole('BUYER'), buyerApplyCoupon); + +export default router; diff --git a/src/routes/index.ts b/src/routes/index.ts index 3c6edec..6f632d6 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -3,6 +3,7 @@ import { responseSuccess } from '../utils/response.utils'; import userRoutes from './UserRoutes'; import productRoutes from './ProductRoutes'; import wishListRoutes from './wishListRoute'; +import couponRoute from './couponRoutes'; import cartRoutes from './CartRoutes'; const router = Router(); @@ -15,5 +16,6 @@ router.use('/user', userRoutes); router.use('/product', productRoutes); router.use('/wish-list', wishListRoutes); router.use('/cart', cartRoutes); +router.use('/coupons', couponRoute); export default router; diff --git a/src/routes/wishListRoute.ts b/src/routes/wishListRoute.ts index d5ac6fb..ea96e40 100644 --- a/src/routes/wishListRoute.ts +++ b/src/routes/wishListRoute.ts @@ -2,13 +2,30 @@ import { RequestHandler, Router } from 'express'; import { authMiddleware } from '../middlewares/verifyToken'; import { hasRole } from '../middlewares'; import { checkUserStatus } from '../middlewares/isAllowed'; -import { wishlistAddProduct,wishlistRemoveProduct,wishlistGetProducts,wishlistClearAllProducts } from '../controllers/wishListController'; +import { + wishlistAddProduct, + wishlistRemoveProduct, + wishlistGetProducts, + wishlistClearAllProducts, +} from '../controllers/wishListController'; const router = Router(); router.post('/add/:id', authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'), wishlistAddProduct); -router.get('/',authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'),wishlistGetProducts); -router.delete('/delete/:id',authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'),wishlistRemoveProduct); -router.delete('/clearAll',authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'),wishlistClearAllProducts); +router.get('/', authMiddleware as RequestHandler, checkUserStatus, hasRole('BUYER'), wishlistGetProducts); +router.delete( + '/delete/:id', + authMiddleware as RequestHandler, + checkUserStatus, + hasRole('BUYER'), + wishlistRemoveProduct +); +router.delete( + '/clearAll', + authMiddleware as RequestHandler, + checkUserStatus, + hasRole('BUYER'), + wishlistClearAllProducts +); -export default router; \ No newline at end of file +export default router; diff --git a/src/services/adminOrderServices/readOrder.ts b/src/services/adminOrderServices/readOrder.ts new file mode 100644 index 0000000..4bb20f0 --- /dev/null +++ b/src/services/adminOrderServices/readOrder.ts @@ -0,0 +1,158 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { responseSuccess, responseError } from '../../utils/response.utils'; +import { VendorOrderItem } from '../../entities/VendorOrderItem'; +import { VendorOrders } from '../../entities/vendorOrders'; +import { Order } from '../../entities/Order'; + +export const getBuyerVendorOrdersService = async (req: Request, res: Response) => { + try { + const vendorOrderRepository = getRepository(VendorOrders); + const orderRepository = getRepository(Order); + + const orders = await orderRepository.find({ + relations: ['buyer', 'orderItems'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); + + if (!orders.length) { + return responseError(res, 200, `There is no pending orders from buyer`, { orders: [] }); + } + + const sanitizedOrdersResponse = []; + + for (const order of orders) { + const vendorOrders = await vendorOrderRepository.find({ + where: { + order: { + id: order.id, + }, + }, + relations: ['vendor', 'vendorOrderItems', 'vendorOrderItems.product'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); + + sanitizedOrdersResponse.push({ + id: order.id, + totalPrice: order.totalPrice, + totalProducts: order.orderItems.length, + orderStatus: order.orderStatus, + address: order.address, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + buyer: { + id: order.buyer.id, + firstName: order.buyer.firstName, + lastName: order.buyer.lastName, + email: order.buyer.lastName, + gender: order.buyer.gender, + phoneNumber: order.buyer.phoneNumber, + photoUrl: order.buyer.photoUrl, + }, + vendors: vendorOrders.map(vendoOrder => ({ + id: vendoOrder.vendor.id, + firstName: vendoOrder.vendor.firstName, + lastName: vendoOrder.vendor.lastName, + email: vendoOrder.vendor.lastName, + gender: vendoOrder.vendor.gender, + phoneNumber: vendoOrder.vendor.phoneNumber, + photoUrl: vendoOrder.vendor.photoUrl, + order: { + id: vendoOrder.id, + totalPrice: vendoOrder.totalPrice, + orderStatus: vendoOrder.orderStatus, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + orderItems: vendoOrder.vendorOrderItems, + }, + })), + }); + } + + responseSuccess(res, 200, 'Orders retrieved successfully', { + totalOrders: orders.length, + orders: sanitizedOrdersResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; + +// Get single vendor order info +export const getSingleBuyerVendorOrderService = async (req: Request, res: Response) => { + try { + const orderId = req.params.id; + + const vendorOrderRepository = getRepository(VendorOrders); + const orderRepository = getRepository(Order); + + const order = await orderRepository.findOne({ + where: { + id: orderId, + }, + relations: ['buyer', 'orderItems'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); + + if (!order) { + return responseError(res, 404, `Order Not Found.`); + } + + const vendorOrders = await vendorOrderRepository.find({ + where: { + order: { + id: order.id, + }, + }, + relations: ['vendor', 'vendorOrderItems', 'vendorOrderItems.product'], + }); + + const sanitizedOrderResponse = { + id: order.id, + totalPrice: order.totalPrice, + totalProducts: order.orderItems.length, + orderStatus: order.orderStatus, + address: order.address, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + buyer: { + id: order.buyer.id, + firstName: order.buyer.firstName, + lastName: order.buyer.lastName, + email: order.buyer.lastName, + gender: order.buyer.gender, + phoneNumber: order.buyer.phoneNumber, + photoUrl: order.buyer.photoUrl, + }, + vendors: vendorOrders.map(vendoOrder => ({ + id: vendoOrder.vendor.id, + firstName: vendoOrder.vendor.firstName, + lastName: vendoOrder.vendor.lastName, + email: vendoOrder.vendor.lastName, + gender: vendoOrder.vendor.gender, + phoneNumber: vendoOrder.vendor.phoneNumber, + photoUrl: vendoOrder.vendor.photoUrl, + order: { + id: vendoOrder.id, + totalPrice: vendoOrder.totalPrice, + orderStatus: vendoOrder.orderStatus, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + orderItems: vendoOrder.vendorOrderItems, + }, + })), + }; + + responseSuccess(res, 200, 'Order retrieved successfully', { + order: sanitizedOrderResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/adminOrderServices/updateOrder.ts b/src/services/adminOrderServices/updateOrder.ts new file mode 100644 index 0000000..876160f --- /dev/null +++ b/src/services/adminOrderServices/updateOrder.ts @@ -0,0 +1,107 @@ +import { Request, Response } from 'express'; +import { Not, getRepository } from 'typeorm'; +import { responseSuccess, responseError } from '../../utils/response.utils'; +import { VendorOrderItem } from '../../entities/VendorOrderItem'; +import { VendorOrders } from '../../entities/vendorOrders'; +import { Order } from '../../entities/Order'; +import { getIO } from '../../utils/socket'; + +export const updateBuyerVendorOrderService = async (req: Request, res: Response) => { + try { + const orderId = req.params.id; + + const vendorOrderRepository = getRepository(VendorOrders); + const orderRepository = getRepository(Order); + + const order = await orderRepository.findOne({ + where: { + id: orderId, + }, + relations: ['buyer', 'orderItems'], + }); + + if (!order) { + return responseError(res, 404, `Order Not Found.`); + } + + if (order.orderStatus === 'completed') { + return responseError(res, 409, 'The order has already been completed.'); + } + + if (order.orderStatus !== 'received') { + return responseError(res, 409, 'Order closure failed: The buyer has not received the item yet.'); + } + + const vendorOrders = await vendorOrderRepository.find({ + where: { + order: { + id: order.id, + }, + }, + relations: ['vendor', 'vendorOrderItems', 'vendorOrderItems.product'], + }); + + for (const order of vendorOrders) { + if (order.orderStatus !== 'delivered') { + return responseError(res, 409, 'Order closure failed: Some vendors have not yet delivered items to the buyer.'); + } + } + + // Update Whole Order + + order.orderStatus = 'completed'; + await orderRepository.save(order); + + const updatedVendorOrder = vendorOrders.map(async order => { + order.orderStatus = 'completed'; + await vendorOrderRepository.save(order); + }); + + const sanitizedOrderResponse = { + id: order.id, + totalPrice: order.totalPrice, + totalProducts: order.orderItems.length, + orderStatus: order.orderStatus, + address: order.address, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + buyer: { + id: order.buyer.id, + firstName: order.buyer.firstName, + lastName: order.buyer.lastName, + email: order.buyer.lastName, + gender: order.buyer.gender, + phoneNumber: order.buyer.phoneNumber, + photoUrl: order.buyer.photoUrl, + }, + vendors: vendorOrders.map(vendoOrder => ({ + id: vendoOrder.vendor.id, + firstName: vendoOrder.vendor.firstName, + lastName: vendoOrder.vendor.lastName, + email: vendoOrder.vendor.lastName, + gender: vendoOrder.vendor.gender, + phoneNumber: vendoOrder.vendor.phoneNumber, + photoUrl: vendoOrder.vendor.photoUrl, + order: { + id: vendoOrder.id, + totalPrice: vendoOrder.totalPrice, + orderStatus: vendoOrder.orderStatus, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + orderItems: vendoOrder.vendorOrderItems, + }, + })), + }; + + getIO().emit('orders', { + action: 'admin update', + order: sanitizedOrderResponse, + }); + + responseSuccess(res, 200, 'Order updated successfully', { + order: sanitizedOrderResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/cartServices/createCart.ts b/src/services/cartServices/createCart.ts index 4fa3646..36232a3 100644 --- a/src/services/cartServices/createCart.ts +++ b/src/services/cartServices/createCart.ts @@ -11,8 +11,7 @@ export const createCartService = async (req: Request, res: Response) => { try { const { error } = validateCartItem(req.body); if (error) { - responseError(res, 400, error.details[0].message); - return; + return responseError(res, 400, error.details[0].message); } if (req.body.quantity < 1) { diff --git a/src/services/couponServices/accessAllCoupon.ts b/src/services/couponServices/accessAllCoupon.ts new file mode 100644 index 0000000..9266a44 --- /dev/null +++ b/src/services/couponServices/accessAllCoupon.ts @@ -0,0 +1,37 @@ +import { Request, Response } from 'express'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { Coupon } from '../../entities/coupon'; +import { User } from '../../entities/User'; + +export const accessAllCouponService = async (req: Request, res: Response) => { + try { + const { id } = req.params; + + // Retrieve the user by id + const userRepository = getRepository(User); + const user = await userRepository.findOne({ where: { id } }); + + if (!user) { + console.log('User not found with id:', id); + return responseError(res, 404, 'User not found'); + } + + // Retrieve all coupons for the user + const couponRepository = getRepository(Coupon); + const coupons = await couponRepository.find({ + where: { vendor: { id: user.id } }, + relations: ['product'], + }); + + if (!coupons.length) { + console.log('No coupons found for user with id:', id); + return responseError(res, 404, 'No coupons found'); + } + + return responseSuccess(res, 200, 'Coupons retrieved successfully', coupons); + } catch (error: any) { + console.log('Error retrieving all coupons:\n', error); + return responseServerError(res, error); + } +}; diff --git a/src/services/couponServices/buyerApplyCoupon.ts b/src/services/couponServices/buyerApplyCoupon.ts new file mode 100644 index 0000000..85762f6 --- /dev/null +++ b/src/services/couponServices/buyerApplyCoupon.ts @@ -0,0 +1,87 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { Coupon } from '../../entities/coupon'; +import { Cart } from '../../entities/Cart'; +import { CartItem } from '../../entities/CartItem'; + +export const buyerApplyCouponService = async (req: Request, res: Response) => { + try { + const { couponCode } = req.body; + + if (!couponCode) return res.status(400).json({ message: 'Coupon Code is required' }); + + const couponRepository = getRepository(Coupon); + const coupon = await couponRepository.findOne({ + where: { code: couponCode }, + relations: ['product'], + }); + + if (!coupon) return res.status(404).json({ message: 'Invalid Coupon Code' }); + + if (coupon) { + if (coupon.expirationDate && coupon.expirationDate < new Date()) { + return res.status(400).json({ message: 'Coupon is expired' }); + } + + if (coupon.usageTimes == coupon.maxUsageLimit) { + return res.status(400).json({ message: 'Coupon Discount Ended' }); + } + } + const couponProductId = coupon.product.id; + + const cartRepository = getRepository(Cart); + let cart = await cartRepository.findOne({ + where: { user: { id: req.user?.id }, isCheckedOut: false }, + relations: ['items', 'items.product'], + }); + + if (!cart) return res.status(400).json({ message: "You don't have a product in cart" }); + + const cartItemRepository = getRepository(CartItem); + const couponCartItem = await cartItemRepository.findOne({ + where: { + cart: { id: cart.id }, + product: { id: couponProductId }, + }, + relations: ['product'], + }); + + if (!couponCartItem) return res.status(404).json({ message: 'No product in Cart with that coupon code' }); + + let amountReducted; + if (coupon.discountType === 'percentage') { + const reduction = (couponCartItem.product.newPrice * coupon.discountRate) / 100; + amountReducted = reduction; + couponCartItem.newPrice = couponCartItem.product.newPrice - reduction; + + await cartItemRepository.save(couponCartItem); + } else { + amountReducted = coupon.discountRate; + couponCartItem.newPrice = couponCartItem.product.newPrice - amountReducted; + await cartItemRepository.save(couponCartItem); + } + + cart = await cartRepository.findOne({ where: { id: cart.id }, relations: ['items', 'items.product'] }); + if (cart) { + cart.updateTotal(); + await cartRepository.save(cart); + } + + coupon.usageTimes += 1; + + if (req.user?.id) { + coupon.usedBy.push(req.user?.id); + } + + await couponRepository.save(coupon); + + return res + .status(200) + .json({ + message: `Coupon Code successfully activated discount on product: ${couponCartItem.product.name}`, + amountDiscounted: amountReducted, + }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/services/couponServices/createCouponService.ts b/src/services/couponServices/createCouponService.ts new file mode 100644 index 0000000..a824ddf --- /dev/null +++ b/src/services/couponServices/createCouponService.ts @@ -0,0 +1,55 @@ +import { Request, Response } from 'express'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { Coupon } from '../../entities/coupon'; +import { validateCoupon } from '../../helper/couponValidator'; +import { User } from '../../entities/User'; +import { Product } from '../../entities/Product'; + +export const createCouponService = async (req: Request, res: Response) => { + try { + const { error } = validateCoupon(req.body); + if (error) { + console.log('Validation Error creating coupon:\n', error); + return res.status(400).json({ status: 'error', error: error?.details[0].message }); + } + + const { code, discountRate, expirationDate, maxUsageLimit, discountType, product: productId } = req.body; + const { id: vendorId } = req.params; + + const userRepository = getRepository(User); + const user = await userRepository.findOne({ where: { id: vendorId } }); + if (!user) { + console.log('Error creating coupon: User not found', user); + return responseError(res, 404, 'User not found'); + } + + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ where: { id: productId } }); + if (!product) { + console.log('Error creating coupon: Product not found', product); + return responseError(res, 403, 'Product not found'); + } + + const couponRepository = getRepository(Coupon); + const existingCoupon = await couponRepository.findOne({ where: { code } }); + if (existingCoupon) { + return responseError(res, 402, 'Coupon code already exists'); + } + + const newCoupon = new Coupon(); + newCoupon.code = code; + newCoupon.discountRate = discountRate; + newCoupon.expirationDate = expirationDate; + newCoupon.maxUsageLimit = maxUsageLimit; + newCoupon.discountType = discountType; + newCoupon.product = product; + newCoupon.vendor = user; + + await couponRepository.save(newCoupon); + responseSuccess(res, 201, 'Coupon created successfully'); + } catch (error: any) { + console.log('Error creating coupon:\n', error); + return responseServerError(res, error); + } +}; diff --git a/src/services/couponServices/deleteCoupon.ts b/src/services/couponServices/deleteCoupon.ts new file mode 100644 index 0000000..c984d9e --- /dev/null +++ b/src/services/couponServices/deleteCoupon.ts @@ -0,0 +1,23 @@ +import { Request, Response } from 'express'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { Coupon } from '../../entities/coupon'; + +export const deleteCouponService = async (req: Request, res: Response) => { + try { + const couponRepository = getRepository(Coupon); + const coupon = await couponRepository.findOne({ where: { code: req.body.code } }); + + if (!coupon) { + console.log('Invalid coupon.'); + return responseError(res, 404, 'Invalid coupon'); + } + + await couponRepository.remove(coupon); + + return responseSuccess(res, 200, 'Coupon deleted successfully'); + } catch (error: any) { + console.log('Error deleting coupon:\n', error); + return responseServerError(res, error); + } +}; diff --git a/src/services/couponServices/readCoupon.ts b/src/services/couponServices/readCoupon.ts new file mode 100644 index 0000000..47e12ea --- /dev/null +++ b/src/services/couponServices/readCoupon.ts @@ -0,0 +1,23 @@ +import { Request, Response } from 'express'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { Coupon } from '../../entities/coupon'; + +export const readCouponService = async (req: Request, res: Response) => { + try { + const { code } = req.params; + if (!code) return responseError(res, 400, 'coupon code is required'); + + const couponRepository = getRepository(Coupon); + const coupon = await couponRepository.findOne({ where: { code: code } }); + + if (!coupon) { + return responseError(res, 404, 'Invalid coupon'); + } + + return responseSuccess(res, 200, 'Coupon retrieved successfully', coupon); + } catch (error: any) { + console.log('Error retrieving coupon:\n', error); + return responseServerError(res, error); + } +}; diff --git a/src/services/couponServices/updateService.ts b/src/services/couponServices/updateService.ts new file mode 100644 index 0000000..26aeef6 --- /dev/null +++ b/src/services/couponServices/updateService.ts @@ -0,0 +1,59 @@ +import { Coupon } from '../../entities/coupon'; +import { Request, Response } from 'express'; +import { responseSuccess, responseError, responseServerError } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { validateCouponUpdate } from '../../helper/couponValidator'; +import { Product } from '../../entities/Product'; + +export const updateCouponService = async (req: Request, res: Response) => { + try { + const { code } = req.params; + const { error } = validateCouponUpdate(req.body); + if (error) { + return res.status(400).json({ status: 'error', error: error?.details[0].message }); + } + + const couponRepository = getRepository(Coupon); + const coupon = await couponRepository.findOne({ where: { code } }); + if (coupon) { + if (req.body.code !== undefined) { + const existtCoupon = await couponRepository.findOne({ where: { code: req.body.code } }); + if (existtCoupon) return responseError(res, 400, 'Coupon code already exists'); + if (req.body.code === coupon.code) return responseError(res, 400, 'Coupon code already up to date'); + coupon.code = req.body.code; + } + if (req.body.discountRate !== undefined) { + coupon.discountRate = req.body.discountRate; + } + if (req.body.expirationDate !== undefined) { + coupon.expirationDate = req.body.expirationDate; + } + if (req.body.maxUsageLimit !== undefined) { + coupon.maxUsageLimit = req.body.maxUsageLimit; + } + if (req.body.discountType !== undefined) { + coupon.discountType = req.body.discountType; + } + if (req.body.product !== undefined) { + const { id } = req.body.product; + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ where: { id } }); + if (!product) { + console.log('Error updating coupon: Product not found', product); + return responseError(res, 404, 'Product not found'); + } + + coupon.product = product; + } + + await couponRepository.save(coupon); + return responseSuccess(res, 200, 'Coupon updated successfully', coupon); + } else { + console.log('Error updating coupon: Coupon not found', coupon); + return responseError(res, 404, 'Coupon not found'); + } + } catch (error: any) { + console.log('Error while updating coupon:\n', error); + return responseServerError(res, error); + } +}; diff --git a/src/services/index.ts b/src/services/index.ts index 8f560c3..08bdbe4 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -21,6 +21,7 @@ export * from './productServices/listAllProductsService'; export * from './productServices/productStatus'; export * from './productServices/viewSingleProduct'; export * from './productServices/searchProduct'; +export * from './productServices/payment' // Buyer wishlist services export * from './wishListServices/addProduct'; @@ -33,3 +34,11 @@ export * from './cartServices/createCart'; export * from './cartServices/readCart'; export * from './cartServices/removeProductInCart'; export * from './cartServices/clearCart'; + +// vendor order management +export * from './vendorOrderServices/readVendorOrder'; +export * from './vendorOrderServices/updateVendorOrder'; + +// vendor order management +export * from './adminOrderServices/readOrder'; +export * from './adminOrderServices/updateOrder'; diff --git a/src/services/orderServices/createOrder.ts b/src/services/orderServices/createOrder.ts new file mode 100644 index 0000000..256bf40 --- /dev/null +++ b/src/services/orderServices/createOrder.ts @@ -0,0 +1,186 @@ +import { Request, Response } from 'express'; +import { getRepository, getManager } from 'typeorm'; +import { Order } from '../../entities/Order'; +import { OrderItem } from '../../entities/OrderItem'; +import { Product } from '../../entities/Product'; +import { User } from '../../entities/User'; +import { Cart } from '../../entities/Cart'; +import { Transaction } from '../../entities/transaction'; +import { responseError, sendErrorResponse, sendSuccessResponse } from '../../utils/response.utils'; +import sendMail from '../../utils/sendOrderMail'; +import { VendorOrders } from '../../entities/vendorOrders'; +import { CartItem } from '../../entities/CartItem'; +import { VendorOrderItem } from '../../entities/VendorOrderItem'; + +export const createOrderService = async (req: Request, res: Response) => { + const { cartId, address } = req.body; + const buyerId = req.user?.id; + + try { + const userRepository = getRepository(User); + const productRepository = getRepository(Product); + const cartRepository = getRepository(Cart); + + const buyer = await userRepository.findOne({ where: { id: buyerId } }); + if (!buyer) { + return responseError(res, 404, 'Buyer not found'); + } + + const cart = await cartRepository.findOne({ + where: { + user: { + id: buyerId, + }, + isCheckedOut: false, + }, + relations: ['items', 'items.product', 'user'], + }); + + if (!cart || cart.items.length === 0) { + return sendErrorResponse(res, 400, 'Cart is empty or already checked out'); + } + + let totalPrice = 0; + const orderItems: OrderItem[] = []; + + for (const item of cart.items) { + const product = item.product; + + if (product.quantity < item.quantity) { + return sendErrorResponse(res, 400, `Not enough ${product.name} in stock`); + } + + totalPrice += product.newPrice * item.quantity; + product.quantity -= item.quantity; + + const orderItem = new OrderItem(); + orderItem.product = product; + orderItem.price = product.newPrice; + orderItem.quantity = item.quantity; + orderItems.push(orderItem); + } + + if (!buyer.accountBalance || buyer.accountBalance < totalPrice) { + return sendErrorResponse(res, 400, 'Not enough funds to perform this transaction'); + } + + const previousBalance = buyer.accountBalance; + buyer.accountBalance -= totalPrice; + const currentBalance = buyer.accountBalance; + + const newOrder = new Order(); + newOrder.buyer = buyer; + newOrder.totalPrice = totalPrice; + newOrder.orderItems = orderItems; + newOrder.quantity = cart.items.reduce((acc, item) => acc + item.quantity, 0); + newOrder.orderDate = new Date(); + newOrder.address = `${address.country}, ${address.city}, ${address.street}`; + + await getManager().transaction(async transactionalEntityManager => { + for (const item of cart.items) { + const product = item.product; + await transactionalEntityManager.save(Product, product); + } + + await transactionalEntityManager.save(User, buyer); + + await transactionalEntityManager.save(Order, newOrder); + for (const orderItem of orderItems) { + orderItem.order = newOrder; + await transactionalEntityManager.save(OrderItem, orderItem); + } + + const orderTransaction = new Transaction(); + orderTransaction.user = buyer; + orderTransaction.order = newOrder; + orderTransaction.amount = totalPrice; + orderTransaction.previousBalance = previousBalance; + orderTransaction.currentBalance = currentBalance; + orderTransaction.type = 'debit'; + orderTransaction.description = 'Purchase of products'; + await transactionalEntityManager.save(Transaction, orderTransaction); + + cart.isCheckedOut = true; + await transactionalEntityManager.save(Cart, cart); + }); + + const orderResponse = { + fullName: `${newOrder.buyer.firstName} ${newOrder.buyer.lastName}`, + email: newOrder.buyer.email, + products: orderItems.map(item => ({ + name: item.product.name, + newPrice: item.price, + quantity: item.quantity, + })), + totalAmount: newOrder.totalPrice, + quantity: newOrder.quantity, + orderDate: newOrder.orderDate, + address: newOrder.address, + }; + + const message = { + subject: 'Order created successfully', + ...orderResponse, + }; + + await sendMail(message); + + // separate order by each vendor getting order related to his products + await saveVendorRelatedOrder(newOrder, cart.items); + + return sendSuccessResponse(res, 201, 'Order created successfully', orderResponse); + } catch (error) { + return sendErrorResponse(res, 500, (error as Error).message); + } +}; + +const saveVendorRelatedOrder = async (order: Order, CartItem: CartItem[]) => { + try { + for (const item of CartItem) { + const productRepository = getRepository(Product); + + const product = await productRepository.findOne({ + where: { + id: item.product.id, + }, + relations: ['vendor'], + }); + + if (!product) return; + + const orderItem = new VendorOrderItem(); + orderItem.product = product; + orderItem['price/unit'] = product.newPrice; + orderItem.quantity = item.quantity; + + const vendorOrdersRepository = getRepository(VendorOrders); + let vendorOrders = await vendorOrdersRepository.findOne({ + where: { + vendor: { + id: product.vendor.id, + }, + order: { + id: order.id, + }, + }, + relations: ['vendorOrderItems'], + }); + + if (vendorOrders) { + vendorOrders.totalPrice = Number(vendorOrders.totalPrice) + +product.newPrice * +item.quantity; + vendorOrders.vendorOrderItems = [...vendorOrders.vendorOrderItems, orderItem]; + } else { + const newVendorOrders = new VendorOrders(); + newVendorOrders.vendor = product.vendor; + newVendorOrders.vendorOrderItems = [orderItem]; + newVendorOrders.order = order; + newVendorOrders.totalPrice = +product.newPrice * item.quantity; + vendorOrders = newVendorOrders; + } + + await vendorOrdersRepository.save(vendorOrders); + } + } catch (error) { + console.log((error as Error).message); + } +}; \ No newline at end of file diff --git a/src/services/orderServices/getOrderService.ts b/src/services/orderServices/getOrderService.ts new file mode 100644 index 0000000..4208123 --- /dev/null +++ b/src/services/orderServices/getOrderService.ts @@ -0,0 +1,63 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { responseSuccess, responseError } from '../../utils/response.utils'; +import { Order } from '../../entities/Order'; +import { OrderItem } from '../../entities/OrderItem'; + +// Example usage: + +export const getOrdersService = async (req: Request, res: Response) => { + try { + const orderRepository = getRepository(Order); + const buyerId = req.user?.id; + + const orders = await orderRepository.find({ + where: { + buyer: { + id: buyerId, + }, + }, + relations: ['buyer', 'orderItems', 'orderItems.product'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); + + if (!orders || orders.length === 0) { + return responseSuccess(res, 404, `You haven't made any orders yet`, { orders: [] }); + } + + const sanitezedResponse = orders.map(order => ({ + id: order.id, + totalPrice: order.totalPrice, + orderStatus: order.orderStatus, + quantity: order.quantity, + address: order.address, + orderDate: order.orderDate, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + buyer: { + id: order.buyer.id, + firstName: order.buyer.firstName, + lastName: order.buyer.lastName, + accountBalance: order.buyer.accountBalance, + }, + orderItems: order.orderItems.map((item: OrderItem) => ({ + id: item.id, + price: item.price, + quantity: item.quantity, + product: { + id: item.product.id, + name: item.product.name, + description: item.product.description, + images: item.product.images, + price: item.product.newPrice, + expirationDate: item.product.expirationDate, + }, + })), + })); + responseSuccess(res, 200, 'Orders retrieved successfully', { orders: sanitezedResponse }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/orderServices/getOrderTransactionHistory.ts b/src/services/orderServices/getOrderTransactionHistory.ts new file mode 100644 index 0000000..6bd0b17 --- /dev/null +++ b/src/services/orderServices/getOrderTransactionHistory.ts @@ -0,0 +1,42 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { Transaction } from '../../entities/transaction'; +import { sendErrorResponse, sendSuccessResponse } from '../../utils/response.utils'; +import { OrderItem } from '../../entities/OrderItem'; + +export const getTransactionHistoryService = async (req: Request, res: Response) => { + const userId = req.user?.id; + + try { + const transactionRepository = getRepository(Transaction); + const transactions = await transactionRepository.find({ + where: { user: { id: userId } }, + order: { createdAt: 'DESC' }, + relations: ['order'], + }); + + if (!transactions || transactions.length === 0) { + return sendErrorResponse(res, 404, 'No transaction history found'); + } + + const transactionHistory = transactions.map(transaction => ({ + id: transaction.id, + amount: transaction.amount, + type: transaction.type, + description: transaction.description, + createdAt: transaction.createdAt, + order: transaction.order + ? { + id: transaction.order.id, + totalPrice: transaction.order.totalPrice, + orderDate: transaction.order.orderDate, + address: transaction.order.address, + } + : null, + })); + + return sendSuccessResponse(res, 200, 'Transaction history retrieved successfully', transactionHistory); + } catch (error) { + return sendErrorResponse(res, 500, (error as Error).message); + } +}; diff --git a/src/services/orderServices/updateOrderService.ts b/src/services/orderServices/updateOrderService.ts new file mode 100644 index 0000000..82a043a --- /dev/null +++ b/src/services/orderServices/updateOrderService.ts @@ -0,0 +1,136 @@ +import { Request, Response } from 'express'; +import { getManager, EntityManager, Repository } from 'typeorm'; +import { Order } from '../../entities/Order'; +import { Product } from '../../entities/Product'; +import { User } from '../../entities/User'; +import { OrderItem } from '../../entities/OrderItem'; +import { Transaction } from '../../entities/transaction'; +import { responseError, sendErrorResponse, sendSuccessResponse } from '../../utils/response.utils'; +import sendMail from '../../utils/sendOrderMail'; +interface OrderStatusType { + orderStatus: + | 'order placed' + | 'cancelled' + | 'awaiting shipment' + | 'in transit' + | 'delivered' + | 'received' + | 'returned'; +} +export const updateOrderService = async (req: Request, res: Response) => { + const { orderId } = req.params; + const { orderStatus } = req.body; + + try { + await getManager().transaction(async (transactionalEntityManager: EntityManager) => { + const orderRepository: Repository = transactionalEntityManager.getRepository(Order); + const productRepository: Repository = transactionalEntityManager.getRepository(Product); + const userRepository: Repository = transactionalEntityManager.getRepository(User); + const orderItemRepository: Repository = transactionalEntityManager.getRepository(OrderItem); + const transactionRepository: Repository = transactionalEntityManager.getRepository(Transaction); + + const buyerId = req.user?.id; + if (!buyerId) { + throw new Error('Unauthorized'); + } + + // Fetch order and related entities + const order: Order | null = await orderRepository.findOne({ + where: { id: orderId, buyer: { id: buyerId } }, + relations: ['orderItems', 'orderItems.product', 'buyer'], + }); + + if (!order) { + return sendErrorResponse(res, 404, 'Order not found'); + } + // Check if order can be updated + if (isOrderFinalStatus(order.orderStatus)) { + return sendErrorResponse(res, 401, `Order cannot be updated once it is ${order.orderStatus}`); + } + + // Handle order status transitions + if (orderStatus !== undefined && order.orderStatus !== orderStatus) { + switch (orderStatus) { + case 'cancelled': + case 'returned': + if (order.orderStatus !== 'delivered') { + await processRefund(order, transactionalEntityManager); + } + break; + default: + break; + } + + order.orderStatus = orderStatus; + } + + // Save updated order status + await orderRepository.save(order); + + // Prepare response data + const orderResponse = { + fullName: `${order.buyer.firstName} ${order.buyer.lastName}`, + email: order.buyer.email, + products: order.orderItems.map((item: OrderItem) => ({ + name: item.product.name, + newPrice: item.price, + quantity: item.quantity, + })), + totalAmount: order.totalPrice, + quantity: order.quantity, + orderDate: order.orderDate, + address: order.address, + }; + + // Send email notification + const message = { + subject: 'Order updated successfully', + ...orderResponse, + }; + await sendMail(message); + + // Respond with success + return sendSuccessResponse(res, 200, 'Order updated successfully', orderResponse); + }); + } catch (error) { + console.error('Error updating order:', error); + return sendErrorResponse(res, 500, (error as Error).message); + } +}; + +async function processRefund (order: Order, entityManager: EntityManager) { + const buyer = order.buyer; + + // Refund buyer + const previousBalance = buyer.accountBalance; + buyer.accountBalance += order.totalPrice; + const currentBalance = buyer.accountBalance; + await entityManager.save(buyer); + + // Record refund transaction + const refundTransaction = new Transaction(); + refundTransaction.user = buyer; + refundTransaction.order = order; + refundTransaction.amount = order.totalPrice; + refundTransaction.previousBalance = previousBalance; + refundTransaction.currentBalance = currentBalance; + refundTransaction.type = 'credit'; + refundTransaction.description = 'Refund for cancelled or returned order'; + await entityManager.save(refundTransaction); + + // Return products to store + for (const orderItem of order.orderItems) { + const product = orderItem.product; + product.quantity += orderItem.quantity; + await entityManager.save(product); + } + + // Clear order details + order.orderItems = []; + order.totalPrice = 0; + order.quantity = 0; +} + +function isOrderFinalStatus (status: string): boolean { + return ['cancelled', 'delivered', 'returned', 'completed'].includes(status); +} diff --git a/src/services/productServices/deleteProduct.ts b/src/services/productServices/deleteProduct.ts index 43ec3d1..068c4c9 100644 --- a/src/services/productServices/deleteProduct.ts +++ b/src/services/productServices/deleteProduct.ts @@ -3,30 +3,28 @@ import { Product } from '../../entities/Product'; import { getRepository } from 'typeorm'; import { responseError, responseSuccess } from '../../utils/response.utils'; - export const deleteProductService = async (req: Request, res: Response) => { - try { - const { id } = req.params; - - const productRepository = getRepository(Product); + try { + const { id } = req.params; - const product = await productRepository.findOne({ - where: { - id: id, - vendor: { - id: req.user?.id - } - } - }); + const productRepository = getRepository(Product); - if (product) { - await productRepository.remove(product); - return responseSuccess(res, 200, 'Product successfully deleted'); - } + const product = await productRepository.findOne({ + where: { + id: id, + vendor: { + id: req.user?.id, + }, + }, + }); - return responseError(res, 404, 'Product not found'); - - } catch (error) { - responseError(res, 400, (error as Error).message); + if (product) { + await productRepository.remove(product); + return responseSuccess(res, 200, 'Product successfully deleted'); } + + return responseError(res, 404, 'Product not found'); + } catch (error) { + responseError(res, 400, (error as Error).message); + } }; diff --git a/src/services/productServices/getRecommendedProductsService.ts b/src/services/productServices/getRecommendedProductsService.ts index 19368e1..fde015d 100644 --- a/src/services/productServices/getRecommendedProductsService.ts +++ b/src/services/productServices/getRecommendedProductsService.ts @@ -1,62 +1,63 @@ -import { Request, Response } from "express"; -import { responseError, responseSuccess } from "../../utils/response.utils"; -import { getRepository } from "typeorm"; -import { Product } from "../../entities/Product"; +import { Request, Response } from 'express'; +import { responseError, responseSuccess } from '../../utils/response.utils'; +import { getRepository } from 'typeorm'; +import { Product } from '../../entities/Product'; interface conditionDoc { - categories: any[] | null; - vendor: any | null + categories: any[] | null; + vendor: any | null; } export const getRecommendedProductsService = async (req: Request, res: Response) => { + try { + // Define pagination parameters + const page = req.query.page ? Number(req.query.page) : 1; + const limit = req.query.limit ? Number(req.query.limit) : 10; + const skip = (page - 1) * limit; + const condition: conditionDoc = { + categories: null, + vendor: null, + }; - try { - // Define pagination parameters - const page = req.query.page ? Number(req.query.page) : 1; - const limit = req.query.limit ? Number(req.query.limit) : 10; - const skip = (page - 1) * limit; - const condition: conditionDoc = { - categories: null, - vendor: null - }; - - if (req.query.categories) { - const categoryIds = Array.isArray(req.query.categories) ? req.query.categories : [req.query.categories]; - condition.categories = categoryIds; - }; - if (req.query.vendor) condition.vendor = req.query.vendor; + if (req.query.categories) { + const categoryIds = Array.isArray(req.query.categories) ? req.query.categories : [req.query.categories]; + condition.categories = categoryIds; + } + if (req.query.vendor) condition.vendor = req.query.vendor; - const productRepository = getRepository(Product); - const productsQuery = productRepository.createQueryBuilder("product") - .leftJoinAndSelect("product.categories", "category") - .leftJoinAndSelect("product.vendor", "vendor") - .where("1 = 1"); + const productRepository = getRepository(Product); + const productsQuery = productRepository + .createQueryBuilder('product') + .leftJoinAndSelect('product.categories', 'category') + .leftJoinAndSelect('product.vendor', 'vendor') + .where('1 = 1'); - if (condition.categories && condition.categories.length > 0) { - productsQuery.andWhere("category.id IN (:...categories)", { categories: condition.categories }); - } - if (condition.vendor) { - productsQuery.andWhere("vendor.id = :vendorId", { vendorId: condition.vendor }); - } + if (condition.categories && condition.categories.length > 0) { + productsQuery.andWhere('category.id IN (:...categories)', { categories: condition.categories }); + } + if (condition.vendor) { + productsQuery.andWhere('vendor.id = :vendorId', { vendorId: condition.vendor }); + } - const products = await productsQuery - .skip(skip) - .take(limit) - .getMany(); - if (products.length < 1) { - return responseSuccess(res, 200, `No products found for the specified ${condition.vendor ? 'vendor' : 'category'}`); - } - const sanitizedProducts = products.map(product => ({ - ...product, - vendor: { - firstName: product.vendor.firstName, - lastName: product.vendor.lastName, - phoneNumber: product.vendor.phoneNumber, - photoUrl: product.vendor.photoUrl - } - })); - return responseSuccess(res, 200, 'Products retrieved', { products: sanitizedProducts }); - } catch (error) { - return responseError(res, 400, (error as Error).message); + const products = await productsQuery.skip(skip).take(limit).getMany(); + if (products.length < 1) { + return responseSuccess( + res, + 200, + `No products found for the specified ${condition.vendor ? 'vendor' : 'category'}` + ); } -}; \ No newline at end of file + const sanitizedProducts = products.map(product => ({ + ...product, + vendor: { + firstName: product.vendor.firstName, + lastName: product.vendor.lastName, + phoneNumber: product.vendor.phoneNumber, + photoUrl: product.vendor.photoUrl, + }, + })); + return responseSuccess(res, 200, 'Products retrieved', { products: sanitizedProducts }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/productServices/listAllProductsService.ts b/src/services/productServices/listAllProductsService.ts index 8950abd..f39c7bb 100644 --- a/src/services/productServices/listAllProductsService.ts +++ b/src/services/productServices/listAllProductsService.ts @@ -5,38 +5,40 @@ import { responseError, responseSuccess } from '../../utils/response.utils'; import { validate } from 'uuid'; export const listAllProductsService = async (req: Request, res: Response) => { - try { - const page = req.query.page ? Number(req.query.page) : 1; - const limit = req.query.limit ? Number(req.query.limit) : 10; - const skip = (page - 1) * limit; - const category = req.query.category ; + try { + const page = req.query.page ? Number(req.query.page) : 1; + const limit = req.query.limit ? Number(req.query.limit) : 10; + const skip = (page - 1) * limit; + const category = req.query.category; - - const productRepository = getRepository(Product); - const products = await productRepository.find({ - where: { - categories: { - name: category as string - } - }, - skip, - take: limit, - relations: ["categories","vendor"], - select: { - vendor: { - id: true, firstName: true, lastName: true, - email: true, phoneNumber: true, photoUrl: true - } - } - } - ); + const productRepository = getRepository(Product); + const products = await productRepository.find({ + where: { + categories: { + name: category as string, + }, + }, + skip, + take: limit, + relations: ['categories', 'vendor'], + select: { + vendor: { + id: true, + firstName: true, + lastName: true, + email: true, + phoneNumber: true, + photoUrl: true, + }, + }, + }); - if (products.length < 1) { - return responseSuccess(res, 200, 'No products found'); - } - - return responseSuccess(res, 200, 'Products retrieved', { products }); - } catch (error) { - responseError(res, 400, (error as Error).message); + if (products.length < 1) { + return responseSuccess(res, 200, 'No products found'); } + + return responseSuccess(res, 200, 'Products retrieved', { products }); + } catch (error) { + responseError(res, 400, (error as Error).message); + } }; diff --git a/src/services/productServices/payment.ts b/src/services/productServices/payment.ts new file mode 100644 index 0000000..b613296 --- /dev/null +++ b/src/services/productServices/payment.ts @@ -0,0 +1,52 @@ +import { Request, Response } from 'express'; +import { Cart } from '../../entities/Cart'; // Import your Cart entity +import { Order } from '../../entities/Order'; // Import your Order entity +import { getRepository, getTreeRepository } from 'typeorm'; +import dotenv from 'dotenv'; +import Stripe from 'stripe'; +dotenv.config(); +const stripeInstance = new Stripe(process.env.STRIPE_SECRET_KEY as string, { + apiVersion: "2024-04-10", +}); + +export const confirmPayment = async (req: Request, res: Response) => { + try { + const { payment_method } = req.body; + const cartId = req.params.cartId; // Get the cart ID from the params + + const cartRepository = getRepository(Cart); + const orderRepository = getTreeRepository(Order) + const cart = await cartRepository.findOne({where: {id : cartId}}); + if (!cart) { + return res.status(404).json({ error: 'Cart not found.' }); + } + const order = await orderRepository.findOne({ where: { buyer: cart.user } }); + if (!order) { + return res.status(404).json({ error: 'order not found.' }); + } + + const paymentIntent = await stripeInstance.paymentIntents.create({ + amount: cart.totalAmount, // Convert total to cents + currency: 'usd', + description: `Order #${cartId}`, + return_url: 'https://frontend-website.com/success', + confirm: true, + payment_method, + }); + + order.orderStatus = 'awaiting shipment'; + await orderRepository.save(order); + + + if (paymentIntent.status === 'succeeded') { + // Payment succeeded + res.status(200).json({ message: 'Payment successful!' }); + } else { + // Payment failed + res.status(400).json({ error: 'Payment failed.' }); + } + } catch (error) { + console.error('Error confirming payment:', error); + res.status(500).json({ error: 'Something went wrong' }); + } +}; \ No newline at end of file diff --git a/src/services/productServices/readProduct.ts b/src/services/productServices/readProduct.ts index 5c9257c..b3c244d 100644 --- a/src/services/productServices/readProduct.ts +++ b/src/services/productServices/readProduct.ts @@ -4,67 +4,75 @@ import { getRepository } from 'typeorm'; import { responseError, responseSuccess } from '../../utils/response.utils'; export const readProductsService = async (req: Request, res: Response) => { - try { - // Define pagination parameters - const page = req.query.page ? Number(req.query.page) : 1; - const limit = req.query.limit ? Number(req.query.limit) : 10; - const skip = (page - 1) * limit; + try { + // Define pagination parameters + const page = req.query.page ? Number(req.query.page) : 1; + const limit = req.query.limit ? Number(req.query.limit) : 10; + const skip = (page - 1) * limit; - // Retrieve products - const productRepository = getRepository(Product); - const products = await productRepository.find({ - where: { - vendor: { - id: req.user?.id, - }, - }, - skip, - take: limit, - relations: ['categories', 'vendor'], - select: { - vendor: { - id: true, firstName: true, lastName: true, - email: true, phoneNumber: true, photoUrl: true - } - } - }); + // Retrieve products + const productRepository = getRepository(Product); + const products = await productRepository.find({ + where: { + vendor: { + id: req.user?.id, + }, + }, + skip, + take: limit, + relations: ['categories', 'vendor'], + select: { + vendor: { + id: true, + firstName: true, + lastName: true, + email: true, + phoneNumber: true, + photoUrl: true, + }, + }, + }); - if (products.length < 1) { - return responseSuccess(res, 200, 'You have no products yet'); - } - return responseSuccess(res, 200, 'Products retrieved', { products }); - } catch (error) { - responseError(res, 400, (error as Error).message); + if (products.length < 1) { + return responseSuccess(res, 200, 'You have no products yet'); } + return responseSuccess(res, 200, 'Products retrieved', { products }); + } catch (error) { + responseError(res, 400, (error as Error).message); + } }; export const readProductService = async (req: Request, res: Response) => { - try { - const { id } = req.params; + try { + const { id } = req.params; - const productRepository = getRepository(Product); - const product = await productRepository.findOne({ - where: { - id: id, - vendor: { - id: req.user?.id, - }, - }, - relations: ['categories', 'vendor'], - select: { - vendor: { - id: true, firstName: true, lastName: true, - email: true, phoneNumber: true, photoUrl: true - } - } - }); + const productRepository = getRepository(Product); + const product = await productRepository.findOne({ + where: { + id: id, + vendor: { + id: req.user?.id, + }, + }, + relations: ['categories', 'vendor'], + select: { + vendor: { + id: true, + firstName: true, + lastName: true, + email: true, + phoneNumber: true, + photoUrl: true, + }, + }, + }); - if (!product) { - return responseError(res, 404, 'Product not found'); - } - - return responseSuccess(res, 200, 'Product retrieved', { product }); - } catch (error) { - responseError(res, 400, (error as Error).message); + if (!product) { + return responseError(res, 404, 'Product not found'); } + + return responseSuccess(res, 200, 'Product retrieved', { product }); + } catch (error) { + responseError(res, 400, (error as Error).message); + } }; diff --git a/src/services/productServices/removeProductImage.ts b/src/services/productServices/removeProductImage.ts index 2995593..4424676 100644 --- a/src/services/productServices/removeProductImage.ts +++ b/src/services/productServices/removeProductImage.ts @@ -21,7 +21,7 @@ export const removeProductImageService = async (req: Request, res: Response) => const product = await productRepository.findOne({ where: { id, - vendor: { id: req.user?.id } + vendor: { id: req.user?.id }, }, relations: ['vendor'], }); diff --git a/src/services/productServices/searchProduct.ts b/src/services/productServices/searchProduct.ts index 765f431..9f33b5f 100644 --- a/src/services/productServices/searchProduct.ts +++ b/src/services/productServices/searchProduct.ts @@ -1,4 +1,4 @@ -import { Request, Response } from "express"; +import { Request, Response } from 'express'; import { getRepository, Like } from 'typeorm'; import { Product } from '../../entities/Product'; @@ -26,10 +26,7 @@ export const searchProductService = async (params: SearchProductParams) => { const skip = (page - 1) * limit; - const [products, total] = await query - .skip(skip) - .take(limit) - .getManyAndCount(); + const [products, total] = await query.skip(skip).take(limit).getManyAndCount(); const totalPages = Math.ceil(total / limit); diff --git a/src/services/productServices/viewSingleProduct.ts b/src/services/productServices/viewSingleProduct.ts index f956625..29ac167 100644 --- a/src/services/productServices/viewSingleProduct.ts +++ b/src/services/productServices/viewSingleProduct.ts @@ -4,35 +4,28 @@ import { getRepository } from 'typeorm'; import { responseError } from '../../utils/response.utils'; import { validate } from 'uuid'; - - export const viewSingleProduct = async (req: Request, res: Response) => { - try { - const productId = req.params.id; + try { + const productId = req.params.id; + + if (!validate(productId)) { + return res.status(400).json({ status: 'error', message: 'Invalid product ID' }); + } + if (productId) { + const products = getRepository(Product); + const product = await products.findOneBy({ id: productId }); - if (!validate(productId)) { - return res.status(400).json({ status: 'error', message: 'Invalid product ID' }); - + if (!product) { + return res.status(404).send({ status: 'error', message: 'Product not found' }); } - if(productId){ - const products = getRepository(Product); - const product = await products.findOneBy({ id: productId }); - - if (!product) { - return res.status(404).send({status:'error', message: 'Product not found'}); - - } - - if (product.expirationDate && new Date(product.expirationDate) < new Date()) { - return res.status(400).json({ status: 'error', message: 'Product expired' }); - - } - res.status(200).json({ status: 'success', product: product }); + if (product.expirationDate && new Date(product.expirationDate) < new Date()) { + return res.status(400).json({ status: 'error', message: 'Product expired' }); } - - } catch (error) { - console.error('Error handling request:', error); - res.status(500).send('Error fetching product details'); + res.status(200).json({ status: 'success', product: product }); } -} \ No newline at end of file + } catch (error) { + console.error('Error handling request:', error); + res.status(500).send('Error fetching product details'); + } +}; diff --git a/src/services/vendorOrderServices/readVendorOrder.ts b/src/services/vendorOrderServices/readVendorOrder.ts new file mode 100644 index 0000000..feec0c3 --- /dev/null +++ b/src/services/vendorOrderServices/readVendorOrder.ts @@ -0,0 +1,119 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { responseSuccess, responseError } from '../../utils/response.utils'; +import { VendorOrderItem } from '../../entities/VendorOrderItem'; +import { VendorOrders } from '../../entities/vendorOrders'; + +export const getVendorOrdersService = async (req: Request, res: Response) => { + try { + const vendorOrderRepository = getRepository(VendorOrders); + const vendorId = req.user?.id; + + const vendorOrders = await vendorOrderRepository.find({ + where: { + vendor: { + id: vendorId, + }, + }, + relations: ['vendor', 'order.buyer', 'vendorOrderItems', 'vendorOrderItems.product'], + order: { + createdAt: 'DESC', // Order by creation date, most recent first + }, + }); + + if (!vendorOrders.length) { + return responseError(res, 200, `You don't have any pending orders from buyer`, { orders: [] }); + } + + const sanitizedOrderResponse = vendorOrders.map(order => ({ + id: order.id, + totalPrice: order.totalPrice, + orderStatus: order.orderStatus, + address: order.order.address, + createdAt: order.createdAt, + updatedAt: order.updatedAt, + vendor: { + id: order.vendor.id, + firstName: order.vendor.firstName, + lastName: order.vendor.lastName, + email: order.vendor.email, + gender: order.vendor.gender, + phoneNumber: order.vendor.phoneNumber, + photoUrl: order.vendor.photoUrl, + }, + buyer: { + id: order.order.buyer.id, + firstName: order.order.buyer.firstName, + lastName: order.order.buyer.lastName, + email: order.order.buyer.lastName, + gender: order.order.buyer.gender, + phoneNumber: order.order.buyer.phoneNumber, + photoUrl: order.order.buyer.photoUrl, + }, + vendorOrderItems: order.vendorOrderItems, + })); + responseSuccess(res, 200, 'Orders retrieved successfully', { + orders: sanitizedOrderResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; + +// Get single vendor order info +export const getSingleVendorOrderService = async (req: Request, res: Response) => { + try { + const vendorOrderId = req.params.id; + + const vendorOrderRepository = getRepository(VendorOrders); + const vendorId = req.user?.id; + + const vendorOrder = await vendorOrderRepository.findOne({ + where: { + id: vendorOrderId, + vendor: { + id: vendorId, + }, + }, + relations: ['vendor', 'order.buyer', 'vendorOrderItems', 'vendorOrderItems.product'], + }); + + if (!vendorOrder) { + return responseError(res, 404, `Order Not Found.`); + } + + const sanitizedOrderResponse = { + id: vendorOrder.id, + totalPrice: vendorOrder.totalPrice, + orderStatus: vendorOrder.orderStatus, + address: vendorOrder.order.address, + createdAt: vendorOrder.createdAt, + updatedAt: vendorOrder.updatedAt, + vendor: { + id: vendorOrder.vendor.id, + firstName: vendorOrder.vendor.firstName, + lastName: vendorOrder.vendor.lastName, + email: vendorOrder.vendor.email, + gender: vendorOrder.vendor.gender, + phoneNumber: vendorOrder.vendor.phoneNumber, + photoUrl: vendorOrder.vendor.photoUrl, + }, + buyer: { + id: vendorOrder.order.buyer.id, + firstName: vendorOrder.order.buyer.firstName, + lastName: vendorOrder.order.buyer.lastName, + email: vendorOrder.order.buyer.lastName, + gender: vendorOrder.order.buyer.gender, + phoneNumber: vendorOrder.order.buyer.phoneNumber, + photoUrl: vendorOrder.order.buyer.photoUrl, + }, + vendorOrderItems: vendorOrder.vendorOrderItems, + }; + + responseSuccess(res, 200, 'Order retrieved successfully', { + order: sanitizedOrderResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/vendorOrderServices/updateVendorOrder.ts b/src/services/vendorOrderServices/updateVendorOrder.ts new file mode 100644 index 0000000..cae2c60 --- /dev/null +++ b/src/services/vendorOrderServices/updateVendorOrder.ts @@ -0,0 +1,87 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { OrderItem } from '../../entities/OrderItem'; +import { responseError, responseSuccess } from '../../utils/response.utils'; +import sendMail from '../../utils/sendOrderMail'; +import { VendorOrders } from '../../entities/vendorOrders'; +import { getIO } from '../../utils/socket'; + +export const updateVendorOrderService = async (req: Request, res: Response) => { + try { + const vendorOrderId = req.params.id; + const { orderStatus } = req.body; + if ( + !['pending', 'is-accepted', 'in-transit', 'cancelled', 'delivered'].includes( + (orderStatus as string).toLowerCase() + ) + ) { + return responseError(res, 400, `Please provide one of defined statuses.`); + } + + const vendorOrderRepository = getRepository(VendorOrders); + const vendorId = req.user?.id; + + const vendorOrder = await vendorOrderRepository.findOne({ + where: { + id: vendorOrderId, + vendor: { + id: vendorId, + }, + }, + relations: ['vendor', 'order.buyer', 'vendorOrderItems', 'vendorOrderItems.product'], + }); + + if (!vendorOrder) { + return responseError(res, 404, `Order Not Found.`); + } + + // Check if order can be updated + if (['delivered', 'cancelled', 'completed'].includes(vendorOrder.orderStatus)) { + return responseError(res, 409, `Order cannot be updated once it is marked as ${vendorOrder.orderStatus}`); + } + + vendorOrder.orderStatus = (orderStatus as string).toLowerCase(); + + // Save updated order status + const updatedVendorOrder = await vendorOrderRepository.save(vendorOrder); + + const sanitizedOrderResponse = { + id: updatedVendorOrder.id, + totalPrice: updatedVendorOrder.totalPrice, + orderStatus: updatedVendorOrder.orderStatus, + address: updatedVendorOrder.order.address, + createdAt: updatedVendorOrder.createdAt, + updatedAt: updatedVendorOrder.updatedAt, + vendor: { + id: updatedVendorOrder.vendor.id, + firstName: updatedVendorOrder.vendor.firstName, + lastName: updatedVendorOrder.vendor.lastName, + email: updatedVendorOrder.vendor.email, + gender: updatedVendorOrder.vendor.gender, + phoneNumber: updatedVendorOrder.vendor.phoneNumber, + photoUrl: updatedVendorOrder.vendor.photoUrl, + }, + buyer: { + id: updatedVendorOrder.order.buyer.id, + firstName: updatedVendorOrder.order.buyer.firstName, + lastName: updatedVendorOrder.order.buyer.lastName, + email: updatedVendorOrder.order.buyer.lastName, + gender: updatedVendorOrder.order.buyer.gender, + phoneNumber: updatedVendorOrder.order.buyer.phoneNumber, + photoUrl: updatedVendorOrder.order.buyer.photoUrl, + }, + vendorOrderItems: updatedVendorOrder.vendorOrderItems, + }; + + getIO().emit('orders', { + action: 'vendor update', + order: sanitizedOrderResponse, + }); + + return responseSuccess(res, 200, 'Order updated successfully', { + order: sanitizedOrderResponse, + }); + } catch (error) { + return responseError(res, 400, (error as Error).message); + } +}; diff --git a/src/services/wishListServices/addProduct.ts b/src/services/wishListServices/addProduct.ts index da3db89..79d0a38 100644 --- a/src/services/wishListServices/addProduct.ts +++ b/src/services/wishListServices/addProduct.ts @@ -4,57 +4,54 @@ import { getRepository } from 'typeorm'; import { wishList } from '../../entities/wishList'; import { Product } from '../../entities/Product'; -export const addProductService = async (req:Request,res:Response)=>{ - try { +export const addProductService = async (req: Request, res: Response) => { + try { + const id = req.params.id; + const wishListRepository = getRepository(wishList); + const productRepository = getRepository(Product); - const id = req.params.id; - const wishListRepository = getRepository(wishList); - const productRepository = getRepository(Product); + const product = await productRepository.findOne({ where: { id } }); + if (!product) { + return res.status(404).json({ message: 'Product not found' }); + } - const product = await productRepository.findOne({where: { id }}); - - if(!product){ - return res.status(404).json({message: "Product not found"}); - } - - const productDetails = { - productId: product.id, - name: product.name, - image: product.images, - newPrice: product.newPrice, - vendorId: product.vendor - } - - const alreadyIn = await wishListRepository.findOne({where: {productId: id, buyer:{ id: req.user?.id} }}) - - if(alreadyIn){ - return res.status(401).json({ - data: { - message: 'Product Already in the wish list', - wishlistAdded: alreadyIn, - product: productDetails, - }, - }) - } - - const addNewProduct = new wishList(); - addNewProduct.productId = id; - addNewProduct.buyer = req.user as User; - - await wishListRepository.save(addNewProduct); + const productDetails = { + productId: product.id, + name: product.name, + image: product.images, + newPrice: product.newPrice, + vendorId: product.vendor, + }; - addNewProduct.buyer = { id: addNewProduct.buyer.id } as unknown as User; + const alreadyIn = await wishListRepository.findOne({ where: { productId: id, buyer: { id: req.user?.id } } }); - return res.status(201).json({ + if (alreadyIn) { + return res.status(401).json({ data: { - message: 'Product Added to wish list', - wishlistAdded: addNewProduct, + message: 'Product Already in the wish list', + wishlistAdded: alreadyIn, product: productDetails, - }, - }); - - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); + }, + }); } -} \ No newline at end of file + + const addNewProduct = new wishList(); + addNewProduct.productId = id; + addNewProduct.buyer = req.user as User; + + await wishListRepository.save(addNewProduct); + + addNewProduct.buyer = { id: addNewProduct.buyer.id } as unknown as User; + + return res.status(201).json({ + data: { + message: 'Product Added to wish list', + wishlistAdded: addNewProduct, + product: productDetails, + }, + }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/services/wishListServices/clearAll.ts b/src/services/wishListServices/clearAll.ts index 88af3c6..7299454 100644 --- a/src/services/wishListServices/clearAll.ts +++ b/src/services/wishListServices/clearAll.ts @@ -2,19 +2,18 @@ import { Request, Response } from 'express'; import { getRepository } from 'typeorm'; import { wishList } from '../../entities/wishList'; -export const clearAllProductService = async (req:Request,res:Response)=>{ - try { - const wishListRepository = getRepository(wishList); - const productsForBuyer = await wishListRepository.find({where: { buyer:{ id: req.user?.id} }}); +export const clearAllProductService = async (req: Request, res: Response) => { + try { + const wishListRepository = getRepository(wishList); + const productsForBuyer = await wishListRepository.find({ where: { buyer: { id: req.user?.id } } }); - if (productsForBuyer.length === 0) { - return res.status(404).json({ message: 'No products in wish list' }); - } - - await wishListRepository.remove(productsForBuyer); - return res.status(200).json({ message: 'All products removed successfully'}); - - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); + if (productsForBuyer.length === 0) { + return res.status(404).json({ message: 'No products in wish list' }); } -} \ No newline at end of file + + await wishListRepository.remove(productsForBuyer); + return res.status(200).json({ message: 'All products removed successfully' }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/services/wishListServices/getProducts.ts b/src/services/wishListServices/getProducts.ts index 107f3aa..98dc434 100644 --- a/src/services/wishListServices/getProducts.ts +++ b/src/services/wishListServices/getProducts.ts @@ -3,36 +3,37 @@ import { getRepository } from 'typeorm'; import { wishList } from '../../entities/wishList'; import { Product } from '../../entities/Product'; -export const getProductsService = async (req:Request,res:Response)=>{ - try { - const wishListRepository = getRepository(wishList); - const productRepository =getRepository(Product); +export const getProductsService = async (req: Request, res: Response) => { + try { + const wishListRepository = getRepository(wishList); + const productRepository = getRepository(Product); - const productsForBuyer = await wishListRepository.find({where: { buyer:{ id: req.user?.id} }}); + const productsForBuyer = await wishListRepository.find({ where: { buyer: { id: req.user?.id } } }); - if (productsForBuyer.length === 0) { - return res.status(404).json({ message: 'No products in wish list', products: productsForBuyer }); - } - - const buyerWishProducts = await Promise.all(productsForBuyer.map(async (product) => { - const productDetails = await productRepository.findOne({ where: { id: product.productId } }); - if(productDetails){ - return { - wishListDetails: product, - productInfo: { - productId: productDetails.id, - name: productDetails.name, - image: productDetails.images, - newPrice: productDetails.newPrice, - vendorId: productDetails.vendor - } - }; - } - })); + if (productsForBuyer.length === 0) { + return res.status(404).json({ message: 'No products in wish list', products: productsForBuyer }); + } - return res.status(200).json({ message: 'Products retrieved', productsForBuyer: buyerWishProducts }); + const buyerWishProducts = await Promise.all( + productsForBuyer.map(async product => { + const productDetails = await productRepository.findOne({ where: { id: product.productId } }); + if (productDetails) { + return { + wishListDetails: product, + productInfo: { + productId: productDetails.id, + name: productDetails.name, + image: productDetails.images, + newPrice: productDetails.newPrice, + vendorId: productDetails.vendor, + }, + }; + } + }) + ); - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); - } -} \ No newline at end of file + return res.status(200).json({ message: 'Products retrieved', productsForBuyer: buyerWishProducts }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/services/wishListServices/removeProducts.ts b/src/services/wishListServices/removeProducts.ts index cb99c0f..b42052f 100644 --- a/src/services/wishListServices/removeProducts.ts +++ b/src/services/wishListServices/removeProducts.ts @@ -2,22 +2,20 @@ import { Request, Response } from 'express'; import { getRepository } from 'typeorm'; import { wishList } from '../../entities/wishList'; -export const removeProductService = async (req:Request,res:Response)=>{ - try { +export const removeProductService = async (req: Request, res: Response) => { + try { + const id = parseInt(req.params.id); + const wishListRepository = getRepository(wishList); - const id = parseInt(req.params.id); - const wishListRepository = getRepository(wishList); + const product = await wishListRepository.findOne({ where: { id } }); - const product = await wishListRepository.findOne({where: { id }}); - - if(!product){ - return res.status(404).json({message: "Product not found in wish list"}); - } - - await wishListRepository.remove(product); - return res.status(200).json({ message: "Product removed from wish list" }); - - } catch (error) { - return res.status(500).json({ error: 'Internal server error' }); + if (!product) { + return res.status(404).json({ message: 'Product not found in wish list' }); } -} \ No newline at end of file + + await wishListRepository.remove(product); + return res.status(200).json({ message: 'Product removed from wish list' }); + } catch (error) { + return res.status(500).json({ error: 'Internal server error' }); + } +}; diff --git a/src/startups/getSwaggerServer.ts b/src/startups/getSwaggerServer.ts index efe12fa..6a7416d 100644 --- a/src/startups/getSwaggerServer.ts +++ b/src/startups/getSwaggerServer.ts @@ -7,7 +7,7 @@ function getSwaggerServer (): string { return process.env.SWAGGER_SERVER; } - return `http://localhost:${process.env.PORT}/api/v1`; + return `http://localhost:${process.env.PORT}`; } export { getSwaggerServer }; diff --git a/src/utils/auth.ts b/src/utils/auth.ts index 91874e3..623883f 100644 --- a/src/utils/auth.ts +++ b/src/utils/auth.ts @@ -1,72 +1,66 @@ /* eslint-disable camelcase */ import passport from 'passport'; -import { Strategy } from "passport-google-oauth20"; +import { Strategy } from 'passport-google-oauth20'; import { User } from '../entities/User'; import { getRepository } from 'typeorm'; import bcrypt from 'bcrypt'; -import "../utils/auth"; +import '../utils/auth'; passport.use( - new Strategy( - { - clientID: process.env.GOOGLE_CLIENT_ID as string, - clientSecret: process.env.GOOGLE_CLIENT_SECRET as string, - callbackURL: 'http://localhost:6890/user/auth/google/callback/', - scope: ['email', 'profile'], - }, - async (accessToken: any, refreshToken: any, profile: any, cb: any) => { - const userRepository = getRepository(User); - const { family_name, - name, - picture, - email, - email_verified + new Strategy( + { + clientID: process.env.GOOGLE_CLIENT_ID as string, + clientSecret: process.env.GOOGLE_CLIENT_SECRET as string, + callbackURL: 'http://localhost:6890/user/auth/google/callback/', + scope: ['email', 'profile'], + }, + async (accessToken: any, refreshToken: any, profile: any, cb: any) => { + const userRepository = getRepository(User); + const { family_name, name, picture, email, email_verified } = profile._json; + const { familyName, givenName } = profile.name; - } = profile._json; - const { familyName, givenName } = profile.name; + if (email || givenName || family_name || picture) { + try { + // Check for existing user + const existingUser = await userRepository.findOneBy({ email }); - if (email || givenName || family_name || picture) { - try { - // Check for existing user - const existingUser = await userRepository.findOneBy({ email }); + if (existingUser) { + return await cb(null, existingUser); + } + const saltRounds = 10; + const hashedPassword = await bcrypt.hash('password', saltRounds); + const newUser = new User(); + newUser.firstName = givenName; + newUser.lastName = family_name ?? familyName ?? 'undefined'; + newUser.email = email; + newUser.userType = 'Buyer'; + newUser.photoUrl = picture; + newUser.gender = 'Not specified'; + newUser.phoneNumber = 'Not specified'; + newUser.password = hashedPassword; + newUser.verified = email_verified; - if (existingUser) { - return await cb(null, existingUser); - } - const saltRounds = 10; - const hashedPassword = await bcrypt.hash("password", saltRounds); - const newUser = new User(); - newUser.firstName = givenName; - newUser.lastName = family_name ?? familyName ?? "undefined"; - newUser.email = email; - newUser.userType = 'Buyer'; - newUser.photoUrl = picture; - newUser.gender = "Not specified"; - newUser.phoneNumber = "Not specified"; - newUser.password = hashedPassword; - newUser.verified = email_verified; - - await userRepository.save(newUser); - return await cb(null, newUser); - } catch (error) { - console.error(error); - return await cb(error, null); - } - } - return await cb(null, profile, { message: 'Missing required profile information' }); + await userRepository.save(newUser); + return await cb(null, newUser); + } catch (error) { + console.error(error); + return await cb(error, null); } - ) + } + return await cb(null, profile, { message: 'Missing required profile information' }); + } + ) ); passport.serializeUser((user: any, cb) => { - cb(null, user.id); + cb(null, user.id); }); passport.deserializeUser(async (id: any, cb) => { - const userRepository = getRepository(User); - try { - const user = await userRepository.findOneBy({id}); - cb(null, user); - } catch (error) { - cb(error); - } + const userRepository = getRepository(User); + try { + const user = await userRepository.findOneBy({ id }); + cb(null, user); + } catch (error) { + cb(error); + } }); diff --git a/src/utils/index.ts b/src/utils/index.ts index 490375a..fdc7feb 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1 +1,20 @@ // export all utils +/** + * Format a number as a currency string. + * @param amount - The amount to format. + * @param currency - The currency code (e.g., 'USD', 'EUR'). Defaults to 'USD'. + * @returns The formatted currency string. + */ +export function formatMoney (amount: number, currency: string = 'RWF'): string { + return amount.toLocaleString('en-US', { style: 'currency', currency }); +} +/** + * Format a date string into a more readable format. + * @param dateString - The date string to format. + * @returns The formatted date string. + */ +export function formatDate (dateString: Date): string { + const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' }; + const date = new Date(dateString); + return date.toLocaleDateString('en-US', options); +} diff --git a/src/utils/response.utils.ts b/src/utils/response.utils.ts index 3fd1ce5..f0e5513 100644 --- a/src/utils/response.utils.ts +++ b/src/utils/response.utils.ts @@ -45,3 +45,11 @@ export const responseServerError = (res: Response, error: string): Response { + return res.status(statusCode).json({ status: 'success', message, data }); +}; + +export const sendErrorResponse = (res: Response, statusCode: number, message: string) => { + return res.status(statusCode).json({ status: 'error', message }); +}; diff --git a/src/utils/sendOrderMail.ts b/src/utils/sendOrderMail.ts new file mode 100644 index 0000000..72ee5b0 --- /dev/null +++ b/src/utils/sendOrderMail.ts @@ -0,0 +1,215 @@ +import nodemailer from 'nodemailer'; +import { formatMoney, formatDate } from './index'; + +interface Product { + name: string; + newPrice: number; + quantity: number; +} + +interface Message { + subject: string; + fullName: string; + email: string; + products: Product[]; + totalAmount: number; + quantity: number; + orderDate: Date; + address: string; +} + +const sendMail = async (message: Message) => { + const transporter = nodemailer.createTransport({ + host: process.env.HOST, + port: 587, + secure: false, // true for 465, false for other ports + auth: { + user: process.env.AUTH_EMAIL as string, + pass: process.env.AUTH_PASSWORD as string, + }, + }); + + const { subject, fullName, email, products, totalAmount, quantity, orderDate, address } = message; + + const mailOptions = { + to: email, + subject: subject, + html: ` + + + + + + + Order Details + + + + +
+ shoping image +

Order Success

+
+

User information

+ + + + + + + + + + + + + + + +
Full Name:Email:Address:
${fullName}${email}${address}
+ + + + + + + + + + + + + + + +
Order Date:Quantity:Total Amount:
${formatDate(orderDate)}${quantity}${formatMoney(totalAmount)}
+
+
+

Products

+ + + + + + + + ${products + .map( + (product: Product) => ` + + + + + + + ` + ) + .join('')} + + + + +
Product NameProduct PriceQuantityTotal
${product.name}${formatMoney(product.newPrice)}${product.quantity}${product.quantity * product.newPrice}
Total${totalAmount}
+
+
+ © 2024 Knights Andela shop. All rights reserved. +
+
+ + + `, + }; + + try { + const info = await transporter.sendMail(mailOptions); + console.log('Email sent: ' + info.response); + } catch (error) { + console.log('Error occurred while sending email', error); + } +}; + +export default sendMail; diff --git a/src/utils/sendOrderMailUpdated.ts b/src/utils/sendOrderMailUpdated.ts new file mode 100644 index 0000000..adddc9a --- /dev/null +++ b/src/utils/sendOrderMailUpdated.ts @@ -0,0 +1,215 @@ +import nodemailer from 'nodemailer'; +import { formatMoney, formatDate } from './index'; + +interface Product { + name: string; + newPrice: number; + quantity: number; +} + +interface Message { + subject: string; + fullName: string; + email: string; + products: Product[]; + totalAmount: number; + quantity: number; + orderDate: Date; + address: string; +} + +const sendMail = async (message: Message) => { + const transporter = nodemailer.createTransport({ + host: process.env.HOST, + port: 587, + secure: false, // true for 465, false for other ports + auth: { + user: process.env.AUTH_EMAIL as string, + pass: process.env.AUTH_PASSWORD as string, + }, + }); + + const { subject, fullName, email, products, totalAmount, quantity, orderDate, address } = message; + + const mailOptions = { + to: email, + subject: subject, + html: ` + + + + + + + Your order details have been updated + + + + +
+ shoping image +

Order Updated

+
+

User information

+ + + + + + + + + + + + + + + +
Full Name:Email:Address:
${fullName}${email}${address}
+ + + + + + + + + + + + + + + +
Order Date:Quantity:Total Amount:
${formatDate(orderDate)}${quantity}${formatMoney(totalAmount)}
+
+
+

Products

+ + + + + + + + ${products + .map( + (product: Product) => ` + + + + + + + ` + ) + .join('')} + + + + +
Product NameProduct PriceQuantityTotal
${product.name}${formatMoney(product.newPrice)}${product.quantity}${product.quantity * product.newPrice}
Total${totalAmount}
+
+
+ © 2024 Knights Andela shop. All rights reserved. +
+
+ + + `, + }; + + try { + const info = await transporter.sendMail(mailOptions); + console.log('Email sent: ' + info.response); + } catch (error) { + console.log('Error occurred while sending email', error); + } +}; + +export default sendMail; diff --git a/src/utils/socket.ts b/src/utils/socket.ts new file mode 100644 index 0000000..e32ae19 --- /dev/null +++ b/src/utils/socket.ts @@ -0,0 +1,21 @@ +import { Server as HTTPServer } from 'http'; +import { Server as SocketIOServer } from 'socket.io'; + +let io: SocketIOServer | undefined; + +export const init = (httpServer: HTTPServer): SocketIOServer => { + io = new SocketIOServer(httpServer, { + cors: { + origin: '*', + methods: ['GET', 'POST', 'DELETE', 'PUT'], + }, + }); + return io; +}; + +export const getIO = (): SocketIOServer => { + if (!io) { + throw new Error('Socket.io not initialized!'); + } + return io; +}; diff --git a/tsconfig.json b/tsconfig.json index 4665a6d..d58c75f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,108 +1,108 @@ { - "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - /* Language and Environment */ - "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - "experimentalDecorators": true /* Enable experimental support for legacy experimental decorators. */, - "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */, - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - /* Modules */ - "module": "commonjs" /* Specify what module code is generated. */, - "rootDir": "./src" /* Specify the root folder within your source files. */, - // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - "types": [ - "node", - "jest", - "express", - "joi" - ] /* Specify type package names to be included without being referenced in a source file. */, - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ - // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ - // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ - // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - /* JavaScript Support */ - "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */, - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./dist" /* Specify an output folder for all emitted files. */, - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, - /* Type Checking */ - "strict": true /* Enable all strict type-checking options. */, - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ - }, - "include": ["src/**/*.ts"], - "exclude": ["node_modules"] - } \ No newline at end of file + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + /* Language and Environment */ + "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + "experimentalDecorators": true /* Enable experimental support for legacy experimental decorators. */, + "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */, + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + /* Modules */ + "module": "commonjs" /* Specify what module code is generated. */, + "rootDir": "./src" /* Specify the root folder within your source files. */, + // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + "types": [ + "node", + "jest", + "express", + "joi" + ] /* Specify type package names to be included without being referenced in a source file. */, + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + /* JavaScript Support */ + "allowJs": true /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */, + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + "outDir": "./dist" /* Specify an output folder for all emitted files. */, + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, + /* Type Checking */ + "strict": true /* Enable all strict type-checking options. */, + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + }, + "include": ["src/**/*.ts"], + "exclude": ["node_modules"] +} From f976460b3d83f4316ba66c9ef5ccf2ca9e25fb1f Mon Sep 17 00:00:00 2001 From: Iadivin Date: Fri, 31 May 2024 07:53:48 +0200 Subject: [PATCH 18/20] feat(docker): implement Docker for project - Include Docker file to build image for project and containerize the project - Configure Docker compose for easy setup --- .dockerignore | 5 +++++ Dockerfile | 13 +++++++++++++ README.md | 18 ++++++++++++++++++ docker-compose.yml | 27 +++++++++++++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..2deef83 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +node_modules +npm-debug.log +Dockerfile +docker-compose.yml +.dockerignore \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5190e01 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM node:20-alpine + +WORKDIR /app + +COPY package.json . + +RUN npm install + +COPY . . + +EXPOSE $PORT + +CMD ["npm", "run", "dev"] diff --git a/README.md b/README.md index 0d6c5f0..453c9d5 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,24 @@ logger.debug('This is a debug message'); npm test ``` +### Setting up docker and using it + +- Download and install docker + ``` + https://www.docker.com/products/docker-desktop/ + ``` +- Download Subsystem for Linux for none linux users +- Set environment varibles like database host to postgresdb + +- Building the image, you must navigate to the project directory in the terminal, then run + ``` + docker-compose up --build + ``` +- Stoping docker-compose container, run + ``` + docker-compose down + ``` + ## Authors - [Maxime Mizero](https://github.com/maxCastro1) diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..99ed647 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,27 @@ +version: '3.8' + +services: + postgresdb: + image: postgres + environment: + POSTGRES_USER: $DEV_DB_USER + POSTGRES_PASSWORD: $DEV_DB_PASS + POSTGRES_DB: $DEV_DB_NAME + volumes: + - knights-data:/var/lib/postgresql/data + + node-app: + build: . + volumes: + - .:/app + - /app/node_modules + image: knights-app:1.0 + env_file: + - ./.env + ports: + - $PORT:$PORT + depends_on: + - postgresdb + +volumes: + knights-data: From c5aa42c180c9bd5e7f99e055d60f99f374cfbf5d Mon Sep 17 00:00:00 2001 From: Icyeza Date: Thu, 30 May 2024 13:15:07 +0200 Subject: [PATCH 19/20] Implement buyer able to leave feedback on products ft adding discount coupon feature implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue adding documentation and tests writing tests Feat-Buyer-coupon-discount-management implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue implementing order tracking and order managment issue adding documentation and tests writing tests implementing stripe payment system implementing stripe payment system Implement buyer able to leave feedback on products Implement buyer able to leave feedback on products --- src/__test__/cart.test.ts | 219 ++++++++++-------- src/__test__/test-assets/DatabaseCleanup.ts | 2 + src/controllers/feedbackController.ts | 21 ++ src/entities/Feedback.ts | 30 +++ src/entities/Order.ts | 5 + src/entities/Product.ts | 5 +- src/entities/User.ts | 3 + src/routes/ProductRoutes.ts | 1 - src/routes/feedbackRoutes.ts | 19 ++ src/routes/index.ts | 2 + .../feedbackServices/adminDeleteFeedback.ts | 25 ++ .../feedbackServices/createFeedback.ts | 44 ++++ .../feedbackServices/deleteFeedback.ts | 27 +++ .../feedbackServices/updateFeedback.ts | 32 +++ src/services/orderServices/createOrder.ts | 14 +- .../getOrderTransactionHistory.ts | 2 - .../orderServices/updateOrderService.ts | 5 - .../getRecommendedProductsService.ts | 1 + .../productServices/listAllProductsService.ts | 2 +- src/services/productServices/readProduct.ts | 2 +- .../productServices/viewSingleProduct.ts | 2 +- 21 files changed, 338 insertions(+), 125 deletions(-) create mode 100644 src/controllers/feedbackController.ts create mode 100644 src/entities/Feedback.ts create mode 100644 src/routes/feedbackRoutes.ts create mode 100644 src/services/feedbackServices/adminDeleteFeedback.ts create mode 100644 src/services/feedbackServices/createFeedback.ts create mode 100644 src/services/feedbackServices/deleteFeedback.ts create mode 100644 src/services/feedbackServices/updateFeedback.ts diff --git a/src/__test__/cart.test.ts b/src/__test__/cart.test.ts index 4d6d1f0..7fe7146 100644 --- a/src/__test__/cart.test.ts +++ b/src/__test__/cart.test.ts @@ -14,6 +14,7 @@ import { cleanDatabase } from './test-assets/DatabaseCleanup'; const vendor1Id = uuid(); const buyer1Id = uuid(); const buyer2Id = uuid(); +const buyer3Id = uuid(); const product1Id = uuid(); const product2Id = uuid(); const catId = uuid(); @@ -52,7 +53,7 @@ const sampleBuyer1: UserInterface = { id: buyer1Id, firstName: 'buyer1', lastName: 'user', - email: 'elijahladdiedv@gmail.com', + email: 'manger@gmail.com', password: 'password', userType: 'Buyer', gender: 'Male', @@ -65,7 +66,7 @@ const sampleBuyer2: UserInterface = { id: buyer2Id, firstName: 'buyer1', lastName: 'user', - email: 'buyer1112@example.com', + email: 'elijahladdiedv@example.com', password: 'password', userType: 'Buyer', gender: 'Male', @@ -73,6 +74,18 @@ const sampleBuyer2: UserInterface = { photoUrl: 'https://example.com/photo.jpg', role: 'BUYER', }; +const sampleBuyer3: UserInterface = { + id: buyer3Id, + firstName: 'buyer1', + lastName: 'user', + email: 'elhladdiedv@example.com', + password: 'password', + userType: 'Admin', + gender: 'Male', + phoneNumber: '121163800', + photoUrl: 'https://example.com/photo.jpg', + role: 'ADMIN', +}; const sampleCat = { id: catId, @@ -175,7 +188,7 @@ afterAll(async () => { server.close(); }); -describe('Cart management for guest/buyer', () => { +describe('Cart| Order management for guest/buyer', () => { describe('Creating new product', () => { it('should create new product', async () => { const response = await request(app) @@ -376,6 +389,108 @@ describe('Cart management for guest/buyer', () => { }); }); + describe('Order management tests', () => { + let orderId: any; + let productId: any; + let feedbackId: any; + let feedback2Id: any; + describe('Create order', () => { + it('should return 400 when user ID is not provided', async () => { + const response = await request(app) + .post('/product/orders') + .send({ + address: { + country: 'Test Country', + city: 'Test City', + street: 'Test Street', + }, + }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(201); + }); + + it('should return orders for the buyer', async () => { + const response = await request(app) + .get('/product/client/orders') + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(200); + orderId = response.body.data.orders[0]?.id; + productId = response.body.data.orders[0]?.orderItems[0]?.product?.id; + }); + it('should return 404 if the buyer has no orders', async () => { + const response = await request(app) + .get('/product/client/orders') + .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); + expect(response.status).toBe(404); + expect(response.body.message).toBeUndefined; + }); + + it('should return transaction history for the buyer', async () => { + const response = await request(app) + .get('/product/orders/history') + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(200); + expect(response.body.message).toBe('Transaction history retrieved successfully'); + }); + + it('should return 400 when user ID is not provided', async () => { + const response = await request(app) + .get('/product/orders/history') + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(200); + }); + }); + + describe('Update order', () => { + it('should update order status successfully', async () => { + const response = await request(app) + .put(`/product/client/orders/${orderId}`) + .send({ orderStatus: 'completed' }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(200); + }); + }); + describe('Add feedback to the product with order', () => { + it('should create new feedback to the ordered product', async () => { + const response = await request(app) + .post(`/feedback/${productId}/new`) + .send({ orderId, comment: 'Well this product looks so fantastic' }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(201); + feedbackId = response.body.data.id + }); + it('should create new feedback to the ordered product', async () => { + const response = await request(app) + .post(`/feedback/${productId}/new`) + .send({ orderId, comment: 'Murigalike this product looks so fantastic' }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(201); + feedback2Id = response.body.data.id + }); + it('should updated existing feedback successfully', async () => { + const response = await request(app) + .put(`/feedback/update/${feedbackId}`,) + .send({ orderId, comment: 'Well this product looks so lovely' }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(200); + }); + it('should remove recorded feedback', async () => { + const response = await request(app) + .delete(`/feedback/delete/${feedbackId}`) + .send({ orderId, comment: 'Well this product looks so lovely' }) + .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); + expect(response.status).toBe(200); + }); + it('should remove recorder feedback as admin ', async () => { + const response = await request(app) + .delete(`/feedback/admin/delete/${feedback2Id}`) + .send({ orderId, comment: 'Well this product looks so lovely' }) + .set('Authorization', `Bearer ${getAccessToken(buyer3Id, sampleBuyer3.email)}`); + expect(response.status).toBe(401); + }); + }); + }); + describe('Deleting product from cart', () => { it('should return 404 if product does not exist in cart', async () => { const response = await request(app) @@ -511,101 +626,3 @@ describe('Cart management for guest/buyer', () => { }); }); }); - -describe('Order management tests', () => { - let orderId: string | null; - describe('Create order', () => { - it('should return 400 when user ID is not provided', async () => { - const response = await request(app) - .post('/product/orders') - .send({ - address: { - country: 'Test Country', - city: 'Test City', - street: 'Test Street', - }, - }) - .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); - expect(response.status).toBe(400); - }); - - it('should create a new order', async () => { - const response = await request(app) - .post('/product/orders') - .send({ - address: { - country: 'Test Country', - city: 'Test City', - street: 'Test Street', - }, - }) - .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); - - expect(response.status).toBe(400); - expect(response.body.message).toBeUndefined; - orderId = response.body.data?.orderId; // Assuming orderId is returned in response - }); - - it('should insert a new order', async () => { - const response = await request(app) - .post('/product/orders') - .send({ - address: { - country: 'Test Country', - city: 'Test City', - street: 'Test Street', - }, - }) - .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); - - expect(response.status).toBe(400); - expect(response.body.message).toBeUndefined; - orderId = response.body.data?.orderId; // Assuming orderId is returned in response - }); - }); - - describe('Get orders', () => { - it('should return orders for the buyer', async () => { - const response = await request(app) - .get('/product/client/orders') - .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); - expect(response.status).toBe(404); - expect(response.body.message).toBeUndefined; - }); - - it('should return 404 if the buyer has no orders', async () => { - const response = await request(app) - .get('/product/client/orders') - .set('Authorization', `Bearer ${getAccessToken(buyer2Id, sampleBuyer2.email)}`); - expect(response.status).toBe(404); - expect(response.body.message).toBeUndefined; - }); - }); - - describe('Get transaction history', () => { - it('should return transaction history for the buyer', async () => { - const response = await request(app) - .get('/product/orders/history') - .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); - expect(response.status).toBe(404); - expect(response.body.message).toBe('No transaction history found'); - }); - - it('should return 400 when user ID is not provided', async () => { - const response = await request(app) - .get('/product/orders/history') - .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); - expect(response.status).toBe(404); - }); - }); - - describe('Update order', () => { - it('should update order status successfully', async () => { - const response = await request(app) - .put(`/product/client/orders/${orderId}`) - .send({ orderStatus: 'delivered' }) - .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`); - expect(response.status).toBe(500); - }); - }); -}); diff --git a/src/__test__/test-assets/DatabaseCleanup.ts b/src/__test__/test-assets/DatabaseCleanup.ts index 3674dfb..b8739d1 100644 --- a/src/__test__/test-assets/DatabaseCleanup.ts +++ b/src/__test__/test-assets/DatabaseCleanup.ts @@ -12,11 +12,13 @@ import { User } from '../../entities/User'; import { server } from '../..'; import { VendorOrderItem } from '../../entities/VendorOrderItem'; import { VendorOrders } from '../../entities/vendorOrders'; +import { Feedback } from '../../entities/Feedback'; export const cleanDatabase = async () => { const connection = getConnection(); // Delete from child tables first + await connection.getRepository(Feedback).delete({}); await connection.getRepository(Transaction).delete({}); await connection.getRepository(Coupon).delete({}); await connection.getRepository(VendorOrderItem).delete({}); diff --git a/src/controllers/feedbackController.ts b/src/controllers/feedbackController.ts new file mode 100644 index 0000000..0cbce14 --- /dev/null +++ b/src/controllers/feedbackController.ts @@ -0,0 +1,21 @@ +import { Request, Response } from 'express'; +import { createFeedbackService } from '../services/feedbackServices/createFeedback'; +import { updateFeedbackService } from '../services/feedbackServices/updateFeedback'; +import { deleteFeedbackService } from '../services/feedbackServices/deleteFeedback'; +import { adminDeleteFeedbackService } from '../services/feedbackServices/adminDeleteFeedback'; + +export const createFeedback = async (req: Request, res: Response) => { + await createFeedbackService(req, res); +}; + +export const updateFeedback = async (req: Request, res: Response) => { + await updateFeedbackService(req, res); +}; + +export const deleteFeedback = async (req: Request, res: Response) => { + await deleteFeedbackService(req, res); +}; + +export const adminDeleteFeedback = async (req: Request, res: Response) => { + await adminDeleteFeedbackService(req, res); +}; diff --git a/src/entities/Feedback.ts b/src/entities/Feedback.ts new file mode 100644 index 0000000..6de9058 --- /dev/null +++ b/src/entities/Feedback.ts @@ -0,0 +1,30 @@ +import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, CreateDateColumn, UpdateDateColumn } from 'typeorm'; +import { User } from './User'; +import { Product } from './Product'; +import { IsNotEmpty } from 'class-validator'; +import { Order } from './Order'; + +@Entity() +export class Feedback { + @PrimaryGeneratedColumn('uuid') + @IsNotEmpty() + id!: string; + + @Column('text') + comment!: string; + + @ManyToOne(() => User, user => user.feedbacks) + user!: User; + + @ManyToOne(() => Product, product => product.feedbacks) + product!: Product; + + @ManyToOne(() => Order, order => order.feedbacks) + order!: Order; + + @CreateDateColumn() + createdAt!: Date; + + @UpdateDateColumn() + updatedAt!: Date; +} diff --git a/src/entities/Order.ts b/src/entities/Order.ts index 47649a7..faa19db 100644 --- a/src/entities/Order.ts +++ b/src/entities/Order.ts @@ -11,6 +11,7 @@ import { IsNotEmpty, IsNumber, IsDate, IsIn } from 'class-validator'; import { User } from './User'; import { OrderItem } from './OrderItem'; import { Transaction } from './transaction'; +import { Feedback } from './Feedback'; @Entity() export class Order { @@ -33,6 +34,10 @@ export class Order { @OneToMany(() => Transaction, transaction => transaction.order) transactions!: Transaction[]; + + @OneToMany(() => Feedback, feedback => feedback.order) + feedbacks!: Feedback[]; + @Column({ default: 'order placed' }) @IsNotEmpty() @IsIn([ diff --git a/src/entities/Product.ts b/src/entities/Product.ts index e144a04..ae027ef 100644 --- a/src/entities/Product.ts +++ b/src/entities/Product.ts @@ -19,11 +19,12 @@ import { Order } from './Order'; import { Coupon } from './coupon'; import { OrderItem } from './OrderItem'; import { VendorOrderItem } from './VendorOrderItem'; +import { Feedback } from './Feedback'; @Entity() @Unique(['id']) export class Product { - static query () { + static query() { throw new Error('Method not implemented.'); } @PrimaryGeneratedColumn('uuid') @@ -39,6 +40,8 @@ export class Product { @OneToMany(() => VendorOrderItem, vendorOrderItems => vendorOrderItems.product) vendorOrderItems!: VendorOrderItem[]; + @OneToMany(() => Feedback, feedback => feedback.product) + feedbacks!: Feedback[]; @OneToOne(() => Coupon, (coupons: any) => coupons.product) @JoinColumn() diff --git a/src/entities/User.ts b/src/entities/User.ts index ef256d7..232ce11 100644 --- a/src/entities/User.ts +++ b/src/entities/User.ts @@ -13,6 +13,7 @@ import { IsEmail, IsNotEmpty, IsString, IsBoolean, IsIn } from 'class-validator' import { roles } from '../utils/roles'; import { Order } from './Order'; import { Transaction } from './transaction'; +import { Feedback } from './Feedback'; export interface UserInterface { id?: string; @@ -111,6 +112,8 @@ export class User { @Column({ type: 'numeric', precision: 24, scale: 2, default: 0 }) accountBalance!: number; + @OneToMany(() => Feedback, feedback => feedback.product) + feedbacks!: Feedback[]; @BeforeInsert() setRole (): void { diff --git a/src/routes/ProductRoutes.ts b/src/routes/ProductRoutes.ts index 4a72b47..2352000 100644 --- a/src/routes/ProductRoutes.ts +++ b/src/routes/ProductRoutes.ts @@ -26,7 +26,6 @@ import { getSingleBuyerVendorOrder, updateBuyerVendorOrder, } from '../controllers'; - const router = Router(); router.get('/all', listAllProducts); router.get('/recommended', authMiddleware as RequestHandler, hasRole('BUYER'), getRecommendedProducts); diff --git a/src/routes/feedbackRoutes.ts b/src/routes/feedbackRoutes.ts new file mode 100644 index 0000000..3ada81b --- /dev/null +++ b/src/routes/feedbackRoutes.ts @@ -0,0 +1,19 @@ +import { RequestHandler, Router } from 'express'; +import { + createFeedback, + updateFeedback, + deleteFeedback, + adminDeleteFeedback +} from '../controllers/feedbackController' +import { authMiddleware } from '../middlewares/verifyToken'; +import { hasRole } from '../middlewares/roleCheck'; + + +const router = Router(); + +router.post('/:productId/new', authMiddleware as RequestHandler, hasRole('BUYER'), createFeedback); +router.put('/update/:feedbackId', authMiddleware as RequestHandler, hasRole('BUYER'), updateFeedback ); +router.delete('/delete/:feedbackId', authMiddleware as RequestHandler, hasRole('BUYER'), deleteFeedback); +router.delete('/admin/delete/:feedbackId', authMiddleware as RequestHandler, hasRole('ADMIN'), adminDeleteFeedback ); + +export default router; diff --git a/src/routes/index.ts b/src/routes/index.ts index 6f632d6..ee8dcdb 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -5,6 +5,7 @@ import productRoutes from './ProductRoutes'; import wishListRoutes from './wishListRoute'; import couponRoute from './couponRoutes'; import cartRoutes from './CartRoutes'; +import feedbackRoute from './feedbackRoutes'; const router = Router(); @@ -17,5 +18,6 @@ router.use('/product', productRoutes); router.use('/wish-list', wishListRoutes); router.use('/cart', cartRoutes); router.use('/coupons', couponRoute); +router.use('/feedback', feedbackRoute); export default router; diff --git a/src/services/feedbackServices/adminDeleteFeedback.ts b/src/services/feedbackServices/adminDeleteFeedback.ts new file mode 100644 index 0000000..7bf6261 --- /dev/null +++ b/src/services/feedbackServices/adminDeleteFeedback.ts @@ -0,0 +1,25 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { Feedback } from '../../entities/Feedback'; +import { responseError, responseSuccess } from '../../utils/response.utils'; + +export const adminDeleteFeedbackService = async (req: Request, res: Response) => { + const { feedbackId } = req.params; + + try { + const feedbackRepository = getRepository(Feedback); + const feedback = await feedbackRepository.findOne({ + where: { id: feedbackId }, + }); + + if (!feedback) { + return responseError(res, 404, 'Feedback not found'); + } + + await feedbackRepository.remove(feedback); + + return responseSuccess(res, 200, 'Feedback successfully removed'); + } catch (error) { + return responseError(res, 500, 'Server error'); + } +}; diff --git a/src/services/feedbackServices/createFeedback.ts b/src/services/feedbackServices/createFeedback.ts new file mode 100644 index 0000000..fa731f3 --- /dev/null +++ b/src/services/feedbackServices/createFeedback.ts @@ -0,0 +1,44 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { Feedback } from '../../entities/Feedback'; +import { Product } from '../../entities/Product'; +import { User } from '../../entities/User'; +import { responseError, responseSuccess } from '../../utils/response.utils'; +import { Order } from '../../entities/Order'; + +interface AuthRequest extends Request { + user?: User; +} + +export const createFeedbackService = async (req: Request, res: Response) => { + const { productId } = req.params; + const { comment, orderId } = req.body; + + try { + const feedbackRepository = getRepository(Feedback); + const productRepository = getRepository(Product); + const orderRepository = getRepository(Order); + if (!orderId) { + return responseError(res, 404, `Your feedback can't be recorded at this time Your order doesn't exist `); + } + const product = await productRepository.findOne({ where: { id: productId } }); + if (!product) { + return responseError(res, 404, `Your feedback can't be recorded at this time product not found`); + } + const order = await orderRepository.findBy({ id: orderId, orderStatus: 'completed', buyer: { id: req.user?.id }, orderItems: { product: { id: productId } } }) + if (!order.length) { + return responseError(res, 404, `Your feedback can't be recorded at this time Your order haven't been completed yet or doesn't contain this product`); + } + + const feedback = new Feedback(); + feedback.comment = comment; + feedback.user = req.user as User; + feedback.product = product; + + await feedbackRepository.save(feedback); + + return responseSuccess(res, 201, 'Feedback created successfully', feedback); + } catch (error) { + return responseError(res, 500, 'Server error'); + } +}; diff --git a/src/services/feedbackServices/deleteFeedback.ts b/src/services/feedbackServices/deleteFeedback.ts new file mode 100644 index 0000000..5de4ea0 --- /dev/null +++ b/src/services/feedbackServices/deleteFeedback.ts @@ -0,0 +1,27 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { Feedback } from '../../entities/Feedback'; +import { responseError, responseSuccess } from '../../utils/response.utils'; + +export const deleteFeedbackService = async (req: Request, res: Response) => { + const { feedbackId } = req.params; + + try { + const feedbackRepository = getRepository(Feedback); + const feedback = await feedbackRepository.findOne({ + where: { id: feedbackId, + user: {id: req?.user?.id }, + } + }); + + if (!feedback) { + return responseError(res, 404, 'Feedback not found'); + } + + await feedbackRepository.remove(feedback); + + return responseSuccess(res, 200, 'Feedback successfully removed'); + } catch (error) { + return responseError(res, 500, 'Server error'); + } +}; diff --git a/src/services/feedbackServices/updateFeedback.ts b/src/services/feedbackServices/updateFeedback.ts new file mode 100644 index 0000000..18258c2 --- /dev/null +++ b/src/services/feedbackServices/updateFeedback.ts @@ -0,0 +1,32 @@ +import { Request, Response } from 'express'; +import { getRepository } from 'typeorm'; +import { Feedback } from '../../entities/Feedback'; +import { responseError, responseSuccess } from '../../utils/response.utils'; +import { User } from '../../entities/User'; + +export const updateFeedbackService = async (req: Request, res: Response) => { + const { feedbackId } = req.params; + const { comment } = req.body; + + try { + const feedbackRepository = getRepository(Feedback); + + const feedback = await feedbackRepository.findOne({ + where: { + id: feedbackId, + user: { id: req?.user?.id }, + }, + }); + + if (!feedback) { + return responseError(res, 404, 'You are not allowed to remove this feedback or you are not allowed to edit this feedback'); + } + + feedback.comment = comment; + await feedbackRepository.save(feedback); + + return responseSuccess(res, 200, 'Feedback updated successfully', feedback); + } catch (error) { + return responseError(res, 500, 'Server error'); + } +}; diff --git a/src/services/orderServices/createOrder.ts b/src/services/orderServices/createOrder.ts index 256bf40..7e1916e 100644 --- a/src/services/orderServices/createOrder.ts +++ b/src/services/orderServices/createOrder.ts @@ -59,15 +59,6 @@ export const createOrderService = async (req: Request, res: Response) => { orderItem.quantity = item.quantity; orderItems.push(orderItem); } - - if (!buyer.accountBalance || buyer.accountBalance < totalPrice) { - return sendErrorResponse(res, 400, 'Not enough funds to perform this transaction'); - } - - const previousBalance = buyer.accountBalance; - buyer.accountBalance -= totalPrice; - const currentBalance = buyer.accountBalance; - const newOrder = new Order(); newOrder.buyer = buyer; newOrder.totalPrice = totalPrice; @@ -94,8 +85,6 @@ export const createOrderService = async (req: Request, res: Response) => { orderTransaction.user = buyer; orderTransaction.order = newOrder; orderTransaction.amount = totalPrice; - orderTransaction.previousBalance = previousBalance; - orderTransaction.currentBalance = currentBalance; orderTransaction.type = 'debit'; orderTransaction.description = 'Purchase of products'; await transactionalEntityManager.save(Transaction, orderTransaction); @@ -105,6 +94,7 @@ export const createOrderService = async (req: Request, res: Response) => { }); const orderResponse = { + id: newOrder.id, fullName: `${newOrder.buyer.firstName} ${newOrder.buyer.lastName}`, email: newOrder.buyer.email, products: orderItems.map(item => ({ @@ -174,7 +164,7 @@ const saveVendorRelatedOrder = async (order: Order, CartItem: CartItem[]) => { newVendorOrders.vendor = product.vendor; newVendorOrders.vendorOrderItems = [orderItem]; newVendorOrders.order = order; - newVendorOrders.totalPrice = +product.newPrice * item.quantity; + newVendorOrders.totalPrice = product.newPrice * item.quantity; vendorOrders = newVendorOrders; } diff --git a/src/services/orderServices/getOrderTransactionHistory.ts b/src/services/orderServices/getOrderTransactionHistory.ts index 74ae473..6bd0b17 100644 --- a/src/services/orderServices/getOrderTransactionHistory.ts +++ b/src/services/orderServices/getOrderTransactionHistory.ts @@ -23,8 +23,6 @@ export const getTransactionHistoryService = async (req: Request, res: Response) id: transaction.id, amount: transaction.amount, type: transaction.type, - previousBalance: transaction.previousBalance, - currentBalance: transaction.currentBalance, description: transaction.description, createdAt: transaction.createdAt, order: transaction.order diff --git a/src/services/orderServices/updateOrderService.ts b/src/services/orderServices/updateOrderService.ts index 6a163fe..bfddf1f 100644 --- a/src/services/orderServices/updateOrderService.ts +++ b/src/services/orderServices/updateOrderService.ts @@ -102,9 +102,6 @@ async function processRefund (order: Order, entityManager: EntityManager) { const buyer = order.buyer; // Refund buyer - const previousBalance = buyer.accountBalance; - buyer.accountBalance += order.totalPrice; - const currentBalance = buyer.accountBalance; await entityManager.save(buyer); // Record refund transaction @@ -112,8 +109,6 @@ async function processRefund (order: Order, entityManager: EntityManager) { refundTransaction.user = buyer; refundTransaction.order = order; refundTransaction.amount = order.totalPrice; - refundTransaction.previousBalance = previousBalance; - refundTransaction.currentBalance = currentBalance; refundTransaction.type = 'credit'; refundTransaction.description = 'Refund for cancelled or returned order'; await entityManager.save(refundTransaction); diff --git a/src/services/productServices/getRecommendedProductsService.ts b/src/services/productServices/getRecommendedProductsService.ts index fde015d..533dcd9 100644 --- a/src/services/productServices/getRecommendedProductsService.ts +++ b/src/services/productServices/getRecommendedProductsService.ts @@ -30,6 +30,7 @@ export const getRecommendedProductsService = async (req: Request, res: Response) .createQueryBuilder('product') .leftJoinAndSelect('product.categories', 'category') .leftJoinAndSelect('product.vendor', 'vendor') + .leftJoinAndSelect('product.feedbacks', 'feedbacks') .where('1 = 1'); if (condition.categories && condition.categories.length > 0) { diff --git a/src/services/productServices/listAllProductsService.ts b/src/services/productServices/listAllProductsService.ts index f39c7bb..4429e89 100644 --- a/src/services/productServices/listAllProductsService.ts +++ b/src/services/productServices/listAllProductsService.ts @@ -20,7 +20,7 @@ export const listAllProductsService = async (req: Request, res: Response) => { }, skip, take: limit, - relations: ['categories', 'vendor'], + relations: ['categories', 'vendor', 'feedbacks'], select: { vendor: { id: true, diff --git a/src/services/productServices/readProduct.ts b/src/services/productServices/readProduct.ts index b3c244d..2836b21 100644 --- a/src/services/productServices/readProduct.ts +++ b/src/services/productServices/readProduct.ts @@ -20,7 +20,7 @@ export const readProductsService = async (req: Request, res: Response) => { }, skip, take: limit, - relations: ['categories', 'vendor'], + relations: ['categories', 'vendor', 'feedbacks'], select: { vendor: { id: true, diff --git a/src/services/productServices/viewSingleProduct.ts b/src/services/productServices/viewSingleProduct.ts index 29ac167..be9764d 100644 --- a/src/services/productServices/viewSingleProduct.ts +++ b/src/services/productServices/viewSingleProduct.ts @@ -13,7 +13,7 @@ export const viewSingleProduct = async (req: Request, res: Response) => { } if (productId) { const products = getRepository(Product); - const product = await products.findOneBy({ id: productId }); + const product = await products.findOne({ where: { id: productId }, relations: ['categories', 'vendor', 'feedbacks'], }); if (!product) { return res.status(404).send({ status: 'error', message: 'Product not found' }); From 8aac64ca6e2e0373895eb120affe699e8de5a70d Mon Sep 17 00:00:00 2001 From: maxCastro1 Date: Tue, 4 Jun 2024 11:31:38 +0200 Subject: [PATCH 20/20] This PR is for the addition of the chatbot --- Intents/cancel.json | 14 + Intents/confirm.json | 14 + Intents/delay.json | 16 + Intents/delivery.json | 15 + Intents/greetings.bye.json | 18 + Intents/greetings.hello.json | 19 + Intents/items.json | 23 + Intents/more.contact.json | 12 + Intents/more.help.json | 19 + Intents/order.json | 12 + Intents/payments.json | 15 + Intents/personal.json | 12 + Intents/profile.info.json | 15 + Intents/reason.json | 13 + Intents/refund.demanding.json | 14 + Intents/refund.status.json | 14 + Intents/thanks.json | 13 + Intents/track.json | 13 + Intents/user.response.json | 14 + Intents/voucher.json | 12 + model.nlp | 5621 +++++++++++++++++++++++ package.json | 3 + src/@types/index.d.ts | 1 + src/__test__/chatBot.test.ts | 53 + src/controllers/chatBotController.ts | 6 + src/controllers/index.ts | 1 + src/node-nlp.d.ts | 1 + src/routes/chatBot.ts | 10 + src/routes/index.ts | 2 + src/services/chatbotServices/chatBot.ts | 30 + src/services/index.ts | 3 + src/train.ts | 43 + tsconfig.json | 4 +- 33 files changed, 6073 insertions(+), 2 deletions(-) create mode 100644 Intents/cancel.json create mode 100644 Intents/confirm.json create mode 100644 Intents/delay.json create mode 100644 Intents/delivery.json create mode 100644 Intents/greetings.bye.json create mode 100644 Intents/greetings.hello.json create mode 100644 Intents/items.json create mode 100644 Intents/more.contact.json create mode 100644 Intents/more.help.json create mode 100644 Intents/order.json create mode 100644 Intents/payments.json create mode 100644 Intents/personal.json create mode 100644 Intents/profile.info.json create mode 100644 Intents/reason.json create mode 100644 Intents/refund.demanding.json create mode 100644 Intents/refund.status.json create mode 100644 Intents/thanks.json create mode 100644 Intents/track.json create mode 100644 Intents/user.response.json create mode 100644 Intents/voucher.json create mode 100644 model.nlp create mode 100644 src/__test__/chatBot.test.ts create mode 100644 src/controllers/chatBotController.ts create mode 100644 src/node-nlp.d.ts create mode 100644 src/routes/chatBot.ts create mode 100644 src/services/chatbotServices/chatBot.ts create mode 100644 src/train.ts diff --git a/Intents/cancel.json b/Intents/cancel.json new file mode 100644 index 0000000..0171b1b --- /dev/null +++ b/Intents/cancel.json @@ -0,0 +1,14 @@ +{ + "intent": "cancel", + "utterances": [ + "Can I cancel my order?", + "Why is my order cancelled?", + "How do I can cancel my order", + "Can I cancel an order" + ], + "responses": [ + "Order can only be cancelled within 7 days of placement. Digital goods do not qualify for refund.", + "Visit my orders page to check status of specific orders." + ] + } + \ No newline at end of file diff --git a/Intents/confirm.json b/Intents/confirm.json new file mode 100644 index 0000000..5c708ec --- /dev/null +++ b/Intents/confirm.json @@ -0,0 +1,14 @@ +{ + "intent": "confirm", + "utterances": [ + "My payment was processed successfully but I didn't get any order confirmation. What should I do?", + "Payment was completed but no confirmation", + "Order was not confirmed", + "Money deducted but order is not confirmed" + ], + "responses": [ + "knight sends you an Email & SMS upon confirmation of your order. If it requires manual confirmation, our team will contact you within 24 hours after order placement. Delay in confirmation SMS may occur due to network error, you may receive it with a delay.", + "It takes upto 24 hours for confirmation, please bear with us! Type Need more help for more assistance. " + ] + } + \ No newline at end of file diff --git a/Intents/delay.json b/Intents/delay.json new file mode 100644 index 0000000..52d0cdf --- /dev/null +++ b/Intents/delay.json @@ -0,0 +1,16 @@ +{ + "intent": "delay", + "utterances": [ + "Why is my order delayed? ", + "Did my order get delayed?", + "Why is my order not delivered yet?", + "When do I get my delivery?" + ], + "responses": [ + "We are really sorry if there has been a delay in your order! If your order is within delivery period, We recommend you to please wait during this period since our Delivery Heroes make 3 attempts to deliver your order!", + "If your order is past up to 3 days after delivery period, There may be logistic issues causing a delay in delivery. Please type 'Common reasons for delivery delay' to know more about this.", + "We appreciate if you could wait for your items as most orders are delivered successfully within this period.", + "If your order is past more than 3 days, Since there may be unexpected issues causing delivery delays, you can click on 'Need more Help' for further assistance." + ] + } + \ No newline at end of file diff --git a/Intents/delivery.json b/Intents/delivery.json new file mode 100644 index 0000000..d3b969b --- /dev/null +++ b/Intents/delivery.json @@ -0,0 +1,15 @@ +{ + "intent": "delivery", + "utterances": [ + "How long does delivery take?", + "How long does shipping take?", + "Please Tell me about my delivery", + "When do I get my delivery?", + "Why is my order not delivered yet" + ], + "responses": [ + "Delivery takes 2-4 days. Please bear with us!", + "Shipping takes 2-4 days. Please bear with us!" + ] + } + \ No newline at end of file diff --git a/Intents/greetings.bye.json b/Intents/greetings.bye.json new file mode 100644 index 0000000..b9aa6f0 --- /dev/null +++ b/Intents/greetings.bye.json @@ -0,0 +1,18 @@ +{ + "intent": "goodbye", + "utterances": [ + "goodbye", + "bye take care", + "see you later", + "bye for now", + "i must go" + ], + "responses": [ + "see you soon!", + "Till next time", + "bye bye", + "have a great day", + "See you later, thanks for visiting. Hope I was able to help!", + "Have a nice day. Hope I was able to help!" + ] +} \ No newline at end of file diff --git a/Intents/greetings.hello.json b/Intents/greetings.hello.json new file mode 100644 index 0000000..7926f49 --- /dev/null +++ b/Intents/greetings.hello.json @@ -0,0 +1,19 @@ +{ + "intent": "greetings", + "utterances": [ + "hello", + "hi", + "howdy", + "Greetings", + "Is anyone there?", + "Hello", + "Good day" + ], + "responses": [ + "Hey :-) My name is knight!", + "Hello, thanks for visiting. My name is knight!", + "Hi there, My name is knight!. What can I do for you?", + "Hi there, My name is knight! How can I help?" + ] + } + \ No newline at end of file diff --git a/Intents/items.json b/Intents/items.json new file mode 100644 index 0000000..3a34861 --- /dev/null +++ b/Intents/items.json @@ -0,0 +1,23 @@ +{ + "intent": "items", + "utterances": [ + "Which items do you have?", + "What kinds of items are there?", + "What do you sell?", + "What do you offer?", + "What can I buy?", + "I'm looking for...", + "Do you have any...", + "I'm interested in...", + "Can I see what you have in...", + "I want to buy a...", + "I'm looking for something like this...", + "What are your most popular items?", + "What are some of your best deals?", + "Do you have any new arrivals?" + ], + "responses": [ + "Search your preference in our flagship store's search bar to see all available products. " + ] + } + \ No newline at end of file diff --git a/Intents/more.contact.json b/Intents/more.contact.json new file mode 100644 index 0000000..df773ac --- /dev/null +++ b/Intents/more.contact.json @@ -0,0 +1,12 @@ +{ + "intent": "more_contact", + "utterances": [ + "Need more help", + "Help me more" + ], + "responses": [ + "Absolutely! How can I help you today? Here are some options based on your inquiry:", + "Sure, let me know what you need help with. Here are a few things I can assist you with:" + ] + } + \ No newline at end of file diff --git a/Intents/more.help.json b/Intents/more.help.json new file mode 100644 index 0000000..3ce18e9 --- /dev/null +++ b/Intents/more.help.json @@ -0,0 +1,19 @@ +{ + "intent": "more_help", + "utterances": [ + "can I talk to an agent", + "can I call customer service", + "customer support number", + "how to contact customer service", + "customer service number", + "contact number for help", + "helpline number", + "How to become a seller", + "How to contact a seller" + ], + "responses": [ + "Contact us for further information here: Phone: +250 780 000 000. Timings are from 09:00 AM to 05:00 PM from Monday to Saturday.", + "For immediate assistance, you can contact our customer service team at +250 780 000 000. Our hours are from 09:00 AM to 05:00 PM, Monday to Saturday." + ] + } + \ No newline at end of file diff --git a/Intents/order.json b/Intents/order.json new file mode 100644 index 0000000..b110674 --- /dev/null +++ b/Intents/order.json @@ -0,0 +1,12 @@ +{ + "intent": "order_status", + "utterances": [ + "What is my order status", + "I want to know my return status", + "How to return status" + ], + "responses": [ + "Please visit the My Orders page for a list of your confirmed orders." + ] + } + \ No newline at end of file diff --git a/Intents/payments.json b/Intents/payments.json new file mode 100644 index 0000000..2243fa3 --- /dev/null +++ b/Intents/payments.json @@ -0,0 +1,15 @@ +{ + "intent": "payments", + "utterances": [ + "Do you take credit cards?", + "Do you accept Mastercard?", + "Can I pay with Cash?", + "Are you cash only?", + "What are your payment methods?", + "How do I pay?" + ], + "responses": [ + "We accept VISA and Mastercard" + ] + } + \ No newline at end of file diff --git a/Intents/personal.json b/Intents/personal.json new file mode 100644 index 0000000..fa32b95 --- /dev/null +++ b/Intents/personal.json @@ -0,0 +1,12 @@ +{ + "intent": "personal", + "utterances": [ + "How are you?", + "How are you doing?", + "How is your day?" + ], + "responses": [ + "I'm good, all's good, thanks. How about you?" + ] + } + \ No newline at end of file diff --git a/Intents/profile.info.json b/Intents/profile.info.json new file mode 100644 index 0000000..229b6ac --- /dev/null +++ b/Intents/profile.info.json @@ -0,0 +1,15 @@ +{ + "intent": "profile_info", + "utterances": [ + "How can I change my profile information", + "I want to change my password", + "I want to change my phone number", + "I want to change my address", + "I want to Reset my password", + "I want to delete my account", + "delete my account" + ], + "responses": [ + "You can easily add or change your account details by following the steps below: Step 1: Click on 'Account', Step 2: Click on 'Manage my account' from the icon, Step 3: You can change or edit your name, address, email address, mobile number, etc., Step 4: Fill in the required details, and click on Save. Note: You can also change your delivery address from the Checkout page before proceeding to pay." + ] + } \ No newline at end of file diff --git a/Intents/reason.json b/Intents/reason.json new file mode 100644 index 0000000..4c7b831 --- /dev/null +++ b/Intents/reason.json @@ -0,0 +1,13 @@ +{ + "intent": "reasons", + "utterances": [ + "Common reasons for delivery delay", + "common reasons for delivery delay", + "reasons for delay", + "delivery delay" + ], + "responses": [ + "Reasons include Seller Sourcing Issues, Courier Issues, Cross Border shipment delay, Wrong Address or Phone Number, and Unavailability of Customer. " + ] + } + \ No newline at end of file diff --git a/Intents/refund.demanding.json b/Intents/refund.demanding.json new file mode 100644 index 0000000..70e004e --- /dev/null +++ b/Intents/refund.demanding.json @@ -0,0 +1,14 @@ +{ + "intent": "demandin_refund", + "utterances": [ + "Can I refund an item.", + "I want to refund an item", + "can I refund my order", + "Are refunds available" + ], + "responses": [ + "Refund can only be issued within 7 days of placement. Digital goods do not qualify for refund.", + "Visit my orders page to check for specific orders." + ] + } + \ No newline at end of file diff --git a/Intents/refund.status.json b/Intents/refund.status.json new file mode 100644 index 0000000..a1f1361 --- /dev/null +++ b/Intents/refund.status.json @@ -0,0 +1,14 @@ +{ + "intent": "refund_status", + "utterances": [ + "Why is the status Refunded when it's not credited?", + "No refund even though status is refunded", + "No refund when status says refunded", + "I did not receive my refund money", + "Refund money not received" + ], + "responses": [ + "Please be patient as refunds take upto 30 days to receive into bank. " + ] + } + diff --git a/Intents/thanks.json b/Intents/thanks.json new file mode 100644 index 0000000..4d0fbb0 --- /dev/null +++ b/Intents/thanks.json @@ -0,0 +1,13 @@ +{ + "intent": "thanks", + "utterances": ["Thanks", + "Thank you", + "That's helpful", + "Thank's a lot!", + "thx", + "thnks"], + "responses": ["Happy to help!", + "Any time!", + "My pleasure"] + } + \ No newline at end of file diff --git a/Intents/track.json b/Intents/track.json new file mode 100644 index 0000000..a130950 --- /dev/null +++ b/Intents/track.json @@ -0,0 +1,13 @@ +{ + "intent": "track", + "utterances": [ + "How can I track my order", + "I want to track my order", + "Can I track my order", + "Track order" + ], + "responses": [ + "Visit the order page, click on the specific order, select 'track my order', and check the status" + ] + } + \ No newline at end of file diff --git a/Intents/user.response.json b/Intents/user.response.json new file mode 100644 index 0000000..998d545 --- /dev/null +++ b/Intents/user.response.json @@ -0,0 +1,14 @@ +{ + "intent": "user_response", + "utterances": [ + "I'm good", + "Im good", + "Im doing good", + "I am good", + "I am okay" + ], + "responses": [ + "Great to hear you are doing good." + ] + } + \ No newline at end of file diff --git a/Intents/voucher.json b/Intents/voucher.json new file mode 100644 index 0000000..cc75c1f --- /dev/null +++ b/Intents/voucher.json @@ -0,0 +1,12 @@ +{ + "intent": "use_voucher", + "utterances": [ + "How to use a voucher?", + "Can I use a voucher?", + "How to use a voucher?" + ], + "responses": [ + "You can add a voucher by clicking on My Cart > Check Out > Enter Voucher Code > APPLY. " + ] + } + \ No newline at end of file diff --git a/model.nlp b/model.nlp new file mode 100644 index 0000000..6aee508 --- /dev/null +++ b/model.nlp @@ -0,0 +1,5621 @@ +{ + "settings": { + "languages": [ + "en" + ], + "tag": "nlp", + "threshold": 0.5, + "autoLoad": true, + "autoSave": true, + "modelFileName": "model.nlp", + "executeActionsBeforeAnswers": false, + "calculateSentiment": true + }, + "nluManager": { + "settings": { + "tag": "nlu-manager" + }, + "locales": [ + "en" + ], + "languageNames": {}, + "domainManagers": { + "en": { + "settings": { + "locale": "en", + "trainByDomain": false, + "tag": "domain-manager-en", + "nluByDomain": { + "default": { + "className": "NeuralNlu", + "settings": {} + } + }, + "useStemDict": true + }, + "stemDict": { + "can,cancel,i,my,order": { + "intent": "cancel", + "domain": "default" + }, + "cancel,is,my,order,whi": { + "intent": "cancel", + "domain": "default" + }, + "can,cancel,do,how,i,my,order": { + "intent": "cancel", + "domain": "default" + }, + "an,can,cancel,i,order": { + "intent": "cancel", + "domain": "default" + }, + "ani,but,confirm,did,do,get,i,my,not,order,payment,process,should,success,was,what": { + "intent": "confirm", + "domain": "default" + }, + "but,complet,confirm,no,payment,was": { + "intent": "confirm", + "domain": "default" + }, + "confirm,not,order,was": { + "intent": "confirm", + "domain": "default" + }, + "but,confirm,deduct,is,money,not,order": { + "intent": "confirm", + "domain": "default" + }, + "delay,is,my,order,whi": { + "intent": "delay", + "domain": "default" + }, + "delay,did,get,my,order": { + "intent": "delay", + "domain": "default" + }, + "deliv,is,my,not,order,whi,yet": { + "intent": "delivery", + "domain": "default" + }, + "deliveri,do,get,i,my,when": { + "intent": "delivery", + "domain": "default" + }, + "deliveri,doe,how,long,take": { + "intent": "delivery", + "domain": "default" + }, + "doe,how,long,ship,take": { + "intent": "delivery", + "domain": "default" + }, + "about,deliveri,me,my,pleas,tell": { + "intent": "delivery", + "domain": "default" + }, + "goodby": { + "intent": "greetings.bye", + "domain": "default" + }, + "bye,care,take": { + "intent": "greetings.bye", + "domain": "default" + }, + "later,see,you": { + "intent": "greetings.bye", + "domain": "default" + }, + "bye,for,now": { + "intent": "greetings.bye", + "domain": "default" + }, + "go,i,must": { + "intent": "greetings.bye", + "domain": "default" + }, + "hello": { + "intent": "greetings.hello", + "domain": "default" + }, + "hi": { + "intent": "greetings.hello", + "domain": "default" + }, + "howdi": { + "intent": "greetings.hello", + "domain": "default" + }, + "greet": { + "intent": "greetings.hello", + "domain": "default" + }, + "anyon,is,there": { + "intent": "greetings.hello", + "domain": "default" + }, + "day,good": { + "intent": "greetings.hello", + "domain": "default" + }, + "do,have,item,which,you": { + "intent": "items", + "domain": "default" + }, + "are,item,kind,of,there,what": { + "intent": "items", + "domain": "default" + }, + "do,sell,what,you": { + "intent": "items", + "domain": "default" + }, + "do,offer,what,you": { + "intent": "items", + "domain": "default" + }, + "buy,can,i,what": { + "intent": "items", + "domain": "default" + }, + "am,for,i,look": { + "intent": "items", + "domain": "default" + }, + "ani,do,have,you": { + "intent": "items", + "domain": "default" + }, + "am,i,in,interest": { + "intent": "items", + "domain": "default" + }, + "can,have,i,in,see,what,you": { + "intent": "items", + "domain": "default" + }, + "a,buy,i,to,want": { + "intent": "items", + "domain": "default" + }, + "am,for,i,like,look,someth,this": { + "intent": "items", + "domain": "default" + }, + "are,item,most,popular,what,your": { + "intent": "items", + "domain": "default" + }, + "are,best,deal,of,some,what,your": { + "intent": "items", + "domain": "default" + }, + "ani,arriv,do,have,new,you": { + "intent": "items", + "domain": "default" + }, + "help,more,need": { + "intent": "more.contact", + "domain": "default" + }, + "help,me,more": { + "intent": "more.contact", + "domain": "default" + }, + "agent,an,can,i,talk,to": { + "intent": "more.help", + "domain": "default" + }, + "call,can,custom,i,servic": { + "intent": "more.help", + "domain": "default" + }, + "custom,number,support": { + "intent": "more.help", + "domain": "default" + }, + "contact,custom,how,servic,to": { + "intent": "more.help", + "domain": "default" + }, + "custom,number,servic": { + "intent": "more.help", + "domain": "default" + }, + "contact,for,help,number": { + "intent": "more.help", + "domain": "default" + }, + "helplin,number": { + "intent": "more.help", + "domain": "default" + }, + "a,becom,how,seller,to": { + "intent": "more.help", + "domain": "default" + }, + "a,contact,how,seller,to": { + "intent": "more.help", + "domain": "default" + }, + "is,my,order,status,what": { + "intent": "order", + "domain": "default" + }, + "i,know,my,return,status,to,want": { + "intent": "order", + "domain": "default" + }, + "how,return,status,to": { + "intent": "order", + "domain": "default" + }, + "card,credit,do,take,you": { + "intent": "payments", + "domain": "default" + }, + "accept,do,mastercard,you": { + "intent": "payments", + "domain": "default" + }, + "can,cash,i,pay,with": { + "intent": "payments", + "domain": "default" + }, + "are,cash,onli,you": { + "intent": "payments", + "domain": "default" + }, + "are,method,payment,what,your": { + "intent": "payments", + "domain": "default" + }, + "do,how,i,pay": { + "intent": "payments", + "domain": "default" + }, + "are,how,you": { + "intent": "personal", + "domain": "default" + }, + "are,do,how,you": { + "intent": "personal", + "domain": "default" + }, + "day,how,is,your": { + "intent": "personal", + "domain": "default" + }, + "can,chang,how,i,inform,my,profil": { + "intent": "profile.info", + "domain": "default" + }, + "chang,i,my,password,to,want": { + "intent": "profile.info", + "domain": "default" + }, + "chang,i,my,number,phone,to,want": { + "intent": "profile.info", + "domain": "default" + }, + "address,chang,i,my,to,want": { + "intent": "profile.info", + "domain": "default" + }, + "i,my,password,reset,to,want": { + "intent": "profile.info", + "domain": "default" + }, + "account,delet,i,my,to,want": { + "intent": "profile.info", + "domain": "default" + }, + "account,delet,my": { + "intent": "profile.info", + "domain": "default" + }, + "common,delay,deliveri,for,reason": { + "intent": "reason", + "domain": "default" + }, + "delay,for,reason": { + "intent": "reason", + "domain": "default" + }, + "delay,deliveri": { + "intent": "reason", + "domain": "default" + }, + "an,can,i,item,refund": { + "intent": "refund.demanding", + "domain": "default" + }, + "an,i,item,refund,to,want": { + "intent": "refund.demanding", + "domain": "default" + }, + "can,i,my,order,refund": { + "intent": "refund.demanding", + "domain": "default" + }, + "are,avail,refund": { + "intent": "refund.demanding", + "domain": "default" + }, + "credit,is,it,not,refund,status,the,when,whi": { + "intent": "refund.status", + "domain": "default" + }, + "even,is,no,refund,status,though": { + "intent": "refund.status", + "domain": "default" + }, + "no,refund,say,status,when": { + "intent": "refund.status", + "domain": "default" + }, + "did,i,money,my,not,receiv,refund": { + "intent": "refund.status", + "domain": "default" + }, + "money,not,receiv,refund": { + "intent": "refund.status", + "domain": "default" + }, + "thank": { + "intent": "thanks", + "domain": "default" + }, + "thank,you": { + "intent": "thanks", + "domain": "default" + }, + "help,is,that": { + "intent": "thanks", + "domain": "default" + }, + "a,is,lot,thank": { + "intent": "thanks", + "domain": "default" + }, + "thx": { + "intent": "thanks", + "domain": "default" + }, + "thnks": { + "intent": "thanks", + "domain": "default" + }, + "can,how,i,my,order,track": { + "intent": "track", + "domain": "default" + }, + "i,my,order,to,track,want": { + "intent": "track", + "domain": "default" + }, + "can,i,my,order,track": { + "intent": "track", + "domain": "default" + }, + "order,track": { + "intent": "track", + "domain": "default" + }, + "am,good,i": { + "intent": "user.response", + "domain": "default" + }, + "good,im": { + "intent": "user.response", + "domain": "default" + }, + "do,good,im": { + "intent": "user.response", + "domain": "default" + }, + "am,i,okay": { + "intent": "user.response", + "domain": "default" + }, + "a,how,to,use,voucher": { + "intent": "voucher", + "domain": "default" + }, + "a,can,i,use,voucher": { + "intent": "voucher", + "domain": "default" + } + }, + "intentDict": { + "cancel": "default", + "confirm": "default", + "delay": "default", + "delivery": "default", + "greetings.bye": "default", + "greetings.hello": "default", + "items": "default", + "more.contact": "default", + "more.help": "default", + "order": "default", + "payments": "default", + "personal": "default", + "profile.info": "default", + "reason": "default", + "refund.demanding": "default", + "refund.status": "default", + "thanks": "default", + "track": "default", + "user.response": "default", + "voucher": "default" + }, + "sentences": [ + { + "domain": "default", + "utterance": "Can I cancel my order?", + "intent": "cancel" + }, + { + "domain": "default", + "utterance": "Why is my order cancelled?", + "intent": "cancel" + }, + { + "domain": "default", + "utterance": "How do I can cancel my order", + "intent": "cancel" + }, + { + "domain": "default", + "utterance": "Can I cancel an order", + "intent": "cancel" + }, + { + "domain": "default", + "utterance": "My payment was processed successfully but I didn't get any order confirmation. What should I do?", + "intent": "confirm" + }, + { + "domain": "default", + "utterance": "Payment was completed but no confirmation", + "intent": "confirm" + }, + { + "domain": "default", + "utterance": "Order was not confirmed", + "intent": "confirm" + }, + { + "domain": "default", + "utterance": "Money deducted but order is not confirmed", + "intent": "confirm" + }, + { + "domain": "default", + "utterance": "Why is my order delayed? ", + "intent": "delay" + }, + { + "domain": "default", + "utterance": "Did my order get delayed?", + "intent": "delay" + }, + { + "domain": "default", + "utterance": "Why is my order not delivered yet?", + "intent": "delay" + }, + { + "domain": "default", + "utterance": "When do I get my delivery?", + "intent": "delay" + }, + { + "domain": "default", + "utterance": "How long does delivery take?", + "intent": "delivery" + }, + { + "domain": "default", + "utterance": "How long does shipping take?", + "intent": "delivery" + }, + { + "domain": "default", + "utterance": "Please Tell me about my delivery", + "intent": "delivery" + }, + { + "domain": "default", + "utterance": "When do I get my delivery?", + "intent": "delivery" + }, + { + "domain": "default", + "utterance": "Why is my order not delivered yet", + "intent": "delivery" + }, + { + "domain": "default", + "utterance": "goodbye", + "intent": "greetings.bye" + }, + { + "domain": "default", + "utterance": "bye take care", + "intent": "greetings.bye" + }, + { + "domain": "default", + "utterance": "see you later", + "intent": "greetings.bye" + }, + { + "domain": "default", + "utterance": "bye for now", + "intent": "greetings.bye" + }, + { + "domain": "default", + "utterance": "i must go", + "intent": "greetings.bye" + }, + { + "domain": "default", + "utterance": "hello", + "intent": "greetings.hello" + }, + { + "domain": "default", + "utterance": "hi", + "intent": "greetings.hello" + }, + { + "domain": "default", + "utterance": "howdy", + "intent": "greetings.hello" + }, + { + "domain": "default", + "utterance": "Greetings", + "intent": "greetings.hello" + }, + { + "domain": "default", + "utterance": "Is anyone there?", + "intent": "greetings.hello" + }, + { + "domain": "default", + "utterance": "Hello", + "intent": "greetings.hello" + }, + { + "domain": "default", + "utterance": "Good day", + "intent": "greetings.hello" + }, + { + "domain": "default", + "utterance": "Which items do you have?", + "intent": "items" + }, + { + "domain": "default", + "utterance": "What kinds of items are there?", + "intent": "items" + }, + { + "domain": "default", + "utterance": "What do you sell?", + "intent": "items" + }, + { + "domain": "default", + "utterance": "What do you offer?", + "intent": "items" + }, + { + "domain": "default", + "utterance": "What can I buy?", + "intent": "items" + }, + { + "domain": "default", + "utterance": "I'm looking for...", + "intent": "items" + }, + { + "domain": "default", + "utterance": "Do you have any...", + "intent": "items" + }, + { + "domain": "default", + "utterance": "I'm interested in...", + "intent": "items" + }, + { + "domain": "default", + "utterance": "Can I see what you have in...", + "intent": "items" + }, + { + "domain": "default", + "utterance": "I want to buy a...", + "intent": "items" + }, + { + "domain": "default", + "utterance": "I'm looking for something like this...", + "intent": "items" + }, + { + "domain": "default", + "utterance": "What are your most popular items?", + "intent": "items" + }, + { + "domain": "default", + "utterance": "What are some of your best deals?", + "intent": "items" + }, + { + "domain": "default", + "utterance": "Do you have any new arrivals?", + "intent": "items" + }, + { + "domain": "default", + "utterance": "Need more help", + "intent": "more.contact" + }, + { + "domain": "default", + "utterance": "Help me more", + "intent": "more.contact" + }, + { + "domain": "default", + "utterance": "can I talk to an agent", + "intent": "more.help" + }, + { + "domain": "default", + "utterance": "can I call customer service", + "intent": "more.help" + }, + { + "domain": "default", + "utterance": "customer support number", + "intent": "more.help" + }, + { + "domain": "default", + "utterance": "how to contact customer service", + "intent": "more.help" + }, + { + "domain": "default", + "utterance": "customer service number", + "intent": "more.help" + }, + { + "domain": "default", + "utterance": "contact number for help", + "intent": "more.help" + }, + { + "domain": "default", + "utterance": "helpline number", + "intent": "more.help" + }, + { + "domain": "default", + "utterance": "How to become a seller", + "intent": "more.help" + }, + { + "domain": "default", + "utterance": "How to contact a seller", + "intent": "more.help" + }, + { + "domain": "default", + "utterance": "What is my order status", + "intent": "order" + }, + { + "domain": "default", + "utterance": "I want to know my return status", + "intent": "order" + }, + { + "domain": "default", + "utterance": "How to return status", + "intent": "order" + }, + { + "domain": "default", + "utterance": "Do you take credit cards?", + "intent": "payments" + }, + { + "domain": "default", + "utterance": "Do you accept Mastercard?", + "intent": "payments" + }, + { + "domain": "default", + "utterance": "Can I pay with Cash?", + "intent": "payments" + }, + { + "domain": "default", + "utterance": "Are you cash only?", + "intent": "payments" + }, + { + "domain": "default", + "utterance": "What are your payment methods?", + "intent": "payments" + }, + { + "domain": "default", + "utterance": "How do I pay?", + "intent": "payments" + }, + { + "domain": "default", + "utterance": "How are you?", + "intent": "personal" + }, + { + "domain": "default", + "utterance": "How are you doing?", + "intent": "personal" + }, + { + "domain": "default", + "utterance": "How is your day?", + "intent": "personal" + }, + { + "domain": "default", + "utterance": "How can I change my profile information", + "intent": "profile.info" + }, + { + "domain": "default", + "utterance": "I want to change my password", + "intent": "profile.info" + }, + { + "domain": "default", + "utterance": "I want to change my phone number", + "intent": "profile.info" + }, + { + "domain": "default", + "utterance": "I want to change my address", + "intent": "profile.info" + }, + { + "domain": "default", + "utterance": "I want to Reset my password", + "intent": "profile.info" + }, + { + "domain": "default", + "utterance": "I want to delete my account", + "intent": "profile.info" + }, + { + "domain": "default", + "utterance": "delete my account", + "intent": "profile.info" + }, + { + "domain": "default", + "utterance": "Common reasons for delivery delay", + "intent": "reason" + }, + { + "domain": "default", + "utterance": "common reasons for delivery delay", + "intent": "reason" + }, + { + "domain": "default", + "utterance": "reasons for delay", + "intent": "reason" + }, + { + "domain": "default", + "utterance": "delivery delay", + "intent": "reason" + }, + { + "domain": "default", + "utterance": "Can I refund an item.", + "intent": "refund.demanding" + }, + { + "domain": "default", + "utterance": "I want to refund an item", + "intent": "refund.demanding" + }, + { + "domain": "default", + "utterance": "can I refund my order", + "intent": "refund.demanding" + }, + { + "domain": "default", + "utterance": "Are refunds available", + "intent": "refund.demanding" + }, + { + "domain": "default", + "utterance": "Why is the status Refunded when it's not credited?", + "intent": "refund.status" + }, + { + "domain": "default", + "utterance": "No refund even though status is refunded", + "intent": "refund.status" + }, + { + "domain": "default", + "utterance": "No refund when status says refunded", + "intent": "refund.status" + }, + { + "domain": "default", + "utterance": "I did not receive my refund money", + "intent": "refund.status" + }, + { + "domain": "default", + "utterance": "Refund money not received", + "intent": "refund.status" + }, + { + "domain": "default", + "utterance": "Thanks", + "intent": "thanks" + }, + { + "domain": "default", + "utterance": "Thank you", + "intent": "thanks" + }, + { + "domain": "default", + "utterance": "That's helpful", + "intent": "thanks" + }, + { + "domain": "default", + "utterance": "Thank's a lot!", + "intent": "thanks" + }, + { + "domain": "default", + "utterance": "thx", + "intent": "thanks" + }, + { + "domain": "default", + "utterance": "thnks", + "intent": "thanks" + }, + { + "domain": "default", + "utterance": "How can I track my order", + "intent": "track" + }, + { + "domain": "default", + "utterance": "I want to track my order", + "intent": "track" + }, + { + "domain": "default", + "utterance": "Can I track my order", + "intent": "track" + }, + { + "domain": "default", + "utterance": "Track order", + "intent": "track" + }, + { + "domain": "default", + "utterance": "I'm good", + "intent": "user.response" + }, + { + "domain": "default", + "utterance": "Im good", + "intent": "user.response" + }, + { + "domain": "default", + "utterance": "Im doing good", + "intent": "user.response" + }, + { + "domain": "default", + "utterance": "I am good", + "intent": "user.response" + }, + { + "domain": "default", + "utterance": "I am okay", + "intent": "user.response" + }, + { + "domain": "default", + "utterance": "How to use a voucher?", + "intent": "voucher" + }, + { + "domain": "default", + "utterance": "Can I use a voucher?", + "intent": "voucher" + }, + { + "domain": "default", + "utterance": "How to use a voucher?", + "intent": "voucher" + } + ], + "domains": { + "master_domain": { + "settings": { + "locale": "en", + "tag": "nlu-en", + "keepStopwords": true, + "nonefeatureValue": 1, + "nonedeltaMultiplier": 1.2, + "spellCheck": false, + "spellCheckDistance": 1, + "filterZeros": true, + "log": true + }, + "features": { + "can": 1, + "i": 1, + "cancel": 1, + "my": 1, + "order": 1, + "whi": 1, + "is": 1, + "how": 1, + "do": 1, + "an": 1, + "payment": 1, + "was": 1, + "process": 1, + "success": 1, + "but": 1, + "did": 1, + "not": 1, + "get": 1, + "ani": 1, + "confirm": 1, + "what": 1, + "should": 1, + "complet": 1, + "no": 1, + "money": 1, + "deduct": 1, + "delay": 1, + "deliv": 1, + "yet": 1, + "when": 1, + "deliveri": 1, + "long": 1, + "doe": 1, + "take": 1, + "ship": 1, + "pleas": 1, + "tell": 1, + "me": 1, + "about": 1, + "goodby": 1, + "bye": 1, + "care": 1, + "see": 1, + "you": 1, + "later": 1, + "for": 1, + "now": 1, + "must": 1, + "go": 1, + "hello": 1, + "hi": 1, + "howdi": 1, + "greet": 1, + "anyon": 1, + "there": 1, + "good": 1, + "day": 1, + "which": 1, + "item": 1, + "have": 1, + "kind": 1, + "of": 1, + "are": 1, + "sell": 1, + "offer": 1, + "buy": 1, + "am": 1, + "look": 1, + "interest": 1, + "in": 1, + "want": 1, + "to": 1, + "a": 1, + "someth": 1, + "like": 1, + "this": 1, + "your": 1, + "most": 1, + "popular": 1, + "some": 1, + "best": 1, + "deal": 1, + "new": 1, + "arriv": 1, + "need": 1, + "more": 1, + "help": 1, + "talk": 1, + "agent": 1, + "call": 1, + "custom": 1, + "servic": 1, + "support": 1, + "number": 1, + "contact": 1, + "helplin": 1, + "becom": 1, + "seller": 1, + "status": 1, + "know": 1, + "return": 1, + "credit": 1, + "card": 1, + "accept": 1, + "mastercard": 1, + "pay": 1, + "with": 1, + "cash": 1, + "onli": 1, + "method": 1, + "chang": 1, + "profil": 1, + "inform": 1, + "password": 1, + "phone": 1, + "address": 1, + "reset": 1, + "delet": 1, + "account": 1, + "common": 1, + "reason": 1, + "refund": 1, + "avail": 1, + "the": 1, + "it": 1, + "even": 1, + "though": 1, + "say": 1, + "receiv": 1, + "thank": 1, + "that": 1, + "lot": 1, + "thx": 1, + "thnks": 1, + "track": 1, + "im": 1, + "okay": 1, + "use": 1, + "voucher": 1 + }, + "intents": { + "cancel": 1, + "confirm": 1, + "delay": 1, + "delivery": 1, + "greetings.bye": 1, + "greetings.hello": 1, + "items": 1, + "more.contact": 1, + "more.help": 1, + "order": 1, + "payments": 1, + "personal": 1, + "profile.info": 1, + "reason": 1, + "refund.demanding": 1, + "refund.status": 1, + "thanks": 1, + "track": 1, + "user.response": 1, + "voucher": 1 + }, + "intentFeatures": { + "cancel": { + "can": 1, + "i": 1, + "cancel": 1, + "my": 1, + "order": 1, + "whi": 1, + "is": 1, + "how": 1, + "do": 1, + "an": 1 + }, + "confirm": { + "my": 1, + "payment": 1, + "was": 1, + "process": 1, + "success": 1, + "but": 1, + "i": 1, + "did": 1, + "not": 1, + "get": 1, + "ani": 1, + "order": 1, + "confirm": 1, + "what": 1, + "should": 1, + "do": 1, + "complet": 1, + "no": 1, + "money": 1, + "deduct": 1, + "is": 1 + }, + "delay": { + "whi": 1, + "is": 1, + "my": 1, + "order": 1, + "delay": 1, + "did": 1, + "get": 1, + "not": 1, + "deliv": 1, + "yet": 1, + "when": 1, + "do": 1, + "i": 1, + "deliveri": 1 + }, + "delivery": { + "how": 1, + "long": 1, + "doe": 1, + "deliveri": 1, + "take": 1, + "ship": 1, + "pleas": 1, + "tell": 1, + "me": 1, + "about": 1, + "my": 1, + "when": 1, + "do": 1, + "i": 1, + "get": 1, + "whi": 1, + "is": 1, + "order": 1, + "not": 1, + "deliv": 1, + "yet": 1 + }, + "greetings.bye": { + "goodby": 1, + "bye": 1, + "take": 1, + "care": 1, + "see": 1, + "you": 1, + "later": 1, + "for": 1, + "now": 1, + "i": 1, + "must": 1, + "go": 1 + }, + "greetings.hello": { + "hello": 1, + "hi": 1, + "howdi": 1, + "greet": 1, + "is": 1, + "anyon": 1, + "there": 1, + "good": 1, + "day": 1 + }, + "items": { + "which": 1, + "item": 1, + "do": 1, + "you": 1, + "have": 1, + "what": 1, + "kind": 1, + "of": 1, + "are": 1, + "there": 1, + "sell": 1, + "offer": 1, + "can": 1, + "i": 1, + "buy": 1, + "am": 1, + "look": 1, + "for": 1, + "ani": 1, + "interest": 1, + "in": 1, + "see": 1, + "want": 1, + "to": 1, + "a": 1, + "someth": 1, + "like": 1, + "this": 1, + "your": 1, + "most": 1, + "popular": 1, + "some": 1, + "best": 1, + "deal": 1, + "new": 1, + "arriv": 1 + }, + "more.contact": { + "need": 1, + "more": 1, + "help": 1, + "me": 1 + }, + "more.help": { + "can": 1, + "i": 1, + "talk": 1, + "to": 1, + "an": 1, + "agent": 1, + "call": 1, + "custom": 1, + "servic": 1, + "support": 1, + "number": 1, + "how": 1, + "contact": 1, + "for": 1, + "help": 1, + "helplin": 1, + "becom": 1, + "a": 1, + "seller": 1 + }, + "order": { + "what": 1, + "is": 1, + "my": 1, + "order": 1, + "status": 1, + "i": 1, + "want": 1, + "to": 1, + "know": 1, + "return": 1, + "how": 1 + }, + "payments": { + "do": 1, + "you": 1, + "take": 1, + "credit": 1, + "card": 1, + "accept": 1, + "mastercard": 1, + "can": 1, + "i": 1, + "pay": 1, + "with": 1, + "cash": 1, + "are": 1, + "onli": 1, + "what": 1, + "your": 1, + "payment": 1, + "method": 1, + "how": 1 + }, + "personal": { + "how": 1, + "are": 1, + "you": 1, + "do": 1, + "is": 1, + "your": 1, + "day": 1 + }, + "profile.info": { + "how": 1, + "can": 1, + "i": 1, + "chang": 1, + "my": 1, + "profil": 1, + "inform": 1, + "want": 1, + "to": 1, + "password": 1, + "phone": 1, + "number": 1, + "address": 1, + "reset": 1, + "delet": 1, + "account": 1 + }, + "reason": { + "common": 1, + "reason": 1, + "for": 1, + "deliveri": 1, + "delay": 1 + }, + "refund.demanding": { + "can": 1, + "i": 1, + "refund": 1, + "an": 1, + "item": 1, + "want": 1, + "to": 1, + "my": 1, + "order": 1, + "are": 1, + "avail": 1 + }, + "refund.status": { + "whi": 1, + "is": 1, + "the": 1, + "status": 1, + "refund": 1, + "when": 1, + "it": 1, + "not": 1, + "credit": 1, + "no": 1, + "even": 1, + "though": 1, + "say": 1, + "i": 1, + "did": 1, + "receiv": 1, + "my": 1, + "money": 1 + }, + "thanks": { + "thank": 1, + "you": 1, + "that": 1, + "is": 1, + "help": 1, + "a": 1, + "lot": 1, + "thx": 1, + "thnks": 1 + }, + "track": { + "how": 1, + "can": 1, + "i": 1, + "track": 1, + "my": 1, + "order": 1, + "want": 1, + "to": 1 + }, + "user.response": { + "i": 1, + "am": 1, + "good": 1, + "im": 1, + "do": 1, + "okay": 1 + }, + "voucher": { + "how": 1, + "to": 1, + "use": 1, + "a": 1, + "voucher": 1, + "can": 1, + "i": 1 + } + }, + "featuresToIntent": { + "can": [ + "cancel", + "items", + "more.help", + "payments", + "profile.info", + "refund.demanding", + "track", + "voucher" + ], + "i": [ + "cancel", + "confirm", + "delay", + "delivery", + "greetings.bye", + "items", + "more.help", + "order", + "payments", + "profile.info", + "refund.demanding", + "refund.status", + "track", + "user.response", + "voucher" + ], + "cancel": [ + "cancel" + ], + "my": [ + "cancel", + "confirm", + "delay", + "delivery", + "order", + "profile.info", + "refund.demanding", + "refund.status", + "track" + ], + "order": [ + "cancel", + "confirm", + "delay", + "delivery", + "order", + "refund.demanding", + "track" + ], + "whi": [ + "cancel", + "delay", + "delivery", + "refund.status" + ], + "is": [ + "cancel", + "confirm", + "delay", + "delivery", + "greetings.hello", + "order", + "personal", + "refund.status", + "thanks" + ], + "how": [ + "cancel", + "delivery", + "more.help", + "order", + "payments", + "personal", + "profile.info", + "track", + "voucher" + ], + "do": [ + "cancel", + "confirm", + "delay", + "delivery", + "items", + "payments", + "personal", + "user.response" + ], + "an": [ + "cancel", + "more.help", + "refund.demanding" + ], + "payment": [ + "confirm", + "payments" + ], + "was": [ + "confirm" + ], + "process": [ + "confirm" + ], + "success": [ + "confirm" + ], + "but": [ + "confirm" + ], + "did": [ + "confirm", + "delay", + "refund.status" + ], + "not": [ + "confirm", + "delay", + "delivery", + "refund.status" + ], + "get": [ + "confirm", + "delay", + "delivery" + ], + "ani": [ + "confirm", + "items" + ], + "confirm": [ + "confirm" + ], + "what": [ + "confirm", + "items", + "order", + "payments" + ], + "should": [ + "confirm" + ], + "complet": [ + "confirm" + ], + "no": [ + "confirm", + "refund.status" + ], + "money": [ + "confirm", + "refund.status" + ], + "deduct": [ + "confirm" + ], + "delay": [ + "delay", + "reason" + ], + "deliv": [ + "delay", + "delivery" + ], + "yet": [ + "delay", + "delivery" + ], + "when": [ + "delay", + "delivery", + "refund.status" + ], + "deliveri": [ + "delay", + "delivery", + "reason" + ], + "long": [ + "delivery" + ], + "doe": [ + "delivery" + ], + "take": [ + "delivery", + "greetings.bye", + "payments" + ], + "ship": [ + "delivery" + ], + "pleas": [ + "delivery" + ], + "tell": [ + "delivery" + ], + "me": [ + "delivery", + "more.contact" + ], + "about": [ + "delivery" + ], + "goodby": [ + "greetings.bye" + ], + "bye": [ + "greetings.bye" + ], + "care": [ + "greetings.bye" + ], + "see": [ + "greetings.bye", + "items" + ], + "you": [ + "greetings.bye", + "items", + "payments", + "personal", + "thanks" + ], + "later": [ + "greetings.bye" + ], + "for": [ + "greetings.bye", + "items", + "more.help", + "reason" + ], + "now": [ + "greetings.bye" + ], + "must": [ + "greetings.bye" + ], + "go": [ + "greetings.bye" + ], + "hello": [ + "greetings.hello" + ], + "hi": [ + "greetings.hello" + ], + "howdi": [ + "greetings.hello" + ], + "greet": [ + "greetings.hello" + ], + "anyon": [ + "greetings.hello" + ], + "there": [ + "greetings.hello", + "items" + ], + "good": [ + "greetings.hello", + "user.response" + ], + "day": [ + "greetings.hello", + "personal" + ], + "which": [ + "items" + ], + "item": [ + "items", + "refund.demanding" + ], + "have": [ + "items" + ], + "kind": [ + "items" + ], + "of": [ + "items" + ], + "are": [ + "items", + "payments", + "personal", + "refund.demanding" + ], + "sell": [ + "items" + ], + "offer": [ + "items" + ], + "buy": [ + "items" + ], + "am": [ + "items", + "user.response" + ], + "look": [ + "items" + ], + "interest": [ + "items" + ], + "in": [ + "items" + ], + "want": [ + "items", + "order", + "profile.info", + "refund.demanding", + "track" + ], + "to": [ + "items", + "more.help", + "order", + "profile.info", + "refund.demanding", + "track", + "voucher" + ], + "a": [ + "items", + "more.help", + "thanks", + "voucher" + ], + "someth": [ + "items" + ], + "like": [ + "items" + ], + "this": [ + "items" + ], + "your": [ + "items", + "payments", + "personal" + ], + "most": [ + "items" + ], + "popular": [ + "items" + ], + "some": [ + "items" + ], + "best": [ + "items" + ], + "deal": [ + "items" + ], + "new": [ + "items" + ], + "arriv": [ + "items" + ], + "need": [ + "more.contact" + ], + "more": [ + "more.contact" + ], + "help": [ + "more.contact", + "more.help", + "thanks" + ], + "talk": [ + "more.help" + ], + "agent": [ + "more.help" + ], + "call": [ + "more.help" + ], + "custom": [ + "more.help" + ], + "servic": [ + "more.help" + ], + "support": [ + "more.help" + ], + "number": [ + "more.help", + "profile.info" + ], + "contact": [ + "more.help" + ], + "helplin": [ + "more.help" + ], + "becom": [ + "more.help" + ], + "seller": [ + "more.help" + ], + "status": [ + "order", + "refund.status" + ], + "know": [ + "order" + ], + "return": [ + "order" + ], + "credit": [ + "payments", + "refund.status" + ], + "card": [ + "payments" + ], + "accept": [ + "payments" + ], + "mastercard": [ + "payments" + ], + "pay": [ + "payments" + ], + "with": [ + "payments" + ], + "cash": [ + "payments" + ], + "onli": [ + "payments" + ], + "method": [ + "payments" + ], + "chang": [ + "profile.info" + ], + "profil": [ + "profile.info" + ], + "inform": [ + "profile.info" + ], + "password": [ + "profile.info" + ], + "phone": [ + "profile.info" + ], + "address": [ + "profile.info" + ], + "reset": [ + "profile.info" + ], + "delet": [ + "profile.info" + ], + "account": [ + "profile.info" + ], + "common": [ + "reason" + ], + "reason": [ + "reason" + ], + "refund": [ + "refund.demanding", + "refund.status" + ], + "avail": [ + "refund.demanding" + ], + "the": [ + "refund.status" + ], + "it": [ + "refund.status" + ], + "even": [ + "refund.status" + ], + "though": [ + "refund.status" + ], + "say": [ + "refund.status" + ], + "receiv": [ + "refund.status" + ], + "thank": [ + "thanks" + ], + "that": [ + "thanks" + ], + "lot": [ + "thanks" + ], + "thx": [ + "thanks" + ], + "thnks": [ + "thanks" + ], + "track": [ + "track" + ], + "im": [ + "user.response" + ], + "okay": [ + "user.response" + ], + "use": [ + "voucher" + ], + "voucher": [ + "voucher" + ] + }, + "neuralNetwork": { + "settings": { + "locale": "en", + "tag": "nlu-en", + "keepStopwords": true, + "nonefeatureValue": 1, + "nonedeltaMultiplier": 1.2, + "spellCheck": false, + "spellCheckDistance": 1, + "filterZeros": true, + "log": true + }, + "features": [ + "can", + "i", + "cancel", + "my", + "order", + "whi", + "is", + "how", + "do", + "an", + "payment", + "was", + "process", + "success", + "but", + "did", + "not", + "get", + "ani", + "confirm", + "what", + "should", + "complet", + "no", + "money", + "deduct", + "delay", + "deliv", + "yet", + "when", + "deliveri", + "long", + "doe", + "take", + "ship", + "pleas", + "tell", + "me", + "about", + "goodby", + "bye", + "care", + "see", + "you", + "later", + "for", + "now", + "must", + "go", + "hello", + "hi", + "howdi", + "greet", + "anyon", + "there", + "good", + "day", + "which", + "item", + "have", + "kind", + "of", + "are", + "sell", + "offer", + "buy", + "am", + "look", + "interest", + "in", + "want", + "to", + "a", + "someth", + "like", + "this", + "your", + "most", + "popular", + "some", + "best", + "deal", + "new", + "arriv", + "need", + "more", + "help", + "talk", + "agent", + "call", + "custom", + "servic", + "support", + "number", + "contact", + "helplin", + "becom", + "seller", + "status", + "know", + "return", + "credit", + "card", + "accept", + "mastercard", + "pay", + "with", + "cash", + "onli", + "method", + "chang", + "profil", + "inform", + "password", + "phone", + "address", + "reset", + "delet", + "account", + "common", + "reason", + "refund", + "avail", + "the", + "it", + "even", + "though", + "say", + "receiv", + "thank", + "that", + "lot", + "thx", + "thnks", + "track", + "im", + "okay", + "use", + "voucher" + ], + "intents": [ + "cancel", + "confirm", + "delay", + "delivery", + "greetings.bye", + "greetings.hello", + "items", + "more.contact", + "more.help", + "order", + "payments", + "personal", + "profile.info", + "reason", + "refund.demanding", + "refund.status", + "thanks", + "track", + "user.response", + "voucher" + ], + "perceptrons": [ + [ + 1.0137546062469482, + -0.5474245548248291, + 11.848198890686035, + 0.4021919369697571, + 2.41121768951416, + 0.7352370619773865, + -0.11675096303224564, + -0.531909167766571, + 0.6789054870605469, + 0.5686358213424683, + -0.43452420830726624, + -0.7262206673622131, + -0.287818044424057, + -0.287818044424057, + -0.7318246364593506, + -0.9134994149208069, + -1.9920411109924316, + -1.386992335319519, + -0.287818044424057, + -1.0195549726486206, + -1.6521244049072266, + -0.287818044424057, + -0.002797139110043645, + -0.002797139110043645, + -0.18727074563503265, + -0.18727074563503265, + -2.59305739402771, + -0.8779183626174927, + -0.8779183626174927, + -0.33857086300849915, + -0.5329172015190125, + -0.14780335128307343, + -0.14780335128307343, + -0.1599469631910324, + -0.0766788199543953, + -0.0694824680685997, + -0.0694824680685997, + -0.0694824680685997, + -0.0694824680685997, + -0.0069275954738259315, + -0.010616364888846874, + -0.003003086894750595, + -0.16376909613609314, + -0.31498128175735474, + -0.006510923616588116, + -0.13119056820869446, + -0.006111734081059694, + -0.11673133820295334, + -0.11673133820295334, + -0.008423068560659885, + -0.0037213850300759077, + -0.0035652429796755314, + -0.0034156523179262877, + -0.012222626246511936, + -0.012222626246511936, + -0.02360852062702179, + -0.015696197748184204, + -0.0112577760592103, + -0.2867816090583801, + -0.17207609117031097, + 0, + 0, + -0.050361473113298416, + 0, + 0, + -0.3207390010356903, + -0.21179741621017456, + -0.11934908479452133, + -0.060127075761556625, + -0.24743472039699554, + -0.027676893398165703, + -0.5639355182647705, + -0.049367498606443405, + -0.015957951545715332, + -0.015957951545715332, + -0.015957951545715332, + -0.011720363982021809, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.4059183895587921, + -0.4059183895587921, + -0.2879806160926819, + -0.3107443153858185, + -0.3107443153858185, + 0, + 0, + -0.020473212003707886, + 0, + -0.011515682563185692, + -0.025052422657608986, + -0.5015026330947876, + -0.0068354010581970215, + -0.017309928312897682, + 0, + 0, + 0, + 0, + -0.38837194442749023, + -0.22747227549552917, + -0.22747227549552917, + 0, + 0, + -0.48755571246147156, + -0.48755571246147156, + -0.48755571246147156, + 0, + 0, + 0, + 0, + -0.005079725757241249, + -0.005079725757241249, + 0, + 0, + -2.282877206802368, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -2.269744634628296, + -0.018390238285064697, + 0, + 0, + 0, + -0.9896306948005769 + ], + [ + -0.3291322588920593, + -0.7270809412002563, + -0.16681955754756927, + -1.7737600803375244, + 1.892374873161316, + -1.1385151147842407, + -0.004768540151417255, + -0.19638314843177795, + -0.29744264483451843, + -0.18516650795936584, + 0.7383124828338623, + 4.340796947479248, + 0.2160470336675644, + 0.2160470336675644, + 2.533582925796509, + -0.36327800154685974, + 2.891287326812744, + -0.25634461641311646, + 0.09664863348007202, + 5.821985244750977, + -0.5967516303062439, + 0.2160470336675644, + 0.8364499807357788, + 0.6777428388595581, + 0.332731157541275, + 1.4811530113220215, + -0.5748860836029053, + -0.7142410278320312, + -0.7142410278320312, + -0.22726833820343018, + -0.18083734810352325, + -0.10491679608821869, + -0.10491679608821869, + -0.2062942087650299, + -0.036959417164325714, + -0.01146351732313633, + -0.01146351732313633, + -0.029890920966863632, + -0.01146351732313633, + -0.0765857994556427, + -0.1386977881193161, + -0.056668512523174286, + -0.061468705534935, + -0.4443903863430023, + -0.061468705534935, + -0.15229962766170502, + -0.057634614408016205, + -0.07866756618022919, + -0.07866756618022919, + -0.1323222666978836, + -0.0604797825217247, + -0.05799480155110359, + -0.055611882358789444, + -0.05049731209874153, + -0.10385537892580032, + -0.04838823154568672, + -0.04838823154568672, + -0.05117446184158325, + -0.1468285769224167, + -0.1599263697862625, + -0.03525151312351227, + -0.06675173342227936, + -0.3849853277206421, + -0.06461493670940399, + -0.05490032583475113, + -0.11226759105920792, + -0.11075426638126373, + -0.059033848345279694, + -0.03388472646474838, + -0.03388472646474838, + -0.03679174557328224, + -0.08090842515230179, + -0.03815352916717529, + -0.01093367300927639, + -0.01093367300927639, + -0.01093367300927639, + -0.32491371035575867, + -0.021362071856856346, + -0.021362071856856346, + -0.01930716447532177, + -0.01930716447532177, + -0.01930716447532177, + -0.02836797386407852, + -0.02836797386407852, + -0.023965725675225258, + -0.04677771031856537, + -0.06024671345949173, + -0.012021305970847607, + -0.012021305970847607, + -0.009854178875684738, + -0.06307084113359451, + -0.03795885667204857, + -0.013223793357610703, + -0.0717272013425827, + -0.0205734483897686, + -0.017550142481923103, + -0.0036168168298900127, + -0.006382063962519169, + -0.2861216962337494, + 0, + -0.0005231029936112463, + -0.038572512567043304, + 0, + 0, + 0, + -0.019087273627519608, + -0.00501098670065403, + -0.00501098670065403, + 0, + -0.26335811614990234, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -1.4128700494766235, + -0.005007071420550346, + -0.038572512567043304, + -0.038572512567043304, + -0.04391763359308243, + -0.04391763359308243, + -0.062341995537281036, + -1.1483964920043945, + -0.0012407215544953942, + 0, + 0, + -0.001188663300126791, + -0.0011387893464416265, + -1.2280935049057007, + 0, + 0, + 0, + 0, + -0.6626121500146844 + ], + [ + -1.2319387197494507, + -0.21801558136940002, + -7.187047004699707, + 3.2004880905151367, + 1.9386931657791138, + 3.482285976409912, + 1.7419606447219849, + -0.49997925758361816, + 2.0536139011383057, + -0.010287845507264137, + -0.7569913864135742, + -0.7583239674568176, + -0.7569913864135742, + -0.7569913864135742, + -0.7569913864135742, + 1.2748510837554932, + -1.373896598815918, + 4.428487300872803, + -0.7913482785224915, + -0.7583239674568176, + -2.4707539081573486, + -0.7569913864135742, + 0, + 0, + -0.19782285392284393, + 0, + 6.592715263366699, + -0.01434242632240057, + -0.01434242632240057, + 2.600883960723877, + -3.6173911094665527, + -0.23327256739139557, + -0.23327256739139557, + -0.2857179045677185, + -0.04939230531454086, + -0.6831585168838501, + -0.6831585168838501, + -0.6831585168838501, + -0.6831585168838501, + -0.04469833895564079, + -0.05349443107843399, + -0.019467800855636597, + -0.02620924822986126, + -0.21258683502674103, + -0.02620924822986126, + -1.9369317293167114, + -0.024292727932333946, + -0.04075866937637329, + -0.04075866937637329, + -0.06484147161245346, + -0.03467138111591339, + -0.03325444832444191, + -0.031895387917757034, + -0.13987219333648682, + -0.16497263312339783, + -0.02490754798054695, + -0.02490754798054695, + -0.031334955245256424, + -0.07237178832292557, + -0.07801632583141327, + -0.011419232003390789, + -0.01838001422584057, + -0.021844979375600815, + -0.024473845958709717, + -0.017832733690738678, + -0.04915530979633331, + -0.07258743047714233, + -0.040489088743925095, + -0.017853913828730583, + -0.017853913828730583, + -0.7192970514297485, + -0.7398727536201477, + -0.015225691720843315, + -0.008584280498325825, + -0.008584280498325825, + -0.008584280498325825, + -0.0018613251158967614, + -0.0004067723057232797, + -0.0004067723057232797, + -0.0012511666864156723, + -0.0012511666864156723, + -0.0012511666864156723, + -0.005174988880753517, + -0.005174988880753517, + -0.012096227146685123, + -0.012096227146685123, + -0.016754278913140297, + -0.010287845507264137, + -0.010287845507264137, + -0.008589562959969044, + -0.029535546898841858, + -0.017882922664284706, + -0.006336822174489498, + -0.046847932040691376, + -0.0018024882301688194, + -0.005290467292070389, + 0, + 0, + -1.9490653276443481, + -0.061430059373378754, + -0.061430059373378754, + -0.2684548497200012, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.20504964888095856, + -0.07669688761234283, + -0.07669688761234283, + -0.08714839071035385, + -0.014107950031757355, + -0.003805781714618206, + -0.012716507539153099, + -0.5159547328948975, + -0.5159547328948975, + -0.6215592622756958, + -1.8250330686569214, + -1.2078466415405273, + 0, + -0.2684548497200012, + -0.2684548497200012, + 0, + 0, + 0, + -0.19782285392284393, + 0, + 0, + 0, + 0, + 0, + -0.9307127594947815, + 0, + 0, + 0, + 0, + -2.8474070106071645 + ], + [ + -1.4451781511306763, + -1.0388836860656738, + -1.4264543056488037, + 2.5314676761627197, + -0.6839140057563782, + 0.7223742604255676, + -0.3522108495235443, + 1.6454493999481201, + 0.5822571516036987, + -0.03301115334033966, + -0.31011736392974854, + -0.31032857298851013, + -0.31011736392974854, + -0.31011736392974854, + -0.32225391268730164, + -0.8661167025566101, + 1.6880625486373901, + 1.8911114931106567, + -0.43638893961906433, + -0.32240062952041626, + -1.270650029182434, + -0.31011736392974854, + 0, + 0, + -0.354684978723526, + -0.006027175113558769, + -2.6551761627197266, + 2.678882122039795, + 2.678882122039795, + 2.1090545654296875, + 3.617849349975586, + 4.080210208892822, + 4.080210208892822, + 2.783381223678589, + 3.421110153198242, + 2.7887074947357178, + 2.7887074947357178, + 2.250455617904663, + 2.7887074947357178, + -0.17000629007816315, + -1.0011149644851685, + -0.852727472782135, + -0.12743763625621796, + -1.3179848194122314, + -0.08253855258226395, + -1.0258104801177979, + -0.07425964623689651, + -0.09686865657567978, + -0.09686865657567978, + -0.28232651948928833, + -0.13063865900039673, + -0.12527960538864136, + -0.12014026939868927, + -0.14789435267448425, + -0.23303095996379852, + -0.09936640411615372, + -0.4535828232765198, + -0.07006469368934631, + -0.19244204461574554, + -0.23298411071300507, + -0.04336852952837944, + -0.07129500061273575, + -0.3177240490913391, + -0.0663289874792099, + -0.05570872128009796, + -0.14094312489032745, + -0.23260855674743652, + -0.1286415457725525, + -0.05846906080842018, + -0.09133340418338776, + -0.5046393275260925, + -1.0630557537078857, + -0.34214919805526733, + -0.031061027199029922, + -0.031061027199029922, + -0.031061027199029922, + -0.3316175937652588, + -0.004776031244546175, + -0.004776031244546175, + -0.006242210045456886, + -0.006242210045456886, + -0.006242210045456886, + -0.019280698150396347, + -0.019280698150396347, + -0.05666345730423927, + -0.6110260486602783, + -0.6137350797653198, + -0.03301115334033966, + -0.03301115334033966, + -0.02883484587073326, + -0.23428231477737427, + -0.16950009763240814, + -0.0407194085419178, + -0.15757475793361664, + -0.21978570520877838, + -0.03889086842536926, + -0.11133536696434021, + -0.24443987011909485, + -1.0306564569473267, + -0.10143721848726273, + -0.20791855454444885, + -0.7177991271018982, + -0.3758620321750641, + 0, + 0, + -0.23245687782764435, + 0, + 0, + 0, + 0, + -0.5588673949241638, + -0.39160844683647156, + -0.39160844683647156, + -0.11280962079763412, + -0.01937008835375309, + -0.006116317119449377, + -0.02907666377723217, + -0.7320131063461304, + -0.7320131063461304, + -0.6825774312019348, + -0.6825774312019348, + -0.803561806678772, + 0, + -0.29712578654289246, + -0.29712578654289246, + 0, + 0, + 0, + -0.3424622714519501, + 0, + 0, + 0, + 0, + 0, + -0.40630239248275757, + 0, + 0, + 0, + 0, + -1.0805806744340831 + ], + [ + -2.1148478984832764, + 0.7997274994850159, + 0, + -0.8561583161354065, + -0.9215051531791687, + -0.006411668844521046, + -0.6620265245437622, + -1.2655911445617676, + -2.195646286010742, + -0.1171831414103508, + -0.22510455548763275, + -0.32071661949157715, + 0, + 0, + -0.22510455548763275, + -0.1251218467950821, + -0.439662367105484, + 0, + -0.23576650023460388, + -0.32071661949157715, + -2.3462860584259033, + 0, + -0.22510455548763275, + -0.4320996403694153, + -0.3351232707500458, + 0, + -1.3317266702651978, + 0, + 0, + -0.18428704142570496, + -0.7287682294845581, + -0.8036311864852905, + -0.8036311864852905, + 1.5954744815826416, + -0.4747324287891388, + 0, + 0, + -0.22864001989364624, + 0, + 12.440009117126465, + 7.522450923919678, + 3.414806365966797, + 5.261117458343506, + 0.5175203084945679, + 6.749449253082275, + 0.9009185433387756, + 4.107618808746338, + 5.865237712860107, + 5.865237712860107, + -1.7676278352737427, + -1.747532844543457, + -1.7450001239776611, + -1.7422480583190918, + -0.5406187176704407, + -0.6789042353630066, + -1.2395411729812622, + -0.739136278629303, + -0.18670904636383057, + -0.3578399419784546, + -2.0377581119537354, + -0.09841568022966385, + -0.12081167101860046, + -1.1265017986297607, + -0.22349581122398376, + -0.1958358734846115, + -0.5817500352859497, + -2.1600258350372314, + -1.4215301275253296, + -0.296112596988678, + -1.8322443962097168, + -0.6588131785392761, + -0.9206690192222595, + -0.4332333505153656, + -0.3052285313606262, + -0.3052285313606262, + -0.3052285313606262, + -0.02176925726234913, + 0, + 0, + -0.0050658793188631535, + -0.0050658793188631535, + -0.0050658793188631535, + -0.029020555317401886, + -0.029020555317401886, + -0.27671024203300476, + -0.533606231212616, + -1.04434072971344, + -0.1171831414103508, + -0.1171831414103508, + -0.13155850768089294, + -0.5340460538864136, + -0.3047577440738678, + -0.2095731496810913, + -1.2781013250350952, + -0.493476003408432, + -0.4744429588317871, + -0.0272076353430748, + -0.03713247552514076, + -0.35035839676856995, + -0.09408554434776306, + -0.12777751684188843, + -1.0055477619171143, + -0.9965164065361023, + -0.12271378934383392, + -0.12271378934383392, + -0.12974151968955994, + -0.12974151968955994, + -0.7104417681694031, + -0.5687134265899658, + 0, + -0.1271994262933731, + 0, + 0, + -0.11704851686954498, + 0, + -0.05229974165558815, + -0.04225518926978111, + -0.4482121765613556, + -0.4482121765613556, + -0.39033257961273193, + -1.3211712837219238, + -0.6426398158073425, + -0.08353639394044876, + -0.006411668844521046, + -0.006411668844521046, + -0.02102518081665039, + -0.02102518081665039, + -0.17535850405693054, + -0.3351232707500458, + -2.2644107341766357, + -0.04576003551483154, + 0, + -1.7263158559799194, + -1.72139310836792, + -0.8258929252624512, + -0.507616400718689, + -0.38756808638572693, + -0.00036949245259165764, + -0.00036949245259165764, + 1.7494741355394363 + ], + [ + -0.7732609510421753, + -4.034710884094238, + -0.16621102392673492, + -1.6832696199417114, + -2.2922849655151367, + -0.43388643860816956, + -1.0391435623168945, + -5.290063381195068, + -2.185589551925659, + -0.12314745038747787, + -0.5387074947357178, + -0.6298438906669617, + 0, + 0, + -0.5978250503540039, + 0, + -1.0414392948150635, + 0, + -0.31424424052238464, + -0.6889615654945374, + -2.4489927291870117, + 0, + -0.5387074947357178, + -1.0135843753814697, + -0.6875489354133606, + -0.04868263751268387, + -2.267845630645752, + 0, + 0, + -0.3452916443347931, + -1.842872977256775, + -0.07328616827726364, + -0.07328616827726364, + -1.2708898782730103, + -0.07328616827726364, + -0.01949692890048027, + -0.01949692890048027, + -0.638847827911377, + -0.01949692890048027, + -3.9341750144958496, + -1.613313913345337, + -1.1190882921218872, + -0.738145649433136, + -2.546537160873413, + -0.717369019985199, + -1.8951687812805176, + -0.4939974844455719, + -0.11324970424175262, + -0.11324970424175262, + 10.278204917907715, + 10.237865447998047, + 10.222160339355469, + 10.205157279968262, + 6.274806022644043, + 4.996850490570068, + 2.905292510986328, + 7.114895343780518, + -0.2540985643863678, + -1.758578896522522, + -0.7043660879135132, + -1.2804059982299805, + -1.3918099403381348, + -2.1373608112335205, + -0.1865386962890625, + -0.13705794513225555, + -0.44377002120018005, + -2.8761284351348877, + -0.4335267245769501, + -0.3696480691432953, + -0.3948061168193817, + -0.19673971831798553, + -1.0657670497894287, + -1.130800485610962, + -0.09097345173358917, + -0.09097345173358917, + -0.09097345173358917, + -4.737697601318359, + -0.07488127052783966, + -0.07488127052783966, + -0.07511845231056213, + -0.07511845231056213, + -0.07511845231056213, + -0.07152976095676422, + -0.07152976095676422, + -0.7411147356033325, + -1.3895823955535889, + -2.6020333766937256, + -0.12314745038747787, + -0.12314745038747787, + -0.10397472232580185, + -1.4408961534500122, + -0.725871205329895, + -0.6670722365379333, + -2.7231180667877197, + -0.3968248665332794, + -1.4507756233215332, + -0.20117171108722687, + -0.30739134550094604, + -1.123271107673645, + 0, + -0.1443576067686081, + -0.3079591393470764, + -0.05154714360833168, + -0.1468522697687149, + -0.1468522697687149, + -0.2189943641424179, + -0.2189943641424179, + -0.4288059175014496, + -0.17068028450012207, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -1.2483890056610107, + -1.2483890056610107, + -0.32805249094963074, + -0.7630698680877686, + -1.8030940294265747, + -0.4283504784107208, + -0.21113920211791992, + -0.21113920211791992, + -0.34558773040771484, + -0.34558773040771484, + -0.08313897997140884, + -0.6284115314483643, + -4.005587577819824, + -1.0675207376480103, + -0.5681915879249573, + -3.989133358001709, + -3.9799017906188965, + -1.730439305305481, + -6.760979175567627, + 0, + 0, + 0, + 4.00835038226357 + ], + [ + -2.0729150772094727, + 1.2105480432510376, + 0, + -3.075517416000366, + -2.1280879974365234, + 0, + -1.4291672706604004, + -3.7731683254241943, + 3.750875234603882, + -3.4637320041656494, + -3.808359146118164, + -0.7863858938217163, + -0.7863858938217163, + -0.7863858938217163, + -0.7863858938217163, + -0.7872745394706726, + -0.7872745394706726, + -0.8203457593917847, + 4.417398929595947, + -0.7863858938217163, + 7.2096943855285645, + -0.7863858938217163, + 0, + 0, + -0.0004443310899659991, + 0, + -1.4016138315200806, + 0, + 0, + -0.0339190810918808, + -0.5746974349021912, + 0, + 0, + -1.8838376998901367, + 0, + 0, + 0, + -0.29276347160339355, + 0, + 0, + -1.3986157178878784, + 0, + -2.1145453453063965, + 1.3252555131912231, + -0.3257300853729248, + 3.266697406768799, + -1.3986157178878784, + -0.37427330017089844, + -0.37427330017089844, + 0, + 0, + 0, + 0, + 0, + 1.3228527307510376, + -4.476612567901611, + 0, + 1.6962932348251343, + 2.854417085647583, + 5.147310733795166, + 1.3228527307510376, + 2.871696710586548, + -0.8401740193367004, + 2.4716386795043945, + 2.4736406803131104, + 8.386700630187988, + 3.6803982257843018, + 6.546629428863525, + 5.792974948883057, + 4.042235851287842, + 1.9097124338150024, + 0.2351648062467575, + 2.9972054958343506, + 0.014523402787744999, + 0.014523402787744999, + 0.014523402787744999, + 0.8547791838645935, + 2.3277828693389893, + 2.3277828693389893, + 1.5485361814498901, + 1.5485361814498901, + 1.5485361814498901, + 0.06981951743364334, + 0.06981951743364334, + -0.3465847671031952, + -0.7826536297798157, + -1.29860520362854, + -0.6727563142776489, + -0.6727563142776489, + -0.7746207118034363, + -1.5045040845870972, + -1.1596300601959229, + -0.21376065909862518, + -1.2060894966125488, + -0.7638314962387085, + -0.2846128046512604, + -0.21201957762241364, + -0.380899578332901, + -1.7838538885116577, + -0.3531716465950012, + -0.4074578583240509, + -1.8838376998901367, + -1.8838376998901367, + -2.419515371322632, + -2.419515371322632, + -1.6732022762298584, + -0.5018000602722168, + -1.5228439569473267, + -0.8719638586044312, + -3.0196237564086914, + -0.23078517615795135, + 0, + 0, + -0.19459597766399384, + 0, + -0.06361047178506851, + -0.032615043222904205, + -0.06359861046075821, + -0.06359861046075821, + -0.5170090794563293, + -1.4016138315200806, + -2.525960922241211, + -0.01885991171002388, + 0, + 0, + 0, + 0, + 0, + -0.0004443310899659991, + -1.074087142944336, + 0, + -0.08746566623449326, + -0.0025967436376959085, + -0.002491012681275606, + 0, + -0.1930888444185257, + -4.403278350830078, + -0.8553791642189026, + -0.8553791642189026, + -0.4586347245196692 + ], + [ + -0.22140660881996155, + -0.2870965600013733, + 0, + -0.7846165299415588, + -0.15873953700065613, + -0.011281087063252926, + -2.0644774436950684, + -0.23955339193344116, + -0.19472968578338623, + -0.08523216098546982, + -0.10342646390199661, + -0.05132650211453438, + 0, + 0, + -0.025844065472483635, + -0.00017023066175170243, + -0.11176835745573044, + 0, + 0, + -0.05132650211453438, + -0.12461326271295547, + 0, + -0.025844065472483635, + -0.08902999758720398, + -0.06705322861671448, + 0, + -0.15028099715709686, + 0, + 0, + -0.0490955151617527, + -0.745243489742279, + -0.0033512338995933533, + -0.0033512338995933533, + -0.12648093700408936, + -0.0033512338995933533, + -0.6030545830726624, + -0.6030545830726624, + 3.2248520851135254, + -0.6030545830726624, + -0.12146465480327606, + -0.03870086744427681, + -0.03870086744427681, + 0, + -0.30469033122062683, + 0, + -1.3063645362854004, + 0, + 0, + 0, + -0.137643501162529, + -0.11902635544538498, + -0.1179807186126709, + -0.11715350300073624, + 0, + 0, + -0.1290770322084427, + -0.05281056836247444, + 0, + -0.002628645393997431, + 0, + 0, + 0, + -0.23906093835830688, + 0, + 0, + 0, + -0.0207328200340271, + 0, + 0, + 0, + -0.014595159329473972, + -0.27468565106391907, + -0.07625328004360199, + 0, + 0, + 0, + -0.095185287296772, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3.235283613204956, + 7.06290864944458, + 3.877683401107788, + -0.06153886765241623, + -0.06153886765241623, + -0.05395161360502243, + -0.2852313220500946, + -0.17201417684555054, + -0.08172166347503662, + -1.455437421798706, + -1.2979955673217773, + -0.053663939237594604, + -0.051299452781677246, + -0.07426265627145767, + -0.18414506316184998, + -0.014595159329473972, + -0.038418881595134735, + -0.08742590248584747, + -0.06441590934991837, + -0.0632362961769104, + -0.0632362961769104, + -0.052749164402484894, + -0.03576807305216789, + -0.10305000096559525, + -0.0530945248901844, + -0.06034179404377937, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.0791553482413292, + -0.0791553482413292, + -0.04793284460902214, + -0.06975246965885162, + -0.23104454576969147, + -0.0613517090678215, + -0.011281087063252926, + -0.011281087063252926, + -0.011696902103722095, + -0.011696902103722095, + -0.03297434374690056, + -0.06705322861671448, + -0.21499337255954742, + -1.9282985925674438, + -0.0005038426024839282, + -0.14002913236618042, + -0.13676577806472778, + -0.0662107840180397, + -0.08920516818761826, + -0.009708352386951447, + 0, + 0, + 0.11517137685731398 + ], + [ + 3.200519561767578, + -0.7589099407196045, + -1.5275399684906006, + -3.0995192527770996, + -2.00679612159729, + 0, + -1.429031491279602, + -0.012760818004608154, + -1.0567845106124878, + 0.7500213384628296, + -0.299394428730011, + -0.07060258835554123, + 0, + 0, + -0.0594392791390419, + 0, + -0.12525728344917297, + 0, + 0, + -0.07060258835554123, + -1.4175167083740234, + 0, + -0.0594392791390419, + -0.0651191994547844, + -0.11094554513692856, + 0, + -0.9104652404785156, + 0, + 0, + -0.00293157109990716, + -0.5573859810829163, + -0.08501628041267395, + -0.08501628041267395, + -0.3801807165145874, + -0.05955946817994118, + 0, + 0, + -0.552058219909668, + 0, + -0.3559640347957611, + -0.7074311971664429, + -0.023821957409381866, + -0.042731598019599915, + -1.234588623046875, + 0, + 1.0346851348876953, + -0.6757804155349731, + 0, + 0, + -0.38050055503845215, + -0.3475361168384552, + -0.3460211753845215, + -0.3452502191066742, + 0, + 0, + -0.3270740211009979, + -0.35466599464416504, + 0, + -1.6785608530044556, + -0.042731598019599915, + 0, + 0, + -0.8738346695899963, + 0, + 0, + -1.3493611812591553, + -0.33822640776634216, + -0.2678961753845215, + 0, + -0.042731598019599915, + -3.1001944541931152, + 2.860347270965576, + 1.7957031726837158, + -0.018584920093417168, + -0.018584920093417168, + -0.018584920093417168, + -0.5774023532867432, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.5536002516746521, + -1.1061232089996338, + 1.3213735818862915, + 3.957881212234497, + 3.957881212234497, + 4.638659954071045, + 4.42684268951416, + 2.3681249618530273, + 2.0528454780578613, + 7.3816752433776855, + 4.17827033996582, + 6.468132495880127, + 4.017130374908447, + 5.217040538787842, + -1.9796524047851562, + -0.3908320665359497, + -1.6709413528442383, + -0.19154834747314453, + -0.19154834747314453, + -0.17416070401668549, + -0.17416070401668549, + -1.2428146600723267, + -0.7238667011260986, + -0.8973953723907471, + -0.0867948979139328, + -0.16916145384311676, + -2.2424511909484863, + -0.32075998187065125, + -0.32075998187065125, + -0.2476712465286255, + -1.478501558303833, + 0, + -0.006954232230782509, + 0, + 0, + -0.3725646734237671, + -0.7989145517349243, + -1.854297399520874, + -0.016981689259409904, + 0, + 0, + 0, + 0, + -0.00293157109990716, + -0.11094554513692856, + -0.6883361339569092, + -0.3473883867263794, + -0.3317181169986725, + -0.4416748285293579, + -0.43391868472099304, + -0.1418841928243637, + -0.27213436365127563, + -0.021505234763026237, + -2.5270771980285645, + -2.5270771980285645, + 0.3450876493306147 + ], + [ + -0.6420600414276123, + -1.9181957244873047, + -0.9622277617454529, + 1.3733851909637451, + 1.7130494117736816, + -2.1014411449432373, + 0.9902098774909973, + 0.909596860408783, + -1.1616764068603516, + -0.0607258602976799, + -0.4026883542537689, + -0.10765376687049866, + -0.0967993512749672, + -0.0967993512749672, + -0.2516874670982361, + -0.5531376600265503, + -0.9255282282829285, + -0.5531376600265503, + -0.0967993512749672, + -0.2632655203342438, + 3.4905331134796143, + -0.0967993512749672, + 0, + -2.0475926399230957, + -0.12525439262390137, + -0.12525439262390137, + -0.9677612781524658, + -0.021905967965722084, + -0.021905967965722084, + -1.255740761756897, + -0.11220162361860275, + 0, + 0, + -0.04746983200311661, + 0, + -0.07886837422847748, + -0.07886837422847748, + -0.07886837422847748, + -0.07886837422847748, + 0, + 0, + 0, + 0, + -1.0360527038574219, + 0, + -0.02445678412914276, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.28641000390052795, + 0, + -0.21070648729801178, + 0, + -0.47402000427246094, + 0, + -0.28641000390052795, + -0.3845341205596924, + -1.04691481590271, + -0.2858976721763611, + -0.28032997250556946, + 0, + 0, + 0, + 0, + 0, + -0.9096251130104065, + 1.1884770393371582, + -0.6546885967254639, + 0, + 0, + 0, + -0.7524798512458801, + -0.10243398696184158, + -0.10243398696184158, + -0.09811604022979736, + -0.09811604022979736, + -0.09811604022979736, + 0, + 0, + 0, + 0, + -0.015519799664616585, + 0, + 0, + 0, + -0.3532436788082123, + -0.3532436788082123, + 0, + -0.3316343426704407, + -0.3924787938594818, + 0, + -0.2033385932445526, + -0.24257385730743408, + 7.729468822479248, + 2.36399245262146, + 5.470393657684326, + -0.6171549558639526, + -0.04746983200311661, + -0.06629005819559097, + -0.06629005819559097, + -0.2993519902229309, + -0.10318173468112946, + -0.1877218633890152, + -0.05038710683584213, + -0.2762553095817566, + -1.657719612121582, + -0.20799502730369568, + -0.20799502730369568, + -0.8902863264083862, + -0.3316343426704407, + -0.32283616065979004, + -0.3706023395061493, + -0.5664393901824951, + -0.5664393901824951, + -0.015637066215276718, + -0.02445678412914276, + -2.798739433288574, + 0, + -0.5251821875572205, + -0.5251821875572205, + -1.4305318593978882, + -1.4305318593978882, + -0.6157680153846741, + 0, + 0, + -0.015519799664616585, + 0, + 0, + 0, + -1.0123201608657837, + 0, + 0, + -0.39987918734550476, + -0.39987918734550476, + -1.012125551662553 + ], + [ + -3.8618507385253906, + 2.661921739578247, + -0.324486643075943, + -2.681408166885376, + -1.070864200592041, + -0.1429082453250885, + -0.9401305913925171, + -2.0808780193328857, + 3.4362409114837646, + -0.5510810613632202, + 5.012321949005127, + -1.0682185888290405, + -0.24958382546901703, + -0.24958382546901703, + -1.0682185888290405, + -0.24958382546901703, + -0.5058361291885376, + -1.057460904121399, + -1.2256693840026855, + -1.0682185888290405, + -0.5766453146934509, + -0.24958382546901703, + -0.7393555045127869, + -0.7923861742019653, + -0.02366284839808941, + 0, + -0.5207908749580383, + 0, + 0, + -0.9092050790786743, + -1.1664316654205322, + -0.23604610562324524, + -0.23604610562324524, + 2.949445962905884, + -0.22940532863140106, + 0, + 0, + 0, + 0, + -0.10126614570617676, + -1.332739233970642, + -1.332739233970642, + -0.5901528000831604, + -0.7608097195625305, + -0.5048365592956543, + -0.5548068881034851, + 0, + -1.1728324890136719, + -1.1728324890136719, + -0.06950733810663223, + -0.04147882014513016, + -0.03993690013885498, + -0.03845171630382538, + 0, + -0.10618571937084198, + -1.829228401184082, + -0.6239013671875, + -0.7514669299125671, + -2.0999088287353516, + -1.7867448329925537, + -0.10618571937084198, + -0.9889819622039795, + 0.08560609817504883, + -2.1254465579986572, + -1.9958056211471558, + -0.3938402533531189, + -1.6643561124801636, + -0.16029290854930878, + -0.31657809019088745, + -0.39398059248924255, + -0.7145650386810303, + -0.7145650386810303, + -0.6206731796264648, + -0.007626057136803865, + -0.007626057136803865, + -0.007626057136803865, + 3.9068644046783447, + -0.7097881436347961, + -0.7097881436347961, + -0.8330930471420288, + -0.8330930471420288, + -0.8330930471420288, + -0.13839125633239746, + -0.13839125633239746, + 0, + 0, + -0.08971934020519257, + 0, + 0, + -0.2813188433647156, + -0.2813188433647156, + -0.2813188433647156, + 0, + -0.09263147413730621, + 0, + 0, + 0, + 0, + -0.19597065448760986, + 0, + 0, + 4.378785133361816, + 4.526092529296875, + 5.922995090484619, + 5.922995090484619, + 10.107356071472168, + -1.0512547492980957, + 6.942415714263916, + 7.998384952545166, + 6.079689025878906, + -0.7038584351539612, + -0.15375125408172607, + -0.15375125408172607, + -0.23844508826732635, + -0.09263147413730621, + -0.05494779720902443, + -0.048433784395456314, + -0.09314513951539993, + -0.09314513951539993, + -0.23382462561130524, + -0.35334011912345886, + -1.2957956790924072, + -0.409479022026062, + -0.1429082453250885, + -0.1429082453250885, + -0.009866238571703434, + -0.009866238571703434, + -0.023210253566503525, + -0.02366284839808941, + -1.1075395345687866, + -0.08971934020519257, + -0.022661320865154266, + -0.2660955786705017, + -0.2567301392555237, + -0.18965840339660645, + -1.3401103019714355, + -0.6953500509262085, + -0.5650429129600525, + -0.5650429129600525, + -0.2684726967987179 + ], + [ + -1.0223896503448486, + -3.3254759311676025, + -0.3594515919685364, + -1.2034928798675537, + -0.7094810009002686, + -0.11835822463035583, + 3.11519455909729, + 7.990487098693848, + 0.09484227001667023, + -0.03216062858700752, + -0.9383915066719055, + 0, + 0, + 0, + -0.043270353227853775, + 0, + -0.18485020101070404, + 0, + -0.6258415579795837, + -0.043270353227853775, + -2.782179832458496, + 0, + 0, + -0.12773528695106506, + -0.06305236369371414, + -0.043270353227853775, + -0.24601295590400696, + 0, + 0, + -0.10957992821931839, + -0.8636319041252136, + -1.4621272087097168, + -1.4621272087097168, + -1.591508150100708, + -0.7966815233230591, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.6140099167823792, + 3.904226064682007, + -0.6140099167823792, + -0.17317022383213043, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.2878693640232086, + -0.3986928164958954, + -0.9750335216522217, + 3.525062322616577, + -0.35377830266952515, + -1.0733240842819214, + -1.0409214496612549, + -0.06699375808238983, + -0.6057316064834595, + 5.004830837249756, + -0.3178902864456177, + -0.25369635224342346, + 0, + 0, + 0, + 0, + 0, + -0.13478565216064453, + -3.095573663711548, + -1.419830322265625, + 0, + 0, + 0, + 2.3318679332733154, + -0.4985043406486511, + -0.4985043406486511, + -0.4953354299068451, + -0.4953354299068451, + -0.4953354299068451, + -0.16272452473640442, + -0.16272452473640442, + 0, + 0, + -0.37520232796669006, + 0, + 0, + 0, + -0.7256875038146973, + -0.7256875038146973, + 0, + -0.015781344845891, + -0.7694862484931946, + 0, + -0.377000093460083, + -0.4205278754234314, + -1.2554208040237427, + 0, + -0.9600287079811096, + -0.24299727380275726, + -0.11906661838293076, + -0.7379854321479797, + -0.7379854321479797, + -2.122434139251709, + 0, + -3.112035036087036, + -3.112035036087036, + -0.9383915066719055, + -0.4391774535179138, + -0.31684646010398865, + -0.31684646010398865, + -0.05564532428979874, + -0.015781344845891, + -0.005053800996392965, + -0.009785249829292297, + -0.03709046170115471, + -0.03709046170115471, + -0.09168491512537003, + -0.17317022383213043, + -1.3464040756225586, + -0.9806076288223267, + -0.08754246681928635, + -0.08754246681928635, + -0.10532320290803909, + -0.10532320290803909, + -0.006247076205909252, + -0.011304006911814213, + -1.222589373588562, + -0.37520232796669006, + -0.10687950998544693, + -0.0387471504509449, + -0.03715534880757332, + -0.22339007258415222, + -0.1271572709083557, + 0, + -0.8067957758903503, + -0.8067957758903503, + -2.6753750922540664 + ], + [ + -0.12718820571899414, + -0.9853842854499817, + -0.5445895195007324, + 5.641761779785156, + -4.2250847816467285, + -0.280537873506546, + -0.4256134331226349, + 0.3338262736797333, + -0.918182909488678, + -1.3661450147628784, + 0, + 0, + 0, + 0, + 0, + -0.6540312767028809, + -0.6540312767028809, + -0.8484894037246704, + 0, + 0, + 0, + 0, + 0, + 0, + -0.6540312767028809, + 0, + -0.5487508773803711, + 0, + 0, + -0.8484894037246704, + -2.1415629386901855, + -0.0575675331056118, + -0.0575675331056118, + -0.0575675331056118, + -0.0575675331056118, + -0.8333489298820496, + -0.8333489298820496, + -0.8333489298820496, + -0.8333489298820496, + 0, + 0, + 0, + 0, + -0.1419188380241394, + 0, + -0.4246017634868622, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.15350814163684845, + 0, + 0, + -1.3661450147628784, + 0, + 0, + 0, + -0.037509985268116, + 0, + 0, + -0.844822108745575, + -0.22552567720413208, + 0, + 0, + 0, + 1.1137510538101196, + 0.27898016571998596, + -1.4447450637817383, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.11407973617315292, + 0, + 0, + 0, + -0.5878565311431885, + -0.3544137477874756, + -0.21363283693790436, + 0.967481255531311, + -0.3053710162639618, + -0.7675119638442993, + -0.007795386016368866, + -0.007795386016368866, + -2.1931285858154297, + -2.1931285858154297, + -2.1931285858154297, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 5.353912830352783, + 2.1121280193328857, + 2.1121280193328857, + 3.23943829536438, + 2.038325786590576, + 2.9767329692840576, + 5.013604164123535, + 4.2997145652771, + 4.2997145652771, + -0.19218771159648895, + -0.3588467240333557, + -3.047213554382324, + 0, + 0, + 0, + 0, + 0, + 0, + -0.6540312767028809, + -0.250901460647583, + -0.08072638511657715, + -0.021549042314291, + -0.09487134218215942, + -0.09106424450874329, + -2.8172950744628906, + -0.0021756167989224195, + -0.04602548107504845, + -0.4669470489025116, + -0.4669470489025116, + -0.14674373041027708 + ], + [ + -0.23209355771541595, + -1.1615275144577026, + -0.005190588533878326, + -3.6277239322662354, + -3.169827938079834, + -1.4822739362716675, + -1.7275220155715942, + -1.2139179706573486, + -0.2021854668855667, + -0.1523972898721695, + -0.11314810812473297, + -0.08779977262020111, + 0, + 0, + -0.059583138674497604, + -1.5408085584640503, + -0.15550094842910767, + -1.6674295663833618, + 0, + -0.08779977262020111, + -0.05608239024877548, + 0, + -0.059583138674497604, + -0.16862013936042786, + -0.045018356293439865, + 0, + 9.606298446655273, + 0, + 0, + -0.24552878737449646, + 4.0383477210998535, + -1.0773080587387085, + -1.0773080587387085, + -1.092512607574463, + 0, + -0.3511105179786682, + -0.3511105179786682, + -0.3511105179786682, + -0.3511105179786682, + -0.4085167646408081, + -0.9077059030532837, + -0.007602308411151171, + -0.09288404881954193, + -0.23860332369804382, + -0.09288404881954193, + 1.0059305429458618, + -0.8925086259841919, + 0, + 0, + -0.41859158873558044, + -0.4048844575881958, + -0.4027630090713501, + -0.4005860686302185, + 0, + -0.0000060307379499136005, + -0.3426108956336975, + -0.0742335394024849, + 0, + -0.19533050060272217, + 0, + -0.0000060307379499136005, + -0.03409332409501076, + -0.1738254725933075, + 0, + 0, + 0, + -0.5821152925491333, + -0.4939543306827545, + 0, + 0, + -0.09052671492099762, + -0.20556989312171936, + -0.14422670006752014, + -0.15840737521648407, + -0.15840737521648407, + -0.15840737521648407, + -0.05607032775878906, + 0, + 0, + -0.03408125042915344, + -0.03408125042915344, + -0.03408125042915344, + 0, + 0, + -0.00014428634312935174, + -0.00014428634312935174, + -0.7335526943206787, + 0, + 0, + 0, + -0.004638887010514736, + -0.001708140131086111, + -0.001953831408172846, + -0.6299360990524292, + -0.6226332187652588, + 0, + 0, + 0, + -0.1530466079711914, + 0, + 0, + -0.04347405955195427, + 0, + 0, + 0, + 0, + 0, + -0.0043099685572087765, + -0.0043099685572087765, + -0.02191714569926262, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -3.760802745819092, + 3.084120035171509, + -0.6946653127670288, + -0.08140380680561066, + -0.04347405955195427, + -0.04347405955195427, + -0.034206993877887726, + -0.034206993877887726, + -0.02565651200711727, + -0.045018356293439865, + -0.42496785521507263, + -0.07680274546146393, + -0.033271674066782, + -0.4210048317909241, + -0.41981253027915955, + -0.11387768387794495, + -0.16938365995883942, + -0.012891450896859169, + -0.08184230327606201, + -0.08184230327606201, + 0.42938872349061835 + ], + [ + 1.292214274406433, + 0.26029807329177856, + -3.265094041824341, + 1.323584794998169, + 2.0901131629943848, + -0.3446880578994751, + -1.5694751739501953, + -0.8493215441703796, + -0.5331605672836304, + 1.0180702209472656, + -0.0004536763299256563, + 0, + 0, + 0, + 0, + -1.6404364109039307, + -3.4016611576080322, + -0.037170104682445526, + 0, + 0, + -1.677952527999878, + 0, + 0, + -2.535099506378174, + -2.8807036876678467, + 0, + -0.037170104682445526, + 0, + 0, + -2.04948091506958, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.0057027386501431465, + -0.5997958779335022, + 0, + 0, + 0, + -0.05450645834207535, + -0.05450645834207535, + 0, + 0, + 0, + 0, + 0, + -0.7775706052780151, + -0.4098859131336212, + 0, + -0.4394400715827942, + 2.708770275115967, + -0.4485231637954712, + -0.7775706052780151, + -0.785632848739624, + 1.7545942068099976, + 0, + 0, + -0.398097425699234, + -0.5929336547851562, + 0, + 0, + -0.0057027386501431465, + 1.2487276792526245, + -0.1948939859867096, + -0.8948578238487244, + 0, + 0, + 0, + -0.7649872899055481, + -0.7560442090034485, + -0.7560442090034485, + -0.003941982984542847, + -0.003941982984542847, + -0.003941982984542847, + 0, + 0, + 0, + 0, + -0.015651213005185127, + -1.3101164102554321, + -1.3101164102554321, + -0.26000744104385376, + -0.26000744104385376, + -0.26000744104385376, + 0, + -0.13279704749584198, + 0, + 0, + 0, + 0, + -3.0560569763183594, + 0, + 0, + -0.3446880578994751, + 0, + 0, + 0, + -0.21462611854076385, + -0.21462611854076385, + -0.26094186305999756, + -0.039530932903289795, + -0.0004536763299256563, + -0.6876921057701111, + -0.10246691852807999, + -0.10246691852807999, + -0.5645003914833069, + -0.13279704749584198, + -0.25327029824256897, + -0.37001025676727295, + -0.4633078873157501, + -0.4633078873157501, + 0, + 0, + 10.846235275268555, + 3.3832929134368896, + -0.3446880578994751, + -0.3446880578994751, + -1.0060052871704102, + -1.0060052871704102, + -1.5285238027572632, + -2.8807036876678467, + -0.17504888772964478, + -0.015651213005185127, + -0.0056052375584840775, + -0.0669519379734993, + -0.06419989466667175, + -3.2434446811676025, + -0.012034664861857891, + -0.15987606346607208, + -0.5193120241165161, + -0.5193120241165161, + -1.6741036713965793 + ], + [ + -1.2913458347320557, + -1.1410175561904907, + -0.1504516303539276, + -0.4215856194496155, + -2.5707266330718994, + -0.003674748819321394, + 0.13974682986736298, + -0.6987276077270508, + -0.39745214581489563, + -1.0970606803894043, + -0.3989872634410858, + -0.5193899273872375, + -0.08799205720424652, + -0.08799205720424652, + -1.1870545148849487, + 1.5699361562728882, + 3.095979928970337, + -0.3248724043369293, + -0.08799205720424652, + -1.2793129682540894, + -0.37088605761528015, + -0.08799205720424652, + -0.23400215804576874, + 3.2401087284088135, + 3.209850788116455, + -0.7191513776779175, + -0.016282057389616966, + -0.31694793701171875, + -0.31694793701171875, + 2.076730966567993, + -0.18918496370315552, + -0.013376947492361069, + -0.013376947492361069, + -0.04278998076915741, + -0.004762548021972179, + -0.011217543855309486, + -0.011217543855309486, + -0.017532918602228165, + -0.011217543855309486, + -0.028222307562828064, + -0.0557534284889698, + -0.02368752472102642, + -0.014544656500220299, + -0.17036139965057373, + -0.014544656500220299, + -0.02665693685412407, + -0.02205268293619156, + -0.0021749138832092285, + -0.0021749138832092285, + -0.049194373190402985, + -0.023485533893108368, + -0.02252129279077053, + -0.021596623584628105, + -0.10593338310718536, + -0.11573706567287445, + -0.3629792332649231, + -0.0001258983975276351, + 0, + -1.1090625524520874, + 0, + -0.0036658381577581167, + -0.006373447831720114, + -2.0295188426971436, + 0, + 0, + 0, + -0.2419360876083374, + 0, + 0, + 0, + -0.722599983215332, + -1.3000450134277344, + -0.33351635932922363, + 0, + 0, + 0, + -0.00553872948512435, + -0.0023433116730302572, + -0.0023433116730302572, + -0.0008746905950829387, + -0.0008746905950829387, + -0.0008746905950829387, + 0, + 0, + -0.0038404290098696947, + -0.006467245519161224, + -0.29648056626319885, + 0, + 0, + 0, + -0.03231830894947052, + -0.012083077803254128, + -0.014325657859444618, + -0.050506096333265305, + 0, + -0.012288431636989117, + 0, + 0, + 3.2137577533721924, + -0.13101829588413239, + -0.6130020618438721, + 0.572363018989563, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.001087351469323039, + 4.734946250915527, + -2.0157506465911865, + 0.572363018989563, + 0.572363018989563, + 1.8228611946105957, + 1.8228611946105957, + 1.7091647386550903, + 3.9290292263031006, + -0.5727516412734985, + -0.26853373646736145, + -0.18373097479343414, + -0.12631776928901672, + -0.12113834172487259, + -0.5061092376708984, + -0.13984650373458862, + -0.0468229278922081, + -0.09297265112400055, + -0.09297265112400055, + -0.6886503062546867 + ], + [ + -0.5077318549156189, + -1.8987878561019897, + -0.35498031973838806, + -1.8763723373413086, + -2.0653798580169678, + -0.9951695799827576, + 1.7244404554367065, + -2.168811082839966, + -2.1415905952453613, + 0, + -0.23866921663284302, + -0.3075999617576599, + 0, + 0, + -0.6796745657920837, + 0, + -0.891762912273407, + 0, + -0.40114548802375793, + -0.7481383681297302, + -0.7970276474952698, + 0, + -0.23866921663284302, + -1.0001347064971924, + -0.5179142355918884, + -0.36288952827453613, + -1.3573659658432007, + -0.09471361339092255, + -0.09471361339092255, + -0.158460795879364, + -1.3037259578704834, + -0.24867312610149384, + -0.24867312610149384, + -0.9490104913711548, + -0.09194017201662064, + -0.10955855250358582, + -0.10955855250358582, + -1.783765196800232, + -0.10955855250358582, + -2.646313428878784, + -1.0704121589660645, + -0.6563863158226013, + -1.646806240081787, + 0.34065505862236023, + -1.646806240081787, + -1.748129963874817, + -0.3809452950954437, + -0.3920825123786926, + -0.3920825123786926, + -2.667757511138916, + -2.6342594623565674, + -2.626725673675537, + -2.6188108921051025, + -2.1725428104400635, + -2.231743335723877, + -1.5861741304397583, + -1.1299805641174316, + -0.2543991804122925, + -0.36038318276405334, + -0.6977182626724243, + -0.04082721844315529, + -0.0990259125828743, + -1.3207709789276123, + -0.32789477705955505, + -0.3065217435359955, + -0.04539057984948158, + -0.698974609375, + 0, + -0.035125356167554855, + -0.035125356167554855, + -0.22145676612854004, + -0.8647521138191223, + -1.1884366273880005, + 0, + 0, + 0, + -1.1018884181976318, + -0.02143898233771324, + -0.02143898233771324, + -0.04176821559667587, + -0.04176821559667587, + -0.04176821559667587, + -0.08753964304924011, + -0.08753964304924011, + -1.7882267236709595, + -3.4442903995513916, + 2.565450668334961, + 0, + 0, + 0, + -0.4173498749732971, + -0.18671193718910217, + -0.22115515172481537, + -2.18947696685791, + -1.294816017150879, + -0.47465768456459045, + -0.033020079135894775, + -0.033020079135894775, + -0.8756087422370911, + 0, + 0, + -0.1833024024963379, + -0.016651319339871407, + -0.5369012951850891, + -0.5369012951850891, + 0, + 0, + -0.9610477089881897, + -0.9610477089881897, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.3945724070072174, + -0.3945724070072174, + 0, + -0.03544429689645767, + -1.1593499183654785, + -0.18549960851669312, + -0.158460795879364, + -0.158460795879364, + -0.6906583905220032, + -0.6906583905220032, + 0, + -0.097763292491436, + 11.378676414489746, + 7.304425239562988, + -0.2728983163833618, + 11.550247192382812, + 11.530162811279297, + -0.7071039080619812, + -1.0914838314056396, + -0.2598259449005127, + -0.7921883463859558, + -0.7921883463859558, + 2.6784531290209324 + ], + [ + 0.380982369184494, + -0.3258844316005707, + -3.4917116165161133, + -0.27739769220352173, + 3.301130533218384, + -1.073818564414978, + -1.505022644996643, + 0.27774229645729065, + -1.3573098182678223, + -0.5270810127258301, + -0.24048076570034027, + -0.8727750778198242, + -0.24048076570034027, + -0.24048076570034027, + -0.3888031840324402, + -0.9459995627403259, + -1.035170555114746, + -0.9459995627403259, + -0.24048076570034027, + -0.9452674388885498, + -0.6623518466949463, + -0.24048076570034027, + 0, + 0, + -0.05696911737322807, + -0.05696911737322807, + -1.082931637763977, + -0.062191810458898544, + -0.062191810458898544, + 0, + -0.09859281778335571, + -0.08082381635904312, + -0.08082381635904312, + -0.08082381635904312, + -0.04772651940584183, + -0.053415942937135696, + -0.053415942937135696, + -0.053415942937135696, + -0.053415942937135696, + 0, + 0, + 0, + -0.005526010878384113, + -0.12121487408876419, + 0, + 0, + 0, + -0.007201648782938719, + -0.007201648782938719, + 0, + 0, + 0, + 0, + 0, + 0, + -0.7524583339691162, + 0, + 0, + 0, + -0.005526010878384113, + 0, + 0, + -0.11378240585327148, + 0, + 0, + -0.2490343451499939, + -0.8400887846946716, + 0, + 0, + -0.005526010878384113, + 0.6075114607810974, + -0.014191977679729462, + -0.8784146904945374, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.12548333406448364, + -0.12548333406448364, + -0.020310726016759872, + -0.2117539495229721, + -0.2117539495229721, + 0, + -0.20880654454231262, + -0.1780262440443039, + 0, + 0, + 0, + -0.756860613822937, + -0.37837353348731995, + -0.37837353348731995, + 0, + 0, + 0, + 0, + -0.026584208011627197, + -0.026584208011627197, + -0.026584208011627197, + 0, + 0, + -0.8632755875587463, + -0.09813888370990753, + -0.09813888370990753, + -0.5334068536758423, + -0.20880654454231262, + -0.141290083527565, + -0.18400461971759796, + -0.24847225844860077, + -0.24847225844860077, + 0, + 0, + -2.349536180496216, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 11.706945419311523, + -0.16522370278835297, + -0.22235870361328125, + -0.5889762043952942, + -0.5889762043952942, + -0.669537763085042 + ], + [ + -1.257106065750122, + 1.9722994565963745, + -0.7403843998908997, + -1.3834630250930786, + -0.97077476978302, + -0.05542337894439697, + -0.2643361985683441, + -1.355240821838379, + 0.2562214136123657, + -0.35549765825271606, + -0.2758129835128784, + -0.3064761757850647, + -0.10345030575990677, + -0.10345030575990677, + -0.2758129835128784, + -0.10345030575990677, + -0.16006582975387573, + -0.7584336996078491, + -0.2175266444683075, + -0.3064761757850647, + -0.5171506404876709, + -0.10345030575990677, + -0.09477495402097702, + -0.09477495402097702, + 0, + 0, + 0, + 0, + 0, + -0.5531495213508606, + -0.6761674284934998, + -0.16182109713554382, + -0.16182109713554382, + -0.36729753017425537, + -0.06748000532388687, + -0.008540223352611065, + -0.008540223352611065, + -0.026633432134985924, + -0.008540223352611065, + -0.3734872341156006, + -0.313742458820343, + -0.1641637533903122, + -0.1652340143918991, + -0.5971291661262512, + -0.1652340143918991, + -3.7121341228485107, + -0.09692328423261642, + -0.8412911891937256, + -0.8412911891937256, + -0.47956082224845886, + -0.3054158389568329, + -0.29459866881370544, + -0.2841568887233734, + -0.1532236486673355, + -0.19646738469600677, + 7.023808479309082, + -6.51149845123291, + -0.12688302993774414, + -0.3361934423446655, + -0.17926666140556335, + -0.026485782116651535, + -0.026485782116651535, + -0.0460079051554203, + -0.07561150193214417, + -0.05101285129785538, + -0.18610434234142303, + 5.773743629455566, + -3.558574914932251, + -3.6353445053100586, + -3.6353445053100586, + -0.19886760413646698, + -0.45692336559295654, + -0.6680894494056702, + -0.5418877601623535, + -0.5418877601623535, + -0.5418877601623535, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.014895623549818993, + -0.03276222199201584, + -0.03418026119470596, + 0, + 0, + -0.06170174479484558, + -0.09910255670547485, + -0.07873842865228653, + -0.013664050959050655, + -0.05212222784757614, + 0, + -0.014957047067582607, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.02163555845618248, + -0.02163555845618248, + -0.6897953748703003, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.14927265048027039, + -0.010437005199491978, + 0, + 0, + 0, + 0, + 0, + 0, + -0.017030984163284302, + -0.00009560387843521312, + 0, + -0.01634802483022213, + -0.015698639675974846, + 0, + 7.572530269622803, + 7.000411510467529, + -0.5314501523971558, + -0.5314501523971558, + -0.4734956401909367 + ], + [ + 1.0063420534133911, + -0.30277952551841736, + -0.6083040237426758, + -0.6710527539253235, + -0.6855297684669495, + -0.030787145718932152, + -0.7419338226318359, + 0.5955686569213867, + -0.34317153692245483, + -0.37119558453559875, + -0.09519360959529877, + -0.10691992193460464, + -0.025333672761917114, + -0.025333672761917114, + -0.09519360959529877, + -0.025333672761917114, + -0.038938913494348526, + -0.09744702279567719, + -0.025333672761917114, + -0.10691992193460464, + -0.3539024293422699, + -0.025333672761917114, + -0.05085968226194382, + -0.05085968226194382, + 0, + 0, + 0, + 0, + 0, + -0.05311308801174164, + -0.21816998720169067, + -0.2906172275543213, + -0.2906172275543213, + -0.3700330853462219, + -0.1103484034538269, + -0.00015175093722064048, + -0.00015175093722064048, + -0.0064401342533528805, + -0.00015175093722064048, + -0.05705874040722847, + -0.08894956856966019, + -0.030272455886006355, + -0.15075212717056274, + -0.1544485092163086, + -0.04713387414813042, + -0.12149176001548767, + -0.04507482424378395, + -0.09408246725797653, + -0.09408246725797653, + -0.09745470434427261, + -0.04398646950721741, + -0.04217682406306267, + -0.0404415987432003, + -0.029789570719003677, + -0.06194312870502472, + -0.03551335260272026, + -0.03551335260272026, + -0.0011829889845103025, + -0.021876968443393707, + -0.0818881243467331, + -0.019806738942861557, + -0.019806738942861557, + -0.019806738942861557, + 0, + 0, + -1.0367865562438965, + -0.12502995133399963, + -0.05542667210102081, + -0.04631301388144493, + -0.1500464528799057, + -0.8274975419044495, + 0.1079937145113945, + 2.482558488845825, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.007324249017983675, + -0.0165301151573658, + -0.0165301151573658, + -0.20215901732444763, + -0.20215901732444763, + -0.038466840982437134, + -0.26354047656059265, + -0.26284584403038025, + -0.00009888518980005756, + -0.00009888518980005756, + -0.9729569554328918, + 0, + -0.9938164949417114, + -1.7601009607315063, + -0.11758595705032349, + 0, + -0.11758595705032349, + 0, + 0, + 0, + 0, + -0.07950513064861298, + -0.07950513064861298, + -0.07950513064861298, + 0, + 0, + -0.05576881393790245, + -0.05576881393790245, + -0.05576881393790245, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.6361966729164124, + 0, + -0.6361966729164124, + 0, + 0, + 0, + 0, + 0, + 5.785028457641602, + 5.785028457641602, + -0.4704635307696706 + ] + ] + } + } + } + } + }, + "intentDomains": {}, + "extraSentences": [ + [ + "en", + "Can I cancel my order?" + ], + [ + "en", + "Why is my order cancelled?" + ], + [ + "en", + "How do I can cancel my order" + ], + [ + "en", + "Can I cancel an order" + ], + [ + "en", + "My payment was processed successfully but I didn't get any order confirmation. What should I do?" + ], + [ + "en", + "Payment was completed but no confirmation" + ], + [ + "en", + "Order was not confirmed" + ], + [ + "en", + "Money deducted but order is not confirmed" + ], + [ + "en", + "Why is my order delayed? " + ], + [ + "en", + "Did my order get delayed?" + ], + [ + "en", + "Why is my order not delivered yet?" + ], + [ + "en", + "When do I get my delivery?" + ], + [ + "en", + "How long does delivery take?" + ], + [ + "en", + "How long does shipping take?" + ], + [ + "en", + "Please Tell me about my delivery" + ], + [ + "en", + "When do I get my delivery?" + ], + [ + "en", + "Why is my order not delivered yet" + ], + [ + "en", + "goodbye" + ], + [ + "en", + "bye take care" + ], + [ + "en", + "see you later" + ], + [ + "en", + "bye for now" + ], + [ + "en", + "i must go" + ], + [ + "en", + "hello" + ], + [ + "en", + "hi" + ], + [ + "en", + "howdy" + ], + [ + "en", + "Greetings" + ], + [ + "en", + "Is anyone there?" + ], + [ + "en", + "Hello" + ], + [ + "en", + "Good day" + ], + [ + "en", + "Which items do you have?" + ], + [ + "en", + "What kinds of items are there?" + ], + [ + "en", + "What do you sell?" + ], + [ + "en", + "What do you offer?" + ], + [ + "en", + "What can I buy?" + ], + [ + "en", + "I'm looking for..." + ], + [ + "en", + "Do you have any..." + ], + [ + "en", + "I'm interested in..." + ], + [ + "en", + "Can I see what you have in..." + ], + [ + "en", + "I want to buy a..." + ], + [ + "en", + "I'm looking for something like this..." + ], + [ + "en", + "What are your most popular items?" + ], + [ + "en", + "What are some of your best deals?" + ], + [ + "en", + "Do you have any new arrivals?" + ], + [ + "en", + "Need more help" + ], + [ + "en", + "Help me more" + ], + [ + "en", + "can I talk to an agent" + ], + [ + "en", + "can I call customer service" + ], + [ + "en", + "customer support number" + ], + [ + "en", + "how to contact customer service" + ], + [ + "en", + "customer service number" + ], + [ + "en", + "contact number for help" + ], + [ + "en", + "helpline number" + ], + [ + "en", + "How to become a seller" + ], + [ + "en", + "How to contact a seller" + ], + [ + "en", + "What is my order status" + ], + [ + "en", + "I want to know my return status" + ], + [ + "en", + "How to return status" + ], + [ + "en", + "Do you take credit cards?" + ], + [ + "en", + "Do you accept Mastercard?" + ], + [ + "en", + "Can I pay with Cash?" + ], + [ + "en", + "Are you cash only?" + ], + [ + "en", + "What are your payment methods?" + ], + [ + "en", + "How do I pay?" + ], + [ + "en", + "How are you?" + ], + [ + "en", + "How are you doing?" + ], + [ + "en", + "How is your day?" + ], + [ + "en", + "How can I change my profile information" + ], + [ + "en", + "I want to change my password" + ], + [ + "en", + "I want to change my phone number" + ], + [ + "en", + "I want to change my address" + ], + [ + "en", + "I want to Reset my password" + ], + [ + "en", + "I want to delete my account" + ], + [ + "en", + "delete my account" + ], + [ + "en", + "Common reasons for delivery delay" + ], + [ + "en", + "common reasons for delivery delay" + ], + [ + "en", + "reasons for delay" + ], + [ + "en", + "delivery delay" + ], + [ + "en", + "Can I refund an item." + ], + [ + "en", + "I want to refund an item" + ], + [ + "en", + "can I refund my order" + ], + [ + "en", + "Are refunds available" + ], + [ + "en", + "Why is the status Refunded when it's not credited?" + ], + [ + "en", + "No refund even though status is refunded" + ], + [ + "en", + "No refund when status says refunded" + ], + [ + "en", + "I did not receive my refund money" + ], + [ + "en", + "Refund money not received" + ], + [ + "en", + "Thanks" + ], + [ + "en", + "Thank you" + ], + [ + "en", + "That's helpful" + ], + [ + "en", + "Thank's a lot!" + ], + [ + "en", + "thx" + ], + [ + "en", + "thnks" + ], + [ + "en", + "How can I track my order" + ], + [ + "en", + "I want to track my order" + ], + [ + "en", + "Can I track my order" + ], + [ + "en", + "Track order" + ], + [ + "en", + "I'm good" + ], + [ + "en", + "Im good" + ], + [ + "en", + "Im doing good" + ], + [ + "en", + "I am good" + ], + [ + "en", + "I am okay" + ], + [ + "en", + "How to use a voucher?" + ], + [ + "en", + "Can I use a voucher?" + ], + [ + "en", + "How to use a voucher?" + ] + ] + }, + "ner": { + "settings": { + "tag": "ner", + "entityPreffix": "%", + "entitySuffix": "%" + }, + "rules": {} + }, + "nlgManager": { + "settings": { + "tag": "nlg-manager" + }, + "responses": { + "en": { + "cancel": [ + { + "answer": "Order can only be cancelled within 7 days of placement. Digital goods do not qualify for refund." + }, + { + "answer": "Visit my orders page to check status of specific orders." + } + ], + "confirm": [ + { + "answer": "knight sends you an Email & SMS upon confirmation of your order. If it requires manual confirmation, our team will contact you within 24 hours after order placement. Delay in confirmation SMS may occur due to network error, you may receive it with a delay." + }, + { + "answer": "It takes upto 24 hours for confirmation, please bear with us! Type Need more help for more assistance. " + } + ], + "delay": [ + { + "answer": "We are really sorry if there has been a delay in your order! If your order is within delivery period, We recommend you to please wait during this period since our Delivery Heroes make 3 attempts to deliver your order!" + }, + { + "answer": "If your order is past up to 3 days after delivery period, There may be logistic issues causing a delay in delivery. Please type 'Common reasons for delivery delay' to know more about this." + }, + { + "answer": "We appreciate if you could wait for your items as most orders are delivered successfully within this period." + }, + { + "answer": "If your order is past more than 3 days, Since there may be unexpected issues causing delivery delays, you can click on 'Need more Help' for further assistance." + } + ], + "delivery": [ + { + "answer": "Delivery takes 2-4 days. Please bear with us!" + }, + { + "answer": "Shipping takes 2-4 days. Please bear with us!" + } + ], + "greetings.bye": [ + { + "answer": "see you soon!" + }, + { + "answer": "Till next time" + }, + { + "answer": "bye bye" + }, + { + "answer": "have a great day" + }, + { + "answer": "See you later, thanks for visiting. Hope I was able to help!" + }, + { + "answer": "Have a nice day. Hope I was able to help!" + } + ], + "greetings.hello": [ + { + "answer": "Hey :-) My name is knight!" + }, + { + "answer": "Hello, thanks for visiting. My name is knight!" + }, + { + "answer": "Hi there, My name is knight!. What can I do for you?" + }, + { + "answer": "Hi there, My name is knight! How can I help?" + } + ], + "items": [ + { + "answer": "Search your preference in our flagship store's search bar to see all available products. " + } + ], + "more.contact": [ + { + "answer": "Absolutely! How can I help you today? Here are some options based on your inquiry:" + }, + { + "answer": "Sure, let me know what you need help with. Here are a few things I can assist you with:" + } + ], + "more.help": [ + { + "answer": "Contact us for further information here: Phone: +250 780 000 000. Timings are from 09:00 AM to 05:00 PM from Monday to Saturday." + }, + { + "answer": "For immediate assistance, you can contact our customer service team at +250 780 000 000. Our hours are from 09:00 AM to 05:00 PM, Monday to Saturday." + } + ], + "order": [ + { + "answer": "Please visit the My Orders page for a list of your confirmed orders." + } + ], + "payments": [ + { + "answer": "We accept VISA and Mastercard" + } + ], + "personal": [ + { + "answer": "I'm good, all's good, thanks. How about you?" + } + ], + "profile.info": [ + { + "answer": "You can easily add or change your account details by following the steps below: Step 1: Click on 'Account', Step 2: Click on 'Manage my account' from the icon, Step 3: You can change or edit your name, address, email address, mobile number, etc., Step 4: Fill in the required details, and click on Save. Note: You can also change your delivery address from the Checkout page before proceeding to pay." + } + ], + "reason": [ + { + "answer": "Reasons include Seller Sourcing Issues, Courier Issues, Cross Border shipment delay, Wrong Address or Phone Number, and Unavailability of Customer. " + } + ], + "refund.demanding": [ + { + "answer": "Refund can only be issued within 7 days of placement. Digital goods do not qualify for refund." + }, + { + "answer": "Visit my orders page to check for specific orders." + } + ], + "refund.status": [ + { + "answer": "Please be patient as refunds take upto 30 days to receive into bank. " + } + ], + "thanks": [ + { + "answer": "Happy to help!" + }, + { + "answer": "Any time!" + }, + { + "answer": "My pleasure" + } + ], + "track": [ + { + "answer": "Visit the order page, click on the specific order, select 'track my order', and check the status" + } + ], + "user.response": [ + { + "answer": "Great to hear you are doing good." + } + ], + "voucher": [ + { + "answer": "You can add a voucher by clicking on My Cart > Check Out > Enter Voucher Code > APPLY. " + } + ] + } + } + }, + "actionManager": { + "settings": { + "tag": "action-manager" + }, + "actions": {} + }, + "slotManager": {} +} \ No newline at end of file diff --git a/package.json b/package.json index 53cc5a7..06430f2 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "mailgen": "^2.0.28", "morgan": "^1.10.0", "multer": "^1.4.5-lts.1", + "node-nlp": "^4.27.0", "nodemailer": "^6.9.13", "nodemon": "^3.1.0", "passport": "^0.7.0", @@ -73,8 +74,10 @@ "@types/express": "^4.17.21", "@types/express-session": "^1.18.0", "@types/jest": "^29.5.12", + "@types/joi": "^17.2.3", "@types/jsend": "^1.0.32", "@types/jsonwebtoken": "^9.0.6", + "@types/mocha": "^10.0.6", "@types/morgan": "^1.9.9", "@types/node": "^20.12.7", "@types/nodemailer": "^6.4.15", diff --git a/src/@types/index.d.ts b/src/@types/index.d.ts index e69de29..8228fa6 100644 --- a/src/@types/index.d.ts +++ b/src/@types/index.d.ts @@ -0,0 +1 @@ +declare module 'node-nlp'; diff --git a/src/__test__/chatBot.test.ts b/src/__test__/chatBot.test.ts new file mode 100644 index 0000000..e588ff6 --- /dev/null +++ b/src/__test__/chatBot.test.ts @@ -0,0 +1,53 @@ +import request from 'supertest'; +import { app, server } from '../index'; +import { createConnection} from 'typeorm'; +import { cleanDatabase } from './test-assets/DatabaseCleanup'; + +beforeAll(async () => { + await createConnection(); +}); + +jest.setTimeout(20000); +afterAll(async () => { + await cleanDatabase(); + server.close(); +}); + + +describe('POST /chat', () => { + it('should respond with a successful message for a valid user query', async () => { + const userMessage = 'What kind of items do you have?'; + const response = await request(app) + .post('/chat') + .send({ message: userMessage }) + .expect(200) + .expect('Content-Type', /json/); + + expect(response.body).toHaveProperty('message'); + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + }); + it('should respond with an error for an empty user message', async () => { + const emptyMessageReq = { body: { message: '' } }; + const response = await request(app) + .post('/chat') + .send(emptyMessageReq) + + expect(response.status).toBe(400); + expect(response.body.status).toBe('error'); + expect(response.body.message).toBe('No user message'); + + }); + it('should respond with an error for an empty user message', async () => { + const userMessage = 'dojdojdodjojoqdj'; + const response = await request(app) + .post('/chat') + .send({ message: userMessage }) + expect(response.status).toBe(200); + expect(response.body.status).toBe('success'); + expect(response.body.message).toBe('Sorry, I am not sure what you mean. Can you rephrase?'); + + + }); + +}); diff --git a/src/controllers/chatBotController.ts b/src/controllers/chatBotController.ts new file mode 100644 index 0000000..5c3d366 --- /dev/null +++ b/src/controllers/chatBotController.ts @@ -0,0 +1,6 @@ +import { Request, Response } from 'express'; +import { chatBot } from '../services'; + +export const chatBotController = async (req: Request, res: Response) => { + await chatBot(req, res); +}; diff --git a/src/controllers/index.ts b/src/controllers/index.ts index 70dea3b..adaf1d1 100644 --- a/src/controllers/index.ts +++ b/src/controllers/index.ts @@ -3,3 +3,4 @@ export * from './productController'; export * from './orderController'; export * from './vendorOrderController'; export * from './adminOrdercontroller'; +export * from './chatBotController'; \ No newline at end of file diff --git a/src/node-nlp.d.ts b/src/node-nlp.d.ts new file mode 100644 index 0000000..8228fa6 --- /dev/null +++ b/src/node-nlp.d.ts @@ -0,0 +1 @@ +declare module 'node-nlp'; diff --git a/src/routes/chatBot.ts b/src/routes/chatBot.ts new file mode 100644 index 0000000..f54638a --- /dev/null +++ b/src/routes/chatBot.ts @@ -0,0 +1,10 @@ +import { RequestHandler, Router } from 'express'; +import { chatBotController } from '../controllers/chatBotController'; +import { optinalAuthMiddleware } from '../middlewares/optionalAuthorization'; + +const router = Router(); + +router.post('/', optinalAuthMiddleware as RequestHandler, chatBotController); + + +export default router; diff --git a/src/routes/index.ts b/src/routes/index.ts index 0d4c5fe..af462b4 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -7,6 +7,7 @@ import couponRoute from './couponRoutes'; import cartRoutes from './CartRoutes'; import feedbackRoute from './feedbackRoutes'; import notificationRoute from './NoficationRoutes' +import chatBot from './chatBot'; const router = Router(); @@ -21,5 +22,6 @@ router.use('/cart', cartRoutes); router.use('/coupons', couponRoute); router.use('/feedback', feedbackRoute); router.use('/notification', notificationRoute); +router.use('/chat', chatBot); export default router; diff --git a/src/services/chatbotServices/chatBot.ts b/src/services/chatbotServices/chatBot.ts new file mode 100644 index 0000000..44b2e37 --- /dev/null +++ b/src/services/chatbotServices/chatBot.ts @@ -0,0 +1,30 @@ +import { configDotenv } from 'dotenv'; +import { Request, Response } from 'express'; +import { sendSuccessResponse, sendErrorResponse } from '../../utils/response.utils'; +import { manager } from '../../train'; + + +export const chatBot = async (req: Request, res: Response) => { + const userMessage = req.body.message; + + try { + if(!userMessage){ + return sendErrorResponse(res, 400, 'No user message'); + } + const result = await manager.process('en', userMessage); + const intent = result.intent; + + if (result.answer || intent !== 'None') { + return sendSuccessResponse(res, 200, "", result.answer) + } + + else { + return sendSuccessResponse(res, 200, "Sorry, I am not sure what you mean. Can you rephrase?", result.answer) + } + + } catch (error) { + console.error(error); + return sendErrorResponse(res, 500, (error as Error).message); + + } + }; \ No newline at end of file diff --git a/src/services/index.ts b/src/services/index.ts index 4f808ed..f31e750 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -47,3 +47,6 @@ export * from './adminOrderServices/updateOrder'; export * from './notificationServices/getNotifications'; export * from './notificationServices/deleteNotification'; export * from './notificationServices/updateNotification'; + +// chatbot +export * from './chatbotServices/chatBot'; \ No newline at end of file diff --git a/src/train.ts b/src/train.ts new file mode 100644 index 0000000..732324e --- /dev/null +++ b/src/train.ts @@ -0,0 +1,43 @@ + +import fs from 'fs' + +import { NlpManager } from 'node-nlp'; + +export const manager = new NlpManager({ languages: ["en"] }); + +async function trainManager() { + const intentFiles = fs.readdirSync('./intents'); + + for (const file of intentFiles) { + try { + const filePath = `./intents/${file}`; + const data = await fs.promises.readFile(filePath, 'utf8'); + const jsonData = JSON.parse(data); + + const intent = file.replace('.json', ''); + + for (const utterances of jsonData.utterances) { + manager.addDocument('en', utterances, intent); + } + + for (const responses of jsonData.responses) { + manager.addAnswer('en', intent, responses); + } + } catch (error) { + console.error(`Error processing intent file ${file}:`, error); + } + } + + await manager.train(); +} + +trainManager() + .then(async () => { + manager.save(); + }) + .catch((error) => console.error('Error training NLP manager:', error)); + + module.exports = { + manager, + trainManager + }; diff --git a/tsconfig.json b/tsconfig.json index d58c75f..7e48aed 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -28,12 +28,12 @@ // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + "typeRoots": ["node_modules/@types", "./src"], /* Specify multiple folders that act like './node_modules/@types'. */ "types": [ "node", "jest", "express", - "joi" + "node-nlp" ] /* Specify type package names to be included without being referenced in a source file. */, // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */