Skip to content

Fix: (#160) 조각 별 상세 정보가 아닌 활동 키워드에서 키워드 이미지는 투명도 30으로 변경한다 #161

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

Merged
anxi01 merged 2 commits into from
Nov 28, 2024
Merged

Fix: (#160) 조각 별 상세 정보가 아닌 활동 키워드에서 키워드 이미지는 투명도 30으로 변경한다 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d8cd61
fix: (#159) 조각 별 상세 정보 페이지에서는 원본 키워드 이미지를 반환한다
anxi01 Nov 28, 2024
09ea369
fix: (#160) 조각 별 상세 정보가 아닌 활동 키워드에서 키워드 이미지는 투명도 30으로 변경한다
anxi01 Nov 28, 2024
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
2 changes: 1 addition & 1 deletion ...a/spring/backend/activity/application/ReadActivitiesByMemberAndKeywordInMonthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ActivitiesByMemberAndKeywordInMonthResponse readActivitiesByMemberAndKeyw
LocalDateTime endDayOfMonth = TimeUtil.toEndDayOfMonth(yearMonth);
List<ActivityWithTitleAndSavedTimeResponse> activities = activityDao.findActivitiesByMemberAndKeywordInMonth(member.getId(), firstDayOfMonth, endDayOfMonth, keywordCategory);
TotalSavedTimeAndActivityCountByKeywordInMonth totalSavedTimeAndActivityCountByKeywordInMonth = activityDao.findTotalSavedTimeAndActivityCountByKeywordInMonth(member.getId(), firstDayOfMonth, endDayOfMonth, keywordCategory);
Keyword keyword = Keyword.create(keywordCategory, imageConverter.convertToTransparent30ImageUrl(keywordCategory));
Keyword keyword = Keyword.create(keywordCategory, imageConverter.convertToImageUrl(keywordCategory));
return new ActivitiesByMemberAndKeywordInMonthResponse(
totalSavedTimeAndActivityCountByKeywordInMonth.totalSavedTimeByKeywordInMonth(),
totalSavedTimeAndActivityCountByKeywordInMonth.totalActivityCountByKeywordInMonth(),
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/spring/backend/activity/application/ReadMonthlyActivityOverviewService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import spring.backend.activity.domain.value.Keyword.Category;
import spring.backend.activity.dto.request.MonthlyActivityOverviewRequest;
import spring.backend.activity.dto.response.MonthlyActivityCountByKeywordResponse;
import spring.backend.activity.dto.response.MonthlyActivityOverviewResponse;
import spring.backend.activity.dto.response.MonthlySavedTimeAndActivityCountResponse;
import spring.backend.activity.infrastructure.persistence.jpa.value.KeywordJpaValue;
import spring.backend.activity.query.dao.ActivityDao;
import spring.backend.core.converter.ImageConverter;
import spring.backend.core.util.TimeUtil;
import spring.backend.member.domain.entity.Member;

Expand All @@ -24,12 +27,22 @@ public class ReadMonthlyActivityOverviewService {

private final ActivityDao activityDao;

private final ImageConverter imageConverter;

public MonthlyActivityOverviewResponse readMonthlyActivityOverview(Member member, MonthlyActivityOverviewRequest monthlyActivityOverviewRequest) {
YearMonth yearMonth = YearMonth.of(monthlyActivityOverviewRequest.year(), monthlyActivityOverviewRequest.month());
LocalDateTime startDayOfMonth = TimeUtil.toStartDayOfMonth(yearMonth);
LocalDateTime endDayOfMonth = TimeUtil.toEndDayOfMonth(yearMonth);
MonthlySavedTimeAndActivityCountResponse monthlySavedTimeAndActivityCountResponse = activityDao.findMonthlyTotalSavedTimeAndTotalCount(member.getId(), startDayOfMonth, endDayOfMonth);
List<MonthlyActivityCountByKeywordResponse> activityByKeywordSummaryResponses = activityDao.findMonthlyActivitiesByKeywordSummary(member.getId(), startDayOfMonth, endDayOfMonth);
return new MonthlyActivityOverviewResponse(member.getUpdatedAt().getYear(), member.getUpdatedAt().getMonth(), monthlySavedTimeAndActivityCountResponse, activityByKeywordSummaryResponses);
List<MonthlyActivityCountByKeywordResponse> updatedActivityByKeywordSummaryResponses = activityByKeywordSummaryResponses.stream()
.map(response -> {
Category category = response.keyword().getCategory();
String imageUrl = imageConverter.convertToTransparent30ImageUrl(category);
KeywordJpaValue updatedKeyword = KeywordJpaValue.create(category, imageUrl);
return new MonthlyActivityCountByKeywordResponse(updatedKeyword, response.activityCount());
})
.toList();
return new MonthlyActivityOverviewResponse(member.getUpdatedAt().getYear(), member.getUpdatedAt().getMonth(), monthlySavedTimeAndActivityCountResponse, updatedActivityByKeywordSummaryResponses);
}
}