get by id purchases and updatePurchaseState fixed

Author: Chmod351

server/Controllers/purchasesController.js

@@ -11,13 +11,13 @@ const purchaseController = {
 };
 
 function createPurchase(req, res, next) {
-  console.log(req.body);
+
   purchaseService
     .createPurchase(
       req.user.id,
       req.body.cartId,
       req.body.amount,
-      req.body.address,
+      req.body.shippingAddress,
     )
     .then((purchase) => res.json(purchase))
     .catch((error) => next(error));

server/Models/purchasesModel.js

@@ -16,7 +16,7 @@ const PurchaseSchema = new mongoose.Schema(
     shippingAddress: {
       type: Object,
       required: true,
-      maxLength: 100,
+      maxLength: 500,
       minlength: 50,
     },
     shippingStatus: {

server/Routes/purchasesRoutes.js

@@ -20,13 +20,13 @@ router.get(
 );
 
 router.delete(
-  '/purchases/:purchaseId',
+  '/purchases/:id',
   authMiddleware,
   purchaseController.cleanPurchase,
 );
 
 router.put(
-  '/purchases/:purchaseId',
+  '/purchases/:id',
   authMiddleware,
   adminCheck,
   purchaseController.updatePurchaseState,

server/View/productView.js

@@ -25,12 +25,11 @@ function isValidObjectId(id) {
 }
 
 async function getProductById(productId) {
-  console.log(productId);
   if (productId && isValidObjectId(productId)) {
     const product = await Product.findById(productId);
     return product;
   } else {
-    throw new NotFoundError('Product Not found');
+    throw new NotFoundError(`Product with id ${productId} Not found`);
   }
 }
 

server/View/purchasesView.js

@@ -1,5 +1,6 @@
 import Purchase from '../Models/purchasesModel.js';
 import StripePaymentProvider from '../helpers/stripe.js';
+import { NotFoundError } from '../helpers/errorHandler.js';
 const paymentProvider = new StripePaymentProvider();
 
 const purchaseService = {
@@ -12,23 +13,42 @@ const purchaseService = {
   processPayment,
 };
 
+async function findPurchaseById(id) {
+  const purchase = await Purchase.findById(id);
+  if (purchase) {
+    return purchase;
+  } else {
+    throw new NotFoundError(`Purchase with id ${id} Not found`);
+  }
+}
+
 async function createPurchase(userId, cartId, amount, shippingAddress) {
   const purchase = new Purchase({
     userId,
     cartId,
     amount,
     shippingAddress,
   });
-  
+
   return await purchase.save();
 }
 
 async function getAllPurchase(page, size) {
   // get a pagination with purchases instead all purchases
-  const pageNumber = parseInt(page) || 1;
-  const pageSize = parseInt(size) || 10;
-  const skipCount = (pageNumber - 1) * pageSize;
-  return await Purchase.find().skip(skipCount).limit(pageSize);
+  const actualPage = parseInt(page) || 1;
+  const pageSize = parseInt(size) || 8;
+  const skipCount = (actualPage - 1) * pageSize;
+
+  const totalCount = await Purchase.countDocuments();
+  const totalPages = Math.ceil(totalCount / pageSize);
+
+  const products = await Purchase.aggregate([
+    { $sample: { size: totalCount } },
+    { $skip: skipCount },
+    { $limit: pageSize },
+  ]);
+
+  return { products, totalPages };
 }
 
 async function getUserPurchase(id) {
@@ -60,17 +80,20 @@ async function getMonthly() {
 }
 
 async function cleanPurchase(id) {
+  await findPurchaseById(id);
   return await Purchase.findByIdAndDelete(id);
 }
 
 async function updatePurchaseState(id, status) {
+  await findPurchaseById(id);
   const newStatus = await Purchase.findOneAndUpdate(
     {
-      purchaseId: id,
+      _id: id,
     },
     { shippingStatus: status },
     { new: true },
   );
+  console.log(newStatus);
   return newStatus;
 }