svn commit: r574737 - /ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java

[jaz-3]

Author: jaz
Date: Tue Sep 11 17:48:14 2007
New Revision: 574737

URL: http://svn.apache.org/viewvc?rev=574737&view=rev
Log:
updated code to not try to create multiple role records

Modified:
    ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java?rev=574737&r1=574736&r2=574737&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java Tue Sep 11 17:48:14 2007
@@ -936,19 +936,24 @@
                 if (Debug.infoOn()) Debug.logInfo(attachmentCount + " attachments added to CommunicationEvent:" + communicationEventId,module);
             }
             
-            //For all other addresses create a CommunicationEventRole
+            // For all other addresses create a CommunicationEventRole
             while (itr.hasNext()) {
                 Map address = (Map) itr.next();
                 String partyId = (String)address.get("partyId");
-                
+
                 // It's not clear what the "role" of this communication event should be, so we'll just put _NA_
-                //Check if "_NA_" role exists for the partyId. If not, then first associate that role with the partyId
-                GenericValue partyRole = delegator.findByPrimaryKey("PartyRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", "_NA_"));
-                if (partyRole == null) {
-                    dispatcher.runSync("createPartyRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", "_NA_", "userLogin", userLogin));
+                // check and see if this role was already created and ignore if true
+                Map commEventRoleMap = UtilMisc.toMap("communicationEventId", communicationEventId, "partyId", partyId, "roleTypeId", "_NA_");
+                GenericValue commEventRole = delegator.findByPrimaryKey("CommunicationEventRole", commEventRoleMap);
+                if (commEventRole == null) {
+                    // Check if "_NA_" role exists for the partyId. If not, then first associate that role with the partyId
+                    GenericValue partyRole = delegator.findByPrimaryKey("PartyRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", "_NA_"));
+                    if (partyRole == null) {
+                        dispatcher.runSync("createPartyRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", "_NA_", "userLogin", userLogin));
+                    }
+                    Map input = UtilMisc.toMap("communicationEventId", communicationEventId, "partyId", partyId, "roleTypeId", "_NA_", "userLogin", userLogin, "contactMechId", (String)address.get("contactMechId"));
+                    dispatcher.runSync("createCommunicationEventRole", input);
                 }
-                Map input = UtilMisc.toMap("communicationEventId", communicationEventId, "partyId", partyId, "roleTypeId", "_NA_", "userLogin", userLogin, "contactMechId", (String)address.get("contactMechId"));
-                dispatcher.runSync("createCommunicationEventRole", input);
             }
             
             Map results = ServiceUtil.returnSuccess();