From 785adc51b2cc2b4d3e845a454f38b2a5197cc7f0 Mon Sep 17 00:00:00 2001 From: stuppie Date: Wed, 23 Sep 2026 15:07:47 -0600 Subject: working on cashout postback, to be hit by thl upon cashout status change, which will send the user an email with the info --- jb/managers/email_manager.py | 29 +++++++++++++++++-- jb/managers/thl.py | 7 +++++ jb/models/wallet.py | 6 ++++ jb/views/wallet.py | 67 +++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 102 insertions(+), 7 deletions(-) diff --git a/jb/managers/email_manager.py b/jb/managers/email_manager.py index 8006844..08ac0cf 100644 --- a/jb/managers/email_manager.py +++ b/jb/managers/email_manager.py @@ -1,14 +1,19 @@ import requests from generalresearch.config import is_debug from generalresearch.currency import USDCent -from generalresearch.models.thl.wallet.cashout_method import CashoutMethodOut +from generalresearch.models.thl.wallet.cashout_method import ( + CashoutMethodOut, + CashoutRequestInfo, +) from jb.config import settings MAUTIC_BASE_URL = "https://mail.jamesbillings67.com" LOGIN_EMAIL_TEMPLATE_ID = 1 # Todo: We need a new template for the cashout confirmation -CASHOUT_EMAIL_TEMPLATE_ID = 3 +CASHOUT_REQUEST_EMAIL_TEMPLATE_ID = 3 +# Todo: We need a new template for the cashout status / sent +CASHOUT_STATUS_EMAIL_TEMPLATE_ID = 4 assert settings.mautic_api_key auth_headers = {"Authorization": f"Basic {settings.mautic_api_key.get_secret_value()}"} @@ -72,7 +77,7 @@ def send_cashout_confirmation_email( email: str, token: str, cashout_method: CashoutMethodOut, amount: USDCent ) -> None: contact_id = get_or_create_contact(email=email) - mautic_url = f"{MAUTIC_BASE_URL}/api/emails/{CASHOUT_EMAIL_TEMPLATE_ID}/contact/{contact_id}/send" + mautic_url = f"{MAUTIC_BASE_URL}/api/emails/{CASHOUT_REQUEST_EMAIL_TEMPLATE_ID}/contact/{contact_id}/send" magic_link = f"{settings.base_url}wallet/cashout/confirm/?token={token}" if is_debug(): print("MAGIC_LINK: ", magic_link) @@ -87,3 +92,21 @@ def send_cashout_confirmation_email( if cashout_method.image_url: email_tokens["image_url"] = cashout_method.image_url send_email_with_tokens(email_tokens, mautic_url) + + +def send_cashout_status_email(email: str, cashout: CashoutRequestInfo) -> None: + assert cashout.status is not None + email_tokens = { + "cashout_id": str(cashout.id), + "cashout_status": cashout.status.value, + } + # todo: (if tango) format credentials and redemption instructions + # "credentials": "", + # "redemption_instructions": "", + + if is_debug(): + print("CASHOUT_STATUS_EMAIL: ", email_tokens) + return + contact_id = get_or_create_contact(email=email) + mautic_url = f"{MAUTIC_BASE_URL}/api/emails/{CASHOUT_STATUS_EMAIL_TEMPLATE_ID}/contact/{contact_id}/send" + send_email_with_tokens(email_tokens, mautic_url) diff --git a/jb/managers/thl.py b/jb/managers/thl.py index 4d6b23a..191a56b 100644 --- a/jb/managers/thl.py +++ b/jb/managers/thl.py @@ -121,3 +121,10 @@ def get_wallet_balance_if_non_negative(amt_worker_id: str) -> USDCent | None: if amt >= 0: return USDCent(amt) return None + + +def get_cashout_detail(cashout_id: str) -> CashoutRequestInfo: + url = f"{settings.fsb_host}{settings.product_id}/cashout/{cashout_id}/" + res = requests.get(url) + assert res.status_code == status.HTTP_200_OK, res.text + return CashoutRequestInfo.model_validate(res.json()["cashout"]) diff --git a/jb/models/wallet.py b/jb/models/wallet.py index 4754922..226e71f 100644 --- a/jb/models/wallet.py +++ b/jb/models/wallet.py @@ -16,6 +16,12 @@ class CashoutConfirmation(BaseModel): token: str = Field(min_length=1) +class CashoutPostback(BaseModel): + model_config = ConfigDict(extra="forbid") + + cashout_id: UUIDStr + + class PendingCashout(BaseModel): model_config = ConfigDict(extra="forbid") diff --git a/jb/views/wallet.py b/jb/views/wallet.py index 9fda533..681cc21 100644 --- a/jb/views/wallet.py +++ b/jb/views/wallet.py @@ -1,17 +1,35 @@ +from datetime import timedelta from typing import Annotated from urllib.parse import urlencode -from fastapi import APIRouter, Depends +from fastapi import APIRouter, Depends, HTTPException, status from fastapi.responses import HTMLResponse +from generalresearch.models.thl.definitions import PayoutStatus from generalresearch.models.thl.wallet.cashout_method import CashoutRequestInfo +from generalresearch.redis_helper import RedisConfig from jb.api.auth import get_authenticated_user from jb.api.cashout_token import consume_cashout_token, create_cashout_token from jb.config import settings -from jb.managers.email_manager import send_cashout_confirmation_email -from jb.managers.thl import get_cashout_method, user_cashout_request +from jb.decorators import get_redis_config +from jb.dependencies import get_gr_api_manager +from jb.managers.email_manager import ( + send_cashout_confirmation_email, + send_cashout_status_email, +) +from jb.managers.gr_api import GRApiManager +from jb.managers.thl import ( + get_cashout_detail, + get_cashout_method, + user_cashout_request, +) from jb.models.auth import User -from jb.models.wallet import CashoutConfirmation, CashoutRequest, PendingCashout +from jb.models.wallet import ( + CashoutConfirmation, + CashoutPostback, + CashoutRequest, + PendingCashout, +) from jb.settings import render_base_html wallet_router = APIRouter(prefix="/wallet", tags=["Wallet"]) @@ -71,3 +89,44 @@ def confirm_cashout( amount=cashout.amount, cashout_method_id=cashout.cashout_method_id, ) + + +@wallet_router.post("/cashout/postback/", status_code=status.HTTP_204_NO_CONTENT) +def cashout_postback( + body: CashoutPostback, + gr_api: Annotated[GRApiManager, Depends(get_gr_api_manager)], + redis_config: Annotated[RedisConfig, Depends(get_redis_config)], +) -> None: + # Treat the posted ID only as a lookup key; THL supplies the trusted details. + try: + cashout = get_cashout_detail(body.cashout_id) + except Exception as e: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail=f"Cashout not found: {e}", + ) + if cashout.product_id != settings.product_id: + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="Cashout not found", + ) + if cashout.status != PayoutStatus.COMPLETE: + raise HTTPException( + status_code=status.HTTP_422_UNPROCESSABLE_CONTENT, + detail="Cashout is not complete", + ) + # In case THL retries, send at most one email for each + dedupe_key = f"wallet:cashout-email-sent:{cashout.id}:{cashout.status.value}" + redis_client = redis_config.create_redis_client() + claimed = redis_client.set(dedupe_key, "sending", nx=True, ex=timedelta(minutes=5)) + if not claimed: + return + + try: + user = gr_api.get_user(product_user_id=cashout.product_user_id) + send_cashout_status_email(email=str(user.email), cashout=cashout) + redis_client.set(dedupe_key, "sent", ex=timedelta(minutes=30)) + except Exception: + # Allow a later retry when user lookup or email delivery fails. + redis_client.delete(dedupe_key) + raise -- cgit v1.2.3