api fix (HemeraProtocol#155)

will0x0909 · web-flow · commit c0c22c907970 · 2024-09-18T18:49:43.000+08:00
diff --git a/api/app/af_ens/routes.py b/api/app/af_ens/routes.py
@@ -39,9 +39,9 @@ def get(self, address):
             "first_register_time": None,
             "first_set_primary_time": None,
         }
-        if address:
+        try:
             address = bytes.fromhex(address[2:])
-        else:
+        except Exception:
             raise APIError("Invalid Address Format", code=400)
 
         dn = datetime.now()
@@ -97,9 +97,7 @@ def get(self, address):
         res["ens_holdings_total"] = len(res["ens_holdings"])
         primary_address_row = db.session.query(ENSAddress).filter(ENSAddress.address == address).first()
         if primary_address_row:
-            primary_record = db.session.query(ENSRecord).filter(ENSRecord.name == primary_address_row.name).first()
-            if primary_record:
-                res["primary_name"] = primary_record.name
+            res["primary_name"] = primary_address_row.name
         else:
             res["primary_name"] = w3.ens.name(w3.to_checksum_address(w3.to_hex(address)))
 
@@ -147,9 +145,9 @@ def get(self, address):
 @af_ens_namespace.route("/v1/aci/<address>/ens/detail")
 class ACIEnsDetail(Resource):
     def get(self, address):
-        if address:
+        try:
             address = bytes.fromhex(address[2:])
-        else:
+        except Exception:
             raise APIError("Invalid Address Format", code=400)
 
         events = []
@@ -194,11 +192,11 @@ def get(self, address):
 
         for r in all_rows:
             name = None
-            if hasattr(r, "node") and r.node:
+            if hasattr(r, "node") and r.node and r.node in node_name_map:
                 name = node_name_map[r.node]
-            elif hasattr(r, "token_id") and r.token_id:
+            elif hasattr(r, "token_id") and r.token_id and r.token_id in token_id_name_map:
                 name = token_id_name_map[r.token_id]
-            elif hasattr(r, "w_token_id") and r.w_token_id:
+            elif hasattr(r, "w_token_id") and r.w_token_id and r.w_token_id in token_id_name_map:
                 name = token_id_name_map[r.w_token_id]
             base = {
                 "block_number": r.block_number,
