From 59528a898580141779c302485fec5f2ffe3620ff Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 13 Jan 2020 10:26:32 +0100
Subject: [PATCH] Scan Service refactoring
---
entity/Attribute_entity/Attribute_entity.aod | 18 ++++++------------
.../recordcontainers/index/query.js | 2 +-
.../recordcontainers/jdito/contentProcess.js | 4 ++--
.../recordcontainers/index/query.js | 7 ++++---
.../Salesproject_entity.aod | 14 ++++----------
.../attrparentid_param/valueProcess.js | 4 ----
.../attrparenttype_param/valueProcess.js | 3 ---
.../displaysimplename_param/valueProcess.js | 3 ---
.../children/objecttype_param/valueProcess.js | 4 ++++
process/DuplicateScanner_lib/process.js | 7 ++++---
process/Sql_lib/process.js | 4 +---
11 files changed, 26 insertions(+), 44 deletions(-)
delete mode 100644 entity/Salesproject_entity/entityfields/projecttypeattribute/children/attrparentid_param/valueProcess.js
delete mode 100644 entity/Salesproject_entity/entityfields/projecttypeattribute/children/attrparenttype_param/valueProcess.js
delete mode 100644 entity/Salesproject_entity/entityfields/projecttypeattribute/children/displaysimplename_param/valueProcess.js
create mode 100644 entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index d1aee4e2e4..18c70a7e76 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -138,6 +138,12 @@
<fieldName>SpecificAttribute</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>6bc87a7f-02f1-4cab-8c98-b89b626b59bd</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>ProjectTypeAttribute</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
@@ -153,18 +159,6 @@
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/specificattribute/children/displaysimplename_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
- <entityParameter>
- <name>AttrParentId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>AttrParentType_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>GetGroups_param</name>
- <expose v="false" />
- </entityParameter>
<entityParameter>
<name>ChildId_param</name>
<expose v="false" />
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index 0dc0d18978..eeb55badd1 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -15,7 +15,7 @@ You may want to check out if your change affects other modules. However adding m
var sqlQuery, sqlHelper, queryCondition, affectedIds;
var CommMediumPhoneIds = db.array( db.COLUMN, "select KEYID from AB_KEYWORD_ENTRY join ab_keyword_attributerelation on AB_KEYWORD_ENTRYID = AB_KEYWORD_ENTRY_ID "
+ " join ab_keyword_attribute on AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTE_ID and CHAR_VALUE = 'TELEPHONE' and AB_KEYWORD_ATTRIBUTE.CONTAINER = 'CommunicationMedium'");
-var sqlHelper = new SqlMaskingUtils();
+sqlHelper = new SqlMaskingUtils();
var querySelect = newSelect("CONTACT.CONTACTID "
+ ", " + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"])
+ ", " + sqlHelper.concat([
diff --git a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
index 39b14cfbd6..4e241b5186 100644
--- a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
@@ -69,14 +69,14 @@ for each (var entry in rolesOrEntities) { // entry contains either a role or an
if (entityPermSetId)
{
- var recordPermSetId = new SqlBuilder(alias)
+ recordPermSetId = new SqlBuilder(alias)
.select("ASYS_PERMISSIONSETID")
.from("ASYS_PERMISSIONSET")
.where("ASYS_PERMISSIONSET.ASYS_PERMISSIONSET_ID", entityPermSetId)
.and("ACCESSTYPE = 'R'")
.arrayColumn();
- var currOverview = [entityPermSetId, entry, "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE"];
+ currOverview = [entityPermSetId, entry, "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE", "VAADIN:CLOSE"];
// default entity permissions
currOverview = prepareOverview(entityPermSetId, currOverview, "default");
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index d3029e1734..0dec5a18db 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -15,7 +15,7 @@ You may want to check out if your change affects other modules. However adding m
var sqlQuery, sqlHelper, queryCondition, affectedIds;
var CommMediumPhoneIds = db.array( db.COLUMN, "select KEYID from AB_KEYWORD_ENTRY join ab_keyword_attributerelation on AB_KEYWORD_ENTRYID = AB_KEYWORD_ENTRY_ID "
+ " join ab_keyword_attribute on AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTE_ID and CHAR_VALUE = 'TELEPHONE' and AB_KEYWORD_ATTRIBUTE.CONTAINER = 'CommunicationMedium'");
-var sqlHelper = new SqlMaskingUtils();
+sqlHelper = new SqlMaskingUtils();
var querySelect = newSelect("CONTACT.CONTACTID "
+ "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"])
+ "," + sqlHelper.concat([
@@ -48,8 +48,9 @@ var querySelect = newSelect("CONTACT.CONTACTID "
.leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE") //TODO: refactor to new SqlBuilder
.orderBy("CONTACT.CONTACTID");
-if (vars.exists("$local.idvalue")) {
- var affectedIds = vars.get("$local.idvalue");
+if (vars.exists("$local.idvalue"))
+{
+ affectedIds = vars.get("$local.idvalue");
querySelect.whereIfSet("CONTACT.CONTACTID", affectedIds, SqlBuilder.IN());
}
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 783baa64fc..c489c9b5d7 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -705,19 +705,13 @@
<name>ProjectTypeAttribute</name>
<dependency>
<name>dependency</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>SpecificAttribute</fieldName>
</dependency>
<children>
<entityParameter>
- <name>AttrParentId_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projecttypeattribute/children/attrparentid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AttrParentType_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projecttypeattribute/children/attrparenttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>DisplaySimpleName_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projecttypeattribute/children/displaysimplename_param/valueProcess.js</valueProcess>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
diff --git a/entity/Salesproject_entity/entityfields/projecttypeattribute/children/attrparentid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/projecttypeattribute/children/attrparentid_param/valueProcess.js
deleted file mode 100644
index ced111e47d..0000000000
--- a/entity/Salesproject_entity/entityfields/projecttypeattribute/children/attrparentid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("AttributeRegistry_basic");
-import("system.result");
-
-result.string($AttributeRegistry.salesprojectType());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/projecttypeattribute/children/attrparenttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/projecttypeattribute/children/attrparenttype_param/valueProcess.js
deleted file mode 100644
index 97b98b26c1..0000000000
--- a/entity/Salesproject_entity/entityfields/projecttypeattribute/children/attrparenttype_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-import("Attribute_lib");
-result.string($AttributeTypes.COMBO);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/projecttypeattribute/children/displaysimplename_param/valueProcess.js b/entity/Salesproject_entity/entityfields/projecttypeattribute/children/displaysimplename_param/valueProcess.js
deleted file mode 100644
index 40effa0178..0000000000
--- a/entity/Salesproject_entity/entityfields/projecttypeattribute/children/displaysimplename_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string(true);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js b/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000..cc6924394a
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/projecttypeattribute/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 77c30a69d5..87ce6b89fc 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -319,8 +319,9 @@ DuplicateScannerUtils.RebuildDuplicatesCache = function(pFilterName, pTargetEnti
foundDuplicateIds = DuplicateScannerUtils.ScanRecords(pTargetEntity, targetRecords,
entityFieldConfigs, resultFields, useExternalWebservice,
pFormatValuesConsumeWebserviceCallback, alreadyIdentifiedIds, indexPattern, entityIdField);
-
- alreadyIdentifiedIds = alreadyIdentifiedIds.concat(foundDuplicateIds);
+
+ if (foundDuplicateIds)
+ alreadyIdentifiedIds = alreadyIdentifiedIds.concat(foundDuplicateIds);
if(targetRecords.length < pRecordsBlockSize)
{
@@ -341,7 +342,7 @@ DuplicateScannerUtils.ScanRecords = function(pTargetEntity, pTargetRecordsData,
//If the contact id loading query has no results, stop.
//No ids should be deleted if an error has been made in this query.
if(pTargetRecordsData.length <= 0)
- return;
+ return null;
//First it gets checked if the current id has already been identified. If that's the case it'll continue with the next.
//Otherwise an object gets build in the form of ["FilterFieldName" = "FilterFieldValueFromQuery"] with which a scan for possible duplicates get's started
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index dae14d849a..52de2eaf80 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -2846,9 +2846,7 @@ SqlMaskingUtils.prototype.cast = function(field, targetDatatype, targetLength) {
case SQLTYPES.VARCHAR:
sqlDataType = _mapDefaults(targetDatatype);
break;
- case db.DBTYPE_FIREBIRD250:
//TODO: firebird support?
- break;
}
if (sqlDataType == undefined) {
@@ -2859,7 +2857,7 @@ SqlMaskingUtils.prototype.cast = function(field, targetDatatype, targetLength) {
targetLength = "";
else if(targetLength != "")
{
- if(typeof(targetLength == "object") && (targetLength instanceof Array))
+ if(Array.isArray(targetLength))
targetLength = "(" + targetLength.join(", ") + ")";
else
targetLength = "(" + targetLength + ")";
--
GitLab