diff --git a/app/controllers/products.controller.js b/app/controllers/products.controller.js index e198270..1a7bad4 100644 --- a/app/controllers/products.controller.js +++ b/app/controllers/products.controller.js @@ -60,6 +60,9 @@ exports.getAllProducts = async (req, res) => { try { const data = await Product.findAll({ + where: { + is_active: true + }, attributes: { include: [ [ @@ -69,8 +72,8 @@ exports.getAllProducts = async (req, res) => { "mapped_establishment_count", ], [ - Sequelize.literal(`(SELECT name FROM admin_users au WHERE au.id = products.created_by)`), - "created_by_name" + Sequelize.literal(`(SELECT name FROM admin_users au WHERE au.id = products.created_by)`), + "created_by_name" ] ], }, @@ -82,14 +85,19 @@ exports.getAllProducts = async (req, res) => { }, ], order: [ - [Sequelize.literal("COALESCE(products.updated_at, products.created_at) DESC")], + ["product_name", "ASC"] ], }); - res.status(200).send({'status':"success",'message':"Fetched successfully",'product_count': data.length, 'data': data }); + res.status(200).send({ + status: "success", + message: "Fetched successfully", + product_count: data.length, + data: data + }); } catch (error) { - res.status(500).send({'status':"failed",'message':error.message }); + res.status(500).send({ status: "failed", message: error.message }); } };