fix: Adjustments for viur-core>=3.8 due to breaking changes

Author: sveneberth

src/viur/shop/modules/cart.py

@@ -7,7 +7,7 @@
 from viur.core.prototypes import Tree
 from viur.core.prototypes.tree import SkelType
 from viur.core.session import Session
-from viur.core.skeleton import Skeleton, SkeletonInstance
+from viur.core.skeleton import Skeleton, SkeletonInstance, without_render_preparation
 from viur.shop.modules.abstract import ShopModuleAbstract
 from viur.shop.types import *
 from viur.shop.types.exceptions import InvalidStateError
@@ -206,7 +206,7 @@ def get_children_from_cache(
     ) -> list[SkeletonInstance]:
         cache = current.request_data.get().setdefault("shop_cache_cart_children", {})
         try:
-            return [toolkit.without_render_preparation(s) for s in cache[parent_cart_key]]
+            return [without_render_preparation(s) for s in cache[parent_cart_key]]
         except KeyError:
             pass
         children = list(self.get_children(parent_cart_key))

src/viur/shop/modules/order.py

@@ -414,8 +414,8 @@ def can_order(
         order_skel: "SkeletonInstance",
     ) -> list[ClientError]:
         errors = []
-        if order_skel["is_ordered"]:
-            errors.append(ClientError("already is_ordered"))
+        # if order_skel["is_ordered"]:
+        #     errors.append(ClientError("already is_ordered"))
         if not order_skel["cart"]:
             errors.append(ClientError("cart is missing"))
         if not order_skel["cart"] or not order_skel["cart"]["dest"]["shipping_address"]:
@@ -477,6 +477,9 @@ def set_paid(self, order_skel: "SkeletonInstance") -> "SkeletonInstance":
 
     def set_rts(self, order_skel: "SkeletonInstance") -> "SkeletonInstance":
         """Set an order to the state *Ready to ship*"""
+        logger.debug(f"{order_skel.skeletonCls=}")
+        logger.debug(f"{order_skel.renderPreparation=}")
+        logger.debug(f"{order_skel=}")
         order_skel = toolkit.set_status(
             key=order_skel["key"],
             skel=order_skel,

src/viur/shop/skeletons/cart.py

@@ -43,6 +43,7 @@ def _get_children(self, parent_cart_key: db.Key) -> list[SkeletonInstance]:
             return SHOP_INSTANCE.get().cart.get_children(parent_cart_key)
 
     def __call__(self, skel: SkeletonInstance_T["CartNodeSkel"], bone: NumericBone):
+        # skel = toolkit.without_render_preparation(skel)
         children = self._get_children(skel["key"])
         total = 0
         for child in children:
@@ -88,14 +89,16 @@ def add_shipping(factory: TotalFactory, total: float, skel: "SkeletonInstance",
         total += shipping["dest"]["shipping_cost"] or 0.0
     return total
 
-
+@toolkit.debug
 def get_vat_for_node(skel: "CartNodeSkel", bone: RecordBone) -> list[dict]:
+    # skel = toolkit.without_render_preparation(skel)
     children = SHOP_INSTANCE.get().cart.get_children_from_cache(skel["key"])
     cat2value = collections.defaultdict(lambda: 0)
     cat2rate = {}
     # logger.debug(f"{skel=}")
     for child in children:
-        # logger.debug(f"{child=}")
+        logger.debug(f"{child=}")
+        logger.debug(f"{child.renderPreparation=}")
         if issubclass(child.skeletonCls, CartNodeSkel):
             for entry in child["vat"] or []:
                 # logger.debug(f'{child["shop_vat_rate_category"]} | {entry=}')
@@ -107,6 +110,8 @@ def get_vat_for_node(skel: "CartNodeSkel", bone: RecordBone) -> list[dict]:
                 cat2rate[child["shop_vat_rate_category"]] = child.price_.vat_rate_percentage
             except TypeError as e:
                 logger.warning(e)
+        else:
+            raise TypeError(f"Unknown child type: {child.skeletonCls=}")
 
     if shipping := skel["shipping"]:
         try:
@@ -435,7 +440,9 @@ def article_skel_full(self) -> SkeletonInstance_T[ArticleAbstractSkel]:
         except KeyError:
             # logger.debug(f'Read article_skel_full {self.article_skel["key"]=}')
             skel = SHOP_INSTANCE.get().article_skel()
-            assert skel.read(self.article_skel["key"])
+            res = skel.read(self.article_skel["key"])
+            print(f"skel.read {res=}")
+            assert res
             CartItemSkel.get_article_cache()[self.article_skel["key"]] = skel
             return skel
 

src/viur/shop/types/price.py

@@ -21,11 +21,12 @@
 
 from viur import toolkit
 from viur.core import current, db, utils
-from viur.core.skeleton import SkeletonInstance
+from viur.core.skeleton import RefSkel, RelSkel, SkeletonInstance
 from .enums import ApplicationDomain, ConditionOperator, DiscountType
 from .exceptions import InvalidStateError
 from ..globals import SHOP_INSTANCE, SHOP_LOGGER
 from ..types import ConfigurationError, DiscountValidationContext
+from viur.core.skeleton.utils import is_skeletoninstance_of
 
 if t.TYPE_CHECKING:
     from ..modules import Discount
@@ -70,7 +71,9 @@ def __init__(self, src_object: SkeletonInstance):
         super().__init__()
         # logger.debug(f"Creating new price object based on {src_object=}")
         shop = SHOP_INSTANCE.get()
-        if isinstance(src_object, SkeletonInstance) and issubclass(src_object.skeletonCls, shop.cart.leafSkelCls):
+        if is_skeletoninstance_of(src_object, shop.cart.leafSkelCls):
+        # if isinstance(src_object, SkeletonInstance) and (issubclass(src_object.skeletonCls, shop.cart.leafSkelCls)
+        #     or issubclass(src_object.skeletonCls, RefSkel) and issubclass( src_object.skeletonCls.skeletonCls,shop.cart.leafSkelCls)):
             self.is_in_cart = True
             self.cart_leaf = src_object
             self.article_skel = toolkit.without_render_preparation(src_object.article_skel_full)
@@ -80,10 +83,14 @@ def __init__(self, src_object: SkeletonInstance):
                 logger.exception(exc)
                 self.cart_discounts = []
             self.cart_discounts = [toolkit.get_full_skel_from_ref_skel(d) for d in self.cart_discounts]
-        elif isinstance(src_object, SkeletonInstance) and issubclass(src_object.skeletonCls, shop.article_skel):
+        elif is_skeletoninstance_of(src_object, shop.article_skel):
+        # elif isinstance(src_object, SkeletonInstance) and (issubclass(src_object.skeletonCls, shop.article_skel)
+        #     or issubclass(src_object.skeletonCls, RefSkel) and issubclass( src_object.skeletonCls.skeletonCls,shop.article_skel)):
             self.is_in_cart = False
             self.article_skel = toolkit.without_render_preparation(src_object)
         else:
+            logger.error(f"Unsupported type {type(src_object)=} | {src_object.skeletonCls=}")
+            logger.error(f"Unsupported type {type(src_object)=} | {type(src_object.skeletonCls)=}")
             raise TypeError(f"Unsupported type {type(src_object)}")
 
         # logger.debug(f"{self.article_skel = }")