Try new metadata structure

Author: peacekeeper

src/main/java/uniresolver/driver/did/btc1/beacons/singleton/SingletonBeacon.java

@@ -17,7 +17,7 @@
 
 import java.net.URI;
 import java.util.Arrays;
-import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -115,8 +115,10 @@ public static DIDUpdate processSingletonBeaconSignal(Tx tx, Map<String, Object>
 
         // Return didUpdatePayload.
 
-        Map<String, Map<String, Object>> didDocumentMetadataDidUpdatePayloads = (Map<String, Map<String, Object>>) didDocumentMetadata.computeIfAbsent("didUpdatePayloads", x -> new LinkedHashMap<>());
-        didDocumentMetadataDidUpdatePayloads.put(tx.txId(), didUpdate.toMap());
+        List<Map<String, Object>> didDocumentMetadataSignals = (List<Map<String, Object>>) didDocumentMetadata.get("signals");
+        log.warn(didDocumentMetadataSignals.toString());
+        Map<String, Object> didDocumentMetadataSignal = didDocumentMetadataSignals.stream().filter(x -> x.get("signalId").equals(tx.txId())).findFirst().get();
+        didDocumentMetadataSignal.put("updatePayload", didUpdate.toMap());
 
         if (log.isDebugEnabled()) log.debug("processSingletonBeaconSignal: " + didUpdate);
         return didUpdate;

src/main/java/uniresolver/driver/did/btc1/crud/read/ResolveTargetDocument.java

@@ -32,7 +32,6 @@
 import uniresolver.driver.did.btc1.util.DIDDocumentUtil;
 import uniresolver.driver.did.btc1.util.HexUtil;
 import uniresolver.driver.did.btc1.util.JSONPatchUtil;
-import uniresolver.driver.did.btc1.util.RecordUtil;
 
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
@@ -290,9 +289,6 @@ private List<BeaconSignal> findNextSignals(Integer contemporaryBlockheight, List
 
         // For each beacon in beacons:
 
-        Map<Integer, Object> didDocumentMetadataNextSignals = (Map<Integer, Object>) didDocumentMetadata.computeIfAbsent("nextSignals", x -> new LinkedHashMap<>());
-        Map<String, Object> didDocumentMetadataNextSignalsContemporaryBlockHeight = (Map<String, Object>) didDocumentMetadataNextSignals.computeIfAbsent(contemporaryBlockheight, x -> new LinkedHashMap<>());
-
         for (Beacon beacon : beacons) {
 
             if (log.isDebugEnabled()) log.debug("Processing beacon: " + beacon);
@@ -313,11 +309,6 @@ private List<BeaconSignal> findNextSignals(Integer contemporaryBlockheight, List
 
             beaconSpends = beaconSpends.stream().filter(tx -> PATTERN_TXOUT.matcher(tx.txOuts().getLast().asm()).matches()).toList();
 
-            List<Map<String, Object>> didDocumentMetadataBeaconSpends = (List<Map<String, Object>>) didDocumentMetadataNextSignalsContemporaryBlockHeight.computeIfAbsent("beaconSpends", x -> new ArrayList<>());
-            didDocumentMetadataBeaconSpends.add(Map.of(
-                    "beacon", RecordUtil.toMap(beacon),
-                    "beaconSpends", beaconSpends.stream().map(RecordUtil::toMap).toList()));
-
             // For each of the filtered beaconSpends push the following beaconSignal object onto the signals array.
 
             for (Tx beaconSpend : beaconSpends) {
@@ -332,11 +323,15 @@ private List<BeaconSignal> findNextSignals(Integer contemporaryBlockheight, List
                         beaconSpendsBlocks.get(beaconSpend).blockTime());
 
                 beaconSignals.add(beaconSignal);
+
+                List<Map<String, Object>> didDocumentMetadataSignals = (List<Map<String, Object>>) didDocumentMetadata.computeIfAbsent("signals", x -> new ArrayList<>());
+                Map<String, Object> didDocumentMetadataSignal = new LinkedHashMap<>();
+                didDocumentMetadataSignals.add(didDocumentMetadataSignal);
+                didDocumentMetadataSignal.put("signalId", beaconSpend.txId());
+                didDocumentMetadataSignal.put("blockheight", beaconSpendsBlocks.get(beaconSpend).blockHeight());
             }
         }
 
-        didDocumentMetadataNextSignalsContemporaryBlockHeight.put("beaconSignals", beaconSignals.stream().map(RecordUtil::toMap).toList());
-
         // If signals is empty, return signals.
 
         if (beaconSignals.isEmpty()) return beaconSignals;
@@ -350,9 +345,6 @@ private List<BeaconSignal> findNextSignals(Integer contemporaryBlockheight, List
         Integer lowestBlockHeight = orderedBeaconSignals.getFirst().blockheight();
         List<BeaconSignal> nextSignals = orderedBeaconSignals.stream().filter(x -> Objects.equals(x.blockheight(), lowestBlockHeight)).toList();
 
-        didDocumentMetadataNextSignalsContemporaryBlockHeight.put("lowestBlockHeight", lowestBlockHeight);
-        didDocumentMetadataNextSignalsContemporaryBlockHeight.put("nextSignals", nextSignals.stream().map(RecordUtil::toMap).toList());
-
         // Return nextSignals.
 
         if (log.isDebugEnabled()) log.debug("findNextSignals: " + nextSignals);