Skip to content

Commit 9fc4938

Browse files
authored
Merge pull request #82 from Konkuk-KUIT/81-collection-fix
fix: newsletter -> usernewsletter
2 parents 2c4eed1 + 92f1a60 commit 9fc4938

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.archiveat.server.domain.collection.dto.response;
22

33
public record NewsletterDto(
4-
Long newsletterId,
5-
String domainName,
6-
String title,
7-
String thumbnailUrl,
8-
Integer consumptionTimeMin,
9-
String memo,
10-
Boolean isRead,
11-
String createdAt) {
4+
Long userNewsletterId,
5+
Long newsletterId,
6+
String domainName,
7+
String title,
8+
String thumbnailUrl,
9+
Integer consumptionTimeMin,
10+
String memo,
11+
Boolean isRead,
12+
String createdAt) {
1213
}

src/main/java/com/archiveat/server/domain/collection/service/CollectionService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public CollectionDetailResponse getCollectionDetail(Long userId, Long collection
8080
UserNewsletter userNewsletter = userNewsletterMap.get(newsletter.getId());
8181

8282
return new NewsletterDto(
83+
userNewsletter != null ? userNewsletter.getId() : null,
8384
newsletter.getId(),
8485
newsletter.getDomain().getName(),
8586
newsletter.getTitle(),

0 commit comments

Comments
 (0)