major

prisma/migrations/20231022135956_test/migration.sql

@@ -0,0 +1,51 @@
+/*
+  Warnings:
+
+  - The values [complete] on the enum `STATUS` will be removed. If these variants are still used in the database, this will fail.
+  - You are about to drop the column `user_type` on the `activity` table. All the data in the column will be lost.
+  - You are about to drop the column `usage` on the `promotion` table. All the data in the column will be lost.
+  - Added the required column `sub_category_id` to the `product` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterEnum
+BEGIN;
+CREATE TYPE "STATUS_new" AS ENUM ('pending', 'completed', 'failed');
+ALTER TABLE "order" ALTER COLUMN "status" DROP DEFAULT;
+ALTER TABLE "order" ALTER COLUMN "status" TYPE "STATUS_new" USING ("status"::text::"STATUS_new");
+ALTER TYPE "STATUS" RENAME TO "STATUS_old";
+ALTER TYPE "STATUS_new" RENAME TO "STATUS";
+DROP TYPE "STATUS_old";
+ALTER TABLE "order" ALTER COLUMN "status" SET DEFAULT 'pending';
+COMMIT;
+
+-- AlterTable
+ALTER TABLE "activity" DROP COLUMN "user_type";
+
+-- AlterTable
+ALTER TABLE "product" ADD COLUMN     "sub_category_id" INTEGER NOT NULL;
+
+-- AlterTable
+ALTER TABLE "promotion" DROP COLUMN "usage";
+
+-- CreateTable
+CREATE TABLE "track_promotion" (
+    "id" SERIAL NOT NULL,
+    "product_id" TEXT NOT NULL,
+    "promo_id" INTEGER NOT NULL,
+    "user_id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "track_promotion_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "product" ADD CONSTRAINT "product_sub_category_id_fkey" FOREIGN KEY ("sub_category_id") REFERENCES "product_sub_category"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "track_promotion" ADD CONSTRAINT "track_promotion_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "track_promotion" ADD CONSTRAINT "track_promotion_product_id_fkey" FOREIGN KEY ("product_id") REFERENCES "product"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "track_promotion" ADD CONSTRAINT "track_promotion_promo_id_fkey" FOREIGN KEY ("promo_id") REFERENCES "promotion"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/schema.prisma

@@ -103,7 +103,7 @@ model order {
 }
 
 model order_item {
-    id             Int          @id @unique
+    id             Int         @id @default(autoincrement())
     order_id       String
     product_id     String
     merchant_id    String
@@ -124,22 +124,23 @@ model order_item {
 }
 
 model product {
-    id             String         @id @unique
-    user_id        String
-    shop_id        String
-    category_id    Int
-    name           String
-    description    String
-    quantity       Int            @default(1)
-    price          Float
-    discount_price Float          @default(0)
-    tax            Float
-    admin_status   ADMIN_STATUS   @default(pending)
-    is_published   Boolean        @default(false)
-    is_deleted     product_status @default(active)
-    currency       String
-    createdAt      DateTime       @default(now())
-    updatedAt      DateTime       @default(now())
+    id              String         @id @default(uuid())
+    user_id         String
+    shop_id         String
+    category_id     Int
+    sub_category_id Int
+    name            String
+    description     String
+    quantity        Int            @default(1)
+    price           Float
+    discount_price  Float          @default(0)
+    tax             Float
+    admin_status    ADMIN_STATUS   @default(pending)
+    is_published    Boolean        @default(false)
+    is_deleted      product_status @default(active)
+    currency        String
+    createdAt       DateTime       @default(now())
+    updatedAt       DateTime       @default(now())
 
     image           product_image[]
     track_promotion track_promotion[]
@@ -149,7 +150,8 @@ model product {
     user           user?                   @relation(fields: [user_id], references: [id], onDelete: Cascade)
     shop           shop                    @relation(fields: [shop_id], references: [id], onDelete: Cascade)
     digital_assets product_digital_assets?
-    sub_category   product_sub_category    @relation(fields: [category_id], references: [id])
+    category       product_category        @relation(fields: [category_id], references: [id]) //! Remove this later on.
+    sub_category   product_sub_category    @relation(fields: [sub_category_id], references: [id])
     //   rating
 }
 
@@ -160,7 +162,6 @@ model product_digital_assets {
     link       String
     type       PRODUCT_ASSET_TYPE @default(external)
     product_id String             @unique
-    // user_id String
     created_at DateTime           @default(now())
     updated_at DateTime           @default(now())
 
@@ -181,6 +182,7 @@ model product_category {
     user_id   String
     user      user     @relation(fields: [user_id], references: [id], onDelete: Cascade)
 
+    product        product[] //! Remove this later on
     sub_categories product_sub_category[]
 }
 
@@ -284,13 +286,13 @@ model sales_report {
 }
 
 model activity {
-    id          String             @id
+    id          String   @id @default(uuid())
     action      String
     user_id     String
     title       String
     description String
-    user_type   ACTIVITY_USER_TYPE
-    createdAt   DateTime           @default(now())
+    // user_type   ACTIVITY_USER_TYPE
+    createdAt   DateTime @default(now())
 
     user user @relation(fields: [user_id], references: [id], onDelete: Cascade)
 }

src/@types/index.d.ts

@@ -28,7 +28,6 @@ export interface TrackPromo {
 }
 
 export interface AddSalesReportType {
-  user_id: string;
   sales: number;
   order_id: string;
 }
@@ -53,7 +52,7 @@ export interface CreateDiscountType {
   discount_type: string;
   amount: number;
   quantity: number;
-  maximum_discount_price: number;
+  maximum_discount_price?: number;
   product_ids: string[];
   valid_from: string;
   valid_to: string;
@@ -64,7 +63,7 @@ export interface UpdateDiscountType {
   amount: number;
   code: string;
   quantity: number;
-  maximum_discount_price: number;
+  maximum_discount_price?: number;
   product_ids: string[];
   valid_from: string;
   valid_to: string;

src/app.ts

@@ -7,6 +7,7 @@ import HandleErrors from './middlewares/error';
 import { Routes } from './@types';
 import swaggerUi from 'swagger-ui-express';
 import swagggerJson from './doc/swagger.json';
+import path from 'path';
 
 export default class App {
   public app: express.Application;
@@ -31,15 +32,16 @@ export default class App {
       cors({
         origin: '*',
         credentials: true,
-      }),
+      })
     );
     this.app.use(bodyParser.json());
     this.app.use(bodyParser.urlencoded({ extended: false }));
+    this.app.use('/', express.static(path.join(__dirname, '..', 'src/public')));
   }
 
   initSwaggerUI() {
     // handle swagger-doc
-    this.app.use('/api/docs', swaggerUi.serve, swaggerUi.setup(swagggerJson));
+    this.app.use('/api/v1/docs', swaggerUi.serve, swaggerUi.setup(swagggerJson));
   }
 
   listen() {
@@ -54,25 +56,32 @@ export default class App {
   initializedRoutes(routes: Routes[]) {
     // initialize all routes middleware
     routes.forEach((route) => {
-      this.app.use('/api', route.router);
+      this.app.use('/api/v1', route.router);
     });
 
     this.app.use('/', (req, res) => {
-      res.json({ message: 'Youve reached Zuriportfolio shop internal api' });
+      res.sendFile(path.join(__dirname, '..', 'src/public/views', 'index.html'));
     });
 
+
     this.app.use('/api', (req, res) => {
-      res.json({ message: 'Youve reached Zuriportfolio shop internal api' });
+      res.sendFile(path.join(__dirname, '..', 'src/public/views', 'index.html'));
+
+    this.app.use('/api/v1', (req, res) => {
+     res.sendFile(path.join(__dirname, '..', 'src/public/views', 'index.html'));
     });
 
     this.initSwaggerUI();
 
     this.app.all('*', (req, res) => {
-      return res.status(404).json({
-        errorStatus: true,
-        code: '--route/route-not-found',
-        message: 'The requested route was not found.',
-      });
+      res.status(404);
+      if (req.accepts('html')) {
+        return res.sendFile(path.join(__dirname, '..', 'src/public/views', '404.html'));
+      } else if (req.accepts('json')) {
+        return res.json({ message: '404 Not Found' });
+      } else {
+        return res.type('txt').send('404 Not Found');
+      }
     });
     // handle global errors
     this.app.use(HandleErrors);

src/config/test.ts

@@ -1,7 +1,7 @@
 // for test purpose.
 // user id for prod db
-export const TestUserId = '2ae314e8-006a-4bc6-a172-bfeca0a78ec1';
+export const TestUserId = 'a87be40d-8632-4c45-9b44-c893560d58c9';
 // 'd7955c27-4d61-4cd6-a6bb-e6402151d51f'
 
 // for development purpose
-// export const TestUserId = 'bac3e83f-b796-4e72-b20e-6e43d038d25d';
+// export const TestUserId = 'bac3e83f-b796-4e72-b20e-6e43d038d25d';

src/controller/activity.controller.ts

@@ -1,38 +1,21 @@
-// import { Request, Response } from 'express';
-// import BaseController from './base.controller';
-// import { v4 as uuidv4 } from 'uuid';
-// import prisma from '../config/prisma';
-// import { TestUserId } from '../config/test';
-// import { createActivitySchema } from '../helper/validate';
+import { Request, Response } from 'express';
+import BaseController from './base.controller';
+import prisma from '../config/prisma';
+import { TestUserId } from '../config/test';
 
-// export default class ActivityController extends BaseController {
-//   constructor() {
-//     super();
-//   }
+export default class ActivityController extends BaseController {
+  constructor() {
+    super();
+  }
 
-//   async addActivity(req: Request, res: Response) {
-//     const user_id = (req as any).user?.id ?? TestUserId;
-//     const { error, value } = createActivitySchema.validate(req.body);
-//     if (error) {
-//       return this.error(res, '--addActivity/invalid request', 'Invalid requets', 400);
-//     }
-//     const { action, title, description } = value;
-//     // Creating activity in the database
-//     const activityId = uuidv4();
-//     const newActivity = await prisma.activity.create({
-//       data: {
-//         id: activityId,
-//         action: action,
-//         user: {
-//           connect: {
-//             id: user_id,
-//           },
-//         },
-//         title: title,
-//         description: description,
-//       },
-//     });
+  async getActivities(req: Request, res: Response) {
+    const userId = (req as any).user?.id ?? TestUserId;
+    const allActivities = await prisma.activity.findMany({
+      where: {
+        user_id: userId,
+      },
+    });
 
-//     return this.success(res, '--addActivity/success', 'Activity recorded successfully', 201, newActivity);
-//   }
-// }
+    return this.success(res, '--activities/success', 'activities fetched successfully', 200, allActivities);
+  }
+}

src/controller/discount.controller.ts

@@ -5,7 +5,7 @@ import prisma from '../config/prisma';
 import { v4 as uuidv4 } from 'uuid';
 import { createDiscountSchema, trackPromotionSchema, updatedDiscountSchema, validateUUID } from '../helper/validate';
 import { CreateDiscountType, UpdateDiscountType } from '../@types';
-import { genRandNum, validateDateRange } from '../helper';
+import { genRandNum, isUUID, validateDateRange } from '../helper';
 import logger from '../config/logger';
 import { TestUserId } from '../config/test';
 
@@ -46,10 +46,9 @@ export default class DiscountController extends BaseController {
 
     const { amount, discount_type, quantity, maximum_discount_price, product_ids, valid_from, valid_to } =
       req.body as CreateDiscountType;
-    const validDiscountType = ['percentage', 'fixed'];
+    const validDiscountType = ['percentage'];
     const validDiscountEnum = {
       percentage: 'Percentage',
-      fixed: 'Fixed',
     };
 
     // verify date range
@@ -148,6 +147,25 @@ export default class DiscountController extends BaseController {
     // check if product exists
     // ! Remember to work on accepting an array of product id's.
     const { promo_id, productId, merchant_id } = payload;
+
+    // check if product and userId id is a valid uuid
+    if (!isUUID(productId) || !isUUID(merchant_id)) {
+      logger.error(`[Track Promo]: One of more of the ids passed are invalid.`);
+
+      return this.error(res, '--discount/invalid-uuid', `One of more of the ids passed are invalid.`, 400);
+    }
+
+    // check if user exists
+    const userExists = await prisma.user.findFirst({
+      where: { id: merchant_id },
+    });
+
+    if (!userExists) {
+      logger.error(`[Track Promo]: Merchant not found. ${merchant_id}`);
+
+      return this.error(res, '--discount/user-notfound', 'Merchant not found', 404);
+    }
+
     const promo_product = await prisma.promo_product.findFirst({
       where: {
         product_id: productId,
@@ -168,7 +186,7 @@ export default class DiscountController extends BaseController {
         res,
         '--discount/promo-notfound',
         `product promo with this id ${promo_id} doesn't exist. `,
-        404
+        404,
       );
     }
 
@@ -202,7 +220,7 @@ export default class DiscountController extends BaseController {
       '--discount/promo-notfound',
       `> Promo tracked for product ${track_promotion.product.name}
       > Merchant: ${track_promotion.user.email}`,
-      404
+      404,
     );
   }
 
@@ -336,7 +354,7 @@ export default class DiscountController extends BaseController {
         '--discount/promotions',
         'Products with promotions and tracked promotions fetched successfully',
         200,
-        productsWithPromotionsAndTrackedCounts
+        productsWithPromotionsAndTrackedCounts,
       );
     }
   }