1 files changed, 33 insertions, 13 deletions

diff --git a/app/app_wallet.py b/app/app_wallet.py
index 9dffbd5..922c683 100644
--- a/app/app_wallet.py
+++ b/app/app_wallet.py
@@ -5,36 +5,45 @@
 from decimal import Decimal
 
 from fastapi import APIRouter, Form, Depends, status
+from fastapi.responses import RedirectResponse, HTMLResponse
 
 from embrace.exceptions import IntegrityError
 from psycopg2.errors import CheckViolation
 from psycopg2.extensions import ISOLATION_LEVEL_SERIALIZABLE
 
-from app_sessions import UserSession
+from app_sessions import UserSession, FlashMessageQueue
 from app_database import db_transaction
+from app_templating import TemplateRenderer
 
 
+to_wallet = RedirectResponse('/wallet', status_code=status.HTTP_303_SEE_OTHER)
+
 router = APIRouter()
 
 
 # TODO: add paging for the transaction history
-@router.get('/wallet')
+@router.get('/wallet', response_class=HTMLResponse)
 def wallet(
     session: UserSession=Depends(UserSession.authenticated),
+    messages: FlashMessageQueue=Depends(FlashMessageQueue),
+    render: TemplateRenderer=Depends(TemplateRenderer),
 ):
     with db_transaction() as tx:
         history = tx.fetch_transactions(user_id=session.get_user_id())
-        return list(history)
+        # rendering done in the transaction to make use the iteration cursor
+        return render('wallet.html.jinja', transactions=history)
 
 
-@router.post('/wallet/transfer')
+@router.post('/wallet/transfer', response_class=HTMLResponse)
 def wallet_transfer(
     session: UserSession=Depends(UserSession.authenticated),
+    messages: FlashMessageQueue=Depends(FlashMessageQueue),
     recipient: str=Form(...),
     amount: Decimal=Form(...),
 ):
     if amount <= 0:
-        return 'error: Invalid transaction amount.'
+        messages.add('error', 'Invalid transaction amount.')
+        return to_wallet
 
     try:
         with db_transaction(ISOLATION_LEVEL_SERIALIZABLE) as tx:
@@ -48,14 +57,17 @@ def wallet_transfer(
                 amount=amount,
                 fee=amount * Decimal(0.10))
 
-        return 'Your business is appreciated.'
+        messages.add('success', 'Your business is appreciated.')
+        return to_wallet
 
     except LookupError as exception:
-        return 'error: ' + str(exception)
+        messages.add('error', str(exception))
+        return to_wallet
 
     except IntegrityError as exception:
         if isinstance(exception.__cause__, CheckViolation):
-            return 'error: Insufficient funds.'
+            messages.add('error', 'Insufficient funds.')
+            return to_wallet
         else:
             raise exception
 
@@ -63,33 +75,41 @@ def wallet_transfer(
 @router.post('/wallet/deposit')
 def wallet_deposit(
     session: UserSession=Depends(UserSession.authenticated),
+    messages: FlashMessageQueue=Depends(FlashMessageQueue),
     amount: Decimal=Form(...),
 ):
     if amount <= 0:
-        return 'error: Invalid transaction amount.'
+        messages.add('error', 'Invalid transaction amount.')
+        return to_wallet
 
     with db_transaction(ISOLATION_LEVEL_SERIALIZABLE) as tx:
         tx.deposit(user_id=session.get_user_id(), amount=amount)
 
-    return 'Your business is appreciated.'
+    messages.add('success', 'Your business is appreciated.')
+    return to_wallet
 
 
 @router.post('/wallet/withdraw')
 def wallet_withdraw(
     session: UserSession=Depends(UserSession.authenticated),
+    messages: FlashMessageQueue=Depends(FlashMessageQueue),
+    render: TemplateRenderer=Depends(TemplateRenderer),
     amount: Decimal=Form(...),
 ):
     if amount <= 0:
-        return 'error: Invalid transaction amount.'
+        messages.add('error', 'Invalid transaction amount.')
+        return to_wallet
 
     try:
         with db_transaction(ISOLATION_LEVEL_SERIALIZABLE) as tx:
             tx.withdraw(user_id=session.get_user_id(), amount=amount)
 
-        return 'Annnnnd... It\'s gone.'
+        messages.add('success', 'Annnnnd... It\'s gone.')
+        return render('launder.html.jinja')
 
     except IntegrityError as exception:
         if isinstance(exception.__cause__, CheckViolation):
-            return 'error: Insufficient funds.'
+            messages.add('error', 'Insufficient funds.')
+            return to_wallet
         else:
             raise exception