fix bug of not mentioned column name

bahram1249 · Mar 16, 2024 · 03bee20 · 03bee20
1 parent 06f476d
commit 03bee20
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/apps/e-commerce/src/admin/discount-action-rule/discount-action-rule.service.ts b/apps/e-commerce/src/admin/discount-action-rule/discount-action-rule.service.ts
@@ -16,7 +16,11 @@ export class DiscountActionRuleService {
   async findAll() {
     const queryBuilder = new QueryOptionsBuilder().filter(
       Sequelize.where(
-        Sequelize.fn('isnull', Sequelize.col('ECDiscountActionRule'), 0),
+        Sequelize.fn(
+          'isnull',
+          Sequelize.col('ECDiscountActionRule.isDeleted'),
+          0,
+        ),
         {
           [Op.eq]: 0,
         },

diff --git a/apps/e-commerce/src/admin/discount-action-type/discount-action-type.service.ts b/apps/e-commerce/src/admin/discount-action-type/discount-action-type.service.ts
@@ -16,7 +16,11 @@ export class DiscountActionTypeService {
   async findAll() {
     const queryBuilder = new QueryOptionsBuilder().filter(
       Sequelize.where(
-        Sequelize.fn('isnull', Sequelize.col('ECDiscountActionType'), 0),
+        Sequelize.fn(
+          'isnull',
+          Sequelize.col('ECDiscountActionType.isDeleted'),
+          0,
+        ),
         {
           [Op.eq]: 0,
         },

diff --git a/apps/e-commerce/src/admin/discount-type/discount-type.service.ts b/apps/e-commerce/src/admin/discount-type/discount-type.service.ts
@@ -15,14 +15,16 @@ export class DiscountTypeService {
   async findAll() {
     const queryBuilder = new QueryOptionsBuilder().filter(
       Sequelize.where(
-        Sequelize.fn('isnull', Sequelize.col('ECDiscountType'), 0),
+        Sequelize.fn('isnull', Sequelize.col('ECDiscountType.isDeleted'), 0),
         {
           [Op.eq]: 0,
         },
       ),
     );
     const count = await this.repository.count(queryBuilder.build());
-    const queryOptions = queryBuilder.attributes(['id', 'name']).build();
+    const queryOptions = queryBuilder
+      .attributes(['id', 'name', 'isCouponBased'])
+      .build();
     const result = await this.repository.findAll(queryOptions);
     return {
       result: result,