Merge branch 'DEVELOP'
diff --git a/src/main/java/org/eclipse/openk/contactbasedata/service/LdapService.java b/src/main/java/org/eclipse/openk/contactbasedata/service/LdapService.java
index 321ec63..7aa035f 100644
--- a/src/main/java/org/eclipse/openk/contactbasedata/service/LdapService.java
+++ b/src/main/java/org/eclipse/openk/contactbasedata/service/LdapService.java
@@ -114,8 +114,7 @@
private RefCommunicationType getRefCommunicationType(Long refCommunicationTypeId) {
return communicationTypeRepository.findAll().stream()
.filter(x -> x.getId().equals(refCommunicationTypeId))
- .findFirst()
- .orElseThrow(NotFoundException::new);
+ .findFirst().orElse(null);
}
private void findExistingAndNotExistingLdapUsers(List<TblInternalPerson> internalPersonList, List<LdapUser> allFoundLdapUsers, List<TblInternalPerson> allNotExistingLdapUsers) {
@@ -169,6 +168,7 @@
}
private boolean isCommunicationDataChangedAndSync(TblInternalPerson tblInternalPerson, String communicationdata, RefCommunicationType refCommunicationType, boolean attributesChanged, Long communicationTypeId) {
+ if (refCommunicationType == null || communicationTypeId == -1L) return false;
List<TblCommunication> tblCommunicationList = tblInternalPerson.getContact().getCommunications();
Optional<TblCommunication> optionalTblCommunication = tblCommunicationList.stream()
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6e2d89d..9857de6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -124,7 +124,7 @@
mail-id: 1
telephone-number-id: 2
scheduling:
- enabled: false
+ enabled: true
cron-expression: '*/10 * * * * *'
authnauth-sync:
