Find the creation date for findExpirableDoc to compare when finding…

… expirable entities #1580
turms-im · Dec 2, 2024 · 52b3ee8 · 52b3ee8
1 parent f71a6cb
commit 52b3ee8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/...ce/src/main/java/im/turms/service/domain/common/repository/ExpirableEntityRepository.java b/...ce/src/main/java/im/turms/service/domain/common/repository/ExpirableEntityRepository.java
@@ -74,11 +74,19 @@ protected Flux<T> findExpirableDocs(Filter filter) {
                 .map(request -> transformExpiredRequest(request, getEntityExpireAfterSeconds()));
     }
 
+    /**
+     * @param options Note that the projection must specify the creation date field to return. The
+     *                method does not specify the creation date field here for better performance.
+     */
     protected Flux<T> findExpirableDocs(Filter filter, QueryOptions options) {
         return mongoClient.findMany(entityClass, filter, options)
                 .map(request -> transformExpiredRequest(request, getEntityExpireAfterSeconds()));
     }
 
+    /**
+     * @param options Note that the projection must specify the creation date field to return. The
+     *                method does not specify the creation date field here for better performance.
+     */
     protected Mono<T> findExpirableDoc(Filter filter, QueryOptions options) {
         return mongoClient.findOne(entityClass, filter, options)
                 .map(request -> transformExpiredRequest(request, getEntityExpireAfterSeconds()));

diff --git a/...ice/src/main/java/im/turms/service/domain/group/repository/GroupInvitationRepository.java b/...ice/src/main/java/im/turms/service/domain/group/repository/GroupInvitationRepository.java
@@ -137,7 +137,9 @@ public Mono<GroupInvitation> findGroupIdAndInviteeIdAndStatus(Long invitationId)
         QueryOptions options = QueryOptions.newBuilder(1)
                 .include(GroupInvitation.Fields.GROUP_ID,
                         GroupInvitation.Fields.INVITEE_ID,
-                        GroupInvitation.Fields.STATUS);
+                        GroupInvitation.Fields.STATUS,
+                        // Required by findExpirableDoc
+                        GroupInvitation.Fields.CREATION_DATE);
         return findExpirableDoc(filter, options);
     }
 
@@ -148,7 +150,9 @@ public Mono<GroupInvitation> findGroupIdAndInviterIdAndInviteeIdAndStatus(Long i
                 .include(GroupInvitation.Fields.GROUP_ID,
                         GroupInvitation.Fields.INVITER_ID,
                         GroupInvitation.Fields.INVITEE_ID,
-                        GroupInvitation.Fields.STATUS);
+                        GroupInvitation.Fields.STATUS,
+                        // Required by findExpirableDoc
+                        GroupInvitation.Fields.CREATION_DATE);
         return findExpirableDoc(filter, options);
     }
 

diff --git a/...ce/src/main/java/im/turms/service/domain/group/repository/GroupJoinRequestRepository.java b/...ce/src/main/java/im/turms/service/domain/group/repository/GroupJoinRequestRepository.java
@@ -147,7 +147,9 @@ public Mono<GroupJoinRequest> findRequesterIdAndStatusAndGroupId(Long requestId)
         QueryOptions options = QueryOptions.newBuilder(1)
                 .include(GroupJoinRequest.Fields.REQUESTER_ID,
                         GroupJoinRequest.Fields.STATUS,
-                        GroupJoinRequest.Fields.GROUP_ID);
+                        GroupJoinRequest.Fields.GROUP_ID,
+                        // Required by findExpirableDoc
+                        GroupJoinRequest.Fields.CREATION_DATE);
         return findExpirableDoc(filter, options);
     }