anaother call

Author: sveneberth

src/viur/shop/types/price.py

@@ -5,8 +5,8 @@
 from viur import toolkit
 from viur.core import current, db, utils
 from viur.core.skeleton import SkeletonInstance
-
 from .enums import ApplicationDomain, ConditionOperator, DiscountType
+from .exceptions import InvalidStateError
 from ..globals import SHOP_INSTANCE, SHOP_LOGGER
 from ..types import ConfigurationError, DiscountValidationContext
 
@@ -51,6 +51,9 @@ def __init__(self, src_object):
             raise TypeError(f"Unsupported type {type(src_object)}")
 
         # logger.debug(f"{self.article_skel = }")
+        # logger.debug(f"{self.article_skel.renderPreparation=} | {hex(id(self.article_skel))}")
+        if self.article_skel.renderPreparation is not None:
+            raise InvalidStateError("ArticleSkel must not have renderPreparation")
 
         if (best_discount := self.shop_current_discount(self.article_skel)) is not None:
             price, skel = best_discount
@@ -179,8 +182,11 @@ def vat_rate_percentage(self) -> float:
         :returns: value as float (0.0 <= value <= 1.0)
         """
         try:
+            # FIXME: self.article_skel has here sometimes renderPreparation set,
+            #        but toolkit.without_render_preparation is already called in __init__
+            #        What's going on here?
             vat_rate = SHOP_INSTANCE.get().vat_rate.get_vat_rate_for_country(
-                category=self.article_skel["shop_vat_rate_category"],
+                category=toolkit.without_render_preparation(self.article_skel)["shop_vat_rate_category"],
             )
         except ConfigurationError as e:  # TODO(discussion): Or re-raise or implement fallback?
             logger.warning(f"No vat rate for article :: {e}")