Make getItem public

golang/authorizer/route.go

@@ -48,6 +48,7 @@ var validUnauthenticatedRoutes = []Route{
 	{"POST", "exchange-token"},
 	{"POST", "issue-jwt"},
 	{"GET", "get-customer-transfer"},
+	{"POST", "get-item"},
 }
 
 var validMerchantRoutes = []Route{
@@ -77,7 +78,6 @@ var validCustomerRoutes = []Route{
 	{"GET", "get-user-profile"},
 	{"POST", "submit-terms"},
 	{"POST", "delete-refresh-token"},
-	{"POST", "get-item"},
 	{"POST", "list-items"},
 	{"POST", "create-sell-job"},
 	{"POST", "complete-sell-job"},

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

@@ -37,6 +37,6 @@ class GetItemOperation @Inject constructor(
     }
 
     override fun getUserPoolAllowList(): List<UserPoolGroup> {
-        return listOf(UserPoolGroup.CUSTOMER)
+        return listOf(UserPoolGroup.UNKNOWN)
     }
 }

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

@@ -39,6 +39,7 @@ class GetAdminTransferOperation @Inject constructor(
             .fee(transferItem.data?.fee ?: transferItem.amount?.let { getFee(it) })
             .payoutTime(transferItem.data?.payoutTime)
             .creationTime(transferItem.data?.creationTime)
+            .inDispute(transferItem.inDispute)
     }
 
     override fun getUserPoolAllowList(): List<UserPoolGroup> {

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

@@ -4,8 +4,8 @@ import com.amazonaws.services.lambda.runtime.Context
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.zenobiapay.api.generated.model.ListAdminTransfersRequest
-import com.zenobiapay.api.generated.model.ListMerchantTransfers200Response
-import com.zenobiapay.api.generated.model.ListMerchantTransfers200ResponseItemsInner
+import com.zenobiapay.api.generated.model.ListAdminTransfers200Response
+import com.zenobiapay.api.generated.model.ListAdminTransfers200ResponseItemsInner
 import com.zenobiapay.api.operation.Operation
 import com.zenobiapay.api.model.cognito.UserPoolGroup
 import com.zenobiapay.api.model.exception.InvalidRequestException
@@ -20,7 +20,7 @@ class ListAdminTransfersOperation @Inject constructor(
     private val objectMapper: ObjectMapper,
     private val transferDao: TransferDao,
     @Named(PAGINATION_SECRET) private val paginationSecret: String
-) : Operation<ListAdminTransfersRequest, ListMerchantTransfers200Response>() {
+) : Operation<ListAdminTransfersRequest, ListAdminTransfers200Response>() {
 
     override val inputType = ListAdminTransfersRequest::class.java
 
@@ -29,23 +29,24 @@ class ListAdminTransfersOperation @Inject constructor(
         input: APIGatewayProxyRequestEvent,
         context: Context,
         userId: String?
-    ): ListMerchantTransfers200Response {
+    ): ListAdminTransfers200Response {
         val merchantId = request.sub
         val (merchantTransfers, continuationToken) = try {
             transferDao.listMerchantTransfers(merchantId, request.continuationToken, paginationSecret)
         } catch (e: BadTokenException) {
             throw InvalidRequestException("Bad token")
         }
-        return ListMerchantTransfers200Response()
+        return ListAdminTransfers200Response()
             .items(merchantTransfers.map {
-                ListMerchantTransfers200ResponseItemsInner()
+                ListAdminTransfers200ResponseItemsInner()
                     .amount(it.amount)
                     .status(it.inboundStatus.toApiTransferStatus().name)
                     .transferRequestId(it.requestId)
                     .customerName(it.data?.customer?.name)
                     .fee(it.data?.fee ?: it.amount?.let { getFee(it) })
                     .payoutTime(it.data?.payoutTime)
                     .creationTime(it.data?.creationTime)
+                    .inDispute(it.inDispute)
             })
             .continuationToken(continuationToken?.encodeToken(objectMapper, paginationSecret))
     }

openapi.yml

@@ -697,6 +697,8 @@ paths:
                     type: string
                   creationTime:
                     type: string
+                  inDispute:
+                    type: boolean
         "400":
           $ref: "#/components/responses/BadRequest"
         "403":
@@ -973,6 +975,8 @@ paths:
                           type: string
                         creationTime:
                           type: string
+                        inDispute:
+                          type: boolean
         "400":
           $ref: "#/components/responses/BadRequest"
         "403":
@@ -1074,6 +1078,9 @@ paths:
                   type: string
                 endTime:
                   type: string
+              required:
+                - startTime
+                - endTime
       responses:
         "200":
           description: "Successful response"

sam/inputs/get-admin-transfer.json

@@ -6,13 +6,11 @@
     "Content-Type": "application/json"
   },
   "multiValueHeaders": {},
-  "queryStringParameters": {
-    "id": "transfer-123456"
-  },
+  "queryStringParameters": null,
   "multiValueQueryStringParameters": null,
   "pathParameters": null,
   "stageVariables": null,
-  "body": "{\"sub\":\"auth0|merchant-user-id\"}",
+  "body": "{\"id\":\"transfer-123456\"}",
   "isBase64Encoded": false,
   "requestContext": {
     "accountId": "123456789012",

sam/lambda-stack.yml

@@ -873,6 +873,8 @@ Resources:
                             type: string
                           creationTime:
                             type: string
+                          inDispute:
+                            type: boolean
                 "400":
                   $ref: "#/components/responses/BadRequest"
                 "403":
@@ -1155,6 +1157,8 @@ Resources:
                                   type: string
                                 creationTime:
                                   type: string
+                                inDispute:
+                                  type: boolean
                 "400":
                   $ref: "#/components/responses/BadRequest"
                 "403":