Skip to content

Commit cd41892

Browse files
committed
REFACTOR: temp refactor
1 parent ae5d7c6 commit cd41892

6 files changed

Lines changed: 31 additions & 14 deletions

File tree

src/main/java/com/studioedge/focus_to_levelup_server/domain/focus/service/FocusServiceV4.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void saveFocus(Member m, Long subjectId) {
113113
return DailySubject.builder()
114114
.member(member)
115115
.subject(subject)
116-
.date(serviceDate)
116+
.date(dailyGoal.getDailyGoalDate())
117117
.build();
118118
});
119119
if (!subject.getMember().getId().equals(m.getId())) {

src/main/java/com/studioedge/focus_to_levelup_server/domain/member/dto/GetProfileResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static GetProfileResponse of(Member member, MemberInfo memberInfo, String
7575
.focusOn(member.getIsFocusing())
7676
.subscriptionType(subscriptionType)
7777
.currentTier(ranking)
78-
.highestTier(memberInfo.getHighestTier() == null ? "-" : memberInfo.getHighestTier().toString())
78+
.highestTier(memberInfo.getHighestTier() == null ? "BRONZE" : memberInfo.getHighestTier().toString())
7979
.currentLevel(member.getCurrentLevel())
8080
.currentExp(member.getCurrentExp())
8181
.totalLevel(memberInfo.getTotalLevel())

src/main/java/com/studioedge/focus_to_levelup_server/global/batch/step/monthly/UpdateMonthlyStatStep.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.springframework.transaction.PlatformTransactionManager;
2222
import org.springframework.util.CollectionUtils;
2323

24-
import java.time.Clock;
2524
import java.time.LocalDate;
2625
import java.time.temporal.TemporalAdjusters;
2726
import java.util.ArrayList;
@@ -40,8 +39,6 @@ public class UpdateMonthlyStatStep {
4039
private final MonthlyStatRepository monthlyStatRepository;
4140
private final DailyGoalRepository dailyGoalRepository;
4241

43-
private final Clock clock;
44-
4542
@Bean
4643
public Step updateMonthlyStat(ItemProcessor<Member, Member> passThroughMemberProcessor) {
4744
return new StepBuilder("updateMonthlyStat", jobRepository)
@@ -65,7 +62,7 @@ public RepositoryItemReader<Member> updateMonthlyStatReader() {
6562

6663
@Bean
6764
public ItemWriter<Member> updateMonthStatWriter() {
68-
LocalDate today = LocalDate.now(clock);
65+
LocalDate today = LocalDate.now();
6966
LocalDate firstDayOfLastMonth = today.minusMonths(1).with(TemporalAdjusters.firstDayOfMonth());
7067
LocalDate lastDayOfLastMonth = today.minusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
7168
int targetYear = firstDayOfLastMonth.getYear();

src/main/java/com/studioedge/focus_to_levelup_server/global/batch/step/monthly/UpdateMonthlySubjectStatStep.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.springframework.transaction.PlatformTransactionManager;
2222
import org.springframework.util.CollectionUtils;
2323

24-
import java.time.Clock;
2524
import java.time.LocalDate;
2625
import java.time.temporal.TemporalAdjusters;
2726
import java.util.ArrayList;
@@ -40,8 +39,6 @@ public class UpdateMonthlySubjectStatStep {
4039
private final MonthlySubjectStatRepository monthlySubjectStatRepository;
4140
private final DailySubjectRepository dailySubjectRepository;
4241

43-
private final Clock clock;
44-
4542
@Bean
4643
public Step updateMonthlySubjectStat() {
4744
return new StepBuilder("updateMonthlySubjectStat", jobRepository)
@@ -72,7 +69,7 @@ public ItemProcessor<Member, Member> passThroughMemberProcessor() {
7269
public ItemWriter<Member> updateMonthlySubjectStatWriter() {
7370
return chunk -> {
7471

75-
LocalDate today = LocalDate.now(clock);
72+
LocalDate today = LocalDate.now();
7673
LocalDate firstDayOfLastMonth = today.minusMonths(1).with(TemporalAdjusters.firstDayOfMonth());
7774
LocalDate lastDayOfLastMonth = today.minusMonths(1).with(TemporalAdjusters.lastDayOfMonth());
7875
Integer lastYearValue = firstDayOfLastMonth.getYear(); // MonthlySubjectStat은 year 필드가 있음

src/main/java/com/studioedge/focus_to_levelup_server/global/batch/step/season_end/GrantSeasonRewardStep.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ private Mail createSeasonEndMail(Member member, Tier finalTier) {
114114
// 보상 계산
115115
int diamonds = Tier.getSeasonRewardDiamonds(finalTier);
116116

117-
// 마스터인 경우 구독권 텍스트 추가
118-
boolean isMaster = (finalTier == Tier.MASTER);
119-
120117
String title = "시즌이 종료되었습니다. 최종 보상을 확인하세요";
121118
String popupTitle = finalTier.name() + " 시즌 종료 보상";
122119
String popupContent = String.format(
@@ -129,7 +126,7 @@ private Mail createSeasonEndMail(Member member, Tier finalTier) {
129126
.senderName("Focus to Level Up")
130127
.type(MailType.SEASON_END)
131128
.title(title)
132-
.description("시즌 종료 보상입니다.\n" + (isMaster ? "(구독권 포함)" : ""))
129+
.description("시즌 종료 보상입니다!\n")
133130
.popupTitle(popupTitle)
134131
.popupContent(popupContent)
135132
.reward(diamonds) // 다이아 보상

src/main/resources/static/advertisement_data.sql

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,31 @@ VALUES
4444
-- , (@ad_id_1, 'HIGH_2');
4545

4646
-- -----------------------------------------------------
47+
-- 2. 김서현(kim._.fx) 선생님 광고
48+
-- 타겟: 예비 고3 (HIGH_3), N수생 (N_SU)
49+
-- 설문조사 기반 데이터
50+
-- -----------------------------------------------------
51+
52+
-- [Step 1] 부모 테이블(advertisements)에 정보 저장
53+
-- 이미지 파일명은 인스타 ID를 참고하여 'kim_fx.png'로 가정하였습니다.
54+
-- 실제 S3에 업로드된 파일명과 일치해야 합니다.
55+
INSERT INTO advertisements (image_url, link, click_count, view_count, is_active)
56+
VALUES (
57+
CONCAT(@s3_ad_base_url, 'kim._.fx.png'),
58+
'https://hacks-zone.imweb.me',
59+
0,
60+
0,
61+
true
62+
);
63+
64+
-- 방금 들어간 광고의 ID를 변수에 저장
65+
SET @ad_id_2 = LAST_INSERT_ID();
66+
67+
-- [Step 2] 자식 테이블(advertisement_categories)에 타겟 카테고리 매핑
68+
-- 설문조사의 '예비 고3'과 'N수'를 모두 포함합니다.
69+
INSERT INTO advertisement_categories (advertisement_id, category_sub)
70+
VALUES
71+
(@ad_id_2, 'HIGH_3'), -- 예비 고3
72+
(@ad_id_2, 'N_SU'); -- N수생 (기타 답변 반영)
4773

4874
SET FOREIGN_KEY_CHECKS = 1;

0 commit comments

Comments
 (0)