Philip/leaner metadata handling

2021-04-14 09:00:10 +00:00
parent 48570b2338
commit c67274846f
13 changed files with 219 additions and 268 deletions
--- a/apps/cic-ussd/tests/cic_ussd/metadata/test_user_metadata.py
+++ b/apps/cic-ussd/tests/cic_ussd/metadata/test_user_metadata.py
@@ -9,26 +9,26 @@ from cic_types.models.person import generate_metadata_pointer
 # local imports
 from cic_ussd.metadata import blockchain_address_to_metadata_pointer
 from cic_ussd.metadata.signer import Signer
-from cic_ussd.metadata.user import UserMetadata
+from cic_ussd.metadata.person import PersonMetadata
 from cic_ussd.redis import get_cached_data


 def test_user_metadata(create_activated_user, define_metadata_pointer_url, load_config):
-    UserMetadata.base_url = load_config.get('CIC_META_URL')
+    PersonMetadata.base_url = load_config.get('CIC_META_URL')
    identifier = blockchain_address_to_metadata_pointer(blockchain_address=create_activated_user.blockchain_address)
-    user_metadata_client = UserMetadata(identifier=identifier)
+    person_metadata_client = PersonMetadata(identifier=identifier)

-    assert user_metadata_client.url == define_metadata_pointer_url
+    assert person_metadata_client.url == define_metadata_pointer_url


-def test_create_user_metadata(caplog,
-                              create_activated_user,
-                              define_metadata_pointer_url,
-                              load_config,
-                              mock_meta_post_response,
-                              person_metadata):
+def test_create_person_metadata(caplog,
+                                create_activated_user,
+                                define_metadata_pointer_url,
+                                load_config,
+                                mock_meta_post_response,
+                                person_metadata):
    identifier = blockchain_address_to_metadata_pointer(blockchain_address=create_activated_user.blockchain_address)
-    user_metadata_client = UserMetadata(identifier=identifier)
+    person_metadata_client = PersonMetadata(identifier=identifier)

    with requests_mock.Mocker(real_http=False) as request_mocker:
        request_mocker.register_uri(
@@ -38,7 +38,7 @@ def test_create_user_metadata(caplog,
            reason='CREATED',
            content=json.dumps(mock_meta_post_response).encode('utf-8')
        )
-        user_metadata_client.create(data=person_metadata)
+        person_metadata_client.create(data=person_metadata)
        assert 'Get signed material response status: 201' in caplog.text

    with pytest.raises(RuntimeError) as error:
@@ -49,19 +49,19 @@ def test_create_user_metadata(caplog,
                status_code=400,
                reason='BAD REQUEST'
            )
-            user_metadata_client.create(data=person_metadata)
+            person_metadata_client.create(data=person_metadata)
        assert str(error.value) == f'400 Client Error: BAD REQUEST for url: {define_metadata_pointer_url}'


-def test_edit_user_metadata(caplog,
-                            create_activated_user,
-                            define_metadata_pointer_url,
-                            load_config,
-                            person_metadata,
-                            setup_metadata_signer):
+def test_edit_person_metadata(caplog,
+                              create_activated_user,
+                              define_metadata_pointer_url,
+                              load_config,
+                              person_metadata,
+                              setup_metadata_signer):
    Signer.gpg_passphrase = load_config.get('KEYS_PASSPHRASE')
    identifier = blockchain_address_to_metadata_pointer(blockchain_address=create_activated_user.blockchain_address)
-    user_metadata_client = UserMetadata(identifier=identifier)
+    person_metadata_client = PersonMetadata(identifier=identifier)
    with requests_mock.Mocker(real_http=False) as request_mocker:
        request_mocker.register_uri(
            'PUT',
@@ -69,7 +69,7 @@ def test_edit_user_metadata(caplog,
            status_code=200,
            reason='OK'
        )
-        user_metadata_client.edit(data=person_metadata, engine='pgp')
+        person_metadata_client.edit(data=person_metadata)
        assert 'Signed content submission status: 200' in caplog.text

    with pytest.raises(RuntimeError) as error:
@@ -80,7 +80,7 @@ def test_edit_user_metadata(caplog,
                status_code=400,
                reason='BAD REQUEST'
            )
-            user_metadata_client.edit(data=person_metadata, engine='pgp')
+            person_metadata_client.edit(data=person_metadata)
        assert str(error.value) == f'400 Client Error: BAD REQUEST for url: {define_metadata_pointer_url}'


@@ -92,7 +92,7 @@ def test_get_user_metadata(caplog,
                           person_metadata,
                           setup_metadata_signer):
    identifier = blockchain_address_to_metadata_pointer(blockchain_address=create_activated_user.blockchain_address)
-    user_metadata_client = UserMetadata(identifier=identifier)
+    person_metadata_client = PersonMetadata(identifier=identifier)
    with requests_mock.Mocker(real_http=False) as request_mocker:
        request_mocker.register_uri(
            'GET',
@@ -101,7 +101,7 @@ def test_get_user_metadata(caplog,
            content=json.dumps(person_metadata).encode('utf-8'),
            reason='OK'
        )
-        user_metadata_client.query()
+        person_metadata_client.query()
        assert 'Get latest data status: 200' in caplog.text
    key = generate_metadata_pointer(
        identifier=identifier,
@@ -118,6 +118,6 @@ def test_get_user_metadata(caplog,
                status_code=404,
                reason='NOT FOUND'
            )
-            user_metadata_client.query()
+            person_metadata_client.query()
            assert 'The data is not available and might need to be added.' in caplog.text
        assert str(error.value) == f'400 Client Error: NOT FOUND for url: {define_metadata_pointer_url}'
--- a/apps/cic-ussd/tests/cic_ussd/state_machine/logic/test_user_logic.py
+++ b/apps/cic-ussd/tests/cic_ussd/state_machine/logic/test_user_logic.py
@@ -15,7 +15,7 @@ from cic_ussd.state_machine.logic.user import (
    get_user_metadata,
    save_complete_user_metadata,
    process_gender_user_input,
-    save_profile_attribute_to_session_data,
+    save_metadata_attribute_to_session_data,
    update_account_status_to_active)


@@ -41,14 +41,14 @@ def test_update_account_status_to_active(create_pending_user, create_in_db_ussd_
    ("enter_location", "location", "Kangemi", "Kangemi"),
    ("enter_products", "products", "Mandazi", "Mandazi"),
 ])
-def test_save_save_profile_attribute_to_session_data(current_state,
-                                                     expected_key,
-                                                     expected_result,
-                                                     user_input,
-                                                     celery_session_worker,
-                                                     create_activated_user,
-                                                     create_in_db_ussd_session,
-                                                     create_in_redis_ussd_session):
+def test_save_metadata_attribute_to_session_data(current_state,
+                                                 expected_key,
+                                                 expected_result,
+                                                 user_input,
+                                                 celery_session_worker,
+                                                 create_activated_user,
+                                                 create_in_db_ussd_session,
+                                                 create_in_redis_ussd_session):
    create_in_db_ussd_session.state = current_state
    serialized_in_db_ussd_session = create_in_db_ussd_session.to_json()
    state_machine_data = (user_input, serialized_in_db_ussd_session, create_activated_user)
@@ -56,7 +56,7 @@ def test_save_save_profile_attribute_to_session_data(current_state,
    in_memory_ussd_session = json.loads(in_memory_ussd_session)
    assert in_memory_ussd_session.get('session_data') == {}
    serialized_in_db_ussd_session['state'] = current_state
-    save_profile_attribute_to_session_data(state_machine_data=state_machine_data)
+    save_metadata_attribute_to_session_data(state_machine_data=state_machine_data)

    in_memory_ussd_session = InMemoryStore.cache.get('AT974186')
    in_memory_ussd_session = json.loads(in_memory_ussd_session)
@@ -87,18 +87,18 @@ def test_format_user_metadata(create_activated_user,


 def test_save_complete_user_metadata(celery_session_worker,
-                                        complete_user_metadata,
-                                        create_activated_user,
-                                        create_in_redis_ussd_session,
-                                        mocker,
-                                        setup_chain_spec,
-                                        ussd_session_data):
+                                     complete_user_metadata,
+                                     create_activated_user,
+                                     create_in_redis_ussd_session,
+                                     mocker,
+                                     setup_chain_spec,
+                                     ussd_session_data):
    ussd_session = create_in_redis_ussd_session.get(ussd_session_data.get('external_session_id'))
    ussd_session = json.loads(ussd_session)
    ussd_session['session_data'] = complete_user_metadata
    user_metadata = format_user_metadata(metadata=ussd_session.get('session_data'), user=create_activated_user)
    state_machine_data = ('', ussd_session, create_activated_user)
-    mocked_create_metadata_task = mocker.patch('cic_ussd.tasks.metadata.create_user_metadata.apply_async')
+    mocked_create_metadata_task = mocker.patch('cic_ussd.tasks.metadata.create_person_metadata.apply_async')
    save_complete_user_metadata(state_machine_data=state_machine_data)
    mocked_create_metadata_task.assert_called_with(
        (user_metadata, create_activated_user.blockchain_address),
@@ -127,7 +127,7 @@ def test_edit_user_metadata_attribute(celery_session_worker,
    }
    state_machine_data = ('', ussd_session, create_activated_user)

-    mocked_edit_metadata = mocker.patch('cic_ussd.tasks.metadata.edit_user_metadata.apply_async')
+    mocked_edit_metadata = mocker.patch('cic_ussd.tasks.metadata.edit_person_metadata.apply_async')
    edit_user_metadata_attribute(state_machine_data=state_machine_data)
    person_metadata['location']['area_name'] = 'nairobi'
    mocked_edit_metadata.assert_called_with(
@@ -146,7 +146,7 @@ def test_get_user_metadata_attribute(celery_session_worker,
    ussd_session = json.loads(ussd_session)
    state_machine_data = ('', ussd_session, create_activated_user)

-    mocked_get_metadata = mocker.patch('cic_ussd.tasks.metadata.query_user_metadata.apply_async')
+    mocked_get_metadata = mocker.patch('cic_ussd.tasks.metadata.query_person_metadata.apply_async')
    get_user_metadata(state_machine_data=state_machine_data)
    mocked_get_metadata.assert_called_with(
        (create_activated_user.blockchain_address,),