chore : 안쓰는 폴더 삭제, db 꼬이는 것 수정

src/main/java/com/wakeUpTogetUp/togetUp/alarm/AlarmProvider.java

@@ -5,8 +5,6 @@
 import com.wakeUpTogetUp.togetUp.alarm.dto.response.AlarmsRes;
 import com.wakeUpTogetUp.togetUp.exception.BaseException;
 import com.wakeUpTogetUp.togetUp.common.Status;
-import com.wakeUpTogetUp.togetUp.routine.RoutineProvider;
-import com.wakeUpTogetUp.togetUp.routine.dto.response.RoutineRes;
 import com.wakeUpTogetUp.togetUp.users.UserRepository;
 import com.wakeUpTogetUp.togetUp.utils.mapper.EntityDtoMapper;
 import lombok.RequiredArgsConstructor;
@@ -18,7 +16,6 @@
 @Service
 @RequiredArgsConstructor
 public class AlarmProvider {
-    private final RoutineProvider routineProvider;
     private final UserRepository userRepository;
     private final AlarmRepository alarmRepository;
 
@@ -56,12 +53,8 @@ public AlarmRes getAlarm(Integer alarmId) {
                         () -> new BaseException(Status.INVALID_ALARM_ID)
                 );
 
-        // 루틴 리스트 가져오기
-        // 하나도 존재하지 않아도 됨
-        List<RoutineRes> routineResList = routineProvider.getRoutinesByAlarmId(alarmId);
 
         AlarmRes alarmRes = EntityDtoMapper.INSTANCE.toAlarmRes(alarm);
-        alarmRes.setRoutineResList(routineResList);
 
         return alarmRes;
     }

src/main/java/com/wakeUpTogetUp/togetUp/alarm/AlarmService.java

@@ -8,9 +8,6 @@
 import com.wakeUpTogetUp.togetUp.common.Status;
 import com.wakeUpTogetUp.togetUp.mission.MissionRepository;
 import com.wakeUpTogetUp.togetUp.mission.model.Mission;
-import com.wakeUpTogetUp.togetUp.routine.RoutineProvider;
-import com.wakeUpTogetUp.togetUp.routine.RoutineService;
-import com.wakeUpTogetUp.togetUp.routine.dto.request.PostRoutineReq;
 import com.wakeUpTogetUp.togetUp.users.UserRepository;
 import com.wakeUpTogetUp.togetUp.users.model.User;
 import com.wakeUpTogetUp.togetUp.utils.mapper.EntityDtoMapper;
@@ -23,8 +20,6 @@
 @Service
 @RequiredArgsConstructor
 public class AlarmService {
-    private final RoutineProvider routineProvider;
-    private final RoutineService routineService;
     private final AlarmRepository alarmRepository;
     private final UserRepository userRepository;
     private final MissionRepository missionRepository;
@@ -67,14 +62,8 @@ public AlarmRes createAlarm(Integer userId, PostAlarmReq postAlarmReq) {
         Alarm alarmCreated = alarmRepository.save(alarm);
         AlarmRes alarmRes = EntityDtoMapper.INSTANCE.toAlarmRes(alarmCreated);
 
-        // 루틴 리스트가 있으면
-        if(!Objects.isNull(postAlarmReq.getRoutineList())) {
-            // 루틴 리스트 생성
-            for(PostRoutineReq routineReq : postAlarmReq.getRoutineList()) {
-                routineService.createRoutine(routineReq, alarmCreated);
-            }
-            alarmRes.setRoutineResList(routineProvider.getRoutinesByAlarmId(alarmCreated.getId()));
-        }
+
+
         return alarmRes;
     }
 
@@ -113,17 +102,7 @@ public AlarmRes updateAlarm(Integer userId, Integer alarmId, PatchAlarmReq patch
         Alarm alarmModified = alarmRepository.save(alarm);
         AlarmRes alarmRes = EntityDtoMapper.INSTANCE.toAlarmRes(alarmModified);
 
-        // 연관 루틴 삭제
-        routineService.deleteRoutinesByAlarmId(alarmId);
-
-        // 루틴 리스트 재생성
-        if(!Objects.isNull(patchAlarmReq.getRoutineList())) {
-            // 루틴 리스트 생성
-            for(PostRoutineReq routineReq : patchAlarmReq.getRoutineList()) {
-                routineService.createRoutine(routineReq, alarmModified);
-            }
-            alarmRes.setRoutineResList(routineProvider.getRoutinesByAlarmId(alarmModified.getId()));
-        }
+
 
         return alarmRes;
     }

src/main/java/com/wakeUpTogetUp/togetUp/alarm/dto/request/PatchAlarmReq.java

@@ -1,6 +1,5 @@
 package com.wakeUpTogetUp.togetUp.alarm.dto.request;
 
-import com.wakeUpTogetUp.togetUp.routine.dto.request.PostRoutineReq;
 import lombok.*;
 
 import java.sql.Time;
@@ -28,5 +27,4 @@ public class PatchAlarmReq {
     private Boolean friday;
     private Boolean saturday;
     private Boolean sunday;
-    private List<PostRoutineReq> routineList;
 }

src/main/java/com/wakeUpTogetUp/togetUp/alarm/dto/request/PostAlarmReq.java

@@ -1,6 +1,5 @@
 package com.wakeUpTogetUp.togetUp.alarm.dto.request;
 
-import com.wakeUpTogetUp.togetUp.routine.dto.request.PostRoutineReq;
 import lombok.*;
 
 import javax.validation.constraints.NotBlank;
@@ -34,5 +33,4 @@ public class PostAlarmReq {
     private Boolean friday;
     private Boolean saturday;
     private Boolean sunday;
-    private List<PostRoutineReq> routineList;        // 알람에 등록할 루틴 리스트
 }

src/main/java/com/wakeUpTogetUp/togetUp/alarm/dto/response/AlarmRes.java

@@ -1,6 +1,6 @@
 package com.wakeUpTogetUp.togetUp.alarm.dto.response;
 
-import com.wakeUpTogetUp.togetUp.routine.dto.response.RoutineRes;
+
 import lombok.*;
 
 import java.util.List;
@@ -30,5 +30,4 @@ public class AlarmRes {
     private Boolean saturday;
     private Boolean sunday;
     private Boolean isActivated;
-    private List<RoutineRes> routineResList;
 }

src/main/java/com/wakeUpTogetUp/togetUp/alarm/model/Alarm.java

@@ -62,10 +62,13 @@ public void modifyProperties(Mission mission, String name, String icon, String s
     }
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(columnDefinition = "INT UNSIGNED")
     private Integer id;
+
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "userId")
+    @JoinColumn(name = "userId",columnDefinition = "INT UNSIGNED")
     private User user;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "missionId")
     private Mission mission;

src/main/java/com/wakeUpTogetUp/togetUp/avatar/model/Avatar.java

@@ -19,20 +19,9 @@ public class Avatar {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(columnDefinition = "INT UNSIGNED")
     private Integer id = null;
 
-//    @Column(name = "avatarPicLink",columnDefinition = "TEXT")
-//    private String avatarPicLink;
-
-    @Column(name = "hair",length = 30)
-    private String hair;
-    @Column(name = "top",length = 30)
-    private String top;
-
-    @Column(name = "bottom",length = 30)
-    private String bottom;
-    @Column(name = "effect",length = 30)
-    private String effect;
 
     @Column(name = "createdAt")
     private Timestamp createdAt;
@@ -42,12 +31,10 @@ public class Avatar {
 
 
     @OneToOne
-    @JoinColumn(name = "userId")
+    @JoinColumn(name = "userId",columnDefinition = "INT UNSIGNED")
     private User user;
 
-    @Column(name="isActivated",columnDefinition = "TINYINT", length=1)
-    @ColumnDefault("1")
-    private int isActivated;
+
 
     @PrePersist
     void createdAt() {