optimize: EpisodeEndpoint (#703)

Author: chivehao

api/src/main/java/run/ikaros/api/core/subject/EpisodeOperate.java

@@ -12,7 +12,10 @@ public interface EpisodeOperate extends AllowPluginOperate {
 
     Flux<Episode> findAllBySubjectId(Long subjectId);
 
-    Mono<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
+    Mono<Episode> findBySubjectIdAndGroupAndSequenceAndName(
+        Long subjectId, EpisodeGroup group, Float sequence, String name);
+
+    Flux<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
                                                      Float sequence);
 
     Mono<Long> countBySubjectId(Long subjectId);

server/src/main/java/run/ikaros/server/core/attachment/service/impl/AttachmentReferenceServiceImpl.java

@@ -135,7 +135,8 @@ public Mono<Void> matchingAttachmentsAndSubjectEpisodes(Long subjectId, Long[] a
                     .switchIfEmpty(Mono.error(new AttachmentRefMatchingException(
                         "Matching fail, episode not fond by seq=" + seq
                             + " and subjectId=" + subjectId
-                            + " and ep group=" + group))))
+                            + " and ep group=" + group)))
+                    .collectList().map(episodeEntities -> episodeEntities.get(0)))
                 .flatMap(episodeEntity -> repository
                     .existsByTypeAndReferenceId(EPISODE, episodeEntity.getId())
                     .filter(exists -> !exists)

server/src/main/java/run/ikaros/server/core/episode/DefaultEpisodeOperate.java

@@ -34,7 +34,14 @@ public Flux<Episode> findAllBySubjectId(Long subjectId) {
     }
 
     @Override
-    public Mono<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
+    public Mono<Episode> findBySubjectIdAndGroupAndSequenceAndName(
+        Long subjectId, EpisodeGroup group, Float sequence, String name) {
+        return service.findBySubjectIdAndGroupAndSequenceAndName(
+            subjectId, group, sequence, name);
+    }
+
+    @Override
+    public Flux<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
                                                             Float sequence) {
         return service.findBySubjectIdAndGroupAndSequence(subjectId, group, sequence);
     }

server/src/main/java/run/ikaros/server/core/episode/DefaultEpisodeService.java

@@ -67,15 +67,28 @@ public Flux<Episode> findAllBySubjectId(Long subjectId) {
     }
 
     @Override
-    public Mono<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
-                                                            Float sequence) {
+    public Mono<Episode> findBySubjectIdAndGroupAndSequenceAndName(
+        Long subjectId, EpisodeGroup group, Float sequence, String name) {
         Assert.isTrue(subjectId >= 0, "'subjectId' must >= 0.");
         Assert.notNull(group, "'group' must not be null");
         Assert.isTrue(sequence >= 0, "'sequence' must >= 0.");
-        return episodeRepository.findBySubjectIdAndGroupAndSequence(subjectId, group, sequence)
+        Assert.hasText(name, "'name' must not be empty.");
+        return episodeRepository.findBySubjectIdAndGroupAndSequenceAndName(
+                subjectId, group, sequence, name)
             .flatMap(episodeEntity -> copyProperties(episodeEntity, new Episode()));
     }
 
+    @Override
+    public Flux<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
+                                                            Float sequence) {
+        Assert.isTrue(subjectId >= 0, "'subjectId' must >= 0.");
+        Assert.notNull(group, "'group' must not be null");
+        Assert.isTrue(sequence >= 0, "'sequence' must >= 0.");
+        return episodeRepository.findBySubjectIdAndGroupAndSequence(
+            subjectId, group, sequence
+        ).flatMap(episodeEntity -> copyProperties(episodeEntity, new Episode()));
+    }
+
     @Override
     public Mono<Void> deleteById(Long episodeId) {
         Assert.isTrue(episodeId >= 0, "'episodeId' must >= 0.");

server/src/main/java/run/ikaros/server/core/episode/EpisodeEndpoint.java

@@ -4,10 +4,12 @@
 import static org.springdoc.core.fn.builders.requestbody.Builder.requestBodyBuilder;
 
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import java.nio.charset.StandardCharsets;
 import lombok.extern.slf4j.Slf4j;
 import org.springdoc.core.fn.builders.apiresponse.Builder;
 import org.springdoc.webflux.core.fn.SpringdocRouteBuilder;
 import org.springframework.stereotype.Component;
+import org.springframework.util.Base64Utils;
 import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
@@ -40,7 +42,7 @@ public RouterFunction<ServerResponse> endpoint() {
                         .implementation(Episode.class))
                     .response(Builder.responseBuilder()
                         .implementation(Episode.class))
-                )
+            )
 
             .PUT("/episode", this::putEpisode,
                 builder -> builder.operationId("PutEpisode")
@@ -50,7 +52,7 @@ public RouterFunction<ServerResponse> endpoint() {
                         .implementation(Episode.class))
                     .response(Builder.responseBuilder()
                         .implementation(Episode.class))
-                )
+            )
 
             .DELETE("/episode/id/{id}", this::deleteById,
                 builder -> builder.operationId("DeleteById")
@@ -96,6 +98,12 @@ public RouterFunction<ServerResponse> endpoint() {
                         .required(true)
                         .in(ParameterIn.QUERY)
                         .implementation(Float.class))
+                    .parameter(parameterBuilder()
+                        .name("name")
+                        .description("episode name, need base64 encode.")
+                        .required(true)
+                        .in(ParameterIn.QUERY)
+                        .implementation(String.class))
                     .response(Builder.responseBuilder().implementation(Episode.class)))
 
             .GET("/episodes/subjectId/{id}", this::getAllBySubjectId,
@@ -190,7 +198,10 @@ private Mono<ServerResponse> getBySubjectIdAndGroupAndSequence(ServerRequest req
         EpisodeGroup group =
             EpisodeGroup.valueOf(request.queryParam("group").orElse(EpisodeGroup.MAIN.name()));
         Float sequence = Float.valueOf(request.queryParam("sequence").orElse("0"));
-        return episodeService.findBySubjectIdAndGroupAndSequence(subjectId, group, sequence)
+        String rawName = request.queryParam("name").orElse("");
+        String name = new String(Base64Utils.decodeFromString(rawName), StandardCharsets.UTF_8);
+        return episodeService.findBySubjectIdAndGroupAndSequenceAndName(
+                subjectId, group, sequence, name)
             .flatMap(episode -> ServerResponse.ok().bodyValue(episode));
     }
 

server/src/main/java/run/ikaros/server/core/episode/EpisodeService.java

@@ -15,7 +15,10 @@ public interface EpisodeService {
 
     Flux<Episode> findAllBySubjectId(Long subjectId);
 
-    Mono<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
+    Mono<Episode> findBySubjectIdAndGroupAndSequenceAndName(
+        Long subjectId, EpisodeGroup group, Float sequence, String name);
+
+    Flux<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
                                                            Float sequence);
 
     Mono<Void> deleteById(Long episodeId);

server/src/main/java/run/ikaros/server/store/repository/EpisodeRepository.java

@@ -16,6 +16,9 @@ Flux<EpisodeEntity> findAllBySubjectIdOrderByGroupDescSequenceAscAirTimeAscCreat
 
     Mono<Void> deleteAllBySubjectId(Long subjectId);
 
-    Mono<EpisodeEntity> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
+    Flux<EpisodeEntity> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
                                                            Float sequence);
+
+    Mono<EpisodeEntity> findBySubjectIdAndGroupAndSequenceAndName(
+        Long subjectId, EpisodeGroup group, Float sequence, String name);
 }