Merge pull request #17 from tukcomCD2024/backend/feature/schedule-db

스케쥴 관련 테이블 db 엔티티 수정

backend/src/main/java/com/isp/backend/domain/image/entity/Image.java

@@ -1,6 +1,5 @@
 package com.isp.backend.domain.image.entity;
 
-import com.isp.backend.domain.schedules.entity.MySchedule;
 import com.isp.backend.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
@@ -18,9 +17,9 @@ public class Image extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id ;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "my_schedule_id", nullable = false)
-    private MySchedule mySchedule;
+//    @ManyToOne(fetch = FetchType.LAZY)
+//    @JoinColumn(name = "schedules_id", nullable = false)
+//    private Schedules schedules;
 
     @Column(name = "image_name")
     private String imageName ;

backend/src/main/java/com/isp/backend/domain/receipt/entity/Receipt.java

@@ -1,6 +1,6 @@
 package com.isp.backend.domain.receipt.entity;
 
-import com.isp.backend.domain.schedules.entity.MySchedule;
+import com.isp.backend.domain.schedules.entity.Schedules;
 import com.isp.backend.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
@@ -18,9 +18,9 @@ public class Receipt extends BaseEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id ;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "schedule_id", nullable = false)
-    private MySchedule mySchedule;
+//    @ManyToOne(fetch = FetchType.LAZY)
+//    @JoinColumn(name = "schedule_id", nullable = false)
+//    private Schedules schedules;
 
     @Column(name = "title")
     private String title ;

backend/src/main/java/com/isp/backend/domain/schedule/controller/ScheduleController.java

@@ -0,0 +1,4 @@
+package com.isp.backend.domain.schedule.controller;
+
+public class ScheduleController {
+}

backend/src/main/java/com/isp/backend/domain/schedule/entity/Schedule.java

@@ -0,0 +1,37 @@
+package com.isp.backend.domain.schedule.entity;
+
+import com.isp.backend.domain.schedules.entity.Schedules;
+import com.isp.backend.global.common.BaseEntity;
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.sql.Timestamp;
+
+@Getter
+@AllArgsConstructor
+@Entity
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(name="schedule")
+public class Schedule {
+
+    @Id
+    @Column(name="id", unique = true, nullable = false)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id ;
+
+    @Column(name = "todo")
+    private String todo ;
+
+    @Column(name = "num")
+    private int num ;
+
+    @Column(name = "date")
+    private String date ;
+
+    // Schedules 엔티티의 필드를 참조하도록 수정
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "schedules_id", nullable = false)
+    private Schedules schedules;
+
+}

backend/src/main/java/com/isp/backend/domain/schedule/repository/ScheduleRepository.java

@@ -0,0 +1,7 @@
+package com.isp.backend.domain.schedule.repository;
+
+import com.isp.backend.domain.schedule.entity.Schedule;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ScheduleRepository extends JpaRepository<Schedule, String> {
+}

backend/src/main/java/com/isp/backend/domain/schedules/controller/ScheduleController.java → backend/src/main/java/com/isp/backend/domain/schedules/controller/SchedulesController.java

@@ -7,5 +7,5 @@
 @RestController
 @RequestMapping("/api/schedules")
 @RequiredArgsConstructor
-public class ScheduleController {
+public class SchedulesController {
 }

backend/src/main/java/com/isp/backend/domain/schedules/entity/MySchedule.java → backend/src/main/java/com/isp/backend/domain/schedules/entity/Schedules.java

@@ -1,21 +1,22 @@
 package com.isp.backend.domain.schedules.entity;
 
 import com.isp.backend.domain.member.entity.Member;
-import com.isp.backend.domain.travelPlace.entity.TravelPlace;
+import com.isp.backend.domain.schedule.entity.Schedule;
 import com.isp.backend.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
+
 @Getter
 @AllArgsConstructor
 @Entity
 @Builder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Table(name="my_schedule")
-public class MySchedule extends BaseEntity {
+@Table(name="schedules")
+public class Schedules extends BaseEntity {
 
     @Id
     @Column(name="id", unique = true, nullable = false)
@@ -30,8 +31,8 @@ public class MySchedule extends BaseEntity {
     private Member member;
 
     @Builder.Default
-    @OneToMany(mappedBy = "mySchedule", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<TravelPlace> travelPlaces = new ArrayList<>();
+    @OneToMany(mappedBy = "schedules", cascade = CascadeType.ALL)
+    private List<Schedule> schedules = new ArrayList<>();
 
     // FK 연결 필요
     @Column(name = "booking_id")
@@ -49,4 +50,5 @@ public class MySchedule extends BaseEntity {
     @Builder.Default
     @Column(name = "activated", nullable = false)
     private boolean activated = true;
+
 }

backend/src/main/java/com/isp/backend/domain/schedules/entity/SharedSchedule.java

@@ -19,8 +19,8 @@ public class SharedSchedule extends BaseEntity {
     private Long id ;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "my_schedule_id", nullable = false)
-    private MySchedule mySchedule;
+    @JoinColumn(name = "schedule_id", nullable = false)
+    private Schedules schedules;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id", nullable = false)

backend/src/main/java/com/isp/backend/domain/schedules/repository/SchedulesRepository.java

@@ -0,0 +1,8 @@
+package com.isp.backend.domain.schedules.repository;
+
+import com.isp.backend.domain.schedules.entity.Schedules;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface SchedulesRepository extends JpaRepository<Schedules, String> {
+
+}

backend/src/main/java/com/isp/backend/domain/schedules/service/ScheduleService.java → backend/src/main/java/com/isp/backend/domain/schedules/service/SchedulesService.java

@@ -5,5 +5,5 @@
 
 @RequiredArgsConstructor
 @Service
-public class ScheduleService {
+public class SchedulesService {
 }

backend/src/main/java/com/isp/backend/global/common/BaseEntity.java

@@ -27,12 +27,12 @@ public class BaseEntity {
 
     @PrePersist
     public void onPrePersist() {
-        this.createdAt = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"));
+        this.createdAt = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm"));
         this.updatedAt = this.createdAt;
     }
 
     @PreUpdate
     public void onPreUpdate(){
-        this.updatedAt = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"));
+        this.updatedAt = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm"));
     }
 }