androidlover5842/TrisolarisServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use property timezone for card issued times
All checks were successful
build-and-deploy / build-deploy (push) Successful in 33s
Details

Browse Source
This commit is contained in:
androidlover5842
2026-01-28 07:05:50 +05:30
parent 2e7f5c9c04
commit eb5b59db02
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/kotlin/com/android/trisolarisserver/controller/IssuedCards.kt
View File

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.ResponseStatus
import org.springframework.web.bind.annotation.RestController import org.springframework.web.bind.annotation.RestController
import org.springframework.web.server.ResponseStatusException import org.springframework.web.server.ResponseStatusException
import java.time.OffsetDateTime import java.time.OffsetDateTime
import java.time.ZoneId
import java.util.UUID import java.util.UUID
@RestController @RestController
@@ -58,7 +59,7 @@ class IssuedCards(
throw ResponseStatusException(HttpStatus.CONFLICT, "Room stay closed") throw ResponseStatusException(HttpStatus.CONFLICT, "Room stay closed")
} }
val issuedAt = OffsetDateTime.now() val issuedAt = nowForProperty(stay.property.timezone)
val expiresAt = request.expiresAt?.let { parseOffset(it) } ?: stay.toAt val expiresAt = request.expiresAt?.let { parseOffset(it) } ?: stay.toAt
?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "expiresAt required") ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "expiresAt required")
if (!expiresAt.isAfter(issuedAt)) { if (!expiresAt.isAfter(issuedAt)) {
@@ -101,7 +102,7 @@ class IssuedCards(
if (stay.toAt != null) { if (stay.toAt != null) {
throw ResponseStatusException(HttpStatus.CONFLICT, "Room stay closed") throw ResponseStatusException(HttpStatus.CONFLICT, "Room stay closed")
} }
val issuedAt = parseOffset(request.issuedAt) ?: OffsetDateTime.now() val issuedAt = parseOffset(request.issuedAt) ?: nowForProperty(stay.property.timezone)
val expiresAt = parseOffset(request.expiresAt) val expiresAt = parseOffset(request.expiresAt)
?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "expiresAt required") ?: throw ResponseStatusException(HttpStatus.BAD_REQUEST, "expiresAt required")
if (!expiresAt.isAfter(issuedAt)) { if (!expiresAt.isAfter(issuedAt)) {
@@ -170,6 +171,15 @@ class IssuedCards(
} }
} }
private fun nowForProperty(timezone: String?): OffsetDateTime {
val zone = try {
if (timezone.isNullOrBlank()) ZoneId.of("Asia/Kolkata") else ZoneId.of(timezone)
} catch (_: Exception) {
ZoneId.of("Asia/Kolkata")
}
return OffsetDateTime.now(zone)
}
private fun requireMember(propertyId: UUID, principal: MyPrincipal?) { private fun requireMember(propertyId: UUID, principal: MyPrincipal?) {
if (principal == null) { if (principal == null) {
throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Missing principal") throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Missing principal")

14
src/main/kotlin/com/android/trisolarisserver/controller/TemporaryRoomCards.kt
View File

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.ResponseStatus
import org.springframework.web.bind.annotation.RestController import org.springframework.web.bind.annotation.RestController
import org.springframework.web.server.ResponseStatusException import org.springframework.web.server.ResponseStatusException
import java.time.OffsetDateTime import java.time.OffsetDateTime
import java.time.ZoneId
import java.util.UUID import java.util.UUID
@RestController @RestController
@@ -49,7 +50,7 @@ class TemporaryRoomCards(
val room = roomRepo.findByIdAndPropertyId(roomId, propertyId) val room = roomRepo.findByIdAndPropertyId(roomId, propertyId)
?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Room not found") ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Room not found")
val issuedAt = OffsetDateTime.now() val issuedAt = nowForProperty(room.property.timezone)
val expiresAt = issuedAt.plusMinutes(temporaryCardDurationMinutes) val expiresAt = issuedAt.plusMinutes(temporaryCardDurationMinutes)
val cardIndex = nextCardIndex(propertyId) val cardIndex = nextCardIndex(propertyId)
val payload = buildSector0Payload(room.roomNumber, cardIndex, issuedAt, expiresAt) val payload = buildSector0Payload(room.roomNumber, cardIndex, issuedAt, expiresAt)
@@ -81,7 +82,7 @@ class TemporaryRoomCards(
val room = roomRepo.findByIdAndPropertyId(roomId, propertyId) val room = roomRepo.findByIdAndPropertyId(roomId, propertyId)
?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Room not found") ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Room not found")
val issuedAt = parseOffset(request.issuedAt) ?: OffsetDateTime.now() val issuedAt = parseOffset(request.issuedAt) ?: nowForProperty(room.property.timezone)
val expiresAt = issuedAt.plusMinutes(temporaryCardDurationMinutes) val expiresAt = issuedAt.plusMinutes(temporaryCardDurationMinutes)
val now = OffsetDateTime.now() val now = OffsetDateTime.now()
if (issuedCardRepo.existsActiveForRoom(propertyId, room.id!!, now)) { if (issuedCardRepo.existsActiveForRoom(propertyId, room.id!!, now)) {
@@ -110,6 +111,15 @@ class TemporaryRoomCards(
} }
} }
private fun nowForProperty(timezone: String?): OffsetDateTime {
val zone = try {
if (timezone.isNullOrBlank()) ZoneId.of("Asia/Kolkata") else ZoneId.of(timezone)
} catch (_: Exception) {
ZoneId.of("Asia/Kolkata")
}
return OffsetDateTime.now(zone)
}
private fun requireIssueActor(propertyId: UUID, principal: MyPrincipal?): com.android.trisolarisserver.models.property.AppUser { private fun requireIssueActor(propertyId: UUID, principal: MyPrincipal?): com.android.trisolarisserver.models.property.AppUser {
if (principal == null) { if (principal == null) {
throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Missing principal") throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Missing principal")