feat: use RequestId type

src/main/kotlin/dev/dnpm/etl/processor/input/KafkaInputListener.kt

@@ -22,6 +22,7 @@ package dev.dnpm.etl.processor.input
 import com.fasterxml.jackson.databind.ObjectMapper
 import de.ukw.ccc.bwhc.dto.Consent
 import de.ukw.ccc.bwhc.dto.MtbFile
+import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.services.RequestProcessor
 import org.apache.kafka.clients.consumer.ConsumerRecord
 import org.slf4j.LoggerFactory
@@ -37,9 +38,9 @@ class KafkaInputListener(
         val mtbFile = objectMapper.readValue(data.value(), MtbFile::class.java)
         val firstRequestIdHeader = data.headers().headers("requestId")?.firstOrNull()
         val requestId = if (null != firstRequestIdHeader) {
-            String(firstRequestIdHeader.value())
+            RequestId(String(firstRequestIdHeader.value()))
         } else {
-            ""
+            RequestId("")
         }
 
         if (mtbFile.consent.status == Consent.Status.ACTIVE) {

src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt

@@ -20,6 +20,8 @@
 package dev.dnpm.etl.processor.monitoring
 
 import dev.dnpm.etl.processor.Fingerprint
+import dev.dnpm.etl.processor.randomRequestId
+import dev.dnpm.etl.processor.RequestId
 import org.springframework.data.annotation.Id
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
@@ -32,12 +34,10 @@ import org.springframework.data.repository.PagingAndSortingRepository
 import java.time.Instant
 import java.util.*
 
-typealias RequestId = UUID
-
 @Table("request")
 data class Request(
     @Id val id: Long? = null,
-    val uuid: String = RequestId.randomUUID().toString(),
+    val uuid: RequestId = randomRequestId(),
     val patientId: String,
     val pid: String,
     @Column("fingerprint")
@@ -48,7 +48,7 @@ data class Request(
     @Embedded.Nullable var report: Report? = null
 ) {
     constructor(
-        uuid: String,
+        uuid: RequestId,
         patientId: String,
         pid: String,
         fingerprint: Fingerprint,
@@ -58,7 +58,7 @@ data class Request(
             this(null, uuid, patientId, pid, fingerprint, type, status, Instant.now())
 
     constructor(
-        uuid: String,
+        uuid: RequestId,
         patientId: String,
         pid: String,
         fingerprint: Fingerprint,
@@ -85,7 +85,7 @@ interface RequestRepository : CrudRepository<Request, Long>, PagingAndSortingRep
 
     fun findAllByPatientIdOrderByProcessedAtDesc(patientId: String): List<Request>
 
-    fun findByUuidEquals(uuid: String): Optional<Request>
+    fun findByUuidEquals(uuid: RequestId): Optional<Request>
 
     fun findRequestByPatientId(patientId: String, pageable: Pageable): Page<Request>
 

src/main/kotlin/dev/dnpm/etl/processor/output/KafkaMtbFileSender.kt

@@ -22,6 +22,7 @@ package dev.dnpm.etl.processor.output
 import com.fasterxml.jackson.databind.ObjectMapper
 import de.ukw.ccc.bwhc.dto.Consent
 import de.ukw.ccc.bwhc.dto.MtbFile
+import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.config.KafkaProperties
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import org.slf4j.LoggerFactory
@@ -101,5 +102,5 @@ class KafkaMtbFileSender(
         return "{\"pid\": \"${request.patientId}\"}"
     }
 
-    data class Data(val requestId: String, val content: MtbFile)
+    data class Data(val requestId: RequestId, val content: MtbFile)
 }

src/main/kotlin/dev/dnpm/etl/processor/output/MtbFileSender.kt

@@ -20,6 +20,7 @@
 package dev.dnpm.etl.processor.output
 
 import de.ukw.ccc.bwhc.dto.MtbFile
+import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import org.springframework.http.HttpStatusCode
 
@@ -32,9 +33,9 @@ interface MtbFileSender {
 
     data class Response(val status: RequestStatus, val body: String = "")
 
-    data class MtbFileRequest(val requestId: String, val mtbFile: MtbFile)
+    data class MtbFileRequest(val requestId: RequestId, val mtbFile: MtbFile)
 
-    data class DeleteRequest(val requestId: String, val patientId: String)
+    data class DeleteRequest(val requestId: RequestId, val patientId: String)
 
 }
 

src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt

@@ -22,6 +22,8 @@ package dev.dnpm.etl.processor.services
 import com.fasterxml.jackson.databind.ObjectMapper
 import de.ukw.ccc.bwhc.dto.MtbFile
 import dev.dnpm.etl.processor.Fingerprint
+import dev.dnpm.etl.processor.randomRequestId
+import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.config.AppConfigProperties
 import dev.dnpm.etl.processor.monitoring.Report
 import dev.dnpm.etl.processor.monitoring.Request
@@ -50,10 +52,10 @@ class RequestProcessor(
 ) {
 
     fun processMtbFile(mtbFile: MtbFile) {
-        processMtbFile(mtbFile, UUID.randomUUID().toString())
+        processMtbFile(mtbFile, randomRequestId())
     }
 
-    fun processMtbFile(mtbFile: MtbFile, requestId: String) {
+    fun processMtbFile(mtbFile: MtbFile, requestId: RequestId) {
         val pid = mtbFile.patient.id
 
         mtbFile pseudonymizeWith pseudonymizeService
@@ -109,10 +111,10 @@ class RequestProcessor(
     }
 
     fun processDeletion(patientId: String) {
-        processDeletion(patientId, UUID.randomUUID().toString())
+        processDeletion(patientId, randomRequestId())
     }
 
-    fun processDeletion(patientId: String, requestId: String) {
+    fun processDeletion(patientId: String, requestId: RequestId) {
         try {
             val patientPseudonym = pseudonymizeService.patientPseudonym(patientId)
 

src/main/kotlin/dev/dnpm/etl/processor/services/RequestService.kt

@@ -19,6 +19,7 @@
 
 package dev.dnpm.etl.processor.services
 
+import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.monitoring.*
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
@@ -36,7 +37,7 @@ class RequestService(
 
     fun findAll(pageable: Pageable): Page<Request> = requestRepository.findAll(pageable)
 
-    fun findByUuid(uuid: String): Optional<Request> =
+    fun findByUuid(uuid: RequestId): Optional<Request> =
         requestRepository.findByUuidEquals(uuid)
 
     fun findRequestByPatientId(patientId: String, pageable: Pageable): Page<Request> = requestRepository.findRequestByPatientId(patientId, pageable)

src/main/kotlin/dev/dnpm/etl/processor/services/ResponseProcessor.kt

@@ -19,6 +19,7 @@
 
 package dev.dnpm.etl.processor.services
 
+import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.monitoring.Report
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import org.slf4j.LoggerFactory
@@ -86,7 +87,7 @@ class ResponseProcessor(
 }
 
 data class ResponseEvent(
-    val requestUuid: String,
+    val requestUuid: RequestId,
     val timestamp: Instant,
     val status: RequestStatus,
     val body: Optional<String> = Optional.empty()

src/main/kotlin/dev/dnpm/etl/processor/services/kafka/KafkaResponseProcessor.kt

@@ -22,6 +22,7 @@ package dev.dnpm.etl.processor.services.kafka
 import com.fasterxml.jackson.annotation.JsonAlias
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.ObjectMapper
+import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import dev.dnpm.etl.processor.output.asRequestStatus
 import dev.dnpm.etl.processor.services.ResponseEvent
@@ -47,7 +48,7 @@ class KafkaResponseProcessor(
             Optional.empty()
         }.ifPresentOrElse({ responseBody ->
             val event = ResponseEvent(
-                responseBody.requestId,
+                RequestId(responseBody.requestId),
                 Instant.ofEpochMilli(data.timestamp()),
                 responseBody.statusCode.asRequestStatus(),
                 when (responseBody.statusCode.asRequestStatus()) {

src/main/kotlin/dev/dnpm/etl/processor/types.kt

@@ -1,5 +1,26 @@
+/*
+ * This file is part of ETL-Processor
+ *
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package dev.dnpm.etl.processor
 
+import java.util.*
+
 class Fingerprint(val value: String) {
     override fun hashCode() = value.hashCode()
 
@@ -9,3 +30,12 @@ class Fingerprint(val value: String) {
         fun empty() = Fingerprint("")
     }
 }
+
+@JvmInline
+value class RequestId(val value: String) {
+
+    fun isBlank() = value.isBlank()
+
+}
+
+fun randomRequestId() = RequestId(UUID.randomUUID().toString())

src/main/kotlin/dev/dnpm/etl/processor/web/HomeController.kt

@@ -20,8 +20,8 @@
 package dev.dnpm.etl.processor.web
 
 import dev.dnpm.etl.processor.NotFoundException
+import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.monitoring.ReportService
-import dev.dnpm.etl.processor.monitoring.RequestId
 import dev.dnpm.etl.processor.services.RequestService
 import org.springframework.data.domain.Pageable
 import org.springframework.data.domain.Sort
@@ -65,7 +65,7 @@ class HomeController(
 
     @GetMapping(path = ["/report/{id}"])
     fun report(@PathVariable id: RequestId, model: Model): String {
-        val request = requestService.findByUuid(id.toString()).orElse(null) ?: throw NotFoundException()
+        val request = requestService.findByUuid(id).orElse(null) ?: throw NotFoundException()
         model.addAttribute("request", request)
         model.addAttribute("issues", reportService.deserialize(request.report?.dataQualityReport))