From be9affd091abcf1518dc9e443071ed2b81c574ae Mon Sep 17 00:00:00 2001
From: Dimitris ZARRAS <Dimitris.ZARRAS@netcompany.com>
Date: Mon, 25 Nov 2024 09:42:51 +0200
Subject: [PATCH] Remove generateDocumentNumber() and
 generateAdministrativeNumber() from GetPidDataFromAuthServer.

---
 .../europa/ec/eudi/pidissuer/PidIssuerApplication.kt  |  2 --
 .../adapter/out/pid/GetPidDataFromAuthServer.kt       | 11 +++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/eu/europa/ec/eudi/pidissuer/PidIssuerApplication.kt b/src/main/kotlin/eu/europa/ec/eudi/pidissuer/PidIssuerApplication.kt
index ec6eed51..6f1e710d 100644
--- a/src/main/kotlin/eu/europa/ec/eudi/pidissuer/PidIssuerApplication.kt
+++ b/src/main/kotlin/eu/europa/ec/eudi/pidissuer/PidIssuerApplication.kt
@@ -278,8 +278,6 @@ fun beans(clock: Clock) = beans {
             clock = clock,
             keycloak = keycloak,
             userRealm = keycloakProperties.userRealm,
-            generateDocumentNumber = { DocumentNumber(UUID.randomUUID().toString()) },
-            generateAdministrativeNumber = { AdministrativeNumber(UUID.randomUUID().toString()) },
         )
     }
     bean<EncodePidInCbor>(isLazyInit = true) {
diff --git a/src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/pid/GetPidDataFromAuthServer.kt b/src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/pid/GetPidDataFromAuthServer.kt
index 00a8ae2b..58c70831 100644
--- a/src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/pid/GetPidDataFromAuthServer.kt
+++ b/src/main/kotlin/eu/europa/ec/eudi/pidissuer/adapter/out/pid/GetPidDataFromAuthServer.kt
@@ -29,6 +29,7 @@ import org.keycloak.admin.client.Keycloak
 import org.keycloak.representations.idm.UserRepresentation
 import org.slf4j.LoggerFactory
 import java.time.*
+import java.util.*
 import kotlin.math.ceil
 
 private val log = LoggerFactory.getLogger(GetPidDataFromAuthServer::class.java)
@@ -36,8 +37,6 @@ private val log = LoggerFactory.getLogger(GetPidDataFromAuthServer::class.java)
 class GetPidDataFromAuthServer(
     private val issuerCountry: IsoCountry,
     private val issuingJurisdiction: IsoCountrySubdivision?,
-    private val generateDocumentNumber: suspend () -> DocumentNumber,
-    private val generateAdministrativeNumber: suspend () -> AdministrativeNumber,
     private val clock: Clock,
     private val keycloak: Keycloak,
     private val userRealm: String,
@@ -134,20 +133,20 @@ class GetPidDataFromAuthServer(
         }
     }
 
-    private suspend fun genPidMetaData(): PidMetaData {
+    private fun genPidMetaData(): PidMetaData {
         val issuanceDate = LocalDate.now(clock)
         return PidMetaData(
             expiryDate = issuanceDate.plusDays(100),
             issuanceDate = issuanceDate,
             issuingCountry = issuerCountry,
             issuingAuthority = IssuingAuthority.AdministrativeAuthority("${issuerCountry.value} Administrative authority"),
-            documentNumber = generateDocumentNumber(),
-            administrativeNumber = generateAdministrativeNumber(),
+            documentNumber = DocumentNumber(UUID.randomUUID().toString()),
+            administrativeNumber = AdministrativeNumber(UUID.randomUUID().toString()),
             issuingJurisdiction = issuingJurisdiction,
         )
     }
 
-    private suspend fun pid(userInfo: UserInfo): Pair<Pid, PidMetaData> {
+    private fun pid(userInfo: UserInfo): Pair<Pid, PidMetaData> {
         val birthDate = requireNotNull(userInfo.birthDate) {
             "missing required attribute 'birthDate'"
         }.let { LocalDate.parse(it) }