src/main/kotlin/wanijo/wanijo2/domain/document.kt

@@ -6,8 +6,6 @@ import org.springframework.data.jdbc.repository.query.Modifying
 import org.springframework.data.jdbc.repository.query.Query
 import org.springframework.data.relational.core.mapping.Table
 import org.springframework.data.repository.Repository
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
 import java.time.ZonedDateTime
 
 typealias DocumentId = Long
@@ -20,40 +18,22 @@ data class Document(
     val id: DocumentId = 0,
     val name: DocumentName,
     val description: DocumentDescription = "",
-    val updatedAt: LocalDateTime = now(),
+    val updatedAt: ZonedDateTime = ZonedDateTime.now(),
-    val createdAt: LocalDateTime = now(),
+    val createdAt: ZonedDateTime = ZonedDateTime.now(),
     val labelFields: Set<LabelField> = emptySet(),
     val dateFields: Set<DateField> = emptySet(),
 ) {
-    fun labelFieldsSorted() =
-        labelFields.sortedBy { it.order }
-
-    fun dateFieldsSorted() =
-        dateFields.sortedBy { it.order }
-
     fun withLabel(field: LabelField) =
         copy(
             labelFields = labelFields + field,
-            updatedAt = now()
+            updatedAt = ZonedDateTime.now()
-        )
-
-    fun withDate(field: DateField) =
-        copy(
-            dateFields = dateFields + field,
-            updatedAt = now()
         )
 
     fun withoutLabel(fieldId: FieldId) =
         copy(
-            updatedAt = now(),
+            updatedAt = ZonedDateTime.now(),
             labelFields = labelFields.filter { it.id != fieldId }.toSet()
         )
-
-    fun withoutDate(fieldId: FieldId) =
-        copy(
-            updatedAt = now(),
-            dateFields = dateFields.filter { it.id != fieldId }.toSet()
-        )
 }
 
 @Table("T_DOCUMENT")

src/main/kotlin/wanijo/wanijo2/domain/event/AddDateFieldCommand.kt

@@ -1,27 +0,0 @@
-package wanijo.wanijo2.domain.event
-
-import jakarta.validation.constraints.Min
-import jakarta.validation.constraints.NotEmpty
-import wanijo.wanijo2.domain.DateField
-import wanijo.wanijo2.domain.DocumentId
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.ZoneOffset
-import java.time.ZonedDateTime
-
-data class AddDateFieldCommand(
-    @Min(1)
-    val documentId: DocumentId,
-    @NotEmpty
-    val dateName: String,
-    @NotEmpty
-    val dateValue: LocalDateTime,
-    val order: Int = 0,
-) {
-    fun toField() =
-        DateField(
-            name = dateName,
-            value = dateValue,
-            order = order
-        )
-}

src/main/kotlin/wanijo/wanijo2/domain/event/AddLabelFieldCommand.kt

@@ -3,7 +3,6 @@ package wanijo.wanijo2.domain.event
 import jakarta.validation.constraints.Min
 import jakarta.validation.constraints.NotEmpty
 import wanijo.wanijo2.domain.DocumentId
-import wanijo.wanijo2.domain.LabelField
 
 data class AddLabelFieldCommand(
     @Min(1)
@@ -13,11 +12,4 @@ data class AddLabelFieldCommand(
     @NotEmpty
     val labelValue: String,
     val order: Int = 0
-) {
+)
-    fun toField() =
-        LabelField(
-            order = order,
-            name = labelName,
-            value = labelValue
-        )
-}

src/main/kotlin/wanijo/wanijo2/domain/event/DeleteDateFieldCommand.kt

@@ -1,12 +0,0 @@
-package wanijo.wanijo2.domain.event
-
-import jakarta.validation.constraints.Min
-import wanijo.wanijo2.domain.DocumentId
-import wanijo.wanijo2.domain.FieldId
-
-data class DeleteDateFieldCommand(
-    @Min(1)
-    val documentId: DocumentId,
-    @Min(1)
-    val dateFieldId: FieldId
-)

src/main/kotlin/wanijo/wanijo2/domain/fields.kt

@@ -2,8 +2,7 @@ package wanijo.wanijo2.domain
 
 import org.springframework.data.annotation.Id
 import org.springframework.data.relational.core.mapping.Table
-import java.time.LocalDateTime
+import java.time.ZonedDateTime
-import java.time.LocalDateTime.now
 
 typealias FieldId = Long
 
@@ -14,8 +13,8 @@ data class LabelField(
     val order: Int = 0,
     val name: String,
     val value: String = "",
-    val updatedAt: LocalDateTime = now(),
+    val updatedAt: ZonedDateTime = ZonedDateTime.now(),
-    val createdAt: LocalDateTime = now(),
+    val createdAt: ZonedDateTime = ZonedDateTime.now(),
 )
 
 @Table("T_DATE_FIELD")
@@ -24,7 +23,7 @@ data class DateField(
     val id: FieldId = 0,
     val order: Int = 0,
     val name: String,
-    val value: LocalDateTime,
+    val value: ZonedDateTime,
-    val updatedAt: LocalDateTime = now(),
+    val updatedAt: ZonedDateTime = ZonedDateTime.now(),
-    val createdAt: LocalDateTime = now(),
+    val createdAt: ZonedDateTime = ZonedDateTime.now(),
 )

src/main/kotlin/wanijo/wanijo2/domain/handler/AddDateFieldHandler.kt

@@ -1,22 +0,0 @@
-package wanijo.wanijo2.domain.handler
-
-import org.springframework.stereotype.Service
-import wanijo.wanijo2.domain.DateField
-import wanijo.wanijo2.domain.DocumentDao
-import wanijo.wanijo2.domain.LabelField
-import wanijo.wanijo2.domain.event.AddDateFieldCommand
-import wanijo.wanijo2.http.DocumentNotFound
-
-@Service
-class AddDateFieldHandler(
-    val documentDao: DocumentDao
-) {
-
-    fun exec(command: AddDateFieldCommand) {
-        val doc = documentDao.findById(command.documentId) ?: throw DocumentNotFound()
-        documentDao.save(
-            doc.withDate(command.toField())
-        )
-    }
-
-}

src/main/kotlin/wanijo/wanijo2/domain/handler/AddLabelFieldHandler.kt

@@ -2,6 +2,7 @@ package wanijo.wanijo2.domain.handler
 
 import org.springframework.stereotype.Service
 import wanijo.wanijo2.domain.DocumentDao
+import wanijo.wanijo2.domain.LabelField
 import wanijo.wanijo2.domain.event.AddLabelFieldCommand
 import wanijo.wanijo2.http.DocumentNotFound
 
@@ -13,7 +14,13 @@ class AddLabelFieldHandler(
     fun exec(command: AddLabelFieldCommand) {
         val doc = documentDao.findById(command.documentId) ?: throw DocumentNotFound()
         documentDao.save(
-            doc.withLabel(command.toField())
+            doc.withLabel(
+                LabelField(
+                    order = command.order,
+                    name = command.labelName,
+                    value = command.labelValue
+                )
+            )
         )
     }
 

src/main/kotlin/wanijo/wanijo2/domain/handler/DeleteDateFieldHandler.kt

@@ -1,18 +0,0 @@
-package wanijo.wanijo2.domain.handler
-
-import org.springframework.stereotype.Service
-import wanijo.wanijo2.domain.DocumentDao
-import wanijo.wanijo2.domain.event.DeleteDateFieldCommand
-import wanijo.wanijo2.http.DocumentNotFound
-
-@Service
-class DeleteDateFieldHandler(
-    val dao: DocumentDao
-) {
-
-    fun exec(command: DeleteDateFieldCommand) {
-        val doc = dao.findById(command.documentId) ?: throw DocumentNotFound()
-        dao.save(doc.withoutDate(command.dateFieldId))
-    }
-
-}

src/main/kotlin/wanijo/wanijo2/domain/tag.kt

@@ -6,8 +6,6 @@ import org.springframework.data.jdbc.repository.query.Modifying
 import org.springframework.data.jdbc.repository.query.Query
 import org.springframework.data.relational.core.mapping.Table
 import org.springframework.data.repository.Repository
-import java.time.LocalDateTime
-import java.time.LocalDateTime.now
 import java.time.ZonedDateTime
 
 typealias TagId = Long
@@ -18,7 +16,7 @@ data class Tag(
     @Id
     val id: TagId = 0,
     val name: TagName,
-    val createdAt: LocalDateTime = now()
+    val createdAt: ZonedDateTime = ZonedDateTime.now()
 )
 
 typealias DocumentTaggingId = Long
@@ -28,8 +26,7 @@ data class DocumentTagging(
     @Id
     val id: DocumentTaggingId = 0,
     val tagId: AggregateReference<Tag, TagId>,
-    val documentId: AggregateReference<Document, DocumentId>,
+    val documentId: AggregateReference<Document, DocumentId>
-    val createdAt: LocalDateTime = now()
 ) {
     companion object {
         fun between(doc: Document, tagId: TagId) =

src/main/kotlin/wanijo/wanijo2/http/controller/AddLabelFieldController.kt

@@ -7,44 +7,36 @@ import org.springframework.ui.set
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestMapping
 import wanijo.wanijo2.domain.DocumentBriefDao
 import wanijo.wanijo2.domain.DocumentId
-import wanijo.wanijo2.domain.event.AddDateFieldCommand
 import wanijo.wanijo2.domain.event.AddLabelFieldCommand
-import wanijo.wanijo2.domain.handler.AddDateFieldHandler
 import wanijo.wanijo2.domain.handler.AddLabelFieldHandler
-import java.time.LocalDateTime
-import java.time.ZonedDateTime.now
 
 @Controller
-class AddFieldController(
+@RequestMapping("/document/{id}/field/label/add")
+class AddLabelFieldController(
     val documentBriefDao: DocumentBriefDao,
-    val addLabelFieldHandler: AddLabelFieldHandler,
+    val addLabelFieldHandler: AddLabelFieldHandler
-    val addDateFieldHandler: AddDateFieldHandler
 ) {
 
-    @GetMapping("/document/{id}/field/add")
+    @GetMapping
     fun addLabel(
         @PathVariable
         id: DocumentId,
         model: Model
     ): String {
-        model["labelForm"] = AddLabelFieldCommand(
+        model["form"] = AddLabelFieldCommand(
             documentId = id,
             labelName = "",
             labelValue = ""
         )
-        model["dateForm"] = AddDateFieldCommand(
-            documentId = id,
-            dateName = "",
-            dateValue = LocalDateTime.now()
-        )
         model["document"] = documentBriefDao.findById(id)
 
         return "addLabelField"
     }
 
-    @PostMapping("/document/{id}/field/label/add")
+    @PostMapping
     fun addLabel(
         @PathVariable
         id: DocumentId,
@@ -55,15 +47,4 @@ class AddFieldController(
         return "redirect:/document/$id"
     }
 
-    @PostMapping("/document/{id}/field/date/add")
-    fun addDate(
-        @PathVariable
-        id: DocumentId,
-        @Valid
-        command: AddDateFieldCommand
-    ): String {
-        addDateFieldHandler.exec(command)
-        return "redirect:/document/$id"
-    }
-
 }

src/main/kotlin/wanijo/wanijo2/http/controller/DeleteLabelFieldController.kt

@@ -5,15 +5,12 @@ import org.springframework.stereotype.Controller
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import wanijo.wanijo2.domain.DocumentId
-import wanijo.wanijo2.domain.event.DeleteDateFieldCommand
 import wanijo.wanijo2.domain.event.DeleteLabelFieldCommand
-import wanijo.wanijo2.domain.handler.DeleteDateFieldHandler
 import wanijo.wanijo2.domain.handler.DeleteLabelFieldHandler
 
 @Controller
-class DeleteFieldController(
+class DeleteLabelFieldController(
-    val labelFieldhandler: DeleteLabelFieldHandler,
+    val handler: DeleteLabelFieldHandler
-    val dateFieldHandler: DeleteDateFieldHandler
 ) {
 
     @PostMapping("/document/{id}/field/label/delete")
@@ -23,18 +20,7 @@ class DeleteFieldController(
         @Valid
         command: DeleteLabelFieldCommand
     ): String {
-        labelFieldhandler.exec(command)
+        handler.exec(command)
-        return "redirect:/document/$id"
-    }
-
-    @PostMapping("/document/{id}/field/date/delete")
-    fun removeDateField(
-        @PathVariable
-        id: DocumentId,
-        @Valid
-        command: DeleteDateFieldCommand
-    ): String {
-        dateFieldHandler.exec(command)
         return "redirect:/document/$id"
     }
 

src/main/resources/db/migration/V202512200144__tagging_created_at.sql

@@ -1,2 +0,0 @@
-ALTER TABLE t_document_tagging
-    ADD COLUMN created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now();

src/main/resources/templates/addLabelField.html

@@ -16,9 +16,7 @@
                 <span class="low-key-hint">hinzufügen</span>
             </h2>
 
-            <form th:action="@{/document/{id}/field/label/add(id=${document.id})}"
+            <form th:action="@{/document/{id}/field/label/add(id=${document.id})}" th:object="${form}" method="post">
-                  th:object="${labelForm}"
-                  method="post">
                 <input type="hidden" th:field="*{documentId}">
 
                 <label for="labelName">name</label>
@@ -27,33 +25,8 @@
                 <label for="labelValue">wert</label>
                 <input id="labelValue" th:field="*{labelValue}" type="text" required>
 
-                <label for="labelOrder">sortierung</label>
+                <label for="order">sortierung</label>
-                <input id="labelOrder" th:field="*{order}" type="number" required>
+                <input id="order" th:field="*{order}" type="number" required>
-
-                <button type="submit">
-                    hinzufügen
-                </button>
-            </form>
-
-            <h2>
-                <span class="low-key-hint">datum zu</span>
-                <th:block th:text="${document.name}"/>
-                <span class="low-key-hint">hinzufügen</span>
-            </h2>
-
-            <form th:action="@{/document/{id}/field/date/add(id=${document.id})}"
-                  th:object="${dateForm}"
-                  method="post">
-                <input type="hidden" th:field="*{documentId}">
-
-                <label for="dateName">name</label>
-                <input id="dateName" type="text" th:field="*{dateName}" required>
-
-                <label for="dateValue">wert</label>
-                <input id="dateValue" th:field="*{dateValue}" type="datetime-local" required>
-
-                <label for="dateOrder">sortierung</label>
-                <input id="dateOrder" th:field="*{order}" type="number" required>
 
                 <button type="submit">
                     hinzufügen

src/main/resources/templates/show.html

@@ -53,19 +53,17 @@
                 <div class="show__markdown" th:utext="${descHtml}"></div>
             </fieldset>
 
-            <h2 class="low-key-hint">
+            <h2 class="low-key-hint">felder</h2>
-                felder
+            <h3 class="low-key-hint">
-                <a th:href="@{/document/{id}/field/add(id=${document.id})}">
+                label
+                <a th:href="@{/document/{id}/field/label/add(id=${document.id})}">
                     <button>
                         neu
                     </button>
                 </a>
-            </h2>
-            <h3 class="low-key-hint">
-                label
             </h3>
             <dl>
-                <th:block th:each="field : ${document.labelFieldsSorted()}">
+                <th:block th:each="field : ${document.labelFields}">
                     <dt>
                         <th:block th:text="${field.name}" />
                         <form class="form-inline" th:action="@{/document/{id}/field/label/delete(id=${document.id})}" method="post">
@@ -81,15 +79,8 @@
                 datumsangaben
             </h3>
             <dl>
-                <th:block th:each="field : ${document.dateFieldsSorted()}">
+                <th:block th:each="field : ${document.dateFields}">
-                    <dt>
+                    <dt th:text="${field.name}"></dt>
-                        <th:block th:text="${field.name}" />
-                        <form class="form-inline" th:action="@{/document/{id}/field/date/delete(id=${document.id})}" method="post">
-                            <input type="hidden" name="dateFieldId" th:value="${field.id}">
-                            <input type="hidden" name="documentId" th:value="${document.id}">
-                            <button type="submit" class="warning">weg</button>
-                        </form>
-                    </dt>
                     <dd th:text="${#temporals.format(field.value, 'yyyy-MM-dd HH:mm')}"></dd>
                 </th:block>
             </dl>