CU-3ewjcba - Refine the API getAppStats.

Author: fred-yu-2013

Diff for: src/modules/subscription/subscription.py

@@ -16,7 +16,7 @@
 from src.modules.subscription.vault import VaultManager
 from src.utils.consts import VAULT_SERVICE_START_TIME, VAULT_SERVICE_END_TIME, VAULT_SERVICE_MODIFY_TIME, VAULT_SERVICE_PRICING_USING, COL_APPLICATION_APP_DID, \
     COL_APPLICATION_ACCESS_COUNT, COL_APPLICATION_ACCESS_AMOUNT, COL_APPLICATION_ACCESS_LAST_TIME
-from src.utils.did.eladid_wrapper import DID, DIDDocument
+from src.utils.did.eladid_wrapper import DID, DIDDocument, DIDURL
 from src.utils.payment_config import PaymentConfig
 from src.utils.http_exception import BadRequestException, ApplicationNotFoundException
 from src.utils.singleton import Singleton
@@ -132,7 +132,7 @@ def __get_appdid_info_by_did(did_str: str):
         if not did_str:
             raise BadRequestException('get_appdid_info: did must provide.')
 
-        did: DID = DID.from_string(did_str)
+        did: DID = DID.create_from_str(did_str)
         doc: DIDDocument = did.resolve()
 
         def get_appinfo_props(vc_json: dict) -> dict:
@@ -150,12 +150,19 @@ def get_developer_props(vc_json: dict):
 
         def get_info_from_credential(fragment: str, props_callback: t.Callable[[dict], dict]) -> dict:
             """ Get the information from the credential. """
-            vc = doc.get_credential(did, fragment)
+            vc = doc.get_credential(DIDURL.create_from_did(did, fragment))
             if not vc.is_valid():
                 logging.error('The credential is not valid.')
                 return {}
             return props_callback(json.loads(vc.to_json()))
 
-        info = get_info_from_credential('appinfo', get_appinfo_props)
-        info.update(get_info_from_credential('developer', get_developer_props))
+        info = {}
+        try:
+            info.update(get_info_from_credential('appinfo', get_appinfo_props))
+        except Exception as e:
+            logging.error(f'Failed to get "appinfo" of the app did: {e}')
+        try:
+            info.update(get_info_from_credential('developer', get_developer_props))
+        except Exception as e:
+            logging.error(f'Failed to get "developer" of the app did: {e}')
         return info

Diff for: tests/subscription_test.py

@@ -6,7 +6,7 @@
 
 import unittest
 
-from tests.utils.http_client import HttpClient
+from tests.utils.http_client import HttpClient, AppDID
 from tests import init_test, test_log, RA, HttpCode
 
 
@@ -36,7 +36,11 @@ def test03_vault_get_info(self):
 
     def test04_vault_get_app_stats(self):
         response = self.cli.get('/subscription/vault/app_stats')
-        self.assertTrue(response.status_code in [200, 404])
+        RA(response).assert_status(200)
+        apps = RA(response).body().get('apps', list)
+        apps = list(filter(lambda a: a['app_did'] == AppDID.app_did, apps))
+        self.assertEqual(len(apps), 1)
+        self.assertTrue(apps[0]['name'])  # resolve app did successfully.
 
     def test05_vault_deactivate(self):
         response = self.cli.post('/subscription/vault?op=deactivation')

Diff for: tests/utils/http_client.py

@@ -35,7 +35,7 @@ def get_owner_credential(self, owner_did: DID) -> str:
 
 class AppDID(Entity):
     access_token = "123"
-    app_did = "did:elastos:ienWaA6sfWETz6gVzX78SNytx8VUwDzxai"
+    app_did = "did:elastos:ic8pRXyAT3JqEXo4PzHQHv5rsoYyEyDwpB"  # can resolve, and from ionic sample of hive js.
 
     def __init__(self, name, mnemonic=None, passphrase=None):
         Entity.__init__(self, name, mnemonic=mnemonic, passphrase=passphrase, need_resolve=False)