Fixed the timeStamp format for Attestation update work flow

holashchand · May 17, 2024 · e3676f6 · e3676f6
1 parent 1ecda5b
commit e3676f6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
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
@@ -20,6 +20,8 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -505,7 +507,12 @@ private static JsonNode searchClaimOsIdFromRequestProperties(ArrayNode arrayNode
 		}
 		List<JsonNode> nodeList = new ArrayList<>();
 		arrayNode.elements().forEachRemaining(nodeList::add);
-		nodeList.sort(Comparator.comparingLong(node -> node.get("osCreatedAt").asLong()));
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
+		nodeList.sort(Comparator.comparing(node -> {
+			String dateString = node.get("osCreatedAt").asText();
+			LocalDateTime dateTime = LocalDateTime.parse(dateString, formatter);
+			return dateTime;
+		}));
 		return nodeList.get(nodeList.size() -1 );
 	}
 

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
@@ -26,6 +26,9 @@
 import org.springframework.web.client.HttpServerErrorException;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.Date;
 
@@ -143,7 +146,7 @@ public ResponseEntity<Object> riseAttestation(HttpServletRequest request, @Reque
             if(!propertyData.isNull()) {
                 attestationRequest.setPropertyData(propertyData);
             }
-            attestationRequest.setOsCreatedAt(new Date());
+            attestationRequest.setOsCreatedAt(LocalDateTime.ofInstant(new Date().toInstant(), ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss")) );
             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
@@ -23,5 +23,5 @@ public class AttestationRequest {
 	private Map<String, List<String>> propertiesOSID;
 	private JsonNode propertyData;
 	private String emailId;
-	private Date osCreatedAt;
+	private String osCreatedAt;
 }