refactor: change data type for observedVersion

halo-dev · Jan 25, 2024 · aec8dea · aec8dea
1 parent 57dfc52
commit aec8dea
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/api/src/main/java/run/halo/app/core/extension/content/Post.java b/api/src/main/java/run/halo/app/core/extension/content/Post.java
@@ -159,7 +159,7 @@ public static class PostStatus {
 
         private Instant lastModifyTime;
 
-        private long observedVersion;
+        private Long observedVersion;
 
         @JsonIgnore
         public ConditionList getConditionsOrDefault() {

diff --git a/application/src/main/java/run/halo/app/infra/SchemeInitializer.java b/application/src/main/java/run/halo/app/infra/SchemeInitializer.java
@@ -153,8 +153,11 @@ public void onApplicationEvent(@NonNull ApplicationContextInitializedEvent event
                 .setIndexFunc(simpleAttribute(Post.class, post -> {
                     var version = post.getMetadata().getVersion();
                     var observedVersion = post.getStatusOrDefault().getObservedVersion();
+                    if (observedVersion == null || observedVersion < version) {
+                        return BooleanUtils.TRUE;
+                    }
                     // do not care about the false case so return null to avoid indexing
-                    return observedVersion >= version ? BooleanUtils.TRUE : null;
+                    return null;
                 })));
         });
         schemeManager.register(Category.class, indexSpecs -> {

diff --git a/application/src/test/java/run/halo/app/content/comment/CommentServiceImplTest.java b/application/src/test/java/run/halo/app/content/comment/CommentServiceImplTest.java
@@ -358,7 +358,8 @@ private String expectListResultJson() {
                             "apiVersion": "content.halo.run/v1alpha1",
                             "kind": "Post",
                             "metadata": {
-                                "name": "fake-post"
+                                "name": "fake-post",
+                                "version": 1
                             }
                         },
                         "stats": {
@@ -403,7 +404,8 @@ private String expectListResultJson() {
                             "apiVersion": "content.halo.run/v1alpha1",
                             "kind": "Post",
                             "metadata": {
-                                "name": "fake-post"
+                                "name": "fake-post",
+                                "version": 1
                             }
                         },
                         "stats": {
@@ -447,7 +449,8 @@ private String expectListResultJson() {
                             "apiVersion": "content.halo.run/v1alpha1",
                             "kind": "Post",
                             "metadata": {
-                                "name": "fake-post"
+                                "name": "fake-post",
+                                "version": 1
                             }
                         },
                         "stats": {