Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class SecurityConfig {
"/auth/login/apple",
"/auth/apple/sync",
"/minimum-version",
"/keywords/popular",
};

private static final String[] swaggerPaths = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ public record PopularNovelGetResponse(
String author,
String genreName,
String novelDescription,
boolean isNovelCompleted,
List<String> novelGenres
boolean isNovelCompleted

) {

public static PopularNovelGetResponse of(Novel novel, AvatarProfile avatarProfile, Feed feed, List<String> keywords, List<String> genres) {
public static PopularNovelGetResponse of(Novel novel, AvatarProfile avatarProfile, Feed feed, List<String> keywords) {
if (avatarProfile == null && feed == null) {
return new PopularNovelGetResponse(
novel.getNovelId(),
Expand All @@ -34,8 +33,7 @@ public static PopularNovelGetResponse of(Novel novel, AvatarProfile avatarProfil
novel.getAuthor(),
novel.getFirstGenreName(),
novel.getNovelDescription(),
novel.getIsCompleted(),
genres
novel.getIsCompleted()

);
}
Expand All @@ -50,8 +48,7 @@ public static PopularNovelGetResponse of(Novel novel, AvatarProfile avatarProfil
novel.getAuthor(),
novel.getFirstGenreName(),
novel.getNovelDescription(),
novel.getIsCompleted(),
genres
novel.getIsCompleted()
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.util.List;
import java.util.Map;

import org.websoso.WSSServer.dto.keyword.KeywordGetResponse;
import org.websoso.WSSServer.library.domain.Keyword;
import org.websoso.WSSServer.user.domain.AvatarProfile;
import org.websoso.WSSServer.feed.domain.Feed;
Expand All @@ -23,14 +22,12 @@ public static PopularNovelsGetResponse create(List<Novel> popularNovels,
List<String> keywordGetResponsesList = keywords.get(novel.getNovelId()).stream()
.map(keyword -> keyword.getKeywordName())
.toList();
List<String> genres = novel.getNovelGenres().stream()
.map(novelGenre -> novelGenre.getGenre().getGenreName())
.toList();

if (feed == null) {
return PopularNovelGetResponse.of(novel, null, null, keywordGetResponsesList, genres);
return PopularNovelGetResponse.of(novel, null, null, keywordGetResponsesList);
}
AvatarProfile avatar = avatarMap.get(feed.getUser().getAvatarProfileId());
return PopularNovelGetResponse.of(novel, avatar, feed, keywordGetResponsesList, genres);
return PopularNovelGetResponse.of(novel, avatar, feed, keywordGetResponsesList);
})
.toList();
return new PopularNovelsGetResponse(popularNovelResponses);
Expand Down
Loading