0044229: Error Message issue with products with duplicated UPC

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1590676653 -19800
#      Thu May 28 20:07:33 2020 +0530
# Node ID a1d93e126641a5ff0d79b497fbf61e4770f61f56
# Parent  c19e4365c09ce607c5da2a87c3aa8cbb14fdbf62
Related to issue-44229 : Updated ADMessage for show duplicate UPC with product name

diff -r c19e4365c09c -r a1d93e126641 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Apr 06 09:27:09 2020 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Thu May 28 20:07:33 2020 +0530
@@ -6,7 +6,7 @@
 <!--6C0BA0880E654548B6486C6C54F277D1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--6C0BA0880E654548B6486C6C54F277D1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6C0BA0880E654548B6486C6C54F277D1-->  <VALUE><![CDATA[OBMUPC_DUPLICATED_UPC]]></VALUE>
-<!--6C0BA0880E654548B6486C6C54F277D1-->  <MSGTEXT><![CDATA[UPC already assigned to another product of this client]]></MSGTEXT>
+<!--6C0BA0880E654548B6486C6C54F277D1-->  <MSGTEXT><![CDATA[UPC is already assigned to the product(s): %s]]></MSGTEXT>
 <!--6C0BA0880E654548B6486C6C54F277D1-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--6C0BA0880E654548B6486C6C54F277D1-->  <AD_MODULE_ID><![CDATA[498812081317415BB86D66FE0AAB6490]]></AD_MODULE_ID>
 <!--6C0BA0880E654548B6486C6C54F277D1-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
diff -r c19e4365c09c -r a1d93e126641 src/org/openbravo/multiupc/event/NoDuplicateUpcHandler.java
--- a/src/org/openbravo/multiupc/event/NoDuplicateUpcHandler.java	Mon Apr 06 09:27:09 2020 +0200
+++ b/src/org/openbravo/multiupc/event/NoDuplicateUpcHandler.java	Thu May 28 20:07:33 2020 +0530
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2017 Openbravo S.L.U.
+ * Copyright (C) 2017-2020 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -8,9 +8,11 @@
  */
 package org.openbravo.multiupc.event;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.enterprise.event.Observes;
 
-import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
@@ -19,14 +21,12 @@
 import org.openbravo.client.kernel.event.EntityPersistenceEvent;
 import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
 import org.openbravo.client.kernel.event.EntityUpdateEvent;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
-import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.dal.service.OBQuery;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.model.common.plm.Product;
 import org.openbravo.multiupc.MultiUPC;
-import org.openbravo.service.db.DalConnectionProvider;
 
 public class NoDuplicateUpcHandler extends EntityPersistenceEventObserver {
   private static Entity[] entities = { ModelProvider.getInstance().getEntity(Product.ENTITY_NAME),
@@ -61,10 +61,39 @@
   }
 
   private void checkDuplicates(String newUpc, String orgId) {
-    if (alreadyExistsUpc(newUpc, orgId)) {
-      String language = OBContext.getOBContext().getLanguage().getLanguage();
-      DalConnectionProvider conn = new DalConnectionProvider(false);
-      throw new OBException(Utility.messageBD(conn, "OBMUPC_DUPLICATED_UPC", language));
+    // Check UPC in MultiUPC
+    final OBQuery<MultiUPC> multiUPCQuery = OBDal.getInstance()
+        .createQuery(MultiUPC.class, "as e where e.upc = :upcValue and e.organization.id = :orgId");
+    multiUPCQuery.setNamedParameter("upcValue", newUpc);
+    multiUPCQuery.setNamedParameter("orgId", orgId);
+    multiUPCQuery.setFilterOnReadableOrganization(false);
+    multiUPCQuery.setMaxResult(10);
+    List<MultiUPC> listMulitUPC = multiUPCQuery.list();
+    if (listMulitUPC.size() > 0) {
+      List<String> listProductName = new ArrayList<String>();
+      for (MultiUPC multiUPC : listMulitUPC) {
+        listProductName.add(multiUPC.getProduct().getName());
+      }
+      throw new OBException(String.format(OBMessageUtils.messageBD("OBMUPC_DUPLICATED_UPC"),
+          String.join(", ", listProductName)));
+    }
+
+    // Check UPC in Product
+    final OBQuery<Product> productQuery = OBDal.getInstance()
+        .createQuery(Product.class,
+            "as e where e.uPCEAN = :upcValue and e.organization.id = :orgId");
+    productQuery.setNamedParameter("upcValue", newUpc);
+    productQuery.setNamedParameter("orgId", orgId);
+    productQuery.setFilterOnReadableOrganization(false);
+    productQuery.setMaxResult(10);
+    List<Product> listProduct = productQuery.list();
+    if (listProduct.size() > 0) {
+      List<String> listProductName = new ArrayList<String>();
+      for (Product product : listProduct) {
+        listProductName.add(product.getName());
+      }
+      throw new OBException(String.format(OBMessageUtils.messageBD("OBMUPC_DUPLICATED_UPC"),
+          String.join(", ", listProductName)));
     }
   }
 
@@ -86,29 +115,4 @@
     }
     return newUpc;
   }
-
-  private boolean alreadyExistsUpc(String upc, String orgId) {
-
-    final OBCriteria<MultiUPC> obcMp = OBDal.getInstance().createCriteria(MultiUPC.class);
-    obcMp.add(Restrictions.eq(MultiUPC.PROPERTY_UPC, upc));
-    obcMp.add(Restrictions.eq(MultiUPC.PROPERTY_ORGANIZATION+ ".id", orgId));
-    obcMp.setFilterOnReadableOrganization(false);
-    obcMp.setMaxResults(1);
-    obcMp.uniqueResult();
-    if (obcMp.uniqueResult() != null) {
-      return true;
-    }
-
-    final OBCriteria<Product> obcP = OBDal.getInstance().createCriteria(Product.class);
-    obcP.add(Restrictions.eq(Product.PROPERTY_UPCEAN, upc));
-    obcP.add(Restrictions.eq(Product.PROPERTY_ORGANIZATION+ ".id", orgId));
-    obcP.setFilterOnReadableOrganization(false);
-    obcP.setMaxResults(1);
-    obcP.uniqueResult();
-    if (obcP.uniqueResult() != null) {
-      return true;
-    }
-
-    return false;
-  }
-}
\ No newline at end of file
+}