[차트 입력 기능] OCR + S3 + presigned url로 구현하기

build.gradle

@@ -67,6 +67,19 @@ dependencies {
 
     // Redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+    // SQS
+    implementation platform("io.awspring.cloud:spring-cloud-aws-dependencies:3.0.1")
+    implementation 'io.awspring.cloud:spring-cloud-aws-starter-sqs'
+
+    // CoolSMS
+    implementation 'net.nurigo:sdk:4.3.0'
+
+    // AWS S3
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
+    // Naver Clova OCR API
+    implementation 'org.springframework.boot:spring-boot-starter-webflux' // WebClient 사용을 위한 라이브러리
 }
 
 tasks.named('test') {

src/main/java/dbdr/domain/careworker/WorkDay.java

@@ -0,0 +1,21 @@
+package dbdr.domain.careworker;
+
+public enum WorkDay {
+	MONDAY(1),
+	TUESDAY(2),
+	WEDNESDAY(4),
+	THURSDAY(8),
+	FRIDAY(16),
+	SATURDAY(32),
+	SUNDAY(64);
+
+	private final int value;
+
+	WorkDay(int value) {
+		this.value = value;
+	}
+
+	public int getValue() {
+		return value;
+	}
+}

src/main/java/dbdr/domain/careworker/entity/Careworker.java

@@ -1,7 +1,6 @@
 package dbdr.domain.careworker.entity;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.time.DayOfWeek;
 import java.time.LocalTime;
 
 import dbdr.domain.core.base.entity.BaseEntity;
@@ -40,11 +39,14 @@ public class Careworker extends BaseEntity {
     @JoinColumn(name = "institution_id")
     private Institution institution;
 
+    @Column(nullable = false)
+    private int workDays; // 비트 플래그로 요일 저장
+
     @Column(nullable = true)
     private String lineUserId;
 
     @Column(nullable = true)
-    private LocalTime alertTime;
+    private LocalTime alertTime = LocalTime.of(17, 0); // 오후 5시로 초기화
 
     @Column(unique = true)
     private String email;
@@ -72,4 +74,25 @@ public void updateLineUserId(String lineUserId) {
     public void updateAlertTime(LocalTime alertTime) {
         this.alertTime = alertTime;
     }
-}
+
+    // 요일 설정 및 조회 메서드
+    public void addWorkDay(DayOfWeek day) {
+        this.workDays |= day.getValue();
+    }
+
+    // 다음 근무일 찾기
+    public DayOfWeek getNextWorkingDay(DayOfWeek currentDay) {
+        for (int i = 1; i <= 7; i++) { // 최대 7일을 순환하여 다음 근무일 찾기
+            DayOfWeek nextDay = currentDay.plus(i);
+            if (isWorkingOn(nextDay)) {
+                return nextDay;
+            }
+        }
+        return null;
+    }
+
+    // 근무일인지 확인하기
+    public boolean isWorkingOn(DayOfWeek day) {
+        return (this.workDays & (1 << (day.getValue() - 1))) != 0;
+    }
+}

src/main/java/dbdr/domain/careworker/service/CareworkerService.java

@@ -4,6 +4,7 @@
 import dbdr.domain.careworker.dto.request.CareworkerRequestDTO;
 import dbdr.domain.careworker.dto.response.CareworkerResponseDTO;
 import dbdr.domain.careworker.repository.CareworkerRepository;
+import dbdr.domain.core.alarm.service.AlarmService;
 import dbdr.domain.institution.entity.Institution;
 import dbdr.domain.institution.service.InstitutionService;
 import dbdr.global.exception.ApplicationError;
@@ -12,6 +13,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -21,6 +23,7 @@ public class CareworkerService {
 
     private final CareworkerRepository careworkerRepository;
     private final InstitutionService institutionService;
+    private final AlarmService alarmService;
 
     @Transactional(readOnly = true)
     public List<CareworkerResponseDTO> getCareworkersByInstitution(Long institutionId) {
@@ -50,8 +53,9 @@ public CareworkerResponseDTO createCareworker(CareworkerRequestDTO careworkerReq
         Institution institution = institutionService.getInstitutionById(institutionId);
         Careworker careworker = new Careworker(institution, careworkerRequestDTO.getName(),
                 careworkerRequestDTO.getEmail(), careworkerRequestDTO.getPhone());
-
         careworkerRepository.save(careworker);
+        alarmService.createCareworkerAlarm(careworker);
+
         return toResponseDTO(careworker);
     }
 
@@ -102,11 +106,20 @@ private CareworkerResponseDTO toResponseDTO(Careworker careworker) {
                 careworker.getName(), careworker.getEmail(), careworker.getPhone());
     }
 
-    public Careworker findByLineUserId(String userId) {
-        return careworkerRepository.findByLineUserId(userId).orElse(null);
+    public List<Careworker> findByAlertTime(LocalTime currentTime) {
+        return careworkerRepository.findByAlertTime(currentTime);
     }
 
     public Careworker findByPhone(String phoneNumber) {
         return careworkerRepository.findByPhone(phoneNumber).orElse(null);
     }
+
+    @Transactional
+    public void updateLineUserId(String userId, String phoneNumber) {
+        Careworker careworker = findByPhone(phoneNumber);
+        careworker.updateLineUserId(userId);
+        careworkerRepository.save(careworker);
+    }
+
+
 }

src/main/java/dbdr/domain/core/alarm/entity/Alarm.java

@@ -0,0 +1,74 @@
+package dbdr.domain.core.alarm.entity;
+
+import java.time.LocalDateTime;
+
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.SQLRestriction;
+
+import dbdr.domain.core.base.entity.BaseEntity;
+import dbdr.domain.core.messaging.MessageChannel;
+import dbdr.domain.core.messaging.Role;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "alarms")
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@SQLDelete(sql = "UPDATE alarms SET is_active = false WHERE id = ?")
+@SQLRestriction("is_active = true")
+public class Alarm extends BaseEntity {
+
+	@Column(nullable = false)
+	private LocalDateTime alertTime;
+
+	@Column(nullable = false)
+	private String message;
+
+	@Enumerated(EnumType.STRING)
+	@Column(nullable = true)
+	private MessageChannel channel;
+
+	@Column(nullable = true)
+	private String channelId;
+
+	@Column(nullable = false)
+	private String phone;
+
+	@Column(nullable = true)
+	private boolean isSend = false;
+
+	@Enumerated(EnumType.STRING)
+	@Column(nullable = false)
+	private Role role;
+
+	@Column(nullable = false)
+	private Long roleId;
+
+	public Alarm(LocalDateTime alertTime, String message, String phone, Role role, Long roleId) {
+		this.alertTime = alertTime;
+		this.message = message;
+		this.phone = phone;
+		this.role = role;
+		this.roleId = roleId;
+	}
+
+	public Alarm(LocalDateTime alertTime, MessageChannel channel, String channelId, String message, String phone, Role role, Long roleId) {
+		this.alertTime = alertTime;
+		this.channel = channel;
+		this.channelId = channelId;
+		this.message = message;
+		this.phone = phone;
+		this.role = role;
+		this.roleId = roleId;
+	}
+}

src/main/java/dbdr/domain/core/alarm/repository/AlarmRepository.java

@@ -0,0 +1,12 @@
+package dbdr.domain.core.alarm.repository;
+
+import java.time.LocalDateTime;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+import dbdr.domain.core.alarm.entity.Alarm;
+
+public interface AlarmRepository extends JpaRepository<Alarm, Long> {
+	Optional<Alarm> findByPhone(String phone);
+
+	Optional<Alarm> findByPhoneAndAlertTime(String phone, LocalDateTime alertTime);
+}