Merge pull request #312 from Sreejit-K/claim-mismatch-on-property-update

claim mis-mapping fix on property update
Sunbird-RC · Apr 25, 2024 · a23865b · a23865b
2 parents c5ce259 + 1dc445e
commit a23865b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/java/middleware-commons/src/main/java/dev/sunbirdrc/registry/middleware/util/JSONUtil.java b/java/middleware-commons/src/main/java/dev/sunbirdrc/registry/middleware/util/JSONUtil.java
@@ -501,7 +501,10 @@ private static JsonNode searchClaimOsIdFromRequestProperties(ArrayNode arrayNode
 				}
 			}
 		}
-		return arrayNode.get(arrayNode.size() - 1);
+		List<JsonNode> nodeList = new ArrayList<>();
+		arrayNode.elements().forEachRemaining(nodeList::add);
+		nodeList.sort(Comparator.comparingLong(node -> node.get("osCreatedAt").asLong()));
+		return nodeList.get(nodeList.size() -1 );
 	}
 
 	private static boolean isRequestBodyPropertyPresentInClaim(Map<String,List<String>> requestBodyProperty,Map<String,JsonNode> claimEntryProperty){

diff --git a/java/registry/src/main/java/dev/sunbirdrc/registry/controller/RegistryClaimsController.java b/java/registry/src/main/java/dev/sunbirdrc/registry/controller/RegistryClaimsController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Collections;
+import java.util.Date;
 
 @RestController
 @ConditionalOnProperty(name = "claims.enabled", havingValue = "true")
@@ -140,6 +141,7 @@ public ResponseEntity<Object> riseAttestation(HttpServletRequest request, @Reque
             if(!propertyData.isNull()) {
                 attestationRequest.setPropertyData(propertyData);
             }
+            attestationRequest.setOsCreatedAt(new Date());
             attestationRequest.setUserId(userId);
             attestationRequest.setEmailId(emailId);
             String attestationOSID = registryHelper.triggerAttestation(attestationRequest, attestationPolicy);

diff --git a/java/registry/src/main/java/dev/sunbirdrc/registry/model/dto/AttestationRequest.java b/java/registry/src/main/java/dev/sunbirdrc/registry/model/dto/AttestationRequest.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -22,4 +23,5 @@ public class AttestationRequest {
 	private Map<String, List<String>> propertiesOSID;
 	private JsonNode propertyData;
 	private String emailId;
+	private Date osCreatedAt;
 }