Debug (#56)

* FF-8 feat: admin management and authorization * FF-8 feat: admin management and authorization * FF-9 * [FF-9] feat: product management * fixed bugs * FF-10 * some changes * Debug * Fixed bug * fixed bug * fixed multer dirname * added commented code --------- Co-authored-by: Ilham Hidayatulloh <[email protected]>
purwadhikafullstack · Feb 13, 2024 · 26334c6 · 26334c6
1 parent 06b125c
commit 26334c6
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 71 deletions.
diff --git a/apps/api/src/controllers/product.controller.js b/apps/api/src/controllers/product.controller.js
@@ -411,46 +411,46 @@ export const getAllBranchProduct = async (req, res) => {
  };
  }
 
- // if (cond && cond === 'disc') {
- //  const allBranchProducts = await ProductBranch.findAndCountAll({
- //  include: [
- //  {
- //  model: Product,
- //  },
- //  {
- //  model: Branch,
- //  },
- //  {
- //  model: Discount,
- //  },
- //  ],
- //  where: {
- //  [Op.and]: [whereCondition, { '$Discounts.id$': null }],
- //  },
- //  });
- //  return res.status(200).send({ result: allBranchProducts });
- // }
-
- // const allBranchProducts = await ProductBranch.findAndCountAll({
- //  include: [
- //  {
- //  model: Product,
- //  },
- //  {
- //  model: Branch,
- //  },
- //  ],
- //  where: whereCondition,
- //  order: [[sortBy, sortOrder.toUpperCase()]],
- //  limit: parseInt(limit),
- //  offset: parseInt(offset),
- // });
- // const totalPages = Math.ceil(allBranchProducts.count / limit);
- // return res
- //  .status(200)
- //  .send({ result: allBranchProducts, page, totalPages });
-
- return res.status(200).send({ message: 'success' });
+ if (cond && cond === 'disc') {
+ const allBranchProducts = await ProductBranch.findAndCountAll({
+ include: [
+ {
+ model: Product,
+ },
+ {
+ model: Branch,
+ },
+ {
+ model: Discount,
+ },
+ ],
+ where: {
+ [Op.and]: [whereCondition, { '$Discounts.id$': null }],
+ },
+ });
+ return res.status(200).send({ result: allBranchProducts });
+ }
+
+ const allBranchProducts = await ProductBranch.findAndCountAll({
+ include: [
+ {
+ model: Product,
+ },
+ {
+ model: Branch,
+ },
+ ],
+ where: whereCondition,
+ order: [[sortBy, sortOrder.toUpperCase()]],
+ limit: parseInt(limit),
+ offset: parseInt(offset),
+ });
+ const totalPages = Math.ceil(allBranchProducts.count / limit);
+ return res
+ .status(200)
+ .send({ result: allBranchProducts, page, totalPages });
+
+ // return res.status(200).send({ message: 'success' });
  } catch (error) {
  console.error(error);
  return res.status(500).send({ message: error.message });

diff --git a/apps/api/src/middleware/admin/product.multer.js b/apps/api/src/middleware/admin/product.multer.js
@@ -65,35 +65,4 @@ module.exports = {
  const limits = { fileSize: 1024 * 1024 };
  return multer({ storage, fileFilter, limits });
  },
-
- multerUploadProfile: () => {
- const storage = multer.diskStorage({
- destination: (req, file, cb) => {
- cb(null, "./src/public/admin_pp");
- },
- filename: (req, file, cb) => {
- cb(
- null,
- "PIMG" +
- "-" +
- Date.now() +
- Math.round(Math.random() * 1000000) +
- "." +
- file.mimetype.split("/")[1]
- );
- },
- });
- const fileFilter = (req, file, cb) => {
- const extFilter = ["jpg", "jpeg", "png", "gif"];
- const checkEct = extFilter.includes(file.mimetype.split("/")[1].toLowerCase());
-
- if (checkEct) {
- cb(null, true);
- } else {
- cb(new Error("file format not match"));
- }
- };
- const limits = { fileSize: 1024 * 1024 };
- return multer({ storage, fileFilter, limits });
- },
 };
diff --git a/apps/api/src/public/admin_pp/PIMG-1707801042877243301.jpeg b/apps/api/src/public/admin_pp/PIMG-1707801042877243301.jpeg
diff --git a/apps/api/src/public/admin_pp/PIMG-1707801848335183396.jpeg b/apps/api/src/public/admin_pp/PIMG-1707801848335183396.jpeg
diff --git a/apps/api/src/public/products/PIMG-170780173322242253.jpeg b/apps/api/src/public/products/PIMG-170780173322242253.jpeg
diff --git a/apps/web/src/pages/admin/stockManagement/index.jsx b/apps/web/src/pages/admin/stockManagement/index.jsx
@@ -57,6 +57,7 @@ export default function StockManagement() {
  Authorization: `Bearer ${token}`,
  },
  });
+ console.log("response", response);
  updateURL(navigate, page, sort, order, search)
  setProductBranchData(response.data?.result.rows)
  setTotalPages(response.data?.totalPages)