[Delivers-18758498] ft-buyer-stripe-payment (#78)

* [Delivers-18758498] ft-buyer-stripe-payment * [Delivers-18758498] ft-buyer-stripe-payment * --ammend * [Delivers-18758498] ft-buyer-stripe-payment * fix bugs in test * fix test * removing bugs * merge to develop and fix code base * merge to develop and fix codebase * Fixes DB double calling * Fixes DB double calling * Fixes DB double calling --------- Co-authored-by: AimePazzo <[email protected]> Co-authored-by: Ndahimana Bonheur <[email protected]>
atlp-rwanda · Jul 2, 2024 · cb7a058 · cb7a058
1 parent b2e95c9
commit cb7a058
Show file tree

Hide file tree

Showing 31 changed files with 1,417 additions and 978 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,6 +26,8 @@ env:
   GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
   GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
   Session_secret: ${{ secrets.Session_secret }}
+  WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
+  STRIPE_SECRET: ${{ secrets.STRIPE_SECRET }}
 
 jobs:
   build:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,9 +39,14 @@
       "src/types/*.*",
       "src/services/googleAuth.ts",
       "src/services/chat.ts",
+      "src/services/cronJob.ts",
+      "src/helpers/passwordExpiryNotifications.ts",
       "src/services/notificationSocket.ts",
+      "src/helpers/notifications.ts",
+      "src/services/stripe.ts",
       "src/services/cronJob.ts",
       "src/helpers/passwordExpiryNotifications.ts"
+
     ],
     "reporter": [
       "html",
@@ -61,7 +66,6 @@
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@types/mocha": "^10.0.6",
     "@types/multer": "^1.4.11",
-    "@types/node-cron": "^3.0.11",
     "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
     "bcrypt": "^5.1.1",
@@ -100,6 +104,7 @@
     "sinon-chai": "^3.7.0",
     "socket.io": "^4.7.5",
     "socket.io-client": "^4.7.5",
+    "stripe": "^15.12.0",
     "supertest": "^7.0.0",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.0",

diff --git a/src/databases/migrations/20240604150804-create-orders.ts b/src/databases/migrations/20240604150804-create-orders.ts
@@ -9,6 +9,10 @@ export = {
         defaultValue: DataTypes.UUIDV4,
         primaryKey: true
       },
+      products: {
+        type: DataTypes.JSONB
+
+      },
       shopId: {
         type: DataTypes.UUID,
         allowNull: false,
@@ -30,7 +34,7 @@ export = {
         onDelete: "CASCADE"
       },
       paymentMethodId: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.STRING,
         allowNull: false
       },
       orderDate: {

diff --git a/src/databases/models/carts.ts b/src/databases/models/carts.ts
@@ -16,6 +16,7 @@ export interface CartAttributes {
 }
 
 class Carts extends Model<CartAttributes> implements CartAttributes {
+    [x: string]: any;
     declare id: string;
     declare userId: string;
     declare status: string;

diff --git a/src/databases/models/orders.ts b/src/databases/models/orders.ts
@@ -9,8 +9,9 @@ import Carts from "./carts";
 export interface OrderAttributes {
     id: string;
     shopId: string;
+    products: any;
     cartId: string;
-    paymentMethodId: number;
+    paymentMethodId: string;
     orderDate: Date;
     status: string;
     createdAt: Date;
@@ -20,8 +21,9 @@ export interface OrderAttributes {
 class Orders extends Model<OrderAttributes> implements OrderAttributes {
     declare id: string;
     declare cartId: string;
+    declare products: any;
     declare shopId: string;
-    declare paymentMethodId: number;
+    declare paymentMethodId: string;
     declare orderDate: Date;
     declare status: string;
     declare createdAt: Date;
@@ -41,6 +43,10 @@ Orders.init(
             defaultValue: DataTypes.UUIDV4,
             primaryKey: true
           },
+          products: {
+            type: new DataTypes.JSONB,
+            allowNull: false
+        },
         shopId: {
             type: new DataTypes.UUID,
             allowNull: false
@@ -50,7 +56,7 @@ Orders.init(
             allowNull: false
         },
         paymentMethodId: {
-            type: new DataTypes.INTEGER,
+            type: new DataTypes.STRING,
             allowNull: false
         },
         orderDate: {

diff --git a/src/databases/seeders/20240520202759-users.ts b/src/databases/seeders/20240520202759-users.ts
@@ -12,6 +12,7 @@ import {
   userEightId,
   userNineId,
   userTenId,
+  userElevenId
 } from "../../types/uuid";
 
 const userOne = {
@@ -205,6 +206,7 @@ const userTen = {
   id: userTenId,
   createdAt: new Date(),
   updatedAt: new Date(),
+  passwordUpdatedAt: new Date(),
   firstName: "F Buyer3",
   lastName: "L Buyer3",
   email: "[email protected]",
@@ -220,6 +222,26 @@ const userTen = {
   isVerified: true,
   is2FAEnabled: false,
 };
+const userEleven = {
+  id: userElevenId,
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  passwordUpdatedAt: new Date(),
+  firstName: "F Buyer3",
+  lastName: "L Buyer3",
+  email: "[email protected]",
+  password: hashPassword("Password@123"),
+  phone: 25089767899,
+  profilePicture: "",
+  gender: "female",
+  birthDate: "2-2-2014",
+  language: "english",
+  currency: "USD",
+  role: "buyer",
+  status: "enabled",
+  isVerified: true,
+  is2FAEnabled: false,
+};
 
 export const up = (queryInterface: QueryInterface) =>
   queryInterface.bulkInsert("users", [
@@ -233,6 +255,7 @@ export const up = (queryInterface: QueryInterface) =>
     userEight,
     userNine,
     userTen,
+    userEleven
   ]);
 
 export const down = async (queryInterface: QueryInterface) => {

diff --git a/src/databases/seeders/20240602133044-carts.ts b/src/databases/seeders/20240602133044-carts.ts
@@ -1,5 +1,5 @@
 import { QueryInterface } from "sequelize";
-import { cartOneId, cartTwoId, userTenId, userTwoId } from "../../types/uuid";
+import { cartOneId, cartTwoId, userTenId, userTwoId , cartThreeId, userElevenId } from "../../types/uuid";
 
 module.exports = {
   async up(queryInterface: QueryInterface) {
@@ -17,6 +17,13 @@ module.exports = {
         status: "pending",
         createdAt: new Date(),
         updatedAt: new Date()
+      },
+      {
+        id: cartThreeId,
+        userId: userElevenId,
+        status: "pending",
+        createdAt: new Date(),
+        updatedAt: new Date()
       }
     ], {});
   },

diff --git a/src/databases/seeders/20240604133044-orders.ts b/src/databases/seeders/20240604133044-orders.ts
@@ -1,11 +1,22 @@
+/* eslint-disable comma-dangle */
 import { QueryInterface } from "sequelize";
-import { cartOneId, orderOneId, orderTwoId, shopOneId } from "../../types/uuid";
+import { cartOneId, orderOneId, orderTwoId, shopOneId,productTwoId,productOneId  } from "../../types/uuid";
 
 module.exports = {
   async up(queryInterface: QueryInterface) {
     await queryInterface.bulkInsert("orders", [
       {
         id: orderOneId,
+        products:JSON.stringify( [
+          {
+            productId:productOneId,
+          status:"pending"
+          },
+          {
+            productId:productTwoId,
+          status:"pending"
+          },
+        ]),
         shopId: shopOneId,
         cartId: cartOneId,
         paymentMethodId: 1,
@@ -16,6 +27,16 @@ module.exports = {
       },
       {
         id: orderTwoId,
+        products:JSON.stringify( [
+          {
+            productId:productOneId,
+          status:"pending"
+          },
+          {
+            productId:productTwoId,
+          status:"pending"
+          }
+        ]),
         shopId: shopOneId,
         cartId: cartOneId,
         paymentMethodId: 2,

diff --git a/src/helpers/passwordExpiryNotifications.ts b/src/helpers/passwordExpiryNotifications.ts
@@ -42,7 +42,7 @@ export const checkPasswordExpirations = async () => {
       const salutation = getSalutation(user.lastName);
       const emailMessage = `${salutation}, your password will expire in 10 minutes. Please update your password to continue using the E-commerce Ninja. You can reset your password using the following link: ${PASSWORD_RESET_URL}`;
       await sendEmail(user.email, "Password Expiration Warning", emailMessage)
-        // .then(() => console.log(`10-minute warning sent to user: ${user.email}`))
+        .then(() => console.log(`10-minute warning sent to user: ${user.email}`))
         .catch((err) =>
           console.error(`Failed to send 10-minute warning to ${user.email}:`, err.message)
         );