fix: single product admin

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/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;

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,17 +1,16 @@
 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,
+  requestBodyValidator(productSchema),
   authMiddleware,
   validOrgAdmin,
   productController.createProduct,
@@ -25,14 +24,14 @@ productRouter.get(
 );
 
 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,14 @@ 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()
+    .min(0.1, "Cost price is required and must be greater than 0"),
 });
 
 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/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(