From f18aaa38956b8a40565b8557276db2dc80fe5ec8 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 29 Oct 2019 15:18:20 +0100
Subject: [PATCH] Refactoring: SqlBuilder usages
---
.../conditionProcess.js | 21 ++++++-------------
.../recordcontainers/db/conditionProcess.js | 2 +-
entity/Contract_entity/conditionProcess.js | 10 +++++----
.../recordcontainer/conditionProcess.js | 6 ++----
.../dbrecordcontainer/conditionProcess.js | 6 ++----
.../recordcontainer/conditionProcess.js | 6 ++----
process/StandardObject_lib/process.js | 4 ++--
7 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
index a9971811a5..b3b5019620 100644
--- a/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
+++ b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/conditionProcess.js
@@ -1,18 +1,9 @@
+import("Sql_lib");
import("system.result");
import("system.vars");
-var resultValue;
-if(vars.get("$param.CampaignId_param") != null && vars.get("$param.CampaignId_param") != "")
-{
- resultValue = "CAMPAIGN_ID = '" + vars.get("$param.CampaignId_param") + "'";
-
- if(vars.get("$param.CampaignStepId_param") != null && vars.get("$param.CampaignStepId_param") != "")
- resultValue += " AND CAMPAIGNSTEP_ID = '" + vars.get("$param.CampaignStepId_param") + "'";
-
- result.string(resultValue);
-}
-else if(vars.get("$param.CampaignStepId_param") != null && vars.get("$param.CampaignStepId_param") != "")
- {
- resultValue = "CAMPAIGNSTEP_ID = '" + vars.get("$param.CampaignStepId_param") + "'";
- result.string(resultValue);
- }
\ No newline at end of file
+var condition = newWhere()
+ .andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", "$param.CampaignId_param")
+ .andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID", "$param.CampaignStepId_param");
+
+result.string(condition.toString());
diff --git a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
index 48e7a6cbbd..5f3455bc5b 100644
--- a/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Campaign_entity/recordcontainers/db/conditionProcess.js
@@ -7,5 +7,5 @@ import("system.vars");
if(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param") == 'true')
{
//TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
- result.string("CAMPAIGN.EMPLOYEE_CONTACT_ID = '" + EmployeeUtils.getCurrentContactId() + "'");
+ result.string(newWhere("CAMPAIGN.EMPLOYEE_CONTACT_ID", EmployeeUtils.getCurrentContactId()).toString());
}
\ No newline at end of file
diff --git a/entity/Contract_entity/conditionProcess.js b/entity/Contract_entity/conditionProcess.js
index a1bd70f117..b40df37b5c 100644
--- a/entity/Contract_entity/conditionProcess.js
+++ b/entity/Contract_entity/conditionProcess.js
@@ -1,7 +1,9 @@
+import("Sql_lib");
import("system.result");
import("system.vars");
-if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != null && vars.get("$param.ContactId_param") != "")
- result.string("CONTRACT.CONTACT_ID = ('" + vars.getString("$param.ContactId_param") + "')");
-else
- result.string("1 = 1");
\ No newline at end of file
+var condition = newWhere();
+if (vars.exists("$param.ContactId_param"))
+ condition.andIfSet("CONTRACT.CONTACT_ID", "$param.ContactId_param");
+
+result.string(condition.toString("1=1"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js b/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
index 09f2397fdf..4371903939 100644
--- a/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
+++ b/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
@@ -1,7 +1,5 @@
import("system.vars");
import("system.result");
-if(vars.get("$param.DuplicateScannerId_param"))
-{
- result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
-}
\ No newline at end of file
+if (vars.get("$param.DuplicateScannerId_param"))
+ result.string(newWhere("DUPLICATESCANNERINDEXCONFIG.DUPLICATESCANNER_ID", "$param.DuplicateScannerId_param").toString());
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
index 09f2397fdf..84dac3bb33 100644
--- a/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
+++ b/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
@@ -1,7 +1,5 @@
import("system.vars");
import("system.result");
-if(vars.get("$param.DuplicateScannerId_param"))
-{
- result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
-}
\ No newline at end of file
+if (vars.get("$param.DuplicateScannerId_param"))
+ result.string(newWhere("DUPLICATESCANNERPREFILTERCONFIG.DUPLICATESCANNER_ID", "$param.DuplicateScannerId_param").toString());
\ No newline at end of file
diff --git a/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js b/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
index 09f2397fdf..b9bff609c9 100644
--- a/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
+++ b/entity/DuplicateScannerResultFieldConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
@@ -1,7 +1,5 @@
import("system.vars");
import("system.result");
-if(vars.get("$param.DuplicateScannerId_param"))
-{
- result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
-}
\ No newline at end of file
+if (vars.get("$param.DuplicateScannerId_param"))
+ result.string(newWhere("DUPLICATESCANNERRESULTFIELDCONFIG.DUPLICATESCANNER_ID", "$param.DuplicateScannerId_param").toString());
\ No newline at end of file
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
index 9a1f8379fa..8c47a39071 100644
--- a/process/StandardObject_lib/process.js
+++ b/process/StandardObject_lib/process.js
@@ -220,7 +220,7 @@ StandardObject.prototype._setContactStandardAddress = function (pAddressID, pCon
["ADDRESS_ID"],
db.getColumnTypes("CONTACT", ["ADDRESS_ID"]),
[pAddressID],
- newWhere("CONTACT.CONTACTID", pContactID));
+ newWhere("CONTACT.CONTACTID", pContactID).build());
}
/**
@@ -289,7 +289,7 @@ StandardObject.prototype._setStandardCommunication = function (pCommunicationID,
["ISSTANDARD"],
db.getColumnTypes("COMMUNICATION", ["ISSTANDARD"]),
[pValue],
- newWhere("COMMUNICATION.COMMUNICATIONID", pCommunicationID));
+ newWhere("COMMUNICATION.COMMUNICATIONID", pCommunicationID).build());
}
/**
--
GitLab