hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

TP-20240927-importfixes #115

Merged
hsh-michaelhoennig merged 33 commits from TP-20240927-importfixes into master 2024-11-21 10:27:36 +01:00
Conversation 0 Commits 33 Files Changed 13 +8 -4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3a55a861f3 - Show all commits

12
src/test/java/net/hostsharing/hsadminng/hs/migration/BaseOfficeDataImport.java
View File

@ -1129,9 +1129,13 @@ public abstract class BaseOfficeDataImport extends CsvDataImport {
|| tradeName.toLowerCase().contains("stichting") || tradeName.toLowerCase().contains("stichting")
|| tradeName.toLowerCase().contains("foundation") || tradeName.toLowerCase().contains("foundation")
|| tradeName.toLowerCase().contains("schule") || tradeName.toLowerCase().contains("schule")
|| tradeName.toLowerCase().contains("Landkreis") || tradeName.toLowerCase().contains("verein")
|| tradeName.toLowerCase().contains("Behörde") || tradeName.toLowerCase().contains("gewerkschaft")
|| tradeName.toLowerCase().contains("Bezirksamt") || tradeName.toLowerCase().contains("gesellschaft")
|| tradeName.toLowerCase().contains("landkreis")
|| tradeName.toLowerCase().contains("behörde")
|| tradeName.toLowerCase().contains("bundesamt")
|| tradeName.toLowerCase().contains("bezirksamt")
) { ) {
return HsOfficePersonType.LEGAL_PERSON; // Haftungsbeschränkt return HsOfficePersonType.LEGAL_PERSON; // Haftungsbeschränkt
} else if (roles.contains("contractual") && !roles.contains("partner") && } else if (roles.contains("contractual") && !roles.contains("partner") &&
@ -1156,7 +1160,7 @@ public abstract class BaseOfficeDataImport extends CsvDataImport {
private static boolean containsWord(final String value, final String... endings) { private static boolean containsWord(final String value, final String... endings) {
final var lowerCaseValue = value.toLowerCase(); final var lowerCaseValue = value.toLowerCase();
for (String ending : endings) { for (String ending : endings) {
if (lowerCaseValue.isEqualTo(ending.toLowerCase()) || if (lowerCaseValue.equals(ending.toLowerCase()) ||
lowerCaseValue.startsWith(ending.toLowerCase() + " ") || lowerCaseValue.startsWith(ending.toLowerCase() + " ") ||
lowerCaseValue.contains(" " + ending.toLowerCase() + " ") || lowerCaseValue.contains(" " + ending.toLowerCase() + " ") ||
lowerCaseValue.endsWith(" " + ending.toLowerCase())) { lowerCaseValue.endsWith(" " + ending.toLowerCase())) {