enh: Upgrade to duniter4j 1.6 that enable Duniter 1.8.6 enhancement (add ?pubkey=true on BMA /wot queries)

Author: blavenie

cesium-plus-pod-core/src/main/java/org/duniter/elasticsearch/rest/wot/RestWotRequirementsGetAction.java

@@ -69,7 +69,7 @@ protected void handleRequest(RestRequest request, RestChannel channel, Client cl
         String pubkey = request.param("pubkey");
 
         try {
-            List<WotRequirements> requirements = wotService.getRequirements(currency, pubkey);
+            List<WotRequirements> requirements = wotService.getRequirementsByPubkey(currency, pubkey);
             if (requirements == null) {
                 XContentBuilder builder = RestXContentBuilder.restContentBuilder(request).startObject()
                         .field("ucode", 2021)

cesium-plus-pod-core/src/main/java/org/duniter/elasticsearch/service/PendingMembershipService.java

@@ -272,7 +272,7 @@ protected XContentBuilder getMembershipWithRequirements(Peer peer,
         do {
 
             try {
-                identities = wotRemoteService.getRequirements(peer, membership.getPubkey());
+                identities = wotRemoteService.getRequirementsByPubkey(peer, membership.getPubkey());
                 requestCounter.increment();
             }
             // Error can occur because of quota on BMA api

cesium-plus-pod-core/src/main/java/org/duniter/elasticsearch/service/WotService.java

@@ -263,10 +263,16 @@ public boolean isMember(String currency, String pubkey) {
         return response.getHits() != null && response.getHits().getTotalHits() > 0;
     }
 
-    public List<WotRequirements> getRequirements(String currency, String pubkey) {
+    public List<WotRequirements> getRequirements(String currency, String uidOrPubkey) {
         waitReady();
         final String currencyId = safeGetCurrency(currency);
-        return this.wotRemoteService.getRequirements(currencyId, pubkey);
+        return this.wotRemoteService.getRequirements(currencyId, uidOrPubkey);
+    }
+
+    public List<WotRequirements> getRequirementsByPubkey(String currency, String pubkey) {
+        waitReady();
+        final String currencyId = safeGetCurrency(currency);
+        return this.wotRemoteService.getRequirementsByPubkey(currencyId, pubkey);
     }
 
     public Optional<Member> getMemberByPubkey(String currency, String pubkey) {
@@ -277,19 +283,25 @@ public Optional<Member> getMemberByPubkey(String currency, String pubkey) {
         }
         // Fallback to remote duniter node (e.g. Blockchain not yet indexed)
         else {
-            Identity source = this.wotRemoteService.getIdentity(currencyId, pubkey);
-            if (source == null
-                || !currencyId.equals(source.getCurrency())
-                || (!source.getIsMember() && source.getWasMember())) return Optional.empty(); // Not a member
-
-            Member target = new Member();
-            target.setPubkey(pubkey);
-            target.setCurrency(currencyId);
-            target.setUid(source.getUid());
-            target.setIsMember(source.getIsMember());
-            target.setWasMember(source.getWasMember());
-            target.setTimestamp(source.getTimestamp());
-            return Optional.of(target);
+            return this.wotRemoteService.getRequirementsByPubkey(currencyId, pubkey)
+                .stream()
+                .map(source -> {
+                    Member target = new Member();
+                    target.setPubkey(pubkey);
+                    target.setCurrency(currencyId);
+                    target.setUid(source.getUid());
+                    target.setWasMember(source.getWasMember());
+                    Boolean isMember = Boolean.FALSE.equals(source.getRevoked())
+                        && source.getMembershipExpiresIn() != null
+                        && source.getMembershipExpiresIn() > 0;
+                    target.setIsMember(isMember);
+                    if (source.getMeta() != null) {
+                        target.setTimestamp(source.getMeta().getTimestamp());
+                    }
+                    return target;
+                })
+                .filter(source -> Boolean.TRUE.equals(source.getWasMember()) || source.getIsMember())
+                .findFirst();
         }
     }
 

pom.xml

@@ -28,7 +28,7 @@
     <javaVersion>11</javaVersion>
 
     <!-- Commons versions -->
-    <duniter4j.version>1.5.10</duniter4j.version>
+    <duniter4j.version>1.6.1</duniter4j.version>
     <log4j.version>1.2.17</log4j.version>
     <slf4j.version>1.7.6</slf4j.version>
     <guava.version>22.0</guava.version>