refactor: reply creation time

halo-dev · Mar 13, 2024 · 17fe4e8 · 17fe4e8
1 parent 0f76008
commit 17fe4e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/application/src/main/java/run/halo/app/core/extension/reconciler/ReplyReconciler.java b/application/src/main/java/run/halo/app/core/extension/reconciler/ReplyReconciler.java
@@ -45,6 +45,12 @@ public Result reconcile(Request request) {
  eventPublisher.publishEvent(new ReplyCreatedEvent(this, reply));
  }
 
+ var creationTime = reply.getSpec().getCreationTime();
+ if (creationTime == null) {
+ reply.getSpec().setCreationTime(reply.getMetadata().getCreationTimestamp());
+ }
+ client.update(reply);
+
  replyNotificationSubscriptionHelper.subscribeNewReplyReasonForReply(reply);
 
  eventPublisher.publishEvent(new ReplyChangedEvent(this, reply));

diff --git a/application/src/main/java/run/halo/app/infra/SchemeInitializer.java b/application/src/main/java/run/halo/app/infra/SchemeInitializer.java
@@ -223,7 +223,8 @@ public void onApplicationEvent(@NonNull ApplicationContextInitializedEvent event
  indexSpecs.add(new IndexSpec()
  .setName("spec.creationTime")
  .setIndexFunc(simpleAttribute(Comment.class,
- comment -> comment.getSpec().getCreationTime().toString())
+ comment -> defaultIfNull(comment.getSpec().getCreationTime(),
+ comment.getMetadata().getCreationTimestamp()).toString())
  ));
  indexSpecs.add(new IndexSpec()
  .setName("spec.approved")
@@ -286,7 +287,8 @@ public void onApplicationEvent(@NonNull ApplicationContextInitializedEvent event
  indexSpecs.add(new IndexSpec()
  .setName("spec.creationTime")
  .setIndexFunc(simpleAttribute(Reply.class,
- reply -> reply.getSpec().getCreationTime().toString())
+ reply -> defaultIfNull(reply.getSpec().getCreationTime(),
+ reply.getMetadata().getCreationTimestamp()).toString())
  ));
  indexSpecs.add(new IndexSpec()
  .setName("spec.commentName")