fix: admin create product

src/controllers/AdminController.ts

@@ -1,12 +1,12 @@
 import { Request, Response } from "express";
+import { check, param, validationResult } from "express-validator";
+import { UserRole } from "../enums/userRoles";
+import { HttpError } from "../middleware";
 import {
+  AdminLogService,
   AdminOrganisationService,
   AdminUserService,
-  AdminLogService,
 } from "../services";
-import { HttpError } from "../middleware";
-import { check, param, validationResult } from "express-validator";
-import { UserRole } from "../enums/userRoles";
 
 /**
  * @swagger

src/controllers/AuthController.ts

@@ -64,7 +64,6 @@ const signUp = async (req: Request, res: Response, next: NextFunction) => {
     const { message, user, access_token } = await authService.signUp(req.body);
     res.status(201).json({ message, user, access_token });
   } catch (error) {
-    console.log(error);
     next(error);
   }
 };
@@ -626,16 +625,16 @@ const verify2FA = async (req: Request, res: Response, next: NextFunction) => {
 };
 
 export {
-  VerifyUserMagicLink,
   changePassword,
   createMagicToken,
+  enable2FA,
   forgotPassword,
   googleAuthCall,
   // handleGoogleAuth,
   login,
   resetPassword,
   signUp,
-  verifyOtp,
-  enable2FA,
   verify2FA,
+  verifyOtp,
+  VerifyUserMagicLink,
 };

src/controllers/NewsLetterSubscriptionController.ts

@@ -104,8 +104,6 @@ const subscribeToNewsletter = async (
         : "You are already subscribed to our newsletter",
     });
   } catch (error) {
-    console.log(error);
-
     next(error);
   }
 };
@@ -294,8 +292,8 @@ const getAllNewsletter = async (
       });
 
     return res.status(200).json({
-      status: "",
-      message: "",
+      status_code: 200,
+      message: "Subscribers list fetched successfully",
       data: data,
       meta,
     });

src/controllers/OrgController.ts

@@ -1207,7 +1207,7 @@ export class OrgController {
 
   /**
    * @swagger
-   * /api/v1/organizations/{org_id}/roles/{role_id}:
+   * /api/v1/organisations/{org_id}/roles/{role_id}:
    *   get:
    *     summary: Get a specific role in an organization
    *     tags: [Organizations]

src/controllers/ProductController.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from "express";
-import { ProductService } from "../services/product.services";
 import { BadRequest } from "../middleware";
+import { ProductService } from "../services/product.services";
 
 class ProductController {
   private productService: ProductService;
@@ -18,7 +18,7 @@ class ProductController {
 
   /**
    * @openapi
-   * /api/v1/organizations/{org_id}/product:
+   * /api/v1/organisations/{org_id}/product:
    *   post:
    *     summary: Create a product
    *     tags: [Product]
@@ -100,9 +100,12 @@ class ProductController {
     const id = req.params.org_id;
     const product = req.body;
     const newProduct = await this.productService.createProduct(id, product);
-    res
-      .status(201)
-      .json({ message: "Product created successfully", data: newProduct });
+    res.status(201).json({
+      status_code: 201,
+      message: "Product created successfully",
+      status: "success",
+      data: newProduct,
+    });
   };
 
   /**
@@ -335,7 +338,7 @@ class ProductController {
 
   /**
    * @openapi
-   * /api/v1/organizations/{org_id}/products/{product_id}:
+   * /api/v1/organisations/{org_id}/products/{product_id}:
    *   get:
    *     summary: get a product by its ID
    *     tags: [Product]

src/middleware/request-validation.ts

@@ -8,9 +8,14 @@ const requestBodyValidator = (schema: ZodSchema<any>) => {
       next();
     } catch (err) {
       if (err instanceof ZodError) {
-        return res.status(400).json({
+        const errorMessages = err.errors.map((error: any) => ({
+          path: `${error.path.join(",")}`,
+          message: `${error.message}`,
+        }));
+
+        return res.status(422).json({
           message: "Invalid request body",
-          // errors: err.errors,
+          errors: errorMessages,
         });
       }
       next(err);

src/models/product.ts

@@ -1,14 +1,15 @@
 import {
-  Entity,
-  PrimaryGeneratedColumn,
   Column,
+  CreateDateColumn,
+  DeleteDateColumn,
+  Entity,
   ManyToOne,
+  PrimaryGeneratedColumn,
   UpdateDateColumn,
-  CreateDateColumn,
 } from "typeorm";
-import { Organization } from "./organization";
-import ExtendedBaseEntity from "./extended-base-entity";
 import { ProductSize, StockStatus } from "../enums/product";
+import ExtendedBaseEntity from "./extended-base-entity";
+import { Organization } from "./organization";
 import { User } from "./user";
 @Entity()
 export class Product extends ExtendedBaseEntity {
@@ -58,4 +59,10 @@ export class Product extends ExtendedBaseEntity {
 
   @ManyToOne(() => User, (user) => user.products)
   user: User;
+
+  @Column({ type: "float", nullable: false, default: 0 })
+  cost_price: number;
+
+  @DeleteDateColumn()
+  deletedAt?: Date;
 }

src/routes/admin.ts

@@ -1,8 +1,7 @@
 import { Router } from "express";
 import admin from "../controllers/AdminController";
-import { authMiddleware, checkPermissions } from "../middleware";
 import { UserRole } from "../enums/userRoles";
-import { Organization } from "../models";
+import { authMiddleware, checkPermissions } from "../middleware";
 import { Limiter } from "../utils";
 
 const adminRouter = Router();

src/routes/organisation.ts

@@ -33,7 +33,7 @@ orgRouter.delete(
 );
 
 orgRouter.post(
-  "/organizations",
+  "/organisations",
   authMiddleware,
   organizationValidation,
   orgController.createOrganisation.bind(orgController),
@@ -87,13 +87,13 @@ orgRouter.put(
 );
 
 orgRouter.get(
-  "/organizations/:org_id/roles/:role_id",
+  "/organisations/:org_id/roles/:role_id",
   authMiddleware,
   orgController.getSingleRole.bind(orgController),
 );
 
 orgRouter.get(
-  "/organizations/:org_id/roles",
+  "/organisations/:org_id/roles",
   authMiddleware,
   orgController.getAllOrganizationRoles.bind(orgController),
 );

src/routes/product.ts

@@ -1,38 +1,37 @@
 import { Router } from "express";
 import { ProductController } from "../controllers/ProductController";
 import { authMiddleware, validOrgAdmin } from "../middleware";
-import { validateProductDetails } from "../middleware/product";
 import { validateUserToOrg } from "../middleware/organizationValidation";
-import { adminOnly } from "../middleware";
+import { requestBodyValidator } from "../middleware/request-validation";
+import { productSchema } from "../schema/product.schema";
 
 const productRouter = Router();
 const productController = new ProductController();
 
-// route
 productRouter.post(
-  "/organizations/:org_id/products",
-  validateProductDetails,
+  "/organisations/:org_id/products",
+  requestBodyValidator(productSchema),
   authMiddleware,
   validOrgAdmin,
   productController.createProduct,
 );
 
 productRouter.get(
-  "/organizations/:org_id/products/search",
+  "/organisations/:org_id/products/search",
   authMiddleware,
   validateUserToOrg,
   productController.getProduct,
 );
 
 productRouter.delete(
-  "/organizations/:org_id/products/:product_id",
+  "/organisations/:org_id/products/:product_id",
   authMiddleware,
   validOrgAdmin,
   productController.deleteProduct,
 );
 
 productRouter.get(
-  "/organizations/:org_id/products/:product_id",
+  "/organisations/:org_id/products/:product_id",
   authMiddleware,
   validOrgAdmin,
   productController.getSingleProduct,

src/schema/product.schema.ts

@@ -2,11 +2,12 @@ import { z } from "zod";
 
 export const productSchema = z.object({
   name: z.string().min(1, "Name is required"),
-  description: z.string().optional(),
-  category: z.string().optional(),
-  price: z.number().min(1, "Price is required"),
-  image: z.string().optional(),
+  description: z.string().min(1, "Description is required"),
+  category: z.string().min(1, "Category is required"),
+  price: z.number().min(0.1, "Price is required and must be greater than 0"),
+  image: z.string(),
   quantity: z.number().min(1, "Quantity is required"),
+  cost_price: z.number().optional(),
 });
 
 export type ProductSchema = z.infer<typeof productSchema>;

src/services/admin.services.ts

@@ -1,9 +1,9 @@
 // / src/services/AdminOrganisationService.ts
-import { NextFunction, Request, Response } from "express";
+import { Request } from "express";
 // import { getRepository, Repository } from 'typeorm';
-import { User, Organization, Log } from "../models";
 import AppDataSource from "../data-source";
 import { HttpError } from "../middleware";
+import { Log, Organization, User } from "../models";
 import { hashPassword } from "../utils/index";
 
 export class AdminOrganisationService {

src/services/newsLetterSubscription.service.ts

@@ -1,8 +1,8 @@
 import { Repository } from "typeorm";
 import AppDataSource from "../data-source";
+import { BadRequest, HttpError, ResourceNotFound } from "../middleware";
 import { NewsLetterSubscriber } from "../models/newsLetterSubscription";
 import { INewsLetterSubscriptionService } from "../types";
-import { BadRequest, HttpError, ResourceNotFound } from "../middleware";
 
 export class NewsLetterSubscriptionService
   implements INewsLetterSubscriptionService

src/services/org.services.ts

@@ -3,22 +3,16 @@ import { v4 as uuidv4 } from "uuid";
 import config from "../config/index";
 import AppDataSource from "../data-source";
 import { UserRole } from "../enums/userRoles";
-import {
-  BadRequest,
-  ResourceNotFound,
-  HttpError,
-  Conflict,
-} from "../middleware";
-import { Organization, Invitation, UserOrganization } from "../models";
+import { BadRequest, Conflict, ResourceNotFound } from "../middleware";
+import { Invitation, Organization, UserOrganization } from "../models";
 import { OrganizationRole } from "../models/organization-role.entity";
 import { User } from "../models/user";
 import { ICreateOrganisation, ICreateOrgRole, IOrgService } from "../types";
-import log from "../utils/logger";
 
-import { addEmailToQueue } from "../utils/queue";
-import renderTemplate from "../views/email/renderTemplate";
 import { PermissionCategory } from "../enums/permission-category.enum";
 import { Permissions } from "../models/permissions.entity";
+import { addEmailToQueue } from "../utils/queue";
+import renderTemplate from "../views/email/renderTemplate";
 const frontendBaseUrl = config.BASE_URL;
 
 export class OrgService implements IOrgService {
@@ -196,7 +190,6 @@ export class OrgService implements IOrgService {
     const organization = await organizationRepository.findOne({
       where: { id: organizationId },
     });
-    console.log("here", organization);
     if (!organization) {
       throw new ResourceNotFound(
         `Organization with ID ${organizationId} not found`,

src/services/product.services.ts

@@ -78,7 +78,6 @@ export class ProductService {
     if (!organization) {
       throw new ServerError("Invalid organisation credentials");
     }
-
     const newProduct = this.productRepository.create(new_Product);
     newProduct.org = organization;
     newProduct.stock_status = await this.calculateProductStatus(
@@ -93,15 +92,11 @@ export class ProductService {
     }
 
     return {
-      status_code: 201,
-      status: "success",
-      message: "Product created successfully",
       data: {
         id: product.id,
         name: product.name,
         description: product.description,
         price: product.price,
-        image: product.image,
         status: product.stock_status,
         quantity: product.quantity,
         created_at: product.created_at,

src/test/product.spec.ts

@@ -1,11 +1,11 @@
 //@ts-nocheck
-import { ProductService } from "../services/product.services";
 import { Repository } from "typeorm";
-import { Product } from "../models/product";
 import { StockStatus } from "../enums/product";
-import { ProductSchema } from "../schema/product.schema";
+import { ServerError } from "../middleware";
 import { Organization } from "../models/organization";
-import { ServerError, ResourceNotFound } from "../middleware";
+import { Product } from "../models/product";
+import { ProductSchema } from "../schema/product.schema";
+import { ProductService } from "../services/product.services";
 
 jest.mock("../utils", () => ({
   getIsInvalidMessage: jest
@@ -70,9 +70,6 @@ describe("ProductService", () => {
         .mockResolvedValue(StockStatus.IN_STOCK);
 
       const result = await productService.createProduct(mockOrgId, mockProduct);
-      expect(result.status_code).toEqual(201);
-      expect(result.status).toEqual("success");
-      expect(result.message).toEqual("Product created successfully");
       expect(result.data.name).toEqual(mockProduct.name);
       expect(result.data.description).toEqual(mockProduct.description);
       expect(result.data.price).toEqual(mockProduct.price);