Merge branch 'feature/igrantio-integrations'

Author: georgepadayatti

mydata_did/patched_protocols/issue_credential/v1_0/models/credential_exchange.py

@@ -10,7 +10,7 @@
 from aries_cloudagent.messaging.valid import INDY_CRED_DEF_ID, INDY_SCHEMA_ID, UUIDFour
 
 unencrypted_tags = environ.get(
-    "EXCH_UNENCRYPTED_TAGS", "False").upper() == "TRUE"
+    "EXCH_UNENCRYPTED_TAGS", "false").upper() == "TRUE"
 
 
 class V10CredentialExchange(BaseExchangeRecord):

mydata_did/patched_protocols/issue_credential/v1_0/routes.py

@@ -940,8 +940,8 @@ async def credential_exchange_send_free_offer(request: web.BaseRequest):
         # Tag filter
         tag_filter = {
             "data_agreement_id": data_agreement_id,
-            "published_flag": "True",
-            "delete_flag": "False",
+            "publish_flag": "true",
+            "delete_flag": "false",
         }
 
         try:
@@ -1069,8 +1069,8 @@ async def credential_exchange_send_bound_offer(request: web.BaseRequest):
             # Tag filter
             tag_filter = {
                 "data_agreement_id": data_agreement_id,
-                "published_flag": "True",
-                "delete_flag": "False",
+                "publish_flag": "true",
+                "delete_flag": "false",
             }
 
             try:

mydata_did/patched_protocols/present_proof/v1_0/models/presentation_exchange.py

@@ -8,7 +8,7 @@
 from aries_cloudagent.messaging.models.base_record import BaseExchangeRecord, BaseExchangeSchema
 from aries_cloudagent.messaging.valid import UUIDFour
 
-unencrypted_tags = environ.get("EXCH_UNENCRYPTED_TAGS", "False").upper() == "TRUE"
+unencrypted_tags = environ.get("EXCH_UNENCRYPTED_TAGS", "false").upper() == "TRUE"
 
 
 class V10PresentationExchange(BaseExchangeRecord):

mydata_did/patched_protocols/present_proof/v1_0/routes.py

@@ -1194,8 +1194,8 @@ async def send_presentation_request_for_data_agreement(request: web.BaseRequest)
     # Tag filter
     tag_filter = {
         "data_agreement_id": data_agreement_id,
-        "published_flag": "True",
-        "delete_flag": "False",
+        "publish_flag": "true",
+        "delete_flag": "false",
     }
 
     try:

mydata_did/v1_0/manager.py

@@ -4,7 +4,7 @@
 
 from aries_cloudagent.messaging.models.base import BaseModel, BaseModelSchema
 from aries_cloudagent.messaging.valid import UUIDFour
-from marshmallow import fields, EXCLUDE, validate, validates
+from marshmallow import fields, EXCLUDE, validate, validates, pre_load
 from marshmallow.exceptions import ValidationError
 from typing import List
 
@@ -186,6 +186,65 @@ def validate_dpia_date(self, dpia_date):
     )
 
 
+class DataAgreementPersonalDataRestriction(BaseModel):
+    """
+    Personal data restriction model class
+    """
+
+    class Meta:
+        # Schema class
+        schema_class = "DataAgreementPersonalDataRestrictionSchema"
+
+    def __init__(
+        self,
+        *,
+        schema_id: str = None,
+        cred_def_id: str = None,
+        **kwargs
+    ):
+        """
+        Initialise personal data restriction model.
+        """
+
+        # Call parent constructor
+        super().__init__(**kwargs)
+
+        # Set attributes
+        self.schema_id = schema_id
+        self.cred_def_id = cred_def_id
+
+
+class DataAgreementPersonalDataRestrictionSchema(BaseModelSchema):
+    """
+    Personal data restriction schema class
+    """
+
+    class Meta:
+        # Model class
+        model_class = DataAgreementPersonalDataRestriction
+
+    schema_id = fields.Str(
+        description="Schema identifier",
+        example="WgWxqztrNooG92RXvxSTWv:2:schema_name:1.0",
+        required=False
+    )
+
+    cred_def_id = fields.Str(
+        description="Credential definition identifier",
+        example="WgWxqztrNooG92RXvxSTWv:3:CL:20:tag",
+        required=False
+    )
+
+    @pre_load
+    def unwrap_envelope(self, data: dict, **kwargs):
+
+        if len(data.values()) < 1:
+            raise ValidationError(
+                "Personal data restriction must contain at least one attribute.")
+        
+        return data
+
+
 class DataAgreementPersonalData(BaseModel):
     """
     Personal data model class
@@ -201,6 +260,7 @@ def __init__(self,
                  attribute_sensitive: bool = None,
                  attribute_category: str = None,
                  attribute_description: str = None,
+                 restrictions: List[DataAgreementPersonalDataRestriction] = None,
                  **kwargs
                  ):
         """
@@ -216,6 +276,7 @@ def __init__(self,
         self.attribute_sensitive = attribute_sensitive
         self.attribute_category = attribute_category
         self.attribute_description = attribute_description
+        self.restrictions = restrictions
 
 
 class DataAgreementPersonalDataSchema(BaseModelSchema):
@@ -270,6 +331,11 @@ def validate_attribute_name(self, attribute_name):
         example="Name of the customer"
     )
 
+    restrictions = fields.List(
+        fields.Nested(DataAgreementPersonalDataRestrictionSchema),
+        required=False
+    )
+
 
 class DataAgreementEvent(BaseModel):
     """
@@ -283,12 +349,12 @@ class Meta:
         unknown = EXCLUDE
 
     def __init__(
-        self, 
-        *, 
-        event_id: str = None, 
-        time_stamp: str = None, 
-        principle_did: str = None, 
-        state: str = None, 
+        self,
+        *,
+        event_id: str = None,
+        time_stamp: str = None,
+        principle_did: str = None,
+        state: str = None,
         **kwargs
     ):
         # Call parent constructor
@@ -308,7 +374,7 @@ class DataAgreementEventSchema(BaseModelSchema):
     class Meta:
         # Model class
         model_class = DataAgreementEvent
-    
+
     event_id = fields.Str(
         data_key="id",
         example="did:mydata:z6MkfiSdYhnLnS6jfwSf2yS2CiwwjZGmFUFL5QbyL2Xu8z2E",
@@ -579,7 +645,8 @@ def validate_usage_purpose_description(self, value):
     # Data agreement personal data (attributes)
     personal_data = fields.List(
         fields.Nested(DataAgreementPersonalDataSchema),
-        required=True
+        required=True,
+        validate=validate.Length(min=1)
     )
 
     # Data agreement DPIA metadata

mydata_did/v1_0/models/data_agreement_model.py

@@ -1,12 +1,13 @@
 from os import environ
+import typing
 from typing import Any
 
 from marshmallow import fields, validate
 
 from aries_cloudagent.messaging.models.base_record import BaseExchangeRecord, BaseExchangeSchema
 from aries_cloudagent.messaging.valid import UUIDFour
 
-from ..data_agreement_model import DataAgreementPersonalData, DataAgreementPersonalDataSchema
+from ..data_agreement_model import DataAgreementPersonalDataRestriction, DataAgreementPersonalDataRestrictionSchema
 
 class DataAgreementPersonalDataRecord(BaseExchangeRecord):
     """
@@ -20,46 +21,52 @@ class Meta:
     RECORD_TYPE = "data_agreement_personal_data_record"
 
     # Wallet record identifier field
-    RECORD_ID_NAME = "data_agreement_personal_data_record_id"
+    RECORD_ID_NAME = "personal_data_id"
 
     # Webhook topic name for this record type
     WEBHOOK_TOPIC = None
 
     # Wallet record tags used for filtering
     # Note: These are not tags for the ledger, but rather tags for the wallet
     #      to group records.
-    TAG_NAMES = {"~attribute_category", "~attribute_sensitive"}
+    TAG_NAMES = {"~attribute_category", "~attribute_sensitive", "~da_template_id"}
 
     def __init__(
         self,
         *,
-        data_agreement_personal_data_record_id: str = None,
+        personal_data_id: str = None,
         attribute_name: str = None,
         attribute_category: str = "Other",
-        attribute_sensitive: str = "True",
+        attribute_sensitive: str = "true",
         attribute_description: str = "Nil",
         state: str = None,
+        restrictions: typing.List[dict] = None,
+        da_template_id: str = None,
+        da_template_version: int = None,
         **kwargs
     ):
         """
         Initialise a new DataAgreementPersonalDataRecord instance.
 
         Args:
-            data_agreement_personal_data_record_id: The unique identifier for the data agreement personal data record.
+            personal_data_id: The unique identifier for the data agreement personal data record.
             attribute_name: The name of the attribute.
             attribute_category: The category of the attribute.
             attribute_sensitive: The sensitive flag of the attribute.
             state: The state of the data agreement personal data record.
         """
-        super().__init__(data_agreement_personal_data_record_id, state, **kwargs)
+        super().__init__(personal_data_id, state, **kwargs)
         self.state = state
         self.attribute_name = attribute_name
         self.attribute_category = attribute_category
         self.attribute_sensitive = attribute_sensitive
         self.attribute_description = attribute_description
+        self.restrictions = restrictions
+        self.da_template_id = da_template_id
+        self.da_template_version = da_template_version
 
     @property
-    def data_agreement_personal_data_record_id(self) -> str:
+    def personal_data_id(self) -> str:
         """
         Get the data agreement personal data record identifier.
 
@@ -78,6 +85,9 @@ def record_value(self) -> dict:
                 "attribute_category",
                 "attribute_sensitive",
                 "attribute_description",
+                "restrictions",
+                "da_template_id",
+                "da_template_version"
             )
         }
 
@@ -95,7 +105,7 @@ class Meta:
         model_class = DataAgreementPersonalDataRecord
 
 
-    data_agreement_personal_data_record_id = fields.Str(
+    personal_data_id = fields.Str(
         required=True,
         example=UUIDFour.EXAMPLE
     )
@@ -122,7 +132,20 @@ class Meta:
     attribute_sensitive = fields.Str(
         required=True,
         description="The sensitive flag of the attribute.",
-        example="True"
+        example="true"
+    )
+
+    restrictions = fields.List(fields.Nested(DataAgreementPersonalDataRestrictionSchema), required=False)
+
+    da_template_id = fields.Str(
+        required=True,
+        description="The data agreement template identifier.",
+        example=UUIDFour.EXAMPLE
+    )
+
+    da_template_version = fields.Int(
+        example=1,
+        description="Data agreement template version"
     )