From 00c8bf0deef48a63aad33e557b5792fc04defc07 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Wed, 27 Oct 2021 14:43:52 +0200
Subject: [PATCH] [Projekt: xRM-ContactManagement][TicketNr.: 1086751][Funktion
getDSGVOAnonymisierungsOrganisationId]
---
.../recordcontainers/db/conditionProcess.js | 2 +-
entity/Organisation_entity/recordcontainers/index/query.js | 2 +-
process/ClassificationUpdate_lib/process.js | 4 ++--
process/DSGVOAnonymize_serverProcess/process.js | 2 +-
process/EwsSyncContact_lib/process.js | 2 +-
process/Organisation_lib/process.js | 6 +++---
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 28b3b918e8..2d3417abfe 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -13,7 +13,7 @@ import("Context_lib");
var cond = newWhere();
var onlyShowContactIds = JSON.parse(vars.get("$param.OnlyShowContactIds_param"));
-cond.and("ORGANISATION.ORGANISATIONID", OrgUtils.getDSGVOAnonymisierungsOrganisationId(), SqlBuilder.NOT_EQUAL())
+cond.and("ORGANISATION.ORGANISATIONID", OrgUtils.getDSGVOAnonymizeOrganisationId(), SqlBuilder.NOT_EQUAL())
// filter privat company if it is not needed
if (vars.getString("$param.WithPrivate_param") != "true")
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index 3101ad9988..e2836f8814 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -63,7 +63,7 @@ var querySelect = newSelect([
, "standardPhone")
.where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
.and("ORGANISATION.ORGANISATIONID", OrgUtils.getPrivateOrganisationId(), SqlBuilder.NOT_EQUAL())
- .and("ORGANISATION.ORGANISATIONID", OrgUtils.getDSGVOAnonymisierungsOrganisationId(), SqlBuilder.NOT_EQUAL());
+ .and("ORGANISATION.ORGANISATIONID", OrgUtils.getDSGVOAnonymizeOrganisationId(), SqlBuilder.NOT_EQUAL());
if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0)
querySelect.and("CONTACT.CONTACTID", "$local.idvalue");
diff --git a/process/ClassificationUpdate_lib/process.js b/process/ClassificationUpdate_lib/process.js
index 73c181e1f7..a577e21adb 100644
--- a/process/ClassificationUpdate_lib/process.js
+++ b/process/ClassificationUpdate_lib/process.js
@@ -1101,7 +1101,7 @@ ClassificationUpdateHelper._buildFilteredRecsObject = function(pClassificationTy
.leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = CONTACT.CONTACTID")
.where(db.toFilterCondition(JSON.stringify(filter), "Organisation_entity"))
.and("ORGANISATION.ORGANISATIONID", OrgUtils.getPrivateOrganisationId(), SqlBuilder.NOT_EQUAL())
- .and("ORGANISATION.ORGANISATIONID", OrgUtils.getDSGVOAnonymisierungsOrganisationId(), SqlBuilder.NOT_EQUAL())
+ .and("ORGANISATION.ORGANISATIONID", OrgUtils.getDSGVOAnonymizeOrganisationId(), SqlBuilder.NOT_EQUAL())
.table();
}
else if (currentObjectType == "Salesproject")
@@ -1430,7 +1430,7 @@ ClassificationUpdateHelper._buildOutdatedStoredClassificationObject = function(p
table = "CONTACT";
idColumn = "CONTACT.CONTACTID";
cond = cond.and("CONTACT.PERSON_ID is null")
- .and("CONTACT.CONTACTID", OrgUtils.getDSGVOAnonymisierungsOrganisationId(), SqlBuilder.NOT_EQUAL())
+ .and("CONTACT.CONTACTID", OrgUtils.getDSGVOAnonymizeOrganisationId(), SqlBuilder.NOT_EQUAL())
.and("CONTACT.CONTACTID", OrgUtils.getPrivateOrganisationId(), SqlBuilder.NOT_EQUAL())
.and("ORGANISATION.ORGANISATIONID", "0", SqlBuilder.NOT_EQUAL())
}
diff --git a/process/DSGVOAnonymize_serverProcess/process.js b/process/DSGVOAnonymize_serverProcess/process.js
index 27131cef0e..c6bacd4d60 100644
--- a/process/DSGVOAnonymize_serverProcess/process.js
+++ b/process/DSGVOAnonymize_serverProcess/process.js
@@ -170,7 +170,7 @@ if (contacts.length > 0)
"USER_EDIT" : user,
"DATE_EDIT" : today,
"ADDRESS_ID" : null,
- "ORGANISATION_ID": OrgUtils.getDSGVOAnonymisierungsOrganisationId(),
+ "ORGANISATION_ID": OrgUtils.getDSGVOAnonymizeOrganisationId(),
"STATUS" : $KeywordRegistry.contactStatus$inactive()
}, "CONTACT"));
diff --git a/process/EwsSyncContact_lib/process.js b/process/EwsSyncContact_lib/process.js
index 3e42ff4620..530ed9e47b 100644
--- a/process/EwsSyncContact_lib/process.js
+++ b/process/EwsSyncContact_lib/process.js
@@ -700,7 +700,7 @@ EwsClientSyncUtils.updateEntrysInSyncTable = function(pUserMapping, pUserLoginPr
{
sqlString.join("ORGANISATION", newWhere("ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
.and("CONTACT.PERSON_ID is null").and("CONTACT.CONTACTID", OrgUtils.getPrivateOrganisationId(), SqlBuilder.NOT_EQUAL())
- .and("CONTACT.CONTACTID", OrgUtils.getDSGVOAnonymisierungsOrganisationId(), SqlBuilder.NOT_EQUAL()));
+ .and("CONTACT.CONTACTID", OrgUtils.getDSGVOAnonymizeOrganisationId(), SqlBuilder.NOT_EQUAL()));
}
sqlString.leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID");
diff --git a/process/Organisation_lib/process.js b/process/Organisation_lib/process.js
index 735a0af107..d078cec15b 100644
--- a/process/Organisation_lib/process.js
+++ b/process/Organisation_lib/process.js
@@ -32,7 +32,7 @@ function OrgUtils() {}//TODO: there exsits a OrgUtils and OrganisationUtils, thi
OrgUtils.isPrivateOrganisationId = function(pOrganisationId)
{
//TODO: use this function everywhere instead of manual checks
- return pOrganisationId.trim() == OrgUtils.getPrivateOrganisationId() || pOrganisationId.trim() == OrgUtils.getDSGVOAnonymisierungsOrganisationId();
+ return pOrganisationId.trim() == OrgUtils.getPrivateOrganisationId() || pOrganisationId.trim() == OrgUtils.getDSGVOAnonymizeOrganisationId();
}
/**
@@ -45,7 +45,7 @@ OrgUtils.isPrivateOrganisationId = function(pOrganisationId)
OrgUtils.isPrivateOrganisationContactId = function(pOrganisationContactId)
{
//contactid and organisationid in private dummy are equal, so it's okay to check the orgnisation-contactid against the orgnisationid
- return pOrganisationContactId.trim() == OrgUtils.getPrivateOrganisationId()|| pOrganisationContactId.trim() == OrgUtils.getDSGVOAnonymisierungsOrganisationId();
+ return pOrganisationContactId.trim() == OrgUtils.getPrivateOrganisationId()|| pOrganisationContactId.trim() == OrgUtils.getDSGVOAnonymizeOrganisationId();
}
/**
@@ -64,7 +64,7 @@ OrgUtils.getPrivateOrganisationId = function()
*
* @return {String} hard coded organisationid of the dummy organisation "DSGVO-Anonymisierung"
*/
-OrgUtils.getDSGVOAnonymisierungsOrganisationId = function()
+OrgUtils.getDSGVOAnonymizeOrganisationId = function()
{
return "1";
}
--
GitLab