Skip to content

Commit 36dd044

Browse files
authored
Merge pull request #159 from WeatherTago/feat/39-alarm
[Refactor] fcm 관련 코드 수정
2 parents 8e0748c + a2c2600 commit 36dd044

10 files changed

Lines changed: 284 additions & 245 deletions

File tree

src/main/java/com/tave/weathertago/config/ExpoConfig.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/main/java/com/tave/weathertago/controller/alarm/AlarmFcmController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.springframework.http.ResponseEntity;
1111
import org.springframework.web.bind.annotation.*;
1212

13-
@Tag(name = "Alarm auto send", description = "알림 전송 API 아직 X")
13+
@Tag(name = "Alarm auto send", description = "알림 전송 API")
1414
@RestController
1515
@RequiredArgsConstructor
1616
@RequestMapping("/api/users/me/alarms")

src/main/java/com/tave/weathertago/domain/Alarm.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.tave.weathertago.domain;
22

33
import com.tave.weathertago.domain.common.BaseEntity;
4+
import com.tave.weathertago.domain.enums.AlarmDay;
5+
import com.tave.weathertago.domain.enums.AlarmPeriod;
46
import jakarta.persistence.*;
57
import lombok.*;
68
import org.springframework.format.annotation.DateTimeFormat;

src/main/java/com/tave/weathertago/domain/AlarmDay.java renamed to src/main/java/com/tave/weathertago/domain/enums/AlarmDay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tave.weathertago.domain;
1+
package com.tave.weathertago.domain.enums;
22

33
public enum AlarmDay {
44
TODAY,

src/main/java/com/tave/weathertago/domain/AlarmPeriod.java renamed to src/main/java/com/tave/weathertago/domain/enums/AlarmPeriod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tave.weathertago.domain;
1+
package com.tave.weathertago.domain.enums;
22

33
public enum AlarmPeriod {
44
EVERYDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY

src/main/java/com/tave/weathertago/domain/Direction.java renamed to src/main/java/com/tave/weathertago/domain/enums/Direction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tave.weathertago.domain;
1+
package com.tave.weathertago.domain.enums;
22

33
public enum Direction {
44
UP(0, "상행"),

src/main/java/com/tave/weathertago/dto/alarm/AlarmRequestDTO.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
package com.tave.weathertago.dto.alarm;
22

3-
import com.tave.weathertago.domain.AlarmDay;
4-
import com.tave.weathertago.domain.AlarmPeriod;
5-
import com.tave.weathertago.domain.Direction;
6-
import com.tave.weathertago.domain.Station;
3+
import com.tave.weathertago.domain.enums.AlarmDay;
4+
import com.tave.weathertago.domain.enums.AlarmPeriod;
75
import lombok.Builder;
86
import lombok.Getter;
97

10-
import java.time.LocalTime;
11-
128
public class AlarmRequestDTO {
139

1410
@Getter

src/main/java/com/tave/weathertago/dto/alarm/AlarmResponseDTO.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.tave.weathertago.dto.alarm;
22

3-
import com.tave.weathertago.domain.*;
3+
import com.tave.weathertago.domain.enums.AlarmDay;
4+
import com.tave.weathertago.domain.enums.AlarmPeriod;
45
import lombok.Builder;
56
import lombok.Getter;
67

7-
import java.time.LocalTime;
8-
98
public class AlarmResponseDTO {
109

1110
@Getter

src/main/java/com/tave/weathertago/repository/AlarmRepository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.tave.weathertago.repository;
22

33
import com.tave.weathertago.domain.*;
4+
import com.tave.weathertago.domain.enums.AlarmDay;
5+
import com.tave.weathertago.domain.enums.AlarmPeriod;
46
import org.springframework.data.jpa.repository.JpaRepository;
57

68
import java.time.LocalTime;

0 commit comments

Comments
 (0)