fix(dpi_ng/consent): correct entity schemas, primary keys, OData query, and mutation headers

Author: Ashwith-N

src/sap_cloud_sdk/core/dpi_ng/consent/client.py

@@ -156,17 +156,44 @@ def save(self, entity: Any) -> None:
             entity: A python-odata entity instance to create or update.
         """
         logger.info("Invoked ODataClient.save")
-        entity.__odata_service__.save(entity)
+        if entity.__odata__.persisted:
+            self._session.headers["If-Match"] = "*"
+        try:
+            entity.__odata_service__.save(entity)
+        finally:
+            self._session.headers.pop("If-Match", None)
         logger.info("Exiting ODataClient.save")
 
+    @staticmethod
+    def _apply_body(entity: Any, body: dict[str, Any]) -> None:
+        """Set fields from *body* on *entity* and force-mark each as dirty.
+
+        The odata library only marks a field dirty when the value changes, so
+        fields already matching their current value are silently dropped from
+        the PATCH body. Forcing dirty ensures the server always receives every
+        field the caller explicitly provided.
+
+        Unknown keys (not mapped as odata property descriptors on the entity
+        class) are silently ignored and never sent in the request.
+        """
+        for k, v in body.items():
+            prop = getattr(type(entity), k, None)
+            if prop is not None:
+                setattr(entity, k, v)
+                entity.__odata__.set_property_dirty(prop)
+
     def delete_entity(self, entity: Any) -> None:
         """Send a DELETE request for the given entity.
 
         Args:
             entity: A python-odata entity instance to delete.
         """
         logger.info("Invoked ODataClient.delete_entity")
-        entity.__odata_service__.delete(entity)
+        self._session.headers["If-Match"] = "*"
+        try:
+            entity.__odata_service__.delete(entity)
+        finally:
+            self._session.headers.pop("If-Match", None)
         logger.info("Exiting ODataClient.delete_entity")
 
     # ------------------------------------------------------------------

src/sap_cloud_sdk/core/dpi_ng/consent/dtos/consent.py

@@ -64,7 +64,7 @@ class CreateConsentRequest(_CamelSerializable):
     template_name: str
     language_code: str
     data_subject_type_name: str
-    jurisdiction_code: str
+    jurisdiction_code: str | None = None
     data_subject_description: str | None = None
     outbound_channel_type_name: str | None = None
     outbound_channel: str | None = None
@@ -88,5 +88,5 @@ class WithdrawConsentRequest(_CamelSerializable):
     """
 
     consent_id: str
-    withdrawn_by: str
+    withdrawn_by: str | None = None
     withdrawn_at: str | None = None

src/sap_cloud_sdk/core/dpi_ng/consent/entities/consent.py

@@ -46,13 +46,13 @@ class Consent(Service.Entity):
         third_party_function_code = StringProperty("thirdPartyFunctionCode")
         consent_status_code = StringProperty("consentStatusCode")
         lifecycle_status_code = StringProperty("lifecycleStatusCode")
-        purpose_description_text_id = StringProperty("purposeDescriptionTextId")
-        purpose_explanatory_text_id = StringProperty("purposeExplanatoryTextId")
-        template_description_text_id = StringProperty("templateDescriptionTextId")
-        template_explanatory_text_id = StringProperty("templateExplanatoryTextId")
-        template_question_text_id = StringProperty("templateQuestionTextId")
-        template_consequence_text_id = StringProperty("templateConsequenceTextId")
-        template_data_privacy_statement_text_id = StringProperty(
+        purpose_description_text_id = UUIDProperty("purposeDescriptionTextId")
+        purpose_explanatory_text_id = UUIDProperty("purposeExplanatoryTextId")
+        template_description_text_id = UUIDProperty("templateDescriptionTextId")
+        template_explanatory_text_id = UUIDProperty("templateExplanatoryTextId")
+        template_question_text_id = UUIDProperty("templateQuestionTextId")
+        template_consequence_text_id = UUIDProperty("templateConsequenceTextId")
+        template_data_privacy_statement_text_id = UUIDProperty(
             "templateDataPrivacyStatementTextId"
         )
         purpose_sensitive_data_flag = BooleanProperty("purposeSensitiveDataFlag")

src/sap_cloud_sdk/core/dpi_ng/consent/entities/consent_configuration.py

@@ -30,7 +30,6 @@ class Jurisdiction(Service.Entity):
         tenant = StringProperty("tenant")
         jurisdiction_id = UUIDProperty("jurisdictionId", primary_key=True)
         jurisdiction_code = StringProperty("jurisdictionCode")
-        description = StringProperty("description")
         created_at = DatetimeProperty("createdAt")
         created_by = StringProperty("createdBy")
         changed_at = DatetimeProperty("changedAt")
@@ -40,8 +39,10 @@ class JurisdictionText(Service.Entity):
         """OData entity representing a localised description for a jurisdiction."""
 
         __odata_collection__ = "jurisdictionTexts"
-        jurisdiction_id = UUIDProperty("jurisdictionId", primary_key=True)
-        language_code = StringProperty("languageCode", primary_key=True)
+        jurisdiction_text_id = UUIDProperty("jurisdictionTextId", primary_key=True)
+        jurisdiction_code = StringProperty("jurisdictionCode")
+        jurisdiction_id = UUIDProperty("jurisdictionId")
+        language_code = StringProperty("languageCode")
         description = StringProperty("description")
 
     class Language(Service.Entity):
@@ -59,7 +60,9 @@ class LanguageDescription(Service.Entity):
         """OData entity representing an additional description for a language."""
 
         __odata_collection__ = "languageDescriptions"
-        language_code = StringProperty("languageCode", primary_key=True)
+        language_desc_id = UUIDProperty("languageDescId", primary_key=True)
+        language_code = StringProperty("languageCode")
+        description_language_code = StringProperty("descriptionLanguageCode")
         description = StringProperty("description")
 
     class SourceInfo(Service.Entity):
@@ -144,7 +147,9 @@ class OutboundChannelType(Service.Entity):
         outbound_channel_type_name = StringProperty("outboundChannelTypeName")
         description = StringProperty("description")
         created_at = DatetimeProperty("createdAt")
+        created_by = StringProperty("createdBy")
         changed_at = DatetimeProperty("changedAt")
+        changed_by = StringProperty("changedBy")
 
     return (
         ThirdParty,

src/sap_cloud_sdk/core/dpi_ng/consent/entities/consent_purpose.py

@@ -23,9 +23,6 @@ class ConsentPurpose(Service.Entity):
         purpose_id = UUIDProperty("purposeId", primary_key=True)
         purpose_name = StringProperty("purposeName")
         lifecycle_status_code = StringProperty("lifecycleStatusCode")
-        lifecycle_status_domain_description = StringProperty(
-            "lifecycleStatusDomainDescription"
-        )
         sensitive_data_flag = BooleanProperty("sensitiveDataFlag")
         created_at = DatetimeProperty("createdAt")
         created_by = StringProperty("createdBy")
@@ -37,9 +34,10 @@ class ConsentPurposeText(Service.Entity):
 
         __odata_collection__ = "consentPurposeTexts"
         tenant = StringProperty("tenant")
-        purpose_id = UUIDProperty("purposeId", primary_key=True)
-        type_code = StringProperty("typeCode", primary_key=True)
-        language_code = StringProperty("languageCode", primary_key=True)
+        purpose_text_id = UUIDProperty("purposeTextId", primary_key=True)
+        purpose_id = UUIDProperty("purposeId")
+        language_code = StringProperty("languageCode")
+        type_code = StringProperty("typeCode")
         text = StringProperty("text")
         changed_at = DatetimeProperty("changedAt")
 

src/sap_cloud_sdk/core/dpi_ng/consent/entities/consent_retention.py

@@ -27,6 +27,7 @@ class ConsentRetentionRule(Service.Entity):
         controller_id = UUIDProperty("controllerId")
         jurisdiction_code = StringProperty("jurisdictionCode")
         consent_model_code = StringProperty("consentModelCode")
+        retention_period = IntegerProperty("retentionPeriod")
         retention_years = IntegerProperty("retentionYears")
         retention_months = IntegerProperty("retentionMonths")
         retention_days = IntegerProperty("retentionDays")

src/sap_cloud_sdk/core/dpi_ng/consent/entities/consent_template.py

@@ -7,6 +7,7 @@
 from odata.property import (
     BooleanProperty,
     DatetimeProperty,
+    IntegerProperty,
     StringProperty,
     UUIDProperty,
 )
@@ -28,8 +29,8 @@ class ConsentTemplate(Service.Entity):
         jurisdiction_code = StringProperty("jurisdictionCode")
         consent_model_code = StringProperty("consentModelCode")
         application_template_id = StringProperty("applicationTemplateId")
-        validity_period = StringProperty("validityPeriod")
-        expiring_period = StringProperty("expiringPeriod")
+        validity_period = IntegerProperty("validityPeriod")
+        expiring_period = IntegerProperty("expiringPeriod")
         lifecycle_status_code = StringProperty("lifecycleStatusCode")
         purpose_name = StringProperty("purposeName")
         controller_name = StringProperty("controllerName")
@@ -44,9 +45,10 @@ class ConsentTemplateText(Service.Entity):
 
         __odata_collection__ = "consentTemplateTexts"
         tenant = StringProperty("tenant")
-        template_id = UUIDProperty("templateId", primary_key=True)
-        type_code = StringProperty("typeCode", primary_key=True)
-        language_code = StringProperty("languageCode", primary_key=True)
+        template_text_id = UUIDProperty("templatTextId", primary_key=True)
+        template_id = UUIDProperty("templateId")
+        language_code = StringProperty("languageCode")
+        type_code = StringProperty("typeCode")
         text = StringProperty("text")
         changed_at = DatetimeProperty("changedAt")
 
@@ -55,11 +57,12 @@ class TemplateThirdPartyPersData(Service.Entity):
 
         __odata_collection__ = "templateThirdPartyPersDatas"
         tenant = StringProperty("tenant")
+        third_party_assignment_id = UUIDProperty("thirdPartyAssignmentId", primary_key=True)
         template_id = UUIDProperty("templateId", primary_key=True)
-        third_party_id = UUIDProperty("thirdPartyId", primary_key=True)
+        third_party_id = UUIDProperty("thirdPartyId")
+        third_party_name = StringProperty("thirdPartyName")
         third_party_function_code = StringProperty("thirdPartyFunctionCode")
         sensitive_data_flag = BooleanProperty("sensitiveDataFlag")
-        created_at = DatetimeProperty("createdAt")
         changed_at = DatetimeProperty("changedAt")
 
     return (

src/sap_cloud_sdk/core/dpi_ng/consent/services/_query.py

@@ -19,11 +19,11 @@ def _apply_query(q: Any, params: dict[str, Any]) -> Any:
         The Query instance with all supported options applied.
     """
     if "filter" in params:
-        q = q.raw({"$filter": params["filter"]})
+        q = q.filter(params["filter"])
     if "top" in params:
         q = q.limit(int(params["top"]))
     if "skip" in params:
         q = q.offset(int(params["skip"]))
     if "orderby" in params:
-        q = q.raw({"$orderby": params["orderby"]})
+        q = q.order_by(params["orderby"])
     return q