Merge branch '1056190_FixCampaingLibCreateLogEntryOrder' into '2020.1.0'

[Projekt: Entwicklung - Neon][TicketNr.: 1056190][Campaign_lib: Falsche...

See merge request xrm/basic!225

entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/onDBInsert.js

@@ -8,4 +8,4 @@ var contactId = rowdata["CAMPAIGNPARTICIPANT.CONTACT_ID"];
 var campaignParticipantId = vars.get("$local.uid");
 var previousCampaignstepId = "";
 
-CampaignUtils.createLogEntry(campaignId, campaignStepId, contactId, campaignParticipantId, previousCampaignstepId);
\ No newline at end of file
+CampaignUtils.createLogEntry(campaignId, campaignStepId, campaignParticipantId, previousCampaignstepId);
\ No newline at end of file

process/Campaign_lib/process.js

+import("system.util");
 import("system.translate");
 import("system.vars");
 import("system.db");
@@ -160,8 +161,6 @@ CampaignUtils.getCampaignStatusByCampaignId = function(pCampaignId)
  *                                              The corresponding campaign id.<br>
  * @param {String} pCampaignStepId              <p>
  *                                              The current campaign step id.<br>
- * @param {String} pContactId                   <p>
- *                                              The contact id,<br>
  * @param {String} pCampaignParticipantId       <p>
  *                                              The contact id of the campaign participant.<br>
  * @param {String} pPreviousCampaignStepId      <p>
@@ -169,11 +168,11 @@ CampaignUtils.getCampaignStatusByCampaignId = function(pCampaignId)
  * @return {Boolean}                            <p>
  *                                              Returns true in case the entry was successfully made.<br>                                                                                                                                                                                                   
  */
-CampaignUtils.createLogEntry = function(pCampaignId, pCampaignStepId, pContactId, pCampaignParticipantId, pPreviousCampaignStepId)
+CampaignUtils.createLogEntry = function(pCampaignId, pCampaignStepId, pCampaignParticipantId, pPreviousCampaignStepId)
 {
     let colsCampaignParticipantLog = CampaignUtils.getParticipantLogInsertColumnNames();
     
-    let valsCampaignParticipantLog = new Array(pCampaignId, pCampaignStepId, pContactId, pCampaignParticipantId, vars.get("$sys.user"), vars.get("$sys.date"), pPreviousCampaignStepId);
+    let valsCampaignParticipantLog = new Array(util.getNewUUID(), pCampaignId, pCampaignStepId, pCampaignParticipantId, vars.get("$sys.user"), vars.get("$sys.date"), pPreviousCampaignStepId);
     
     let rows = db.insertData("CAMPAIGNPARTICIPANTLOG", colsCampaignParticipantLog, null, valsCampaignParticipantLog);
     return (rows == 1);
@@ -187,7 +186,7 @@ CampaignUtils.createLogEntry = function(pCampaignId, pCampaignStepId, pContactId
  */
 CampaignUtils.getParticipantLogInsertColumnNames = function()
 {
-    return ["CAMPAIGNPARTICIPANT_ID", "CAMPAIGN_ID", "CAMPAIGNSTEP_ID", "CAMPAIGNPARTICIPANTLOGID", "USER_NEW", "DATE_NEW", "PREVIOUS_CAMPAIGNSTEP_ID"];
+    return ["CAMPAIGNPARTICIPANTLOGID", "CAMPAIGN_ID", "CAMPAIGNSTEP_ID", "CAMPAIGNPARTICIPANT_ID", "USER_NEW", "DATE_NEW", "PREVIOUS_CAMPAIGNSTEP_ID"];
 }
 
 /**