diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/IssuedCards.kt b/src/main/kotlin/com/android/trisolarisserver/controller/IssuedCards.kt index 62a55c0..fa64086 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/IssuedCards.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/IssuedCards.kt @@ -48,7 +48,7 @@ class IssuedCards( @AuthenticationPrincipal principal: MyPrincipal?, @RequestBody request: CardPrepareRequest ): CardPrepareResponse { - requireIssueActor(propertyId, principal) + val actor = requireIssueActor(propertyId, principal) val stay = roomStayRepo.findById(roomStayId).orElseThrow { ResponseStatusException(HttpStatus.NOT_FOUND, "Room stay not found") } @@ -73,7 +73,10 @@ class IssuedCards( key = payload.key, timeData = payload.timeData, issuedAt = issuedAt.toString(), - expiresAt = expiresAt.toString() + expiresAt = expiresAt.toString(), + issuerUserId = actor.id, + issuerFirebaseUid = actor.firebaseUid, + issuerName = actor.name ) } diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/TemporaryRoomCards.kt b/src/main/kotlin/com/android/trisolarisserver/controller/TemporaryRoomCards.kt index 444cbf5..ae459a2 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/TemporaryRoomCards.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/TemporaryRoomCards.kt @@ -46,7 +46,7 @@ class TemporaryRoomCards( @PathVariable roomId: UUID, @AuthenticationPrincipal principal: MyPrincipal? ): CardPrepareResponse { - requireIssueActor(propertyId, principal) + val actor = requireIssueActor(propertyId, principal) val room = roomRepo.findByIdAndPropertyId(roomId, propertyId) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Room not found") @@ -59,7 +59,10 @@ class TemporaryRoomCards( key = payload.key, timeData = payload.timeData, issuedAt = issuedAt.toString(), - expiresAt = expiresAt.toString() + expiresAt = expiresAt.toString(), + issuerUserId = actor.id, + issuerFirebaseUid = actor.firebaseUid, + issuerName = actor.name ) } diff --git a/src/main/kotlin/com/android/trisolarisserver/controller/dto/BookingDtos.kt b/src/main/kotlin/com/android/trisolarisserver/controller/dto/BookingDtos.kt index 76be33e..aa5ce86 100644 --- a/src/main/kotlin/com/android/trisolarisserver/controller/dto/BookingDtos.kt +++ b/src/main/kotlin/com/android/trisolarisserver/controller/dto/BookingDtos.kt @@ -81,5 +81,8 @@ data class CardPrepareResponse( val key: String, val timeData: String, val issuedAt: String, - val expiresAt: String + val expiresAt: String, + val issuerUserId: UUID? = null, + val issuerFirebaseUid: String? = null, + val issuerName: String? = null )