Add env variables for mock verkkokauppa Backend and Frontend URLs

Author: ranta

.env.example

@@ -24,4 +24,6 @@ TUNNISTAMO_ALLOWED_REDIRECT_HOSTS=local-tilavaraus.hel.fi:3000,local-tilavaraus.
 #VERKKOKAUPPA_ORDER_API_URL=
 #VERKKOKAUPPA_PAYMENT_API_URL=
 #VERKKOKAUPPA_PRODUCT_API_URL=
-#USE_MOCK_VERKKOKAUPPA_API=
+#MOCK_VERKKOKAUPPA_API_ENABLED=True
+#MOCK_VERKKOKAUPPA_FRONTEND_URL=http://localhost:3000
+#MOCK_VERKKOKAUPPA_BACKEND_URL=http://localhost:8000

api/graphql/tests/conftest.py

@@ -17,4 +17,6 @@ def _setup_verkkokauppa_env_variables(settings):
     settings.VERKKOKAUPPA_PAYMENT_API_URL = "http://test-payment:1234"
     settings.VERKKOKAUPPA_MERCHANT_API_URL = "http://test-merchant:1234"
     settings.VERKKOKAUPPA_NAMESPACE = "tilanvaraus"
-    settings.USE_MOCK_VERKKOKAUPPA_API = False
+    settings.MOCK_VERKKOKAUPPA_API_ENABLED = False
+    settings.MOCK_VERKKOKAUPPA_FRONTEND_URL = "http://mock-verkkokauppa.com"
+    settings.MOCK_VERKKOKAUPPA_BACKEND_URL = "http://mock-verkkokauppa.com"

api/graphql/types/reservations/serializers/confirm_serializers.py

@@ -90,7 +90,7 @@ def validate(self, data, prefill_from_profile=False):
 
             active_price = ReservationUnitPricingHelper.get_active_price(reservation_unit)
             if active_price.pricing_type == PricingType.PAID or self.instance.price_net > 0:
-                if not reservation_unit.payment_product and not settings.USE_MOCK_VERKKOKAUPPA_API:
+                if not reservation_unit.payment_product and not settings.MOCK_VERKKOKAUPPA_API_ENABLED:
                     raise ValidationErrorWithCode(
                         "Reservation unit is missing payment product",
                         ValidationErrorCodes.MISSING_PAYMENT_PRODUCT,
@@ -150,7 +150,7 @@ def save(self, **kwargs) -> Reservation:
                 )
             else:
                 verkkokauppa_order: Order
-                if settings.USE_MOCK_VERKKOKAUPPA_API:
+                if settings.MOCK_VERKKOKAUPPA_API_ENABLED:
                     verkkokauppa_order = create_mock_verkkokauppa_order(self.instance)
                 else:
                     order_params: CreateOrderParams = get_verkkokauppa_order_params(self.instance)

merchants/mock_verkkokauppa_api/views.py

@@ -49,8 +49,7 @@ def get(self, request: WSGIRequest, *args, **kwargs) -> HttpResponseRedirect:
 
     def post(self, request: WSGIRequest, *args, **kwargs) -> HttpResponseRedirect | HttpResponse:
         payment_order = self.get_payment_order(order_uuid=kwargs.get("order_uuid"))
-        # Assume that the second URL in CORS_ALLOWED_ORIGINS is the Frontend UI URL
-        frontend_url = settings.CORS_ALLOWED_ORIGINS[1].strip("/")
+        frontend_url = settings.MOCK_VERKKOKAUPPA_FRONTEND_URL.strip("/")
 
         if "payment_success" in request.POST:
             self.handle_payment_success(payment_order=payment_order)

merchants/verkkokauppa/helpers.py

@@ -150,7 +150,7 @@ def create_mock_verkkokauppa_order(reservation: Reservation) -> Order:
     price_vat = round_decimal(Decimal(quantity * reservation.price_net * (reservation.tax_percentage_value / 100)), 2)
 
     # Assume that the first URL in CORS_ALLOWED_ORIGINS is the backend URL
-    base_url = settings.CORS_ALLOWED_ORIGINS[0].strip("/")
+    base_url = settings.MOCK_VERKKOKAUPPA_BACKEND_URL.strip("/")
     # Reservation URI in the django admin
     mock_verkkokauppa_checkout_url = reverse("mock_verkkokauppa", args=[order_uuid]).strip("/")
     admin_url = reverse("admin:reservations_reservation_change", args=[reservation.id]).strip("/")

merchants/verkkokauppa/tests/conftest.py

@@ -11,7 +11,9 @@ def _setup_verkkokauppa_env_variables(settings):
     settings.VERKKOKAUPPA_PAYMENT_API_URL = "http://test-payment:1234"
     settings.VERKKOKAUPPA_MERCHANT_API_URL = "http://test-merchant:1234"
     settings.VERKKOKAUPPA_NAMESPACE = "tilanvaraus"
-    settings.USE_MOCK_VERKKOKAUPPA_API = False
+    settings.MOCK_VERKKOKAUPPA_API_ENABLED = False
+    settings.MOCK_VERKKOKAUPPA_FRONTEND_URL = "http://mock-verkkokauppa.com"
+    settings.MOCK_VERKKOKAUPPA_BACKEND_URL = "http://mock-verkkokauppa.com"
 
 
 @pytest.fixture()

reservation_units/utils/reservation_unit_reservation_state_helper.py

@@ -124,8 +124,8 @@ def __has_valid_pricing(cls, reservation_unit: ReservationUnit) -> bool:
         if active_price is None:
             return False
 
-        # If USE_MOCK_VERKKOKAUPPA_API is True there is no need to check for payment products,
-        if settings.USE_MOCK_VERKKOKAUPPA_API:
+        # If MOCK_VERKKOKAUPPA_API_ENABLED is True there is no need to check for payment products,
+        if settings.MOCK_VERKKOKAUPPA_API_ENABLED:
             return True
 
         # Pricing is FREE
@@ -137,9 +137,9 @@ def __has_valid_pricing(cls, reservation_unit: ReservationUnit) -> bool:
 
     @classmethod
     def __has_valid_pricing_query(cls) -> Q:
-        # If USE_MOCK_VERKKOKAUPPA_API is True there is no need to check for payment products,
+        # If MOCK_VERKKOKAUPPA_API_ENABLED is True there is no need to check for payment products,
         # as the products are created when a reservation is made.
-        if settings.USE_MOCK_VERKKOKAUPPA_API:
+        if settings.MOCK_VERKKOKAUPPA_API_ENABLED:
             return Q(active_pricing_type__isnull=False)
 
         return (
@@ -314,7 +314,7 @@ def __is_reservation_closed(cls, reservation_unit: ReservationUnit) -> bool:
             or (
                 active_price.pricing_type == PricingType.PAID
                 and reservation_unit.payment_product is None
-                and not settings.USE_MOCK_VERKKOKAUPPA_API  # Don't show as closed if using Mock Verkkokauppa API
+                and not settings.MOCK_VERKKOKAUPPA_API_ENABLED  # Don't show as closed if using Mock Verkkokauppa API
             )
         )
 
@@ -323,7 +323,7 @@ def __get_is_reservation_closed_query(cls) -> QueryState:
         now = local_datetime()
 
         payment_product_query = Q(active_pricing_type=PricingType.PAID) & Q(payment_product__isnull=True)
-        if settings.USE_MOCK_VERKKOKAUPPA_API:
+        if settings.MOCK_VERKKOKAUPPA_API_ENABLED:
             payment_product_query = Q()
 
         return QueryState(

reservations/tasks.py

@@ -64,7 +64,7 @@ def refund_paid_reservation_task(reservation_pk: int) -> None:
     if not payment_order:
         return
 
-    if not settings.USE_MOCK_VERKKOKAUPPA_API:
+    if not settings.MOCK_VERKKOKAUPPA_API_ENABLED:
         refund = VerkkokauppaAPIClient.refund_order(order_uuid=payment_order.remote_id)
         payment_order.refund_id = refund.refund_id
         payment_order.save()

reservations/tests/conftest.py

@@ -17,4 +17,6 @@ def _setup_verkkokauppa_env_variables(settings):
     settings.VERKKOKAUPPA_PAYMENT_API_URL = "http://test-payment:1234"
     settings.VERKKOKAUPPA_MERCHANT_API_URL = "http://test-merchant:1234"
     settings.VERKKOKAUPPA_NAMESPACE = "tilanvaraus"
-    settings.USE_MOCK_VERKKOKAUPPA_API = False
+    settings.MOCK_VERKKOKAUPPA_API_ENABLED = False
+    settings.MOCK_VERKKOKAUPPA_FRONTEND_URL = "http://mock-verkkokauppa.com"
+    settings.MOCK_VERKKOKAUPPA_BACKEND_URL = "http://mock-verkkokauppa.com"

tests/conftest.py

@@ -83,7 +83,9 @@ def _setup_verkkokauppa_env_variables(settings):
     settings.VERKKOKAUPPA_PAYMENT_API_URL = "http://test-payment:1234"
     settings.VERKKOKAUPPA_MERCHANT_API_URL = "http://test-merchant:1234"
     settings.VERKKOKAUPPA_NAMESPACE = "tilanvaraus"
-    settings.USE_MOCK_VERKKOKAUPPA_API = False
+    settings.MOCK_VERKKOKAUPPA_API_ENABLED = False
+    settings.MOCK_VERKKOKAUPPA_FRONTEND_URL = "http://mock-verkkokauppa.com"
+    settings.MOCK_VERKKOKAUPPA_BACKEND_URL = "http://mock-verkkokauppa.com"
 
 
 @pytest.hookimpl()