denis/gremiumhub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(fullstack): Add logical AND and OR operators to seed files, add Sensitiviäts-Check

Browse Source
This commit is contained in:
Denis Lugowski
2026-02-04 06:22:08 +01:00
parent 40957bd496
commit 1bc2e9b111
23 changed files with 3488 additions and 2001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/application_form/ApplicationFormFormatService.kt
View File

@@ -11,7 +11,6 @@ import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormSnapshotD
import com.betriebsratkanzlei.legalconsenthub_api.model.FormElementSectionSnapshotDto
import com.betriebsratkanzlei.legalconsenthub_api.model.FormElementSnapshotDto
import com.betriebsratkanzlei.legalconsenthub_api.model.FormElementSubSectionSnapshotDto
import com.betriebsratkanzlei.legalconsenthub_api.model.FormElementVisibilityCondition
import com.fasterxml.jackson.core.type.TypeReference
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import org.springframework.stereotype.Service
@@ -21,6 +20,8 @@ import java.time.Instant
import java.time.LocalDate
import java.time.ZoneId
import java.time.format.DateTimeFormatter
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionGroup as VisibilityConditionGroupDto
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionNode as VisibilityConditionNodeDto
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionOperator as VisibilityConditionOperatorDto
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionType as VisibilityConditionTypeDto
@@ -168,12 +169,12 @@ class ApplicationFormFormatService(
if (element.options.isEmpty()) return "Keine Daten" to false
val objectMapper = jacksonObjectMapper()
val headers = element.options.map { LatexEscaper.escape(it.label ?: "") }
val headers = element.options.map { LatexEscaper.escape(it.label) }
val columnData =
element.options.map { option ->
try {
val typeRef = object : TypeReference<List<String>>() {}
objectMapper.readValue(option.value ?: "[]", typeRef)
objectMapper.readValue(option.value, typeRef)
} catch (e: Exception) {
emptyList<String>()
}
@@ -268,26 +269,61 @@ class ApplicationFormFormatService(
element: FormElementSnapshotDto,
formElementsByRef: Map<String, FormElementSnapshotDto>,
): Boolean {
val conditions = element.visibilityConditions
if (conditions.isNullOrEmpty()) return true
val group = element.visibilityConditions ?: return true
if (group.conditions?.isEmpty() != false) return true
// All conditions must be met (AND logic)
return conditions.all { condition -> evaluateSingleCondition(condition, formElementsByRef) }
return evaluateGroup(group, formElementsByRef)
}
private fun evaluateSingleCondition(
condition: FormElementVisibilityCondition,
private fun evaluateGroup(
group: VisibilityConditionGroupDto,
formElementsByRef: Map<String, FormElementSnapshotDto>,
): Boolean {
val sourceElement = formElementsByRef[condition.sourceFormElementReference] ?: return false
val conditions = group.conditions ?: return true
val results = conditions.map { evaluateNode(it, formElementsByRef) }
return when (group.operator) {
VisibilityConditionGroupDto.Operator.AND -> results.all { it }
VisibilityConditionGroupDto.Operator.OR -> results.any { it }
null -> true
}
}
private fun evaluateNode(
node: VisibilityConditionNodeDto,
formElementsByRef: Map<String, FormElementSnapshotDto>,
): Boolean =
when (node.nodeType) {
VisibilityConditionNodeDto.NodeType.LEAF, null -> evaluateLeafCondition(node, formElementsByRef)
VisibilityConditionNodeDto.NodeType.GROUP -> {
val nestedGroup =
VisibilityConditionGroupDto(
operator =
when (node.groupOperator) {
VisibilityConditionNodeDto.GroupOperator.AND -> VisibilityConditionGroupDto.Operator.AND
VisibilityConditionNodeDto.GroupOperator.OR -> VisibilityConditionGroupDto.Operator.OR
null -> VisibilityConditionGroupDto.Operator.AND
},
conditions = node.conditions,
)
evaluateGroup(nestedGroup, formElementsByRef)
}
}
private fun evaluateLeafCondition(
node: VisibilityConditionNodeDto,
formElementsByRef: Map<String, FormElementSnapshotDto>,
): Boolean {
val sourceRef = node.sourceFormElementReference ?: return false
val sourceElement = formElementsByRef[sourceRef] ?: return false
val sourceValue = getFormElementValue(sourceElement)
val operator = condition.formElementOperator ?: VisibilityConditionOperatorDto.EQUALS
val conditionMet = evaluateCondition(sourceValue, condition.formElementExpectedValue, operator)
val operator = node.formElementOperator ?: VisibilityConditionOperatorDto.EQUALS
val conditionMet = evaluateCondition(sourceValue, node.formElementExpectedValue ?: "", operator)
return when (condition.formElementConditionType) {
return when (node.formElementConditionType) {
VisibilityConditionTypeDto.SHOW -> conditionMet
VisibilityConditionTypeDto.HIDE -> !conditionMet
null -> conditionMet
}
}
@@ -314,5 +350,9 @@ class ApplicationFormFormatService(
expectedValue?.let { !actualValue.equals(it, ignoreCase = true) } ?: false
VisibilityConditionOperatorDto.IS_EMPTY -> actualValue.isEmpty()
VisibilityConditionOperatorDto.IS_NOT_EMPTY -> actualValue.isNotEmpty()
VisibilityConditionOperatorDto.CONTAINS ->
expectedValue?.let { actualValue.contains(it, ignoreCase = true) } ?: false
VisibilityConditionOperatorDto.NOT_CONTAINS ->
expectedValue?.let { !actualValue.contains(it, ignoreCase = true) } ?: true
}
}

15
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/application_form_version/ApplicationFormVersionService.kt
View File

@@ -127,11 +127,9 @@ class ApplicationFormVersionService(
type = element.type,
options = element.options.map { formOptionMapper.toFormOptionDto(it) },
visibilityConditions =
element.visibilityConditions
.map {
visibilityConditionMapper
.toFormElementVisibilityConditionDto(it)
},
element.visibilityConditions?.let {
visibilityConditionMapper.toGroupConditionDto(it)
},
sectionSpawnTriggers =
element.sectionSpawnTriggers.map {
spawnTriggerMapper.toSectionSpawnTriggerDto(it)
@@ -186,10 +184,9 @@ class ApplicationFormVersionService(
.map { formOptionMapper.toFormOption(it) }
.toMutableList(),
visibilityConditions =
elementSnapshot.visibilityConditions
?.map { visibilityConditionMapper.toFormElementVisibilityCondition(it) }
?.toMutableList()
?: mutableListOf(),
elementSnapshot.visibilityConditions?.let {
visibilityConditionMapper.toGroupCondition(it)
},
sectionSpawnTriggers =
elementSnapshot.sectionSpawnTriggers
?.map { spawnTriggerMapper.toSectionSpawnTrigger(it) }

11
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/config/JacksonConfig.kt Normal file
View File

@@ -0,0 +1,11 @@
package com.betriebsratkanzlei.legalconsenthub.config
import com.fasterxml.jackson.databind.Module
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
@Configuration
class JacksonConfig {
@Bean
fun visibilityConditionJacksonModule(): Module = visibilityConditionModule()
}

99
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/config/VisibilityConditionNodeDeserializer.kt Normal file
View File

@@ -0,0 +1,99 @@
package com.betriebsratkanzlei.legalconsenthub.config
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionNode
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionOperator
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionType
import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.databind.DeserializationContext
import com.fasterxml.jackson.databind.JsonDeserializer
import com.fasterxml.jackson.databind.JsonNode
import com.fasterxml.jackson.databind.JsonSerializer
import com.fasterxml.jackson.databind.SerializerProvider
import com.fasterxml.jackson.databind.module.SimpleModule
class VisibilityConditionNodeDeserializer : JsonDeserializer<VisibilityConditionNode>() {
override fun deserialize(
p: JsonParser,
ctxt: DeserializationContext,
): VisibilityConditionNode {
val node = p.codec.readTree<JsonNode>(p)
val nodeType = node.get("nodeType")?.asText()
return if (nodeType == "GROUP") {
val groupOperator =
node.get("groupOperator")?.asText()?.let {
VisibilityConditionNode.GroupOperator.forValue(it)
}
val conditions =
node.get("conditions")?.map { childNode ->
val childParser = childNode.traverse(p.codec)
childParser.nextToken()
deserialize(childParser, ctxt)
} ?: emptyList()
VisibilityConditionNode(
nodeType = VisibilityConditionNode.NodeType.GROUP,
groupOperator = groupOperator,
conditions = conditions,
)
} else {
// Default to LEAF for backward compatibility
val sourceRef = node.get("sourceFormElementReference")?.asText()
val conditionType =
node.get("formElementConditionType")?.asText()?.let {
VisibilityConditionType.valueOf(it)
}
val expectedValue = node.get("formElementExpectedValue")?.asText()
val formElementOperator =
node.get("formElementOperator")?.asText()?.let {
VisibilityConditionOperator.valueOf(it)
}
VisibilityConditionNode(
nodeType = VisibilityConditionNode.NodeType.LEAF,
sourceFormElementReference = sourceRef,
formElementConditionType = conditionType,
formElementExpectedValue = expectedValue,
formElementOperator = formElementOperator,
)
}
}
}
class VisibilityConditionNodeSerializer : JsonSerializer<VisibilityConditionNode>() {
override fun serialize(
value: VisibilityConditionNode,
gen: JsonGenerator,
serializers: SerializerProvider,
) {
gen.writeStartObject()
gen.writeStringField("nodeType", (value.nodeType ?: VisibilityConditionNode.NodeType.LEAF).value)
if (value.nodeType == VisibilityConditionNode.NodeType.GROUP) {
value.groupOperator?.let { gen.writeStringField("groupOperator", it.value) }
gen.writeArrayFieldStart("conditions")
value.conditions?.forEach { serialize(it, gen, serializers) }
gen.writeEndArray()
} else {
value.formElementConditionType?.let {
gen.writeStringField("formElementConditionType", it.value)
}
value.sourceFormElementReference?.let {
gen.writeStringField("sourceFormElementReference", it)
}
value.formElementExpectedValue?.let {
gen.writeStringField("formElementExpectedValue", it)
}
value.formElementOperator?.let {
gen.writeStringField("formElementOperator", it.value)
}
}
gen.writeEndObject()
}
}
fun visibilityConditionModule(): SimpleModule =
SimpleModule("VisibilityConditionModule").apply {
addDeserializer(VisibilityConditionNode::class.java, VisibilityConditionNodeDeserializer())
addSerializer(VisibilityConditionNode::class.java, VisibilityConditionNodeSerializer())
}

8
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/form_element/FormElement.kt
View File

@@ -12,6 +12,8 @@ import jakarta.persistence.GeneratedValue
import jakarta.persistence.Id
import jakarta.persistence.JoinColumn
import jakarta.persistence.ManyToOne
import org.hibernate.annotations.JdbcTypeCode
import org.hibernate.type.SqlTypes
import java.util.UUID
@Entity
@@ -30,9 +32,9 @@ class FormElement(
@ManyToOne
@JoinColumn(name = "form_element_sub_section_id", nullable = false)
var formElementSubSection: FormElementSubSection? = null,
@ElementCollection
@CollectionTable(name = "visibility_conditions", joinColumns = [JoinColumn(name = "form_element_id")])
var visibilityConditions: MutableList<FormElementVisibilityCondition> = mutableListOf(),
@JdbcTypeCode(SqlTypes.JSON)
@Column(columnDefinition = "jsonb")
var visibilityConditions: GroupCondition? = null,
@ElementCollection
@CollectionTable(name = "section_spawn_triggers", joinColumns = [JoinColumn(name = "form_element_id")])
var sectionSpawnTriggers: MutableList<SectionSpawnTrigger> = mutableListOf(),

18
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/form_element/FormElementMapper.kt
View File

@@ -22,8 +22,8 @@ class FormElementMapper(
formElement.formElementSubSection?.id
?: throw IllegalStateException("FormElementSubSection ID must not be null!"),
visibilityConditions =
formElement.visibilityConditions.map {
visibilityConditionMapper.toFormElementVisibilityConditionDto(it)
formElement.visibilityConditions?.let {
visibilityConditionMapper.toGroupConditionDto(it)
},
sectionSpawnTriggers =
formElement.sectionSpawnTriggers.map {
@@ -49,10 +49,9 @@ class FormElementMapper(
type = formElement.type,
formElementSubSection = formElementSubSection,
visibilityConditions =
formElement.visibilityConditions
?.map { visibilityConditionMapper.toFormElementVisibilityCondition(it) }
?.toMutableList()
?: mutableListOf(),
formElement.visibilityConditions?.let {
visibilityConditionMapper.toGroupCondition(it)
},
sectionSpawnTriggers =
formElement.sectionSpawnTriggers
?.map { spawnTriggerMapper.toSectionSpawnTrigger(it) }
@@ -78,10 +77,9 @@ class FormElementMapper(
type = formElement.type,
formElementSubSection = formElementSubSection,
visibilityConditions =
formElement.visibilityConditions
?.map { visibilityConditionMapper.toFormElementVisibilityCondition(it) }
?.toMutableList()
?: mutableListOf(),
formElement.visibilityConditions?.let {
visibilityConditionMapper.toGroupCondition(it)
},
sectionSpawnTriggers =
formElement.sectionSpawnTriggers
?.map { spawnTriggerMapper.toSectionSpawnTrigger(it) }

15
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/form_element/FormElementVisibilityCondition.kt
View File

@@ -1,15 +0,0 @@
package com.betriebsratkanzlei.legalconsenthub.form_element
import jakarta.persistence.Embeddable
import jakarta.persistence.EnumType
import jakarta.persistence.Enumerated
@Embeddable
data class FormElementVisibilityCondition(
@Enumerated(EnumType.STRING)
val formElementConditionType: VisibilityConditionType,
val sourceFormElementReference: String,
val formElementExpectedValue: String?,
@Enumerated(EnumType.STRING)
val formElementOperator: VisibilityConditionOperator = VisibilityConditionOperator.EQUALS,
)

119
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/form_element/FormElementVisibilityConditionMapper.kt
View File

@@ -1,34 +1,87 @@
package com.betriebsratkanzlei.legalconsenthub.form_element
import org.springframework.stereotype.Component
import com.betriebsratkanzlei.legalconsenthub_api.model.FormElementVisibilityCondition as FormElementVisibilityConditionDto
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionGroup as VisibilityConditionGroupDto
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionNode as VisibilityConditionNodeDto
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionOperator as VisibilityConditionOperatorDto
import com.betriebsratkanzlei.legalconsenthub_api.model.VisibilityConditionType as VisibilityConditionTypeDto
@Component
class FormElementVisibilityConditionMapper {
fun toFormElementVisibilityConditionDto(
condition: FormElementVisibilityCondition,
): FormElementVisibilityConditionDto =
FormElementVisibilityConditionDto(
formElementConditionType = toVisibilityConditionTypeDto(condition.formElementConditionType),
sourceFormElementReference = condition.sourceFormElementReference,
formElementExpectedValue = condition.formElementExpectedValue,
formElementOperator = toVisibilityConditionOperatorDto(condition.formElementOperator),
fun toGroupConditionDto(group: GroupCondition): VisibilityConditionGroupDto =
VisibilityConditionGroupDto(
operator = toGroupOperatorDto(group.operator),
conditions = group.conditions.map { toNodeDto(it) },
)
fun toFormElementVisibilityCondition(
conditionDto: FormElementVisibilityConditionDto,
): FormElementVisibilityCondition =
FormElementVisibilityCondition(
formElementConditionType = toVisibilityConditionType(conditionDto.formElementConditionType),
sourceFormElementReference = conditionDto.sourceFormElementReference,
formElementExpectedValue = conditionDto.formElementExpectedValue,
formElementOperator =
conditionDto.formElementOperator?.let { toVisibilityConditionOperator(it) }
?: VisibilityConditionOperator.EQUALS,
fun toGroupCondition(groupDto: VisibilityConditionGroupDto): GroupCondition =
GroupCondition(
operator = toGroupOperator(groupDto.operator ?: VisibilityConditionGroupDto.Operator.AND),
conditions = groupDto.conditions?.map { toNode(it) } ?: emptyList(),
)
private fun toNodeDto(node: VisibilityConditionNode): VisibilityConditionNodeDto =
when (node) {
is LeafCondition ->
VisibilityConditionNodeDto(
nodeType = VisibilityConditionNodeDto.NodeType.LEAF,
sourceFormElementReference = node.sourceFormElementReference,
formElementConditionType = node.formElementConditionType?.let { toVisibilityConditionTypeDto(it) },
formElementExpectedValue = node.formElementExpectedValue,
formElementOperator = toVisibilityConditionOperatorDto(node.formElementOperator),
)
is GroupCondition ->
VisibilityConditionNodeDto(
nodeType = VisibilityConditionNodeDto.NodeType.GROUP,
groupOperator = toNodeGroupOperatorDto(node.operator),
conditions = node.conditions.map { toNodeDto(it) },
)
}
private fun toNode(nodeDto: VisibilityConditionNodeDto): VisibilityConditionNode =
when (nodeDto.nodeType) {
VisibilityConditionNodeDto.NodeType.GROUP ->
GroupCondition(
operator = toGroupOperatorFromNode(nodeDto.groupOperator),
conditions = nodeDto.conditions?.map { toNode(it) } ?: emptyList(),
)
VisibilityConditionNodeDto.NodeType.LEAF, null ->
LeafCondition(
formElementConditionType = nodeDto.formElementConditionType?.let { toVisibilityConditionType(it) },
sourceFormElementReference = nodeDto.sourceFormElementReference ?: "",
formElementExpectedValue = nodeDto.formElementExpectedValue,
formElementOperator =
nodeDto.formElementOperator?.let { toVisibilityConditionOperator(it) }
?: VisibilityConditionOperator.EQUALS,
)
}
private fun toGroupOperatorDto(op: GroupOperator): VisibilityConditionGroupDto.Operator =
when (op) {
GroupOperator.AND -> VisibilityConditionGroupDto.Operator.AND
GroupOperator.OR -> VisibilityConditionGroupDto.Operator.OR
}
private fun toGroupOperator(op: VisibilityConditionGroupDto.Operator): GroupOperator =
when (op) {
VisibilityConditionGroupDto.Operator.AND -> GroupOperator.AND
VisibilityConditionGroupDto.Operator.OR -> GroupOperator.OR
}
private fun toNodeGroupOperatorDto(op: GroupOperator): VisibilityConditionNodeDto.GroupOperator =
when (op) {
GroupOperator.AND -> VisibilityConditionNodeDto.GroupOperator.AND
GroupOperator.OR -> VisibilityConditionNodeDto.GroupOperator.OR
}
private fun toGroupOperatorFromNode(op: VisibilityConditionNodeDto.GroupOperator?): GroupOperator =
when (op) {
VisibilityConditionNodeDto.GroupOperator.AND -> GroupOperator.AND
VisibilityConditionNodeDto.GroupOperator.OR -> GroupOperator.OR
null -> GroupOperator.AND
}
private fun toVisibilityConditionTypeDto(type: VisibilityConditionType): VisibilityConditionTypeDto =
when (type) {
VisibilityConditionType.SHOW -> VisibilityConditionTypeDto.SHOW
@@ -45,27 +98,23 @@ class FormElementVisibilityConditionMapper {
operator: VisibilityConditionOperator,
): VisibilityConditionOperatorDto =
when (operator) {
VisibilityConditionOperator.EQUALS ->
VisibilityConditionOperatorDto.EQUALS
VisibilityConditionOperator.NOT_EQUALS ->
VisibilityConditionOperatorDto.NOT_EQUALS
VisibilityConditionOperator.IS_EMPTY ->
VisibilityConditionOperatorDto.IS_EMPTY
VisibilityConditionOperator.IS_NOT_EMPTY ->
VisibilityConditionOperatorDto.IS_NOT_EMPTY
VisibilityConditionOperator.EQUALS -> VisibilityConditionOperatorDto.EQUALS
VisibilityConditionOperator.NOT_EQUALS -> VisibilityConditionOperatorDto.NOT_EQUALS
VisibilityConditionOperator.IS_EMPTY -> VisibilityConditionOperatorDto.IS_EMPTY
VisibilityConditionOperator.IS_NOT_EMPTY -> VisibilityConditionOperatorDto.IS_NOT_EMPTY
VisibilityConditionOperator.CONTAINS -> VisibilityConditionOperatorDto.CONTAINS
VisibilityConditionOperator.NOT_CONTAINS -> VisibilityConditionOperatorDto.NOT_CONTAINS
}
private fun toVisibilityConditionOperator(
operatorDto: VisibilityConditionOperatorDto,
): VisibilityConditionOperator =
when (operatorDto) {
VisibilityConditionOperatorDto.EQUALS ->
VisibilityConditionOperator.EQUALS
VisibilityConditionOperatorDto.NOT_EQUALS ->
VisibilityConditionOperator.NOT_EQUALS
VisibilityConditionOperatorDto.IS_EMPTY ->
VisibilityConditionOperator.IS_EMPTY
VisibilityConditionOperatorDto.IS_NOT_EMPTY ->
VisibilityConditionOperator.IS_NOT_EMPTY
VisibilityConditionOperatorDto.EQUALS -> VisibilityConditionOperator.EQUALS
VisibilityConditionOperatorDto.NOT_EQUALS -> VisibilityConditionOperator.NOT_EQUALS
VisibilityConditionOperatorDto.IS_EMPTY -> VisibilityConditionOperator.IS_EMPTY
VisibilityConditionOperatorDto.IS_NOT_EMPTY -> VisibilityConditionOperator.IS_NOT_EMPTY
VisibilityConditionOperatorDto.CONTAINS -> VisibilityConditionOperator.CONTAINS
VisibilityConditionOperatorDto.NOT_CONTAINS -> VisibilityConditionOperator.NOT_CONTAINS
}
}

5
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/form_element/FormOption.kt
View File

@@ -7,6 +7,8 @@ import jakarta.persistence.AttributeOverrides
import jakarta.persistence.Column
import jakarta.persistence.Embeddable
import jakarta.persistence.Embedded
import org.hibernate.annotations.JdbcTypeCode
import org.hibernate.type.SqlTypes
@Embeddable
class FormOption(
@@ -35,4 +37,7 @@ class FormOption(
AttributeOverride(name = "isCheckbox", column = Column(name = "col_config_is_checkbox")),
)
var columnConfig: TableColumnConfig? = null,
@JdbcTypeCode(SqlTypes.JSON)
@Column(columnDefinition = "jsonb", name = "visibility_conditions")
var visibilityConditions: GroupCondition? = null,
)

9
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/form_element/FormOptionMapper.kt
View File

@@ -6,6 +6,7 @@ import org.springframework.stereotype.Component
@Component
class FormOptionMapper(
private val columnConfigMapper: TableColumnConfigMapper,
private val visibilityConditionMapper: FormElementVisibilityConditionMapper,
) {
fun toFormOptionDto(formOption: FormOption): FormOptionDto =
FormOptionDto(
@@ -14,6 +15,10 @@ class FormOptionMapper(
processingPurpose = formOption.processingPurpose,
employeeDataCategory = formOption.employeeDataCategory,
columnConfig = formOption.columnConfig?.let { columnConfigMapper.toTableColumnConfigDto(it) },
visibilityConditions =
formOption.visibilityConditions?.let {
visibilityConditionMapper.toGroupConditionDto(it)
},
)
fun toFormOption(formOptionDto: FormOptionDto): FormOption =
@@ -23,5 +28,9 @@ class FormOptionMapper(
processingPurpose = formOptionDto.processingPurpose,
employeeDataCategory = formOptionDto.employeeDataCategory,
columnConfig = formOptionDto.columnConfig?.let { columnConfigMapper.toTableColumnConfig(it) },
visibilityConditions =
formOptionDto.visibilityConditions?.let {
visibilityConditionMapper.toGroupCondition(it)
},
)
}

4
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/form_element/SectionSpawnTriggerMapper.kt
View File

@@ -43,6 +43,8 @@ class SectionSpawnTriggerMapper {
VisibilityConditionOperator.NOT_EQUALS -> VisibilityConditionOperatorDto.NOT_EQUALS
VisibilityConditionOperator.IS_EMPTY -> VisibilityConditionOperatorDto.IS_EMPTY
VisibilityConditionOperator.IS_NOT_EMPTY -> VisibilityConditionOperatorDto.IS_NOT_EMPTY
VisibilityConditionOperator.CONTAINS -> VisibilityConditionOperatorDto.CONTAINS
VisibilityConditionOperator.NOT_CONTAINS -> VisibilityConditionOperatorDto.NOT_CONTAINS
}
private fun toVisibilityConditionOperator(
@@ -53,5 +55,7 @@ class SectionSpawnTriggerMapper {
VisibilityConditionOperatorDto.NOT_EQUALS -> VisibilityConditionOperator.NOT_EQUALS
VisibilityConditionOperatorDto.IS_EMPTY -> VisibilityConditionOperator.IS_EMPTY
VisibilityConditionOperatorDto.IS_NOT_EMPTY -> VisibilityConditionOperator.IS_NOT_EMPTY
VisibilityConditionOperatorDto.CONTAINS -> VisibilityConditionOperator.CONTAINS
VisibilityConditionOperatorDto.NOT_CONTAINS -> VisibilityConditionOperator.NOT_CONTAINS
}
}

4
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/form_element/TableColumnFilterMapper.kt
View File

@@ -26,6 +26,8 @@ class TableColumnFilterMapper {
VisibilityConditionOperator.NOT_EQUALS -> VisibilityConditionOperatorDto.NOT_EQUALS
VisibilityConditionOperator.IS_EMPTY -> VisibilityConditionOperatorDto.IS_EMPTY
VisibilityConditionOperator.IS_NOT_EMPTY -> VisibilityConditionOperatorDto.IS_NOT_EMPTY
VisibilityConditionOperator.CONTAINS -> VisibilityConditionOperatorDto.CONTAINS
VisibilityConditionOperator.NOT_CONTAINS -> VisibilityConditionOperatorDto.NOT_CONTAINS
}
private fun VisibilityConditionOperatorDto.toEntity(): VisibilityConditionOperator =
@@ -34,5 +36,7 @@ class TableColumnFilterMapper {
VisibilityConditionOperatorDto.NOT_EQUALS -> VisibilityConditionOperator.NOT_EQUALS
VisibilityConditionOperatorDto.IS_EMPTY -> VisibilityConditionOperator.IS_EMPTY
VisibilityConditionOperatorDto.IS_NOT_EMPTY -> VisibilityConditionOperator.IS_NOT_EMPTY
VisibilityConditionOperatorDto.CONTAINS -> VisibilityConditionOperator.CONTAINS
VisibilityConditionOperatorDto.NOT_CONTAINS -> VisibilityConditionOperator.NOT_CONTAINS
}
}

31
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/form_element/VisibilityConditionNode.kt Normal file
View File

@@ -0,0 +1,31 @@
package com.betriebsratkanzlei.legalconsenthub.form_element
import com.fasterxml.jackson.annotation.JsonSubTypes
import com.fasterxml.jackson.annotation.JsonTypeInfo
@JsonTypeInfo(
use = JsonTypeInfo.Id.DEDUCTION,
defaultImpl = LeafCondition::class,
)
@JsonSubTypes(
JsonSubTypes.Type(GroupCondition::class),
JsonSubTypes.Type(LeafCondition::class),
)
sealed interface VisibilityConditionNode
data class GroupCondition(
val operator: GroupOperator,
val conditions: List<VisibilityConditionNode>,
) : VisibilityConditionNode
data class LeafCondition(
val formElementConditionType: VisibilityConditionType? = null,
val sourceFormElementReference: String,
val formElementExpectedValue: String? = null,
val formElementOperator: VisibilityConditionOperator = VisibilityConditionOperator.EQUALS,
) : VisibilityConditionNode
enum class GroupOperator {
AND,
OR,
}

2
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/form_element/VisibilityConditionOperator.kt
View File

@@ -5,4 +5,6 @@ enum class VisibilityConditionOperator {
NOT_EQUALS,
IS_EMPTY,
IS_NOT_EMPTY,
CONTAINS,
NOT_CONTAINS,
}

6
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/seed/InitialApplicationFormSeeder.kt
View File

@@ -3,6 +3,7 @@ package com.betriebsratkanzlei.legalconsenthub.seed
import com.betriebsratkanzlei.legalconsenthub.application_form.ApplicationFormMapper
import com.betriebsratkanzlei.legalconsenthub.application_form.ApplicationFormRepository
import com.betriebsratkanzlei.legalconsenthub.application_form_version.ApplicationFormVersionService
import com.betriebsratkanzlei.legalconsenthub.config.visibilityConditionModule
import com.betriebsratkanzlei.legalconsenthub.user.User
import com.betriebsratkanzlei.legalconsenthub.user.UserRepository
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormDto
@@ -25,7 +26,10 @@ class InitialApplicationFormSeeder(
private val userRepository: UserRepository,
private val versionService: ApplicationFormVersionService,
) : ApplicationRunner {
private val yamlMapper = ObjectMapper(YAMLFactory()).findAndRegisterModules()
private val yamlMapper =
ObjectMapper(
YAMLFactory(),
).findAndRegisterModules().registerModule(visibilityConditionModule())
override fun run(args: ApplicationArguments) {
seedInitialFormIfMissing()

6
legalconsenthub-backend/src/main/kotlin/com/betriebsratkanzlei/legalconsenthub/seed/InitialApplicationFormTemplateSeeder.kt
View File

@@ -2,6 +2,7 @@ package com.betriebsratkanzlei.legalconsenthub.seed
import com.betriebsratkanzlei.legalconsenthub.application_form.ApplicationFormMapper
import com.betriebsratkanzlei.legalconsenthub.application_form.ApplicationFormRepository
import com.betriebsratkanzlei.legalconsenthub.config.visibilityConditionModule
import com.betriebsratkanzlei.legalconsenthub.user.User
import com.betriebsratkanzlei.legalconsenthub.user.UserRepository
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormDto
@@ -22,7 +23,10 @@ class InitialApplicationFormTemplateSeeder(
private val applicationFormMapper: ApplicationFormMapper,
private val userRepository: UserRepository,
) : ApplicationRunner {
private val yamlMapper = ObjectMapper(YAMLFactory()).findAndRegisterModules()
private val yamlMapper =
ObjectMapper(
YAMLFactory(),
).findAndRegisterModules().registerModule(visibilityConditionModule())
override fun run(args: ApplicationArguments) {
seedInitialTemplateIfMissing()

2
legalconsenthub-backend/src/main/resources/application-testcontainers.yaml
View File

@@ -13,7 +13,7 @@ spring:
database-platform: org.hibernate.dialect.PostgreSQLDialect
hibernate:
ddl-auto: create
show-sql: true
show-sql: false
properties:
hibernate:
format_sql: true

29
legalconsenthub-backend/src/main/resources/db/migrations/001-schema.sql
View File

@@ -68,12 +68,13 @@ create table form_element_options
form_element_id uuid not null,
col_config_filter_expected_val varchar(255),
col_config_filter_operator varchar(255) check (col_config_filter_operator in
('EQUALS', 'NOT_EQUALS', 'IS_EMPTY',
'IS_NOT_EMPTY')),
('EQUALS', 'NOT_EQUALS', 'IS_EMPTY', 'IS_NOT_EMPTY',
'CONTAINS', 'NOT_CONTAINS')),
col_config_source_table_ref varchar(255),
label varchar(255) not null,
option_value TEXT not null,
row_constraint_table_reference varchar(255)
row_constraint_table_reference varchar(255),
visibility_conditions jsonb
);
create table form_element
@@ -89,9 +90,11 @@ create table form_element
reference varchar(255),
row_preset_filter_expected_val varchar(255),
row_preset_filter_operator varchar(255) check (row_preset_filter_operator in
('EQUALS', 'NOT_EQUALS', 'IS_EMPTY', 'IS_NOT_EMPTY')),
('EQUALS', 'NOT_EQUALS', 'IS_EMPTY', 'IS_NOT_EMPTY', 'CONTAINS',
'NOT_CONTAINS')),
row_preset_source_table_ref varchar(255),
title varchar(255),
visibility_conditions jsonb,
primary key (id)
);
@@ -141,7 +144,8 @@ create table section_spawn_triggers
section_spawn_condition_type varchar(255) check (section_spawn_condition_type in ('SHOW', 'HIDE')),
section_spawn_expected_value varchar(255),
section_spawn_operator varchar(255) check (section_spawn_operator in
('EQUALS', 'NOT_EQUALS', 'IS_EMPTY', 'IS_NOT_EMPTY')),
('EQUALS', 'NOT_EQUALS', 'IS_EMPTY', 'IS_NOT_EMPTY', 'CONTAINS',
'NOT_CONTAINS')),
template_reference varchar(255)
);
@@ -169,16 +173,6 @@ create table uploaded_file
primary key (id)
);
create table visibility_conditions
(
form_element_id uuid not null,
form_element_condition_type varchar(255) check (form_element_condition_type in ('SHOW', 'HIDE')),
form_element_expected_value varchar(255),
form_element_operator varchar(255) check (form_element_operator in
('EQUALS', 'NOT_EQUALS', 'IS_EMPTY', 'IS_NOT_EMPTY')),
source_form_element_reference varchar(255)
);
alter table if exists application_form
add constraint FKhtad5onoy2jknhtyfmx6cvvey
foreign key (created_by_id)
@@ -259,8 +253,3 @@ alter table if exists uploaded_file
add constraint FKtg323a9339lx0do79gu4eftao
foreign key (uploaded_by_id)
references app_user;
alter table if exists visibility_conditions
add constraint FK5xuf7bd179ogpq5a1m3g8q7jb
foreign key (form_element_id)
references form_element;

1706
legalconsenthub-backend/src/main/resources/seed/initial_application_form.yaml
View File

File diff suppressed because it is too large Load Diff

3124
legalconsenthub-backend/src/main/resources/seed/initial_application_form_template.yaml
View File

File diff suppressed because it is too large Load Diff