Fix missing Content-Type in VerkkokauppaAPIClient headers

- Changed to use `json` instead of `data` as it automatically sets it and does not require converting dicts to json before

Author: ranta

merchants/verkkokauppa/tests/test_merchant_requests.py

@@ -1,4 +1,3 @@
-import json
 from typing import Any
 from uuid import UUID
 
@@ -95,7 +94,7 @@ def test__create_merchant__makes_valid_request_returns_merchant():
     VerkkokauppaAPIClient.generic.assert_called_with(
         "post",
         url=(settings.VERKKOKAUPPA_MERCHANT_API_URL + "/create/merchant/" + settings.VERKKOKAUPPA_NAMESPACE),
-        data=json.dumps(create_merchant_params.to_json()),
+        json=create_merchant_params.to_json(),
         headers={"api-key": settings.VERKKOKAUPPA_API_KEY},
     )
 
@@ -147,7 +146,7 @@ def test__update_merchant__makes_valid_request_returns_merchant():
             + settings.VERKKOKAUPPA_NAMESPACE
             + "/7107df38-5985-39c9-8c83-ffe18bff24f5"
         ),
-        data=json.dumps(update_merchant_params.to_json()),
+        json=update_merchant_params.to_json(),
         headers={"api-key": settings.VERKKOKAUPPA_API_KEY},
     )
 

merchants/verkkokauppa/tests/test_order_requests.py

@@ -1,4 +1,3 @@
-import json
 from datetime import UTC, datetime
 from decimal import Decimal
 from typing import Any
@@ -270,7 +269,7 @@ def test_verkkokauppa__create_order__makes_valid_request(settings):
     VerkkokauppaAPIClient.generic.assert_called_with(
         "post",
         url=settings.VERKKOKAUPPA_ORDER_API_URL + "/",
-        data=json.dumps(create_order_params.to_json()),
+        json=create_order_params.to_json(),
         headers={"api-key": settings.VERKKOKAUPPA_API_KEY},
     )
 
@@ -390,7 +389,7 @@ def test_verkkokauppa__cancel_order__makes_valid_request(settings):
     VerkkokauppaAPIClient.generic.assert_called_with(
         "post",
         url=urljoin(settings.VERKKOKAUPPA_ORDER_API_URL, f"{order_uuid}/cancel"),
-        data="null",
+        json=None,
         headers={
             "api-key": settings.VERKKOKAUPPA_API_KEY,
             "user": user_uuid,

merchants/verkkokauppa/tests/test_product_requests.py

@@ -1,4 +1,3 @@
-import json
 from uuid import UUID
 
 import pytest
@@ -65,7 +64,7 @@ def test__create_product__makes_valid_request():
     VerkkokauppaAPIClient.generic.assert_called_with(
         "post",
         url=settings.VERKKOKAUPPA_PRODUCT_API_URL + "/",
-        data=json.dumps(create_product_params.to_json()),
+        json=create_product_params.to_json(),
         headers={"api-key": settings.VERKKOKAUPPA_API_KEY},
     )
 
@@ -121,7 +120,7 @@ def test__create_or_update__account_makes_valid_request():
     VerkkokauppaAPIClient.generic.assert_called_with(
         "post",
         url=settings.VERKKOKAUPPA_PRODUCT_API_URL + "/0bd382a0-d79f-44c8-b3c6-8617bf72ebd5/accounting",
-        data=json.dumps(create_or_update_account_params.to_json()),
+        json=create_or_update_account_params.to_json(),
         headers={
             "api-key": settings.VERKKOKAUPPA_API_KEY,
             "namespace": settings.VERKKOKAUPPA_NAMESPACE,

merchants/verkkokauppa/verkkokauppa_api_client.py

@@ -84,7 +84,7 @@ def create_order(cls, *, order_params: CreateOrderParams) -> Order:
         try:
             response = cls.post(
                 url=url,
-                data=order_params.to_json(),
+                json=order_params.to_json(),
             )
             response_json = cls.response_json(response)
 
@@ -236,7 +236,7 @@ def create_merchant(cls, *, params: CreateMerchantParams) -> Merchant:
         try:
             response = cls.post(
                 url=url,
-                data=params.to_json(),
+                json=params.to_json(),
             )
             response_json = cls.response_json(response)
 
@@ -259,7 +259,7 @@ def update_merchant(cls, *, merchant_uuid: UUID, params: UpdateMerchantParams) -
         try:
             response = cls.post(
                 url=url,
-                data=params.to_json(),
+                json=params.to_json(),
             )
             response_json = cls.response_json(response)
 
@@ -285,7 +285,7 @@ def create_product(cls, *, params: CreateProductParams) -> Product:
         try:
             response = cls.post(
                 url=url,
-                data=params.to_json(),
+                json=params.to_json(),
             )
             response_json = cls.response_json(response)
 
@@ -312,7 +312,7 @@ def create_or_update_accounting(cls, *, product_uuid: UUID, params: CreateOrUpda
         try:
             response = cls.post(
                 url=url,
-                data=params.to_json(),
+                json=params.to_json(),
                 headers={"namespace": settings.VERKKOKAUPPA_NAMESPACE},
             )
             response_json = cls.response_json(response)

opening_hours/utils/hauki_api_client.py

@@ -67,7 +67,7 @@ def get_resource(cls, *, hauki_resource_id: str) -> HaukiAPIResource:
     def create_resource(cls, *, data: dict) -> HaukiAPIResource:
         url = cls._build_url("resource")
 
-        response = cls.post(url=url, data=data)
+        response = cls.post(url=url, json=data)
         response_json: HaukiAPIResource = cls.response_json(response)
 
         if not response_json.get("id"):
@@ -80,7 +80,7 @@ def update_resource(cls, *, data: dict) -> HaukiAPIResource:
         hauki_resource_id = data["id"]
         url = cls._build_url(f"resource/{hauki_resource_id}")
 
-        response = cls.put(url=url, data=data)
+        response = cls.put(url=url, json=data)
         response_json: HaukiAPIResource = cls.response_json(response)
 
         if not response_json.get("id"):
@@ -145,7 +145,4 @@ def _get_mutate_headers(cls, headers: dict[str, Any] | None) -> dict[str, Any]:
         if not settings.HAUKI_API_KEY:
             raise HaukiConfigurationError("HAUKI_API_KEY environment variable must to be configured.")
 
-        return {
-            "Content-Type": "application/json",
-            "Authorization": f"APIToken {settings.HAUKI_API_KEY}",
-        }
+        return {"Authorization": f"APIToken {settings.HAUKI_API_KEY}"}

utils/external_service/base_external_service_client.py

@@ -86,17 +86,17 @@ def get(cls, *, url: str, params: dict[str, Any] | None = None, headers: dict[st
         return response
 
     @classmethod
-    def post(cls, *, url: str, data: dict[str, Any] | None = None, headers: dict[str, Any] | None = None) -> Response:
-        response = cls.generic("post", url=url, data=json.dumps(data), headers=cls._get_mutate_headers(headers))
+    def post(cls, *, url: str, json: dict[str, Any] | None = None, headers: dict[str, Any] | None = None) -> Response:
+        response = cls.generic("post", url=url, json=json, headers=cls._get_mutate_headers(headers))
 
         if response.status_code >= 500:
             cls.handle_500_error(response)
 
         return response
 
     @classmethod
-    def put(cls, *, url: str, data: dict[str, Any] | None = None, headers: dict[str, Any] | None = None) -> Response:
-        response = cls.generic("put", url=url, data=json.dumps(data), headers=cls._get_mutate_headers(headers))
+    def put(cls, *, url: str, json: dict[str, Any] | None = None, headers: dict[str, Any] | None = None) -> Response:
+        response = cls.generic("put", url=url, json=json, headers=cls._get_mutate_headers(headers))
 
         if response.status_code >= 500:
             cls.handle_500_error(response)