♻️ chore: 알림 2개로 수정

LgE02 · LgE02 · commit f9264b93be3f · 2025-12-10T23:43:33.000+09:00
diff --git a/src/main/java/com/api/advanced_mobile/domain/alarm/entity/Alarm.java b/src/main/java/com/api/advanced_mobile/domain/alarm/entity/Alarm.java
@@ -1,5 +1,6 @@
 package com.api.advanced_mobile.domain.alarm.entity;
 
+import com.api.advanced_mobile.domain.alarm.entity.enums.AlarmType;
 import com.api.advanced_mobile.domain.member.entity.Member;
 import com.api.advanced_mobile.global.entity.BaseEntity;
 import jakarta.persistence.*;
@@ -23,16 +24,29 @@ public class Alarm extends BaseEntity {
 
     private LocalTime alarmTime;
 
-    @OneToOne(fetch = FetchType.LAZY)
+    @Enumerated(EnumType.STRING)
+    private AlarmType type;
+
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "member_id")
     private Member member;
 
     //기본 생성
-    public static Alarm createDefault(Member member){
+    public static Alarm createMorning(Member member) {
+        return Alarm.builder()
+                .member(member)
+                .type(AlarmType.MORNING)
+                .activate(true)
+                .alarmTime(LocalTime.of(8, 0))
+                .build();
+    }
+
+    public static Alarm createNight(Member member) {
         return Alarm.builder()
                 .member(member)
+                .type(AlarmType.NIGHT)
                 .activate(true)
-                .alarmTime(LocalTime.of(22,0))
+                .alarmTime(LocalTime.of(20, 0))
                 .build();
     }
 
diff --git a/src/main/java/com/api/advanced_mobile/domain/alarm/entity/enums/AlarmType.java b/src/main/java/com/api/advanced_mobile/domain/alarm/entity/enums/AlarmType.java
@@ -0,0 +1,6 @@
+package com.api.advanced_mobile.domain.alarm.entity.enums;
+
+public enum AlarmType {
+    MORNING,
+    NIGHT
+}
diff --git a/src/main/java/com/api/advanced_mobile/domain/alarm/repository/AlarmRepository.java b/src/main/java/com/api/advanced_mobile/domain/alarm/repository/AlarmRepository.java
@@ -1,6 +1,7 @@
 package com.api.advanced_mobile.domain.alarm.repository;
 
 import com.api.advanced_mobile.domain.alarm.entity.Alarm;
+import com.api.advanced_mobile.domain.alarm.entity.enums.AlarmType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -9,4 +10,6 @@
 @Repository
 public interface AlarmRepository extends JpaRepository<Alarm,Long> {
     Optional<Alarm> findByMemberId(Long id);
+
+    Optional<Alarm> findByMemberIdAndType(Long id, AlarmType alarmType);
 }
diff --git a/src/main/java/com/api/advanced_mobile/domain/alarm/service/AlarmServiceImpl.java b/src/main/java/com/api/advanced_mobile/domain/alarm/service/AlarmServiceImpl.java
@@ -1,6 +1,7 @@
 package com.api.advanced_mobile.domain.alarm.service;
 
 import com.api.advanced_mobile.domain.alarm.entity.Alarm;
+import com.api.advanced_mobile.domain.alarm.entity.enums.AlarmType;
 import com.api.advanced_mobile.domain.alarm.exception.NotFoundAlarmException;
 import com.api.advanced_mobile.domain.alarm.repository.AlarmRepository;
 import com.api.advanced_mobile.domain.alarm.web.dto.AlarmRes;
@@ -18,34 +19,45 @@ public class AlarmServiceImpl implements AlarmService{
     //알림 조회
     @Override
     public AlarmRes getAlarm(Long id) {
-        Alarm alarm = alarmRepo.findByMemberId(id)
+        Alarm morning = alarmRepo.findByMemberIdAndType(id, AlarmType.MORNING)
                 .orElseThrow(NotFoundAlarmException::new);
 
-        return AlarmRes.from(
-                alarm.isActivate()
-                ,alarm.getAlarmTime()
-        );
+        Alarm night = alarmRepo.findByMemberIdAndType(id, AlarmType.NIGHT)
+                .orElseThrow(NotFoundAlarmException::new);
+
+
+        return AlarmRes.from(morning, night);
     }
 
     //알림 수정
     @Transactional
     @Override
     public AlarmRes modifyAlarm(Long id, ModifyAlarmReq req) {
-        Alarm alarm = alarmRepo.findByMemberId(id)
+
+        Alarm morning = alarmRepo.findByMemberIdAndType(id, AlarmType.MORNING)
                 .orElseThrow(NotFoundAlarmException::new);
 
-        if (req.getActivate() != null) {
-            alarm.modifyActivate(req.getActivate());
+        Alarm night = alarmRepo.findByMemberIdAndType(id, AlarmType.NIGHT)
+                .orElseThrow(NotFoundAlarmException::new);
+
+
+        updateAlarm(morning, req.getMorning());
+        updateAlarm(night, req.getNight());
+
+
+        return AlarmRes.from(morning, night);
+    }
+
+    private void updateAlarm(Alarm alarm, ModifyAlarmReq.AlarmUpdate update) {
+        if (update == null) return;
+
+        if (update.getActivate() != null) {
+            alarm.modifyActivate(update.getActivate());
         }
 
         // time 변경 요청이 있을 때만 수정
-        if (req.getTime() != null) {
-            alarm.modifyTime(req.getTime());
+        if (update.getTime() != null) {
+            alarm.modifyTime(update.getTime());
         }
-
-        return AlarmRes.from(
-                alarm.isActivate()
-                ,alarm.getAlarmTime()
-        );
     }
 }
diff --git a/src/main/java/com/api/advanced_mobile/domain/alarm/web/dto/AlarmRes.java b/src/main/java/com/api/advanced_mobile/domain/alarm/web/dto/AlarmRes.java
@@ -1,21 +1,38 @@
 package com.api.advanced_mobile.domain.alarm.web.dto;
 
+import com.api.advanced_mobile.domain.alarm.entity.Alarm;
+import com.api.advanced_mobile.domain.alarm.entity.enums.AlarmType;
 import jakarta.validation.Valid;
 import lombok.Builder;
+import lombok.Data;
 import lombok.Getter;
 
 import java.time.LocalTime;
 
-@Getter
+@Data
 @Builder
 public class AlarmRes {
-    private boolean activate;
-    private LocalTime time;
 
-    public static AlarmRes from(boolean activate, LocalTime time){
+    private AlarmInfo morning;
+    private AlarmInfo night;
+
+    @Data
+    @Builder
+    public static class AlarmInfo{
+        private boolean activate;
+        private LocalTime time;
+    }
+
+    public static AlarmRes from(Alarm morning, Alarm night) {
         return AlarmRes.builder()
-                .activate(activate)
-                .time(time)
+                .morning(AlarmInfo.builder()
+                        .activate(morning.isActivate())
+                        .time(morning.getAlarmTime())
+                        .build())
+                .night(AlarmInfo.builder()
+                        .activate(night.isActivate())
+                        .time(night.getAlarmTime())
+                        .build())
                 .build();
     }
 }
diff --git a/src/main/java/com/api/advanced_mobile/domain/alarm/web/dto/ModifyAlarmReq.java b/src/main/java/com/api/advanced_mobile/domain/alarm/web/dto/ModifyAlarmReq.java
@@ -7,7 +7,13 @@
 
 @Data
 public class ModifyAlarmReq {
-    private Boolean activate;
-    private LocalTime time;
+    private AlarmUpdate morning;
+    private AlarmUpdate night;
+
+    @Data
+    public static class AlarmUpdate {
+        private Boolean activate;
+        private LocalTime time;
+    }
 
 }
diff --git a/src/main/java/com/api/advanced_mobile/domain/member/entity/Member.java b/src/main/java/com/api/advanced_mobile/domain/member/entity/Member.java
@@ -54,6 +54,15 @@ public class Member extends BaseEntity {
             orphanRemoval = true)
     private List<Calender> calenders = new ArrayList<>();
 
+    @OneToMany(
+            mappedBy = "member",
+            fetch = FetchType.LAZY,
+            cascade = CascadeType.ALL,
+            orphanRemoval = true
+    )
+    @Builder.Default
+    private List<Alarm> alarms = new ArrayList<>();
+
     // Trouble 추가
     public void addTrouble(Trouble trouble){
         MemberTrouble mt = MemberTrouble.of(this, trouble);
diff --git a/src/main/java/com/api/advanced_mobile/domain/member/service/MemberServiceImpl.java b/src/main/java/com/api/advanced_mobile/domain/member/service/MemberServiceImpl.java
@@ -190,8 +190,10 @@ private void createDefaultRoutines(Member member){
 
     //기본 알림 생성
     private void createDefaultAlarm(Member member) {
-        Alarm alarm = Alarm.createDefault(member);
+        Alarm morning = Alarm.createMorning(member);
+        Alarm night   = Alarm.createNight(member);
 
-        alarmRepository.save(alarm);
+        alarmRepository.save(morning);
+        alarmRepository.save(night);
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -15,6 +15,15 @@ spring.jpa.open-in-view: false
 #session cookies
 server.servlet.session.timeout=60m
 
+#local
+server.servlet.session.cookie.same-site=lax
+server.servlet.session.cookie.secure=false
+
+#server
+#server.servlet.session.cookie.same-site=none
+#server.servlet.session.cookie.secure=true
+
+
 #swagger
 springdoc.swagger-ui.use-root-path=true
 springdoc.swagger-ui.path=/swagger-ui.html

Original file line number	Diff line number	Diff line change
`@@ -190,8 +190,10 @@ private void createDefaultRoutines(Member member){`
`190`	`190`
`191`	`191`	`//기본 알림 생성`
`192`	`192`	`private void createDefaultAlarm(Member member) {`
`193`		`- Alarm alarm = Alarm.createDefault(member);`
	`193`	`+ Alarm morning = Alarm.createMorning(member);`
	`194`	`+ Alarm night = Alarm.createNight(member);`
`194`	`195`
`195`		`- alarmRepository.save(alarm);`
	`196`	`+ alarmRepository.save(morning);`
	`197`	`+ alarmRepository.save(night);`
`196`	`198`	`}`
`197`	`199`	`}`