Renamed 'published_flag' (record tag) to 'publish_flag'

Signed-off-by: George J Padayatti <[email protected]>

Author: georgepadayatti

mydata_did/patched_protocols/issue_credential/v1_0/routes.py

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

mydata_did/patched_protocols/present_proof/v1_0/routes.py

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

mydata_did/v1_0/manager.py

@@ -1419,7 +1419,7 @@ async def create_and_store_data_agreement_in_wallet(self, data_agreement: dict,
 
             for personal_data in personal_data_list:
 
-                # Check if the personal data is already in the wallet
+                # Retreive the personal data record.
                 personal_data_record: DataAgreementPersonalDataRecord = await DataAgreementPersonalDataRecord.retrieve_by_id(self.context, personal_data.get("attribute_id"))
 
                 if personal_data_record:
@@ -1460,7 +1460,7 @@ async def create_and_store_data_agreement_in_wallet(self, data_agreement: dict,
             method_of_use=data_agreement.method_of_use,
             state=DataAgreementV1Record.STATE_PREPARATION,
             data_agreement=data_agreement.serialize(),
-            published_flag="True" if not draft_mode else "False"
+            publish_flag="True" if not draft_mode else "False"
         )
 
         if draft_mode:
@@ -1570,13 +1570,13 @@ async def publish_data_agreement_in_wallet(self, data_agreement_id: str) -> Data
             })
 
             # Check if the data agreement is already published
-            if data_agreement_record.published_flag == "True":
+            if data_agreement_record.publish_flag == "True":
                 raise ADAManagerError(
                     f"Failed to publish data agreement: data agreement with id {data_agreement_id} is already published"
                 )
 
             # Set the data agreement record to published
-            data_agreement_record.published_flag = "True"
+            data_agreement_record.publish_flag = "True"
 
             # Fetch personal data list for proof request
             storage_record = await storage.search_records(
@@ -1685,13 +1685,13 @@ async def query_data_agreements_in_wallet(self, tag_filter: dict = None) -> typi
         try:
 
             # If template_version is provided, then data agreements with that version will be returned
-            # published_flag flag is not required for this query
+            # publish_flag flag is not required for this query
             template_version = None
             if "template_version" in tag_filter:
                 template_version = tag_filter["template_version"]
 
                 tag_filter.pop("template_version", None)
-                tag_filter.pop("published_flag", None)
+                tag_filter.pop("publish_flag", None)
                 tag_filter.pop("delete_flag", None)
 
             self._logger.info(
@@ -1758,7 +1758,7 @@ async def update_data_agreement_in_wallet(self, data_agreement_id: str, data_agr
             # Tag filter
             tag_filter = {
                 "data_agreement_id": data_agreement_id,
-                "published_flag": "True",
+                "publish_flag": "True",
                 "delete_flag": "False",
             }
 
@@ -1768,8 +1768,8 @@ async def update_data_agreement_in_wallet(self, data_agreement_id: str, data_agr
                 tag_filter=tag_filter
             )
 
-            # Update the published_flag status for the old data agreement record
-            old_data_agreement_record.published_flag = "False"
+            # Update the publish_flag status for the old data agreement record
+            old_data_agreement_record.publish_flag = "False"
 
             # Update the old data agreement record
             await old_data_agreement_record.save(self.context)
@@ -1785,7 +1785,7 @@ async def update_data_agreement_in_wallet(self, data_agreement_id: str, data_agr
                 method_of_use=data_agreement.method_of_use,
                 state=DataAgreementV1Record.STATE_PREPARATION,
                 data_agreement=data_agreement.serialize(),
-                published_flag="True"
+                publish_flag="True"
             )
 
             if data_agreement.method_of_use == DataAgreementV1Record.METHOD_OF_USE_DATA_SOURCE:
@@ -1896,7 +1896,7 @@ async def delete_data_agreement_in_wallet(self, data_agreement_id: str):
 
             tag_filter = {
                 "data_agreement_id": data_agreement_id,
-                "published_flag": "True",
+                "publish_flag": "True",
                 "delete_flag": "False",
             }
 
@@ -3100,7 +3100,7 @@ async def construct_data_agreement_qr_code_payload(self,
         # Tag filter
         tag_filter = {
             "data_agreement_id": data_agreement_id,
-            "published_flag": "True",
+            "publish_flag": "True",
             "delete_flag": "False",
         }
 
@@ -3377,7 +3377,7 @@ async def process_data_agreement_qr_code_initiate_message(self, data_agreement_q
         # Tag filter
         tag_filter = {
             "data_agreement_id": qr_code_metadata_record.tags.get("data_agreement_id"),
-            "published_flag": "True",
+            "publish_flag": "True",
             "delete_flag": "False",
         }
 
@@ -4042,7 +4042,7 @@ async def process_read_all_data_agreement_template_message(self, read_all_data_a
         # Query all the data agreement templates.
 
         tag_filter = {
-            "published_flag": "True",
+            "publish_flag": "True",
             "delete_flag": "False",
         }
         data_agreement_v1_records: typing.List[DataAgreementV1Record] = await DataAgreementV1Record.query(

mydata_did/v1_0/routes.py

@@ -407,7 +407,7 @@ class DataAgreementQueryStringSchema(OpenAPISchema):
         required=False,
     )
 
-    published_flag = fields.Bool(
+    publish_flag = fields.Bool(
         description="Published flag to query published data agreements",
         required=False,
     )
@@ -491,7 +491,7 @@ class DataAgreementV1RecordResponseSchema(OpenAPISchema):
     )
 
     # Production flag
-    published_flag = fields.Str(
+    publish_flag = fields.Str(
         required=True,
         description="The production flag.",
         example="False",
@@ -1578,8 +1578,8 @@ async def query_data_agreements_in_wallet(request: web.BaseRequest):
     if "delete_flag" in request.query and request.query["delete_flag"] != "":
         tag_filter["delete_flag"] = "True" if request.query["delete_flag"] == "true" else "False"
 
-    if "published_flag" in request.query and request.query["published_flag"] != "":
-        tag_filter["published_flag"] = "True" if request.query["published_flag"] == "true" else "False"
+    if "publish_flag" in request.query and request.query["publish_flag"] != "":
+        tag_filter["publish_flag"] = "True" if request.query["publish_flag"] == "true" else "False"
 
     # Initialise MyData DID Manager
     mydata_did_manager: ADAManager = ADAManager(