mpt-extension-sdk 5.1.2__tar.gz → 5.2.0__tar.gz

{mpt_extension_sdk-5.1.2 → mpt_extension_sdk-5.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpt-extension-sdk
-Version: 5.1.2
+Version: 5.2.0
 Summary: Extensions SDK for SoftwareONE Marketplace Platform
 Author: SoftwareOne AG
 License: Apache-2.0 license

{mpt_extension_sdk-5.1.2 → mpt_extension_sdk-5.2.0}/docker-compose.yml

@@ -20,6 +20,8 @@ services:
     command: bash -c "ruff check . && pytest"
     volumes:
       - .:/extension_sdk
+    environment:
+      - PROCESS_CHECK_INTERVAL_SECS=0
 
   format:
     container_name: mpt_extension_sdk_format

{mpt_extension_sdk-5.1.2 → mpt_extension_sdk-5.2.0}/mpt_extension_sdk/mpt_http/mpt.py

@@ -209,6 +209,22 @@ def get_agreements_by_next_sync(mpt_client, next_sync_parameter):
     return get_agreements_by_query(mpt_client, rql_query)
 
 
+def get_agreements_by_3yc_enroll_status(
+    mpt_client: MPTClient, enroll_statuses: tuple[str], status: str = "Active"
+):
+    param_condition = (
+        f"any(parameters.fulfillment,"
+        f"and(eq(externalId,3YCEnrollStatus),in(displayValue,({",".join(enroll_statuses)}))))"
+    )
+    status_condition = f"eq(status,{status})"
+
+    rql_query = (
+        f"and({status_condition},{param_condition})"
+        "&select=lines,parameters,subscriptions,product,listing"
+    )
+    return get_agreements_by_query(mpt_client, rql_query)
+
+
 @wrap_mpt_http_error
 def update_agreement_subscription(mpt_client, subscription_id, **kwargs):
     response = mpt_client.put(

{mpt_extension_sdk-5.1.2 → mpt_extension_sdk-5.2.0}/mpt_extension_sdk/runtime/master.py

@@ -1,4 +1,5 @@
 import logging
+import os
 import signal
 import threading
 import time
@@ -14,7 +15,7 @@ logger = logging.getLogger(__name__)
 
 
 HANDLED_SIGNALS = (signal.SIGINT, signal.SIGTERM)
-PROCESS_CHECK_INTERVAL_SECS = 5
+PROCESS_CHECK_INTERVAL_SECS = int(os.environ.get("PROCESS_CHECK_INTERVAL_SECS", 5))
 
 
 def _display_path(path):

{mpt_extension_sdk-5.1.2 → mpt_extension_sdk-5.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mpt-extension-sdk"
-version = "5.1.2"
+version = "5.2.0"
 description = "Extensions SDK for SoftwareONE Marketplace Platform"
 authors = [{ name = "SoftwareOne AG" }]
 requires-python = ">=3.12,<4"

{mpt_extension_sdk-5.1.2 → mpt_extension_sdk-5.2.0}/tests/django/settings.py

@@ -169,7 +169,7 @@ MPT_API_TOKEN = os.getenv("MPT_API_TOKEN", "change-me!")
 MPT_API_TOKEN_OPERATIONS = os.getenv("MPT_API_TOKEN_OPERATIONS", "change-me!")
 # TODO: Should be synced with the initializer.py::initialize function
 MPT_PRODUCTS_IDS = ["PRD-1111-1111"]
-MPT_ORDERS_API_POLLING_INTERVAL_SECS = 30
+MPT_ORDERS_API_POLLING_INTERVAL_SECS = 0
 MPT_PORTAL_BASE_URL = "https://portal.s1.local"
 MPT_NOTIFY_CATEGORIES = json.loads(
     os.getenv("MPT_NOTIFY_CATEGORIES", '{"ORDERS": "NTC-0000-0006"}')

{mpt_extension_sdk-5.1.2 → mpt_extension_sdk-5.2.0}/tests/mpt/conftest.py

@@ -1,5 +1,23 @@
 import pytest
 
+from mpt_extension_sdk.mpt_http.base import MPTClient
+
+
+@pytest.fixture()
+def mock_mpt_client(mocker):
+    """
+    Create an instance of the MPT client used by the extension.
+    """
+    return mocker.MagicMock(spec=MPTClient)
+
+
+@pytest.fixture()
+def mock_get_agreements_by_query(mocker):
+    return mocker.patch(
+        "mpt_extension_sdk.mpt_http.mpt.get_agreements_by_query",
+        spec=True,
+    )
+
 
 @pytest.fixture(scope="session")
 def notify_post_resp():

{mpt_extension_sdk-5.1.2 → mpt_extension_sdk-5.2.0}/tests/mpt/test_mpt.py

@@ -15,6 +15,7 @@ from mpt_extension_sdk.mpt_http.mpt import (
     get_agreement,
     get_agreement_subscription,
     get_agreement_subscription_by_external_id,
+    get_agreements_by_3yc_enroll_status,
     get_agreements_by_customer_deployments,
     get_agreements_by_external_id_values,
     get_agreements_by_ids,
@@ -1054,6 +1055,23 @@ def test_get_agreements_by_next_sync(mocker):
     mocked_get_by_query.assert_called_once_with(mocked_client, rql_query)
 
 
+@pytest.mark.parametrize("status", ["Active", "processing"])
+def test_get_agreements_by_3yc_enroll_status(
+    mock_mpt_client, mock_get_agreements_by_query, status
+):
+    rql_query = (
+        f"and(eq(status,{status}),any(parameters.fulfillment,and(eq(externalId,3YCEnrollStatus),"
+        "in(displayValue,(REQUESTED,ACCEPTED)))))"
+        "&select=lines,parameters,subscriptions,product,listing"
+    )
+
+    get_agreements_by_3yc_enroll_status(
+        mock_mpt_client, ("REQUESTED", "ACCEPTED"), status=status
+    )
+
+    mock_get_agreements_by_query.assert_called_once_with(mock_mpt_client, rql_query)
+
+
 def test_get_buyer(mpt_client, requests_mocker):
     buyer_id = "buyer_id"
     requests_mocker.get(