cleanup

Author: sveneberth

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,9 +477,6 @@ 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

@@ -2,18 +2,24 @@
 import typing as t  # noqa
 
 from viur import toolkit
-from viur.core import current, db, utils
+from viur.core import conf, current, db, utils
 from viur.core.bones import *
 from viur.core.prototypes.tree import TreeSkel
 from viur.core.skeleton import SkeletonInstance
 from viur.shop.types import *
+
 from .vat import VatIncludedSkel
 from ..globals import SHOP_INSTANCE, SHOP_LOGGER
 from ..skeletons.article import ArticleAbstractSkel
 from ..types.response import make_json_dumpable
 
 logger = SHOP_LOGGER.getChild(__name__)
 
+if conf.version >= (3, 8, 15):  # TODO: 3,8,16
+    from viur.core.skeleton.utils import without_render_preparation
+else:
+    from viur.toolkit import without_render_preparation
+
 Addition = t.Callable[["TotalFactory", float, SkeletonInstance_T["CartNodeSkel"], BaseBone], float]
 
 
@@ -43,7 +49,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)
+        skel = without_render_preparation(skel)
         children = self._get_children(skel["key"])
         total = 0
         for child in children:
@@ -89,16 +95,16 @@ def add_shipping(factory: TotalFactory, total: float, skel: "SkeletonInstance",
         total += shipping["dest"]["shipping_cost"] or 0.0
     return total
 
-@toolkit.debug
+
+# @toolkit.debug
 def get_vat_for_node(skel: "CartNodeSkel", bone: RecordBone) -> list[dict]:
-    # skel = toolkit.without_render_preparation(skel)
+    skel = 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.renderPreparation=}")
+        # logger.debug(f"{child=}")
         if issubclass(child.skeletonCls, CartNodeSkel):
             for entry in child["vat"] or []:
                 # logger.debug(f'{child["shop_vat_rate_category"]} | {entry=}')
@@ -441,7 +447,7 @@ def article_skel_full(self) -> SkeletonInstance_T[ArticleAbstractSkel]:
             # logger.debug(f'Read article_skel_full {self.article_skel["key"]=}')
             skel = SHOP_INSTANCE.get().article_skel()
             res = skel.read(self.article_skel["key"])
-            print(f"skel.read {res=}")
+            logger.info(f"skel.read {res=}")
             assert res
             CartItemSkel.get_article_cache()[self.article_skel["key"]] = skel
             return skel

src/viur/shop/types/price.py

@@ -20,19 +20,47 @@
 import typing as t  # noqa
 
 from viur import toolkit
-from viur.core import current, db, utils
-from viur.core.skeleton import RefSkel, RelSkel, SkeletonInstance
+from viur.core import conf, 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
-from viur.core.skeleton.utils import is_skeletoninstance_of
 
 if t.TYPE_CHECKING:
     from ..modules import Discount
 
 logger = SHOP_LOGGER.getChild(__name__)
 
+if conf.version >= (3, 8, 15):  # TODO: 3,8,16
+    from viur.core.skeleton.utils import is_skeletoninstance_of
+else:
+    def is_skeletoninstance_of(
+        obj: t.Any,
+        skel_cls: type["Skeleton"],
+        *,
+        accept_ref_skel: bool = True,
+    ) -> bool:
+        """
+        Checks whether an object is an SkeletonInstance that belongs to a specific Skeleton class.
+
+        :param obj: The object to check.
+        :param skel_cls: The skeleton class that will be checked against ``obj``.
+        :param accept_ref_skel: If True, ``obj`` can also be just a RefSkelFor``skel_cls``.
+            If False, no ``RefSkel`` is accepted.
+        """
+        from . import RefSkel, Skeleton, SkeletonInstance
+
+        if not issubclass(skel_cls, Skeleton):
+            raise TypeError(f"{skel_cls=} is not a Skeleton.")
+
+        if not isinstance(obj, SkeletonInstance):
+            return False
+        if issubclass(obj.skeletonCls, skel_cls):
+            return True
+        return False
+
 # TODO: Use decimal package instead of floats?
 #       -> decimal mode in NumericBone?
 
@@ -72,8 +100,6 @@ def __init__(self, src_object: SkeletonInstance):
         # logger.debug(f"Creating new price object based on {src_object=}")
         shop = SHOP_INSTANCE.get()
         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)
@@ -84,13 +110,10 @@ def __init__(self, src_object: SkeletonInstance):
                 self.cart_discounts = []
             self.cart_discounts = [toolkit.get_full_skel_from_ref_skel(d) for d in self.cart_discounts]
         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 = }")