[#1856] fix bugs that occur when parsing nested metadata

IntersectMBO · Oct 3, 2024 · 352f929 · 352f929
1 parent 8b90452
commit 352f929
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/govtool/frontend/src/consts/dRepActions/jsonContext.ts b/govtool/frontend/src/consts/dRepActions/jsonContext.ts
@@ -2,6 +2,7 @@ export const CIP_119 =
   "https://github.com/cardano-foundation/CIPs/blob/master/CIP-0119/README.md#";
 
 export const DREP_CONTEXT = {
+  "@language": "en-us",
   CIP100:
     "https://github.com/cardano-foundation/CIPs/blob/master/CIP-0100/README.md#",
   CIP119: CIP_119,

diff --git a/govtool/metadata-validation/src/app.service.ts b/govtool/metadata-validation/src/app.service.ts
@@ -61,7 +61,7 @@ export class AppService {
       if (hashedMetadata !== hash) {
         // Optionally validate on a parsed metadata
         const hashedParsedMetadata = blake.blake2bHex(
-          JSON.stringify(parsedData),
+          JSON.stringify(parsedData, null, 2),
           undefined,
           32,
         );

diff --git a/govtool/metadata-validation/src/utils/getFieldValue.ts b/govtool/metadata-validation/src/utils/getFieldValue.ts
@@ -9,12 +9,13 @@ export const getFieldValue = (
   body: Record<string, unknown>,
   field: string,
 ): unknown => {
-  if (body[field] && body[field]['@value']) {
-    return body[field]['@value'];
+  const fieldValue = body[field];
+  if (fieldValue.hasOwnProperty('@value')) {
+    return fieldValue['@value'];
   }
 
-  if (body[field]) {
-    return body[field];
+  if (fieldValue) {
+    return fieldValue;
   }
 
   return undefined;

diff --git a/govtool/metadata-validation/src/utils/parseMetadata.ts b/govtool/metadata-validation/src/utils/parseMetadata.ts
@@ -10,7 +10,12 @@ export const parseMetadata = (body: Record<string, unknown>) => {
   const metadata = {};
 
   Object.keys(body).forEach((key) => {
-    metadata[key] = getFieldValue(body, key);
+    if (key === 'references') {
+      const parsedReferences = (body[key] as Record<string, unknown>[]).map((reference) => parseMetadata(reference));
+      metadata[key] = parsedReferences;
+    } else {
+      metadata[key] = getFieldValue(body, key);
+    }
   });
   return metadata;
 };