diff --git a/bp/cart/services/check_sumup_status.py b/bp/cart/services/check_sumup_status.py index 722d631..e81cade 100644 --- a/bp/cart/services/check_sumup_status.py +++ b/bp/cart/services/check_sumup_status.py @@ -1,5 +1,5 @@ from shared.browser.app.payments.sumup import get_checkout as sumup_get_checkout -from shared.events import emit_event +from shared.events import emit_activity from shared.services.registry import services @@ -17,10 +17,18 @@ async def check_sumup_status(session, order): session, order.id, order.user_id, order.session_id ) await services.calendar.confirm_tickets_for_order(session, order.id) - await emit_event(session, "order.paid", "order", order.id, { - "order_id": order.id, - "user_id": order.user_id, - }) + await emit_activity( + session, + activity_type="rose:OrderPaid", + actor_uri="internal:cart", + object_type="rose:Order", + object_data={ + "order_id": order.id, + "user_id": order.user_id, + }, + source_type="order", + source_id=order.id, + ) elif sumup_status == "FAILED": order.status = "failed" else: diff --git a/bp/cart/services/checkout.py b/bp/cart/services/checkout.py index b032526..0db306b 100644 --- a/bp/cart/services/checkout.py +++ b/bp/cart/services/checkout.py @@ -13,7 +13,7 @@ from shared.models.page_config import PageConfig from shared.models.market_place import MarketPlace from shared.config import config from shared.contracts.dtos import CalendarEntryDTO -from shared.events import emit_event +from shared.events import emit_activity from shared.services.registry import services @@ -166,11 +166,19 @@ async def create_order_from_cart( session, order.id, user_id, session_id, page_post_id ) - await emit_event(session, "order.created", "order", order.id, { - "order_id": order.id, - "user_id": user_id, - "session_id": session_id, - }) + await emit_activity( + session, + activity_type="Create", + actor_uri="internal:cart", + object_type="rose:Order", + object_data={ + "order_id": order.id, + "user_id": user_id, + "session_id": session_id, + }, + source_type="order", + source_id=order.id, + ) return order diff --git a/shared b/shared index d697709..2e9db11 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit d697709f60a71941880f4288be469913d11ce967 +Subproject commit 2e9db119252aae9db2374b948c687467081a0b85