add startup check for payment service

Author: AndreWohnsland

src/api/api.py

@@ -26,7 +26,7 @@
 from src.programs.addons import ADDONS, CouldNotInstallAddonError
 from src.resource_stats import start_resource_tracker
 from src.service.nfc_payment_service import NFCPaymentService
-from src.startup_checks import can_update, connection_okay, is_python_deprecated
+from src.startup_checks import can_update, check_payment_service, connection_okay, is_python_deprecated
 from src.updater import UpdateInfo, Updater
 from src.utils import get_platform_data
 
@@ -48,6 +48,11 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[Any, Any]:
         shared.startup_need_time_adjustment.set_issue()
     if is_python_deprecated():
         shared.startup_python_deprecated.set_issue()
+    payment_check = check_payment_service()
+    if not payment_check.ok:
+        _logger.warning(f"Payment service check failed: {payment_check.reason}. Disabling payment.")
+        cfg.PAYMENT_TYPE = "Disabled"
+        shared.startup_payment_issue.set_issue(message=payment_check.reason)
     mc = MachineController()
     mc.init_machine()
     ADDONS.setup_addons()

src/api/models.py

@@ -111,6 +111,7 @@ class IssueData(BaseModel):
     deprecated: StartupIssue
     internet: StartupIssue
     config: StartupIssue
+    payment: StartupIssue
 
 
 class DateTimeInput(BaseModel):

src/api/routers/options.py

@@ -350,6 +350,7 @@ async def check_issues() -> IssueData:
         deprecated=shared.startup_python_deprecated,
         internet=shared.startup_need_time_adjustment,
         config=shared.startup_config_issue,
+        payment=shared.startup_payment_issue,
     )
 
 
@@ -358,6 +359,7 @@ async def ignore_issues() -> ApiMessage:
     shared.startup_python_deprecated.set_ignored()
     shared.startup_need_time_adjustment.set_ignored()
     shared.startup_config_issue.set_ignored()
+    shared.startup_payment_issue.set_ignored()
     return ApiMessage(message="Issues ignored")
 
 

src/config/config_manager.py

@@ -482,6 +482,7 @@ def __init__(self) -> None:
         self.startup_need_time_adjustment = StartupIssue()
         self.startup_python_deprecated = StartupIssue()
         self.startup_config_issue = StartupIssue()
+        self.startup_payment_issue = StartupIssue()
 
 
 def version_callback(value: bool) -> None:

src/dialog_handler.py

@@ -478,6 +478,10 @@ def say_python_deprecated(self, sys_python: str, program_python: str) -> None:
         """Inform that the given system python is older than the recommended python for the program."""
         self.__output_language_dialog("python_deprecated", sys_python=sys_python, program_python=program_python)
 
+    def say_payment_disabled(self, reason: str) -> None:
+        """Inform the user that the payment service was disabled at startup."""
+        self.__output_language_dialog("payment_disabled", reason=reason)
+
     def say_welcome_message(self) -> None:
         """Display the welcome dialog, show version and platform info."""
         self.__output_language_dialog(

src/language.yaml

@@ -184,6 +184,9 @@ dialog:
   python_deprecated:
     en: 'Your system Python is {sys_python}. In the future, {program_python} is required. Please upgrade, otherwise a future CocktailBerry update will break your program. Also, the auto update function will not show new updates until then.'
     de: 'Die Python Version des Systems is {sys_python}. In Zukunft wird {program_python} benötigt. Bitte upgrade diese bald, sonst wird mit einem kommenden Update CocktailBerry nicht mehr funktionieren. Die Autoupdate Funktion wird solange keine neuen Updates anzeigen.'
+  payment_disabled:
+    en: "The payment service was disabled because of a startup issue:\n\n{reason}\n\nPlease check your configuration."
+    de: "Der Zahlungsservice wurde aufgrund eines Startproblems deaktiviert:\n\n{reason}\n\nBitte überprüfe die Konfiguration."
   ask_export_data:
     en: 'Export cocktail and ingredient data, as well reset possible values?'
     de: 'Cocktail und Zutaten Daten exportieren und mögliche Werte zurücksetzen?'

src/machine/controller.py

@@ -236,7 +236,7 @@ def cleanup(self) -> None:
 
     def _stop_pumps(self, pin_list: list[int], print_prefix: str = "") -> None:
         """Informs and closes all given pins."""
-        _logger.debug(f"{print_prefix}<x> Closing Pins: {pin_list}")
+        _logger.info(f"{print_prefix}<x> Closing Pins: {pin_list}")
         self.pin_controller.close_pin_list(pin_list)
 
     def default_led(self) -> None:

src/service/sumup_payment_service.py

@@ -1,3 +1,5 @@
+import ast
+import json
 import time
 from collections.abc import Callable
 from dataclasses import dataclass
@@ -62,11 +64,40 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> Result[T]:
             if isinstance(exc, APIError):
                 reason = str(exc.body)
                 code = exc.status
-            return Err(error=reason, code=code)
+            return Err(error=_format_sumup_error(reason), code=code)
 
     return wrapper
 
 
+def _format_sumup_error(error: str) -> str:
+    """Normalize SumUp error strings for readability."""
+    parsed = _parse_sumup_error_payload(error)
+    if parsed is None:
+        return error
+    try:
+        return json.dumps(parsed)
+    except (TypeError, ValueError):
+        return error
+
+
+def _parse_sumup_error_payload(error: str) -> dict | list | None:
+    if not error:
+        return None
+    try:
+        parsed = json.loads(error)
+        if isinstance(parsed, (dict, list)):
+            return parsed
+    except json.JSONDecodeError:
+        pass
+    try:
+        parsed = ast.literal_eval(error)
+        if isinstance(parsed, (dict, list)):
+            return parsed
+    except (SyntaxError, ValueError):
+        return None
+    return None
+
+
 class _SumupSdkClient:
     def __init__(self, api_key: str, merchant_code: str) -> None:
         self._client = Sumup(api_key=api_key)
@@ -146,7 +177,7 @@ def __init__(self, api_key: str | None = None, merchant_code: str | None = None)
         if getattr(self, "_initialized", False):
             return
         if not api_key or not merchant_code:
-            raise ValueError("api_key and merchant_code are required for first initialization")
+            raise ValueError("Sumup api_key and merchant_code are required for this payment service")
         self._client: _SumupSdkClient = _SumupSdkClient(api_key=api_key, merchant_code=merchant_code)
         self._initialized = True
         _logger.info("SumupPaymentService initialized")
@@ -158,6 +189,9 @@ def get_all_readers(self) -> list[Reader]:
             return []
         return result.data
 
+    def get_all_readers_result(self) -> Result[list[Reader]]:
+        return self._client.list_readers()
+
     def create_reader(self, name: str, pairing_code: str) -> Result[Reader]:
         return self._client.create_reader(name, pairing_code)
 

src/startup_checks.py

@@ -1,10 +1,24 @@
 import sys
+from dataclasses import dataclass
 
 from src import FUTURE_PYTHON_VERSION
 from src.config.config_manager import CONFIG as cfg
+from src.logger_handler import LoggerHandler
+from src.machine.rfid import RFIDReader
+from src.service.sumup_payment_service import Err, SumupPaymentService
 from src.updater import UpdateInfo, Updater
 from src.utils import has_connection
 
+_logger = LoggerHandler("startup_checks")
+
+
+@dataclass
+class PaymentCheckResult:
+    """Result of a payment startup check."""
+
+    ok: bool
+    reason: str = ""
+
 
 def can_update() -> UpdateInfo:
     """Check if there is an update and it is possible."""
@@ -26,3 +40,40 @@ def is_python_deprecated() -> bool:
     """Check if to display the deprecation warning for newer python version install."""
     sys_python = sys.version_info
     return sys_python < FUTURE_PYTHON_VERSION
+
+
+def check_payment_service() -> PaymentCheckResult:
+    """Check if the configured payment service can start properly."""
+    if not cfg.payment_enabled:
+        return PaymentCheckResult(ok=True)
+    if cfg.sumup_payment:
+        return _check_sumup()
+    if cfg.cocktailberry_payment:
+        return _check_cocktailberry_nfc()
+    return PaymentCheckResult(ok=True)
+
+
+def _check_sumup() -> PaymentCheckResult:
+    """Validate SumUp payment prerequisites."""
+    # Try to initialize the client and list readers to verify credentials
+    try:
+        service = SumupPaymentService(
+            api_key=cfg.PAYMENT_SUMUP_API_KEY,
+            merchant_code=cfg.PAYMENT_SUMUP_MERCHANT_CODE,
+        )
+        result = service.get_all_readers_result()
+        if isinstance(result, Err):
+            return PaymentCheckResult(ok=False, reason=f"SumUp API error: {result.error} (code: {result.code})")
+        _logger.info(f"SumUp startup check passed, {len(result.data)} reader(s) found.")
+    except Exception as e:
+        return PaymentCheckResult(ok=False, reason=f"SumUp API error: {e}")
+    if not cfg.PAYMENT_SUMUP_TERMINAL_ID:
+        _logger.warning("Reader is not set, but it is required for payments. Please set it up.")
+    return PaymentCheckResult(ok=True)
+
+
+def _check_cocktailberry_nfc() -> PaymentCheckResult:
+    """Validate CocktailBerry NFC payment prerequisites."""
+    if RFIDReader().rfid is None:
+        return PaymentCheckResult(ok=False, reason=f"Could not set up or use {cfg.RFID_READER} reader, see logs.")
+    return PaymentCheckResult(ok=True)

src/tabs/maker.py

@@ -44,15 +44,6 @@ def _build_comment_maker(cocktail: Cocktail) -> str:
     return comment
 
 
-def _log_cocktail(cocktail_volume: int, real_volume: int, cocktail_name: str, taken_time: float) -> None:
-    """Enter a log entry for the made cocktail."""
-    volume_string = f"{cocktail_volume} ml"
-    cancel_log_addition = ""
-    if shared.cocktail_status.status == PrepareResult.CANCELED:
-        cancel_log_addition = f" - Recipe canceled at {round(taken_time, 1)} s - {real_volume} ml"
-    _logger.log_event("INFO", f"{volume_string:6} - {cocktail_name}{cancel_log_addition}")
-
-
 def prepare_cocktail(
     cocktail: Cocktail,
     w: MainScreen | None = None,
@@ -82,7 +73,6 @@ def prepare_cocktail(
 
     percentage_made = taken_time / max_time
     real_volume = round(cocktail.adjusted_amount * percentage_made)
-    _log_cocktail(cocktail.adjusted_amount, real_volume, display_name, taken_time)
 
     # run Addons after cocktail preparation
     addon_data["consumption"] = consumption
@@ -177,5 +167,3 @@ def prepare_ingredient(ingredient: Ingredient, w: MainScreen | None = None) -> N
     consumed_volume = made_volume[0]
     DBC = DatabaseCommander()
     DBC.increment_ingredient_consumption(ingredient.name, consumed_volume)
-    volume_string = f"{consumed_volume} ml"
-    _logger.log_event("INFO", f"{volume_string:6} | {ingredient.name}")