Skip to content

Commit 15aa9ec

Browse files
author
Theodore Li
committed
Fix bank not found error
1 parent a9130a2 commit 15aa9ec

3 files changed

Lines changed: 11 additions & 2 deletions

File tree

kotlin/lambda/item-handler/src/main/kotlin/com/zenobiapay/item/operations/GetItemOperation.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent
55
import com.zenobiapay.api.generated.model.GetItemRequest
66
import com.zenobiapay.api.generated.model.Item
77
import com.zenobiapay.api.model.cognito.UserPoolGroup
8+
import com.zenobiapay.api.model.exception.InvalidRequestException
89
import com.zenobiapay.api.model.exception.ResourceNotFoundException
910
import com.zenobiapay.api.operation.Operation
1011
import com.zenobiapay.item.util.S3UrlGenerator
@@ -23,7 +24,12 @@ class GetItemOperation @Inject constructor(
2324
context: Context,
2425
userId: String?
2526
): Item {
26-
val item = rdsWrapper.getItem(UUID.fromString(request.itemId)) ?: throw ResourceNotFoundException("ITEM")
27+
val uuidItem = try {
28+
UUID.fromString(request.itemId)
29+
} catch (e: IllegalArgumentException) {
30+
throw InvalidRequestException("Invalid item ID format")
31+
}
32+
val item = rdsWrapper.getItem(uuidItem) ?: throw ResourceNotFoundException("ITEM")
2733

2834
return Item()
2935
.itemId(item.itemId.toString())

kotlin/lambda/transfer-handler/src/main/kotlin/com/zenobiapay/transfer/operations/FulfillTransferOperation.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ class FulfillTransferOperation @Inject constructor(
9393
} catch (e: software.amazon.awssdk.services.dynamodb.model.ResourceNotFoundException) {
9494
logger.info { "Could not find bank id $bankAccountId" }
9595
throw ResourceNotFoundException("BANK_ACCOUNT")
96+
} catch (e: NullPointerException) {
97+
logger.info { "Bank account not found for userId $userId, bankAccountId $bankAccountId, deviceId ${request.deviceId}" }
98+
throw ResourceNotFoundException("BANK_ACCOUNT")
9699
}
97100

98101
if (customerBankAccountItem.data.bankPermissions != BankPermissions.SEND_ONLY) {

sql/add-item-and-transfer-fields.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ ALTER TABLE items
44
ADD COLUMN IF NOT EXISTS color TEXT,
55
ADD COLUMN IF NOT EXISTS material TEXT,
66
ADD COLUMN IF NOT EXISTS year TEXT,
7-
ADD COLUMN IF NOT EXISTS image_keys TEXT[];
7+
ADD COLUMN IF NOT EXISTS image_keys TEXT[],
88
ADD COLUMN IF NOT EXISTS resale_job_id TEXT;

0 commit comments

Comments
 (0)