add route to payment's details

api.saladeaula.digital/app/exceptions.py

@@ -11,6 +11,9 @@ class ConflictError(ServiceError):
         super().__init__(HTTPStatus.CONFLICT, msg)
 
 
+class OrderNotFoundError(NotFoundError): ...
+
+
 class UserNotFoundError(NotFoundError): ...
 
 

api.saladeaula.digital/app/routes/orders/__init__.py

@@ -1,12 +1,14 @@
 from aws_lambda_powertools.event_handler.api_gateway import Router
 from layercake.dynamodb import (
     DynamoDBPersistenceLayer,
+    KeyPair,
     SortKey,
     TransactKey,
 )
 
 from boto3clients import dynamodb_client
 from config import ORDER_TABLE
+from exceptions import OrderNotFoundError
 
 from .checkout import router as checkout
 
@@ -18,12 +20,25 @@ dyn = DynamoDBPersistenceLayer(ORDER_TABLE, dynamodb_client)
 
 @router.get('/<order_id>')
 def get_order(order_id: str):
-    return dyn.collection.get_items(
+    order = dyn.collection.get_items(
         TransactKey(order_id)
         + SortKey('0')
-        + SortKey('ITEMS')
+        + SortKey('ITEMS', rename_key='items')
-        + SortKey('ADDRESS')
+        + SortKey('ADDRESS', rename_key='address')
-        + SortKey('PIX')
+        + SortKey('CREDIT_CARD', rename_key='credit_card')
-        + SortKey('NFSE')
+        + SortKey('INVOICE', rename_key='invoice')
-        + SortKey('FEE'),
+        + SortKey('NFSE', rename_key='nfse')
+        + SortKey('FEE', rename_key='fee')
+        + SortKey('TRANSACTION#STATS', rename_key='stats'),
     )
+
+    if not order:
+        raise OrderNotFoundError('Order not found')
+
+    attempts = dyn.collection.query(KeyPair(order_id, 'TRANSACTION#ATTEMPT#'))
+    enrollments = dyn.collection.query(KeyPair(order_id, 'ENROLLMENT#'))
+
+    return order | {
+        'attempts': attempts['items'],
+        'enrollments': enrollments['items'],
+    }

apps/admin.saladeaula.digital/app/routes/_.$orgid.payments.$id._index/route.tsx

@@ -0,0 +1,56 @@
+import type { Route } from './+types/route'
+
+import { Link } from 'react-router'
+
+import { request as req } from '@repo/util/request'
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbList,
+  BreadcrumbPage,
+  BreadcrumbSeparator
+} from '@repo/ui/components/ui/breadcrumb'
+
+export function meta() {
+  return [
+    {
+      title: 'Pagamento'
+    }
+  ]
+}
+
+export async function loader({ params, request, context }: Route.LoaderArgs) {
+  const r = await req({
+    url: `/orders/${params.id}`,
+    request,
+    context
+  })
+
+  if (!r.ok) {
+    throw new Response(null, { status: r.status })
+  }
+
+  return { order: await r.json() }
+}
+
+export default function Route({ loaderData: { order } }: Route.ComponentProps) {
+  return (
+    <div className="space-y-2.5">
+      <Breadcrumb>
+        <BreadcrumbList>
+          <BreadcrumbItem>
+            <BreadcrumbLink asChild>
+              <Link to="../payments">Histórico de pagamentos</Link>
+            </BreadcrumbLink>
+          </BreadcrumbItem>
+          <BreadcrumbSeparator />
+          <BreadcrumbItem>
+            <BreadcrumbPage>Pagamento</BreadcrumbPage>
+          </BreadcrumbItem>
+        </BreadcrumbList>
+      </Breadcrumb>
+      <pre>{JSON.stringify(order, null, 2)}</pre>
+    </div>
+  )
+}

apps/admin.saladeaula.digital/app/routes/_.$orgid.users.$id/route.tsx

@@ -44,8 +44,7 @@ export async function loader({ params, request, context }: Route.LoaderArgs) {
     throw new Response(null, { status: r.status })
   }
 
-  const data = await r.json()
+  return { user: await r.json() } as { user: any }
-  return { data } as { data: any }
 }
 
 export function shouldRevalidate({
@@ -55,9 +54,7 @@ export function shouldRevalidate({
   return currentParams.id !== nextParams.id
 }
 
-export default function Route({
+export default function Route({ loaderData: { user } }: Route.ComponentProps) {
-  loaderData: { data: user }
-}: Route.ComponentProps) {
   return (
     <div className="space-y-2.5">
       <Breadcrumb>

orders-events/app/events/payments/charge_credit_card.py

@@ -77,7 +77,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
             transact.put(
                 item={
                     'id': order_id,
-                    'sk': f'TRANSACTION#ATTEMPTS#{now_.isoformat()}',
+                    'sk': f'TRANSACTION#ATTEMPT#{now_.isoformat()}',
                     'brand': credit_card.brand,
                     'last4': credit_card.last4,
                     'status': 'SUCCEEDED',
@@ -88,7 +88,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
             transact.put(
                 item={
                     'id': order_id,
-                    'sk': f'TRANSACTION#ATTEMPTS#{now_.isoformat()}',
+                    'sk': f'TRANSACTION#ATTEMPT#{now_.isoformat()}',
                     'brand': credit_card.brand,
                     'last4': credit_card.last4,
                     'status': 'FAILED',