fix bug of query of discounts

bahram1249 · May 20, 2024 · caf9501 · caf9501
1 parent c866512
commit caf9501
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/apps/e-commerce/src/product-discount/product-discount-setter.service.ts b/apps/e-commerce/src/product-discount/product-discount-setter.service.ts
@@ -172,21 +172,25 @@ export class ProductDiscountSetterService {
           },
         ])
         .filter(
-          Sequelize.where(
-            Sequelize.fn(
-              'dateadd',
-              Sequelize.literal('minute'),
-              Sequelize.literal('10'),
+          Sequelize.where(Sequelize.fn('getdate'), {
+            [Op.between]: [
               Sequelize.fn(
                 'isnull',
-                Sequelize.col('ECDiscount.endDate'),
+                Sequelize.col('ECDiscount.startDate'),
                 Sequelize.fn('getdate'),
               ),
-            ),
-            {
-              [Op.gte]: Sequelize.fn('getdate'),
-            },
-          ),
+              Sequelize.fn(
+                'dateadd',
+                Sequelize.literal('day'),
+                Sequelize.literal('1'),
+                Sequelize.fn(
+                  'isnull',
+                  Sequelize.col('ECDiscount.endDate'),
+                  Sequelize.fn('getdate'),
+                ),
+              ),
+            ],
+          }),
         )
         .filter(
           Sequelize.where(