Philip/leaner metadata handling

apps/cic-ussd/cic_ussd/tasks/callback_handler.py

@@ -57,14 +57,9 @@ def process_account_creation_callback(self, result: str, url: str, status_code:
             queue = self.request.delivery_info.get('routing_key')
             s = celery.signature(
                     'cic_ussd.tasks.metadata.add_phone_pointer',
-                    [
-                        result,
-                        phone_number,
-                        'pgp',
-                    ],
-                    queue=queue,
+                    [result, phone_number]
                     )
-            s.apply_async()
+            s.apply_async(queue=queue)
 
             # expire cache
             cache.expire(task_id, timedelta(seconds=180))

apps/cic-ussd/cic_ussd/tasks/metadata.py

@@ -1,14 +1,13 @@
 # standard imports
-import json
 import logging
 
-# external imports
+# third-party imports
 import celery
 from hexathon import strip_0x
 
 # local imports
 from cic_ussd.metadata import blockchain_address_to_metadata_pointer
-from cic_ussd.metadata.user import UserMetadata
+from cic_ussd.metadata.person import PersonMetadata
 from cic_ussd.metadata.phone import PhonePointerMetadata
 from cic_ussd.tasks.base import CriticalMetadataTask
 
@@ -17,7 +16,7 @@ logg = logging.getLogger().getChild(__name__)
 
 
 @celery_app.task
-def query_user_metadata(blockchain_address: str):
+def query_person_metadata(blockchain_address: str):
     """
     :param blockchain_address:
     :type blockchain_address:
@@ -25,12 +24,12 @@ def query_user_metadata(blockchain_address: str):
     :rtype:
     """
     identifier = blockchain_address_to_metadata_pointer(blockchain_address=blockchain_address)
-    user_metadata_client = UserMetadata(identifier=identifier)
-    user_metadata_client.query()
+    person_metadata_client = PersonMetadata(identifier=identifier)
+    person_metadata_client.query()
 
 
 @celery_app.task
-def create_user_metadata(blockchain_address: str, data: dict):
+def create_person_metadata(blockchain_address: str, data: dict):
     """
     :param blockchain_address:
     :type blockchain_address:
@@ -40,19 +39,20 @@ def create_user_metadata(blockchain_address: str, data: dict):
     :rtype:
     """
     identifier = blockchain_address_to_metadata_pointer(blockchain_address=blockchain_address)
-    user_metadata_client = UserMetadata(identifier=identifier)
-    user_metadata_client.create(data=data)
+    person_metadata_client = PersonMetadata(identifier=identifier)
+    person_metadata_client.create(data=data)
 
 
 @celery_app.task
-def edit_user_metadata(blockchain_address: str, data: bytes, engine: str):
+def edit_person_metadata(blockchain_address: str, data: bytes):
     identifier = blockchain_address_to_metadata_pointer(blockchain_address=blockchain_address)
-    user_metadata_client = UserMetadata(identifier=identifier)
-    user_metadata_client.edit(data=data, engine=engine)
+    person_metadata_client = PersonMetadata(identifier=identifier)
+    person_metadata_client.edit(data=data)
 
 
 @celery_app.task(bind=True, base=CriticalMetadataTask)
-def add_phone_pointer(self, blockchain_address: str, phone: str, engine: str):
+def add_phone_pointer(self, blockchain_address: str, phone_number: str):
+    identifier = phone_number.encode('utf-8')
     stripped_address = strip_0x(blockchain_address)
-    phone_metadata_client = PhonePointerMetadata(identifier=phone.encode('utf-8'), engine=engine)
+    phone_metadata_client = PhonePointerMetadata(identifier=identifier)
     phone_metadata_client.create(data=stripped_address)