refactor saving revision timestamp (#25)

* refactor saving revision timestamp * removed unnecessary ordering.
who-icatx · Oct 30, 2024 · 85af92f · 85af92f
1 parent c4287e2
commit 85af92f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/...ava/edu/stanford/protege/webprotege/linearizationservice/model/LinearizationRevision.java b/...ava/edu/stanford/protege/webprotege/linearizationservice/model/LinearizationRevision.java
@@ -18,18 +18,8 @@ public record LinearizationRevision(@Indexed(name = "timestamp", direction = Ind
     public static final String USER_ID = "userId";
     public static final String LINEARIZATION_EVENTS = "linearizationEvents";
 
-    private static long lastTimestamp = 0;
-    private static int counter = 0;
-
     public static LinearizationRevision create(UserId userId, Set<LinearizationEvent> linearizationEvents) {
-        long currentTimestamp = Instant.now().toEpochMilli();
-        if (currentTimestamp == lastTimestamp) {
-            counter++;
-        } else {
-            lastTimestamp = currentTimestamp;
-            counter = 0;
-        }
-        return new LinearizationRevision(currentTimestamp + counter, userId, linearizationEvents);
+        return new LinearizationRevision(new Date().getTime(), userId, linearizationEvents);
     }
 
     @Override

diff --git a/...ord/protege/webprotege/linearizationservice/services/LinearizationHistoryServiceImpl.java b/...ord/protege/webprotege/linearizationservice/services/LinearizationHistoryServiceImpl.java
@@ -67,10 +67,7 @@ public void saveMultipleEntityLinearizationHistories(Set<EntityLinearizationHist
     public Optional<EntityLinearizationHistory> getExistingHistoryOrderedByRevision(IRI entityIri, ProjectId projectId) {
         return linearizationHistoryRepository.findHistoryByEntityIriAndProjectId(entityIri.toString(), projectId)
                 .map(history -> {
-                    Set<LinearizationRevision> sortedRevisions = history.getLinearizationRevisions()
-                            .stream()
-                            .sorted(Comparator.comparingLong(LinearizationRevision::timestamp))
-                            .collect(Collectors.toCollection(TreeSet::new));
+                    Set<LinearizationRevision> sortedRevisions = new TreeSet<>(history.getLinearizationRevisions());
                     // Return a new EntityLinearizationHistory object with the sorted revisions
                     return new EntityLinearizationHistory(history.getWhoficEntityIri(), history.getProjectId(), sortedRevisions);
                 });