Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add getBySubjectIdAndGroupAndSequence endpoint in EpisodeEndpoi… #701

Merged
merged 1 commit into from
Oct 16, 2024
+61 −0
Merged

feat: add getBySubjectIdAndGroupAndSequence endpoint in EpisodeEndpoi… #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/src/main/java/run/ikaros/api/core/subject/EpisodeOperate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import run.ikaros.api.plugin.AllowPluginOperate;
import run.ikaros.api.store.enums.EpisodeGroup;

public interface EpisodeOperate extends AllowPluginOperate {
Mono<Episode> save(Episode episode);
Expand All @@ -11,6 +12,9 @@ public interface EpisodeOperate extends AllowPluginOperate {

Flux<Episode> findAllBySubjectId(Long subjectId);

Mono<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
Float sequence);

Mono<Long> countBySubjectId(Long subjectId);

/**
Expand Down
7 changes: 7 additions & 0 deletions server/src/main/java/run/ikaros/server/core/episode/DefaultEpisodeOperate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import run.ikaros.api.core.subject.Episode;
import run.ikaros.api.core.subject.EpisodeOperate;
import run.ikaros.api.core.subject.EpisodeResource;
import run.ikaros.api.store.enums.EpisodeGroup;

@Slf4j
@Component
Expand All @@ -32,6 +33,12 @@ public Flux<Episode> findAllBySubjectId(Long subjectId) {
return service.findAllBySubjectId(subjectId);
}

@Override
public Mono<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
Float sequence) {
return service.findBySubjectIdAndGroupAndSequence(subjectId, group, sequence);
}

@Override
public Mono<Long> countBySubjectId(Long subjectId) {
return service.countBySubjectId(subjectId);
Expand Down
11 changes: 11 additions & 0 deletions server/src/main/java/run/ikaros/server/core/episode/DefaultEpisodeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import run.ikaros.api.core.subject.Episode;
import run.ikaros.api.core.subject.EpisodeResource;
import run.ikaros.api.store.enums.AttachmentReferenceType;
import run.ikaros.api.store.enums.EpisodeGroup;
import run.ikaros.server.store.entity.EpisodeEntity;
import run.ikaros.server.store.repository.AttachmentReferenceRepository;
import run.ikaros.server.store.repository.AttachmentRepository;
Expand Down Expand Up @@ -65,6 +66,16 @@ public Flux<Episode> findAllBySubjectId(Long subjectId) {
.flatMap(episodeEntity -> copyProperties(episodeEntity, new Episode()));
}

@Override
public Mono<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.");
Expand Down
35 changes: 35 additions & 0 deletions server/src/main/java/run/ikaros/server/core/episode/EpisodeEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
import run.ikaros.api.constant.OpenApiConst;
import run.ikaros.api.core.subject.Episode;
import run.ikaros.api.core.subject.EpisodeResource;
import run.ikaros.api.infra.utils.StringUtils;
import run.ikaros.api.store.enums.EpisodeGroup;
import run.ikaros.server.endpoint.CoreEndpoint;

@Slf4j
Expand Down Expand Up @@ -73,6 +75,29 @@ public RouterFunction<ServerResponse> endpoint() {
.implementation(Long.class))
.response(Builder.responseBuilder().implementation(Episode.class)))

.GET("/episode/subjectId/{id}", this::getBySubjectIdAndGroupAndSequence,
builder -> builder.operationId("GetById")
.tag(tag).description("Get episode by episode id.")
.parameter(parameterBuilder()
.name("id")
.description("Subject id")
.in(ParameterIn.PATH)
.required(true)
.implementation(Long.class))
.parameter(parameterBuilder()
.name("group")
.description("episode group")
.required(true)
.in(ParameterIn.QUERY)
.implementation(EpisodeGroup.class))
.parameter(parameterBuilder()
.name("sequence")
.description("episode sequence")
.required(true)
.in(ParameterIn.QUERY)
.implementation(EpisodeGroup.class))
.response(Builder.responseBuilder().implementation(Episode.class)))

.GET("/episodes/subjectId/{id}", this::getAllBySubjectId,
builder -> builder.operationId("getAllBySubjectId")
.tag(tag).description("Get all by subject id.")
Expand Down Expand Up @@ -159,6 +184,16 @@ private Mono<ServerResponse> getById(ServerRequest request) {
.flatMap(episode -> ServerResponse.ok().bodyValue(episode));
}

private Mono<ServerResponse> getBySubjectIdAndGroupAndSequence(ServerRequest request) {
String id = request.pathVariable("id");
Long subjectId = StringUtils.isNotBlank(id) ? Long.parseLong(id) : -1L;
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)
.flatMap(episode -> ServerResponse.ok().bodyValue(episode));
}

private Mono<ServerResponse> postEpisode(ServerRequest request) {
return request.bodyToMono(Episode.class)
.flatMap(episodeService::save)
Expand Down
4 changes: 4 additions & 0 deletions server/src/main/java/run/ikaros/server/core/episode/EpisodeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import reactor.core.publisher.Mono;
import run.ikaros.api.core.subject.Episode;
import run.ikaros.api.core.subject.EpisodeResource;
import run.ikaros.api.store.enums.EpisodeGroup;

public interface EpisodeService {
@Transactional
Expand All @@ -14,6 +15,9 @@ public interface EpisodeService {

Flux<Episode> findAllBySubjectId(Long subjectId);

Mono<Episode> findBySubjectIdAndGroupAndSequence(Long subjectId, EpisodeGroup group,
Float sequence);

Mono<Void> deleteById(Long episodeId);

Mono<Long> countBySubjectId(Long subjectId);
Expand Down
Loading