0047670: Backend discounts executor not ordering properly the discount rules

Description

Backend discounts executor not ordering properly the discount rules.

Null values should go first and with same priority, should be ordered by id.

* OB.Discounts.Pos.ruleImpls: array with not manual discounts and promotions including children filters, filtered by current role and sorted by priority and id (null priorities first).

Steps To Reproduce

-Create 2 discounts
-First discount priority 10
-Second one priority null

Go to web pos and create a ticket that applies 2 discounts. Discount without priority is applied first and later the other one

Use the endpoint ../ws/org.openbravo.discounts.discount. Discount with priority is applied first and later the other one

Proposed Solution

Attached file

Tags

NOR

Attached Files

patch.diff [^] (1,050 bytes) 2021-09-10 12:09 [Show Content] [Hide Content]

From be3e604588d97af83b073b574df75cb94bb85a2d Mon Sep 17 00:00:00 2001
From: jetxarri <javier.echarri@openbravo.com>
Date: Fri, 10 Sep 2021 11:55:53 +0200
Subject: [PATCH] Fixes issue NOE-4512: Discounts not applied in the same order

---
 src/org/openbravo/discounts/engine/DiscountJSExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/openbravo/discounts/engine/DiscountJSExecutor.java b/src/org/openbravo/discounts/engine/DiscountJSExecutor.java
index c40b285..80e5b16 100644
--- a/src/org/openbravo/discounts/engine/DiscountJSExecutor.java
+++ b/src/org/openbravo/discounts/engine/DiscountJSExecutor.java
@@ -224,7 +224,7 @@ public abstract class DiscountJSExecutor implements DiscountExecutor {
       throw new OBException(e.getMessage());
     }
 
-    whereClause += " order by pa.priority";
+    whereClause += " order by pa.priority nulls first, pa.id";
 
     OBQuery<PriceAdjustment> discountCandidatesQuery = OBDal.getInstance()
         .createQuery(PriceAdjustment.class, whereClause)
-- 
2.31.0

Relationships [ Relation Graph ] [ Dependency Graph ]

Notes
(0131780) hgbot (developer) 2021-09-14 13:08	Merge Request created: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts/-/merge_requests/11 [^]

(0131822) hgbot (developer) 2021-09-15 16:22	Merge request merged: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts/-/merge_requests/11 [^]

(0131823) hgbot (developer) 2021-09-15 16:22	Directly closing issue as related merge request is already approved. Repository: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts [^] Changeset: 9a0758229ea5a0de988086e1546dda1517269570 Author: Rafael Queralta <rafaelcuba81@gmail.com> Date: 2021-09-14T07:06:03-04:00 URL: https://gitlab.com/openbravo/product/pmods/org.openbravo.discounts/-/commit/9a0758229ea5a0de988086e1546dda1517269570 [^] Fixed BUG-47670: Filtered by current role and sorted by priority and id --- M src/org/openbravo/discounts/engine/DiscountJSExecutor.java ---

Issue History
Date Modified	Username	Field	Change
2021-09-10 12:09	jetxarri	New Issue
2021-09-10 12:09	jetxarri	Assigned To	=> Retail
2021-09-10 12:09	jetxarri	File Added: patch.diff
2021-09-10 12:09	jetxarri	OBNetwork customer	=> OBPS
2021-09-10 12:09	jetxarri	Triggers an Emergency Pack	=> No
2021-09-10 12:10	jetxarri	Tag Attached: NOR
2021-09-13 21:02	rqueralta	Assigned To	Retail => rqueralta
2021-09-13 21:02	rqueralta	Status	new => scheduled
2021-09-14 13:08	hgbot	Merge Request Status	=> open
2021-09-14 13:08	hgbot	Note Added: 0131780
2021-09-15 16:21	hgbot	Merge Request Status	open => approved
2021-09-15 16:22	hgbot	Note Added: 0131822
2021-09-15 16:22	hgbot	Resolution	open => fixed
2021-09-15 16:22	hgbot	Status	scheduled => closed
2021-09-15 16:22	hgbot	Note Added: 0131823