Allow partial Razorpay settings updates
All checks were successful
build-and-deploy / build-deploy (push) Successful in 34s
All checks were successful
build-and-deploy / build-deploy (push) Successful in 34s
This commit is contained in:
@@ -59,6 +59,7 @@ class RazorpaySettingsController(
|
|||||||
val property = propertyRepo.findById(propertyId).orElseThrow {
|
val property = propertyRepo.findById(propertyId).orElseThrow {
|
||||||
ResponseStatusException(HttpStatus.NOT_FOUND, "Property not found")
|
ResponseStatusException(HttpStatus.NOT_FOUND, "Property not found")
|
||||||
}
|
}
|
||||||
|
val existing = settingsRepo.findByPropertyId(propertyId)
|
||||||
val keyId = request.keyId?.trim()?.ifBlank { null } ?: request.merchantKey?.trim()?.ifBlank { null }
|
val keyId = request.keyId?.trim()?.ifBlank { null } ?: request.merchantKey?.trim()?.ifBlank { null }
|
||||||
val keySecret = request.keySecret?.trim()?.ifBlank { null }
|
val keySecret = request.keySecret?.trim()?.ifBlank { null }
|
||||||
?: run {
|
?: run {
|
||||||
@@ -66,24 +67,25 @@ class RazorpaySettingsController(
|
|||||||
val candidate = if (prefer256) request.salt256 else request.salt32
|
val candidate = if (prefer256) request.salt256 else request.salt32
|
||||||
candidate?.trim()?.ifBlank { null } ?: request.salt256?.trim()?.ifBlank { null } ?: request.salt32?.trim()?.ifBlank { null }
|
candidate?.trim()?.ifBlank { null } ?: request.salt256?.trim()?.ifBlank { null } ?: request.salt32?.trim()?.ifBlank { null }
|
||||||
}
|
}
|
||||||
if (keyId == null || keySecret == null) {
|
val webhookSecret = request.webhookSecret?.trim()?.ifBlank { null }
|
||||||
|
val isTest = request.isTest
|
||||||
|
if (existing == null && (keyId == null || keySecret == null)) {
|
||||||
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "keyId/keySecret required")
|
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "keyId/keySecret required")
|
||||||
}
|
}
|
||||||
val existing = settingsRepo.findByPropertyId(propertyId)
|
|
||||||
val updated = if (existing == null) {
|
val updated = if (existing == null) {
|
||||||
RazorpaySettings(
|
RazorpaySettings(
|
||||||
property = property,
|
property = property,
|
||||||
keyId = keyId,
|
keyId = keyId!!,
|
||||||
keySecret = keySecret,
|
keySecret = keySecret!!,
|
||||||
webhookSecret = request.webhookSecret?.trim(),
|
webhookSecret = webhookSecret,
|
||||||
isTest = request.isTest ?: false,
|
isTest = isTest ?: false,
|
||||||
updatedAt = OffsetDateTime.now()
|
updatedAt = OffsetDateTime.now()
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
existing.keyId = keyId
|
if (keyId != null) existing.keyId = keyId
|
||||||
existing.keySecret = keySecret
|
if (keySecret != null) existing.keySecret = keySecret
|
||||||
existing.webhookSecret = request.webhookSecret?.trim()
|
if (webhookSecret != null) existing.webhookSecret = webhookSecret
|
||||||
request.isTest?.let { existing.isTest = it }
|
isTest?.let { existing.isTest = it }
|
||||||
existing.updatedAt = OffsetDateTime.now()
|
existing.updatedAt = OffsetDateTime.now()
|
||||||
existing
|
existing
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user