Skip to content
Snippets Groups Projects
Commit 299bf139 authored by OZGCloud's avatar OZGCloud
Browse files

cleanup property documentation

parent 36e77456
No related branches found
No related tags found
No related merge requests found
...@@ -19,8 +19,7 @@ class VorgangProperties { ...@@ -19,8 +19,7 @@ class VorgangProperties {
public static final String PREFIX = "ozgcloud.vorgang"; public static final String PREFIX = "ozgcloud.vorgang";
/** /**
* Konfiguriert für welche Art von Anträgen der Button zur Erstellung von Bescheiden angezeigt wird. Der Art eines Antrags wird basierend auf form * List of Vorgänge for which notices can be issued.
* id und form engine name bestimmt.
*/ */
private List<VorgangProperty> bescheid = Collections.emptyList(); private List<VorgangProperty> bescheid = Collections.emptyList();
...@@ -29,7 +28,13 @@ class VorgangProperties { ...@@ -29,7 +28,13 @@ class VorgangProperties {
@Getter @Getter
static class VorgangProperty { static class VorgangProperty {
/**
* ID of the received formular
*/
private String formId; private String formId;
/**
* Name of the form engine providing the used formular
*/
private String formEngineName; private String formEngineName;
} }
......
...@@ -30,7 +30,6 @@ import java.util.Objects; ...@@ -30,7 +30,6 @@ import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.function.Predicate; import java.util.function.Predicate;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.hateoas.EntityModel; import org.springframework.hateoas.EntityModel;
import org.springframework.hateoas.Link; import org.springframework.hateoas.Link;
...@@ -67,9 +66,6 @@ class VorgangWithEingangProzessor implements RepresentationModelProcessor<Entity ...@@ -67,9 +66,6 @@ class VorgangWithEingangProzessor implements RepresentationModelProcessor<Entity
static final String USER_PROFILE_SEARCH_DELETED_PARAM = "deleted"; static final String USER_PROFILE_SEARCH_DELETED_PARAM = "deleted";
static final String USER_PROFILE_SEARCH_ORGANISATIONS_EINHEIT_ID_PARAM = "organisationsEinheitId"; static final String USER_PROFILE_SEARCH_ORGANISATIONS_EINHEIT_ID_PARAM = "organisationsEinheitId";
private static final Predicate<EingangHeader> HAS_FORM_ID_WITH_ENGINE_NAME =
eingangHeader -> ObjectUtils.allNotNull(eingangHeader.getFormEngineName(), eingangHeader.getFormId());
@Autowired @Autowired
private PostfachMailController postfachMailController; private PostfachMailController postfachMailController;
@Autowired @Autowired
...@@ -148,16 +144,15 @@ class VorgangWithEingangProzessor implements RepresentationModelProcessor<Entity ...@@ -148,16 +144,15 @@ class VorgangWithEingangProzessor implements RepresentationModelProcessor<Entity
boolean hasVorgangCreateBescheidEnabled(VorgangWithEingang vorgang) { boolean hasVorgangCreateBescheidEnabled(VorgangWithEingang vorgang) {
return ofNullable(vorgang.getEingang()) return ofNullable(vorgang.getEingang())
.map(Eingang::getHeader) .map(Eingang::getHeader)
.filter(HAS_FORM_ID_WITH_ENGINE_NAME)
.map(this::isCreateBescheidEnabled) .map(this::isCreateBescheidEnabled)
.orElse(false); .orElse(false);
} }
private boolean isCreateBescheidEnabled(EingangHeader eingangHeader) { private boolean isCreateBescheidEnabled(EingangHeader eingangHeader) {
return vorgangProperties.getBescheid().stream().filter(prop -> isFormIdAndFormEngineNameMatching(eingangHeader, prop)).count() > 0; return vorgangProperties.getBescheid().stream().anyMatch(prop -> isFormIdAndFormEngineNameMatching(eingangHeader, prop));
} }
private boolean isFormIdAndFormEngineNameMatching(EingangHeader eingangHeader, VorgangProperty prop) { private boolean isFormIdAndFormEngineNameMatching(EingangHeader eingangHeader, VorgangProperty property) {
return prop.getFormId().equals(eingangHeader.getFormId()) && prop.getFormEngineName().equals(eingangHeader.getFormEngineName()); return property.getFormId().equals(eingangHeader.getFormId()) && property.getFormEngineName().equals(eingangHeader.getFormEngineName());
} }
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment