[ofbiz-framework] branch release22.01 updated: Fixed: Error in BlackList to DenyList migration service (OFBIZ-12732)

[pgil]

This is an automated email from the ASF dual-hosted git repository.

pgil pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release22.01 by this push:
     new 30330e7e1d Fixed: Error in BlackList to DenyList migration service 
(OFBIZ-12732)
30330e7e1d is described below

commit 30330e7e1dd666ff024856364b35ee487d933f13
Author: Gil Portenseigne <p...@apache.org>
AuthorDate: Mon Jan 2 12:04:10 2023 +0100

    Fixed: Error in BlackList to DenyList migration service (OFBIZ-12732)
    
    Fix migration service implementation using the new field name (Deny), New 
type must be created first to avoid FK error.
    Old Type should be deleted after old list to avoid FK issue.
---
 .../ofbiz/order/OrderBlacklistServices.groovy      | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git 
a/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderBlacklistServices.groovy
 
b/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderBlacklistServices.groovy
index 995ca4b138..1eae3abb25 100644
--- 
a/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderBlacklistServices.groovy
+++ 
b/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderBlacklistServices.groovy
@@ -23,24 +23,27 @@ import org.apache.ofbiz.entity.GenericValue
  * Migrate all elements present on OldOrderBlacklist and OldOrderBlacklistType 
to respectively OrderDenylist and OrderDenylistType entities
  * Update service created 2021-02
  */
-def migrateOldOrderBlacklistAndOldOrderBlacklistType() {
-    List<GenericValue> oldOrderBlacklist = 
delegator.findAll("OldOrderBlacklist", false)
-    oldOrderBlacklist.each {
-        GenericValue OrderDenylist = makeValue("OrderDenylist")
-        OrderDenylist.blacklistString = it.blacklistString
-        OrderDenylist.orderBlacklistTypeId = it.orderBlacklistTypeId
-        OrderDenylist.create()
-        it.remove()
+Map migrateOldOrderBlacklistAndOldOrderBlacklistType() {
+    List<GenericValue> oldOrderBlacklistType = 
delegator.findAll('OldOrderBlacklistType', false)
+    List<GenericValue> typesToRemove = []
+    oldOrderBlacklistType.each {
+        GenericValue orderDenyListType = makeValue('OrderDenylistType')
+        orderDenyListType.orderDenylistTypeId = it.orderBlacklistTypeId
+        orderDenyListType.description = it.description
+        orderDenyListType.create()
+        typesToRemove << it
     }
 
-    List<GenericValue> oldOrderBlacklistType = 
delegator.findAll("OldOrderBlacklistType", false)
+    List<GenericValue> oldOrderBlacklist = 
delegator.findAll('OldOrderBlacklist', false)
     oldOrderBlacklist.each {
-        GenericValue OrderDenylistType = makeValue("OrderDenylistType")
-        orderBlacklist.orderBlacklistTypeId = it.orderBlacklistTypeId
-        OrderDenylistType.description = it.description
-        OrderDenylistType.create()
+        GenericValue orderDenyList = makeValue('OrderDenylist')
+        orderDenyList.denylistString = it.blacklistString
+        orderDenyList.orderDenylistTypeId = it.orderBlacklistTypeId
+        orderDenyList.create()
         it.remove()
     }
 
+    delegator.removeAll(typesToRemove)
+
     return success()
 }