Skip to content

Commit 709a2af

Browse files
authored
hotfix/OPS-346 : 파일 조회 수정 (#104)
1 parent cf67de3 commit 709a2af

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

src/main/java/org/tuna/zoopzoop/backend/domain/archive/folder/service/FolderService.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.tuna.zoopzoop.backend.domain.datasource.repository.DataSourceRepository;
1717
import org.tuna.zoopzoop.backend.domain.member.entity.Member;
1818
import org.tuna.zoopzoop.backend.domain.member.repository.MemberRepository;
19+
import org.tuna.zoopzoop.backend.domain.datasource.entity.Tag;
1920

2021
import java.util.HashSet;
2122
import java.util.List;
@@ -184,8 +185,11 @@ public FolderFilesDto getFilesInFolderForPersonal(Integer memberId, Integer fold
184185
ds.getSummary(),
185186
ds.getSourceUrl(),
186187
ds.getImageUrl(),
187-
ds.getTags() == null ? List.of() : ds.getTags(),
188-
ds.getCategory() == null ? null : ds.getCategory().toString()
188+
ds.getTags() == null ? List.of()
189+
: ds.getTags().stream()
190+
.map(Tag::getTagName)
191+
.toList(),
192+
ds.getCategory() == null ? null : ds.getCategory().name()
189193
))
190194
.toList();
191195

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.tuna.zoopzoop.backend.domain.datasource.dto;
22

3-
import org.tuna.zoopzoop.backend.domain.datasource.entity.Tag;
4-
53
import java.time.LocalDate;
64
import java.util.List;
75

@@ -12,6 +10,8 @@ public record FileSummary(
1210
String summary,
1311
String sourceUrl,
1412
String imageUrl,
15-
List<Tag> tags,
13+
List<String> tags,
1614
String category
1715
) {}
16+
17+

src/main/java/org/tuna/zoopzoop/backend/domain/news/service/NewsService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ public List<String> getTagFrequencyFromFiles(Integer memberId, Integer folderId)
2222
List<FileSummary> files = folderFilesDto.files();
2323

2424
Map<String, Long> tags = files.stream()
25-
.flatMap(file -> file.tags().stream())
26-
.map(tag -> tag.getTagName())
25+
.flatMap(file -> {
26+
List<String> ts = file.tags();
27+
return (ts == null ? List.<String>of() : ts).stream();
28+
})
2729
.collect(Collectors.groupingBy(
2830
tagName -> tagName,
2931
Collectors.counting()

src/test/java/org/tuna/zoopzoop/backend/domain/archive/folder/service/FolderServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ void getFilesInFolderForPersonal_success() {
298298
assertThat(f0.summary()).isEqualTo("요약 A");
299299
assertThat(f0.sourceUrl()).isEqualTo("http://src/a");
300300
assertThat(f0.imageUrl()).isEqualTo("http://img/a");
301-
assertThat(f0.tags()).extracting(Tag::getTagName).containsExactly("tag1", "tag2");
301+
assertThat(f0.tags()).containsExactly("tag1", "tag2");
302302
}
303303

304304
@Test

src/test/java/org/tuna/zoopzoop/backend/domain/space/space/controller/ApiV1SpaceControllerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.springframework.security.test.context.support.WithUserDetails;
99
import org.springframework.test.context.ActiveProfiles;
1010
import org.springframework.test.web.servlet.ResultActions;
11-
import org.springframework.transaction.annotation.Propagation;
1211
import org.springframework.transaction.annotation.Transactional;
1312
import org.tuna.zoopzoop.backend.domain.member.enums.Provider;
1413
import org.tuna.zoopzoop.backend.domain.member.service.MemberService;

0 commit comments

Comments
 (0)