From 66c8d009edb7706ffeb4bc4211f7340615576aa0 Mon Sep 17 00:00:00 2001 From: DaeunSon <130820902+DaeunSon@users.noreply.github.com> Date: Wed, 25 Jun 2025 16:27:33 +0900 Subject: [PATCH] =?UTF-8?q?Chore=20:=20=EA=B5=AC=EC=A1=B0=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HomeController.java | 7 ++++--- .../{userController => }/LoginController.java | 2 +- .../controller/StudentDataController.java | 4 ++++ .../enjoy/controller/TrackController.java | 4 ++++ .../{smartair => enjoy}/dto/CourseDto.java | 4 ++-- .../dto/CourseStatusDto.java | 2 +- .../dto/TrackDetailDto.java | 2 +- .../dto/TrackProgressDto.java | 2 +- .../entity/StudentCourse.java | 2 +- .../{smartair => enjoy}/entity/Track.java | 2 +- .../entity/TrackCourse.java | 2 +- .../repository/ScheduledCourseRepository.java | 4 ++++ .../repository/StudentCourseRepository.java | 6 +++--- .../repository/TrackCourseRepository.java | 6 +++--- .../repository/TrackRepository.java | 6 +++--- .../enjoy/repository/UserRepository.java | 4 ++++ .../service/TrackService.java | 18 +++++++++--------- .../controller/StudentDataController.java | 4 ---- .../smartair/controller/TrackController.java | 4 ---- .../repository/ScheduledCourseRepository.java | 4 ---- .../smartair/repository/UserRepository.java | 4 ---- 21 files changed, 47 insertions(+), 46 deletions(-) rename src/main/java/com/example/{smartair => enjoy}/controller/HomeController.java (88%) rename src/main/java/com/example/enjoy/controller/{userController => }/LoginController.java (96%) create mode 100644 src/main/java/com/example/enjoy/controller/StudentDataController.java create mode 100644 src/main/java/com/example/enjoy/controller/TrackController.java rename src/main/java/com/example/{smartair => enjoy}/dto/CourseDto.java (91%) rename src/main/java/com/example/{smartair => enjoy}/dto/CourseStatusDto.java (93%) rename src/main/java/com/example/{smartair => enjoy}/dto/TrackDetailDto.java (94%) rename src/main/java/com/example/{smartair => enjoy}/dto/TrackProgressDto.java (95%) rename src/main/java/com/example/{smartair => enjoy}/entity/StudentCourse.java (91%) rename src/main/java/com/example/{smartair => enjoy}/entity/Track.java (93%) rename src/main/java/com/example/{smartair => enjoy}/entity/TrackCourse.java (94%) create mode 100644 src/main/java/com/example/enjoy/repository/ScheduledCourseRepository.java rename src/main/java/com/example/{smartair => enjoy}/repository/StudentCourseRepository.java (81%) rename src/main/java/com/example/{smartair => enjoy}/repository/TrackCourseRepository.java (61%) rename src/main/java/com/example/{smartair => enjoy}/repository/TrackRepository.java (79%) create mode 100644 src/main/java/com/example/enjoy/repository/UserRepository.java rename src/main/java/com/example/{smartair => enjoy}/service/TrackService.java (90%) delete mode 100644 src/main/java/com/example/smartair/controller/StudentDataController.java delete mode 100644 src/main/java/com/example/smartair/controller/TrackController.java delete mode 100644 src/main/java/com/example/smartair/repository/ScheduledCourseRepository.java delete mode 100644 src/main/java/com/example/smartair/repository/UserRepository.java diff --git a/src/main/java/com/example/smartair/controller/HomeController.java b/src/main/java/com/example/enjoy/controller/HomeController.java similarity index 88% rename from src/main/java/com/example/smartair/controller/HomeController.java rename to src/main/java/com/example/enjoy/controller/HomeController.java index 603980c..48ff0f3 100644 --- a/src/main/java/com/example/smartair/controller/HomeController.java +++ b/src/main/java/com/example/enjoy/controller/HomeController.java @@ -1,8 +1,9 @@ -package com.example.smartair.controller; +package com.example.enjoy.controller; + import ch.qos.logback.core.model.Model; -import com.example.smartair.dto.TrackProgressDto; -import com.example.smartair.service.TrackService; +import com.example.enjoy.dto.TrackProgressDto; +import com.example.enjoy.service.TrackService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/example/enjoy/controller/userController/LoginController.java b/src/main/java/com/example/enjoy/controller/LoginController.java similarity index 96% rename from src/main/java/com/example/enjoy/controller/userController/LoginController.java rename to src/main/java/com/example/enjoy/controller/LoginController.java index 0cfdcdb..1ce7d89 100644 --- a/src/main/java/com/example/enjoy/controller/userController/LoginController.java +++ b/src/main/java/com/example/enjoy/controller/LoginController.java @@ -1,4 +1,4 @@ -package com.example.enjoy.controller.userController; +package com.example.enjoy.controller; import com.example.enjoy.dto.loginDto.MemberCommand; import com.example.enjoy.dto.loginDto.MemberDto; diff --git a/src/main/java/com/example/enjoy/controller/StudentDataController.java b/src/main/java/com/example/enjoy/controller/StudentDataController.java new file mode 100644 index 0000000..88e6f23 --- /dev/null +++ b/src/main/java/com/example/enjoy/controller/StudentDataController.java @@ -0,0 +1,4 @@ +package com.example.enjoy.controller; + +public class StudentDataController { +} diff --git a/src/main/java/com/example/enjoy/controller/TrackController.java b/src/main/java/com/example/enjoy/controller/TrackController.java new file mode 100644 index 0000000..9460444 --- /dev/null +++ b/src/main/java/com/example/enjoy/controller/TrackController.java @@ -0,0 +1,4 @@ +package com.example.enjoy.controller; + +public class TrackController { +} diff --git a/src/main/java/com/example/smartair/dto/CourseDto.java b/src/main/java/com/example/enjoy/dto/CourseDto.java similarity index 91% rename from src/main/java/com/example/smartair/dto/CourseDto.java rename to src/main/java/com/example/enjoy/dto/CourseDto.java index 133278a..b15eedc 100644 --- a/src/main/java/com/example/smartair/dto/CourseDto.java +++ b/src/main/java/com/example/enjoy/dto/CourseDto.java @@ -1,4 +1,4 @@ -package com.example.smartair.dto; +package com.example.enjoy.dto; import lombok.AllArgsConstructor; import lombok.Getter; @@ -14,4 +14,4 @@ public class CourseDto { private String courseName; // 현재 과목명 private String courseAlias; // 과거 과목명 (없으면 null) -} +} \ No newline at end of file diff --git a/src/main/java/com/example/smartair/dto/CourseStatusDto.java b/src/main/java/com/example/enjoy/dto/CourseStatusDto.java similarity index 93% rename from src/main/java/com/example/smartair/dto/CourseStatusDto.java rename to src/main/java/com/example/enjoy/dto/CourseStatusDto.java index 05a476f..dcbe8f9 100644 --- a/src/main/java/com/example/smartair/dto/CourseStatusDto.java +++ b/src/main/java/com/example/enjoy/dto/CourseStatusDto.java @@ -1,4 +1,4 @@ -package com.example.smartair.dto; +package com.example.enjoy.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/example/smartair/dto/TrackDetailDto.java b/src/main/java/com/example/enjoy/dto/TrackDetailDto.java similarity index 94% rename from src/main/java/com/example/smartair/dto/TrackDetailDto.java rename to src/main/java/com/example/enjoy/dto/TrackDetailDto.java index dea047b..9b1a5bb 100644 --- a/src/main/java/com/example/smartair/dto/TrackDetailDto.java +++ b/src/main/java/com/example/enjoy/dto/TrackDetailDto.java @@ -1,4 +1,4 @@ -package com.example.smartair.dto; +package com.example.enjoy.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/example/smartair/dto/TrackProgressDto.java b/src/main/java/com/example/enjoy/dto/TrackProgressDto.java similarity index 95% rename from src/main/java/com/example/smartair/dto/TrackProgressDto.java rename to src/main/java/com/example/enjoy/dto/TrackProgressDto.java index 1528031..626ea96 100644 --- a/src/main/java/com/example/smartair/dto/TrackProgressDto.java +++ b/src/main/java/com/example/enjoy/dto/TrackProgressDto.java @@ -1,4 +1,4 @@ -package com.example.smartair.dto; +package com.example.enjoy.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/example/smartair/entity/StudentCourse.java b/src/main/java/com/example/enjoy/entity/StudentCourse.java similarity index 91% rename from src/main/java/com/example/smartair/entity/StudentCourse.java rename to src/main/java/com/example/enjoy/entity/StudentCourse.java index 0624742..674d50c 100644 --- a/src/main/java/com/example/smartair/entity/StudentCourse.java +++ b/src/main/java/com/example/enjoy/entity/StudentCourse.java @@ -1,4 +1,4 @@ -package com.example.smartair.entity; +package com.example.enjoy.entity; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/example/smartair/entity/Track.java b/src/main/java/com/example/enjoy/entity/Track.java similarity index 93% rename from src/main/java/com/example/smartair/entity/Track.java rename to src/main/java/com/example/enjoy/entity/Track.java index 124ddbb..ca64b5a 100644 --- a/src/main/java/com/example/smartair/entity/Track.java +++ b/src/main/java/com/example/enjoy/entity/Track.java @@ -1,4 +1,4 @@ -package com.example.smartair.entity; +package com.example.enjoy.entity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/example/smartair/entity/TrackCourse.java b/src/main/java/com/example/enjoy/entity/TrackCourse.java similarity index 94% rename from src/main/java/com/example/smartair/entity/TrackCourse.java rename to src/main/java/com/example/enjoy/entity/TrackCourse.java index 986205b..c9f0156 100644 --- a/src/main/java/com/example/smartair/entity/TrackCourse.java +++ b/src/main/java/com/example/enjoy/entity/TrackCourse.java @@ -1,4 +1,4 @@ -package com.example.smartair.entity; +package com.example.enjoy.entity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/example/enjoy/repository/ScheduledCourseRepository.java b/src/main/java/com/example/enjoy/repository/ScheduledCourseRepository.java new file mode 100644 index 0000000..2a82b5e --- /dev/null +++ b/src/main/java/com/example/enjoy/repository/ScheduledCourseRepository.java @@ -0,0 +1,4 @@ +package com.example.enjoy.repository; + +public interface ScheduledCourseRepository { +} diff --git a/src/main/java/com/example/smartair/repository/StudentCourseRepository.java b/src/main/java/com/example/enjoy/repository/StudentCourseRepository.java similarity index 81% rename from src/main/java/com/example/smartair/repository/StudentCourseRepository.java rename to src/main/java/com/example/enjoy/repository/StudentCourseRepository.java index 2f9daac..72e9871 100644 --- a/src/main/java/com/example/smartair/repository/StudentCourseRepository.java +++ b/src/main/java/com/example/enjoy/repository/StudentCourseRepository.java @@ -1,6 +1,6 @@ -package com.example.smartair.repository; +package com.example.enjoy.repository; -import com.example.smartair.entity.StudentCourse; +import com.example.enjoy.entity.StudentCourse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.transaction.annotation.Transactional; @@ -12,4 +12,4 @@ public interface StudentCourseRepository extends JpaRepository { -} +} \ No newline at end of file diff --git a/src/main/java/com/example/smartair/repository/TrackRepository.java b/src/main/java/com/example/enjoy/repository/TrackRepository.java similarity index 79% rename from src/main/java/com/example/smartair/repository/TrackRepository.java rename to src/main/java/com/example/enjoy/repository/TrackRepository.java index 3269a91..99c2f63 100644 --- a/src/main/java/com/example/smartair/repository/TrackRepository.java +++ b/src/main/java/com/example/enjoy/repository/TrackRepository.java @@ -1,6 +1,6 @@ -package com.example.smartair.repository; +package com.example.enjoy.repository; -import com.example.smartair.entity.Track; +import com.example.enjoy.entity.Track; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import java.util.List; @@ -9,4 +9,4 @@ public interface TrackRepository extends JpaRepository { @Query("SELECT DISTINCT t FROM Track t LEFT JOIN FETCH t.courses") List findAllWithCourses(); -} +} \ No newline at end of file diff --git a/src/main/java/com/example/enjoy/repository/UserRepository.java b/src/main/java/com/example/enjoy/repository/UserRepository.java new file mode 100644 index 0000000..01913a7 --- /dev/null +++ b/src/main/java/com/example/enjoy/repository/UserRepository.java @@ -0,0 +1,4 @@ +package com.example.enjoy.repository; + +public interface UserRepository { +} \ No newline at end of file diff --git a/src/main/java/com/example/smartair/service/TrackService.java b/src/main/java/com/example/enjoy/service/TrackService.java similarity index 90% rename from src/main/java/com/example/smartair/service/TrackService.java rename to src/main/java/com/example/enjoy/service/TrackService.java index baba871..7afb620 100644 --- a/src/main/java/com/example/smartair/service/TrackService.java +++ b/src/main/java/com/example/enjoy/service/TrackService.java @@ -1,12 +1,12 @@ -package com.example.smartair.service; - -import com.example.smartair.dto.CourseDto; -import com.example.smartair.dto.TrackProgressDto; -import com.example.smartair.entity.StudentCourse; -import com.example.smartair.entity.Track; -import com.example.smartair.entity.TrackCourse; -import com.example.smartair.repository.StudentCourseRepository; -import com.example.smartair.repository.TrackRepository; +package com.example.enjoy.service; + +import com.example.enjoy.dto.CourseDto; +import com.example.enjoy.dto.TrackProgressDto; +import com.example.enjoy.entity.StudentCourse; +import com.example.enjoy.entity.Track; +import com.example.enjoy.entity.TrackCourse; +import com.example.enjoy.repository.StudentCourseRepository; +import com.example.enjoy.repository.TrackRepository; import org.springframework.stereotype.Service; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/smartair/controller/StudentDataController.java b/src/main/java/com/example/smartair/controller/StudentDataController.java deleted file mode 100644 index cb579ff..0000000 --- a/src/main/java/com/example/smartair/controller/StudentDataController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.smartair.controller; - -public class StudentDataController { -} diff --git a/src/main/java/com/example/smartair/controller/TrackController.java b/src/main/java/com/example/smartair/controller/TrackController.java deleted file mode 100644 index 96f7a5a..0000000 --- a/src/main/java/com/example/smartair/controller/TrackController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.smartair.controller; - -public class TrackController { -} diff --git a/src/main/java/com/example/smartair/repository/ScheduledCourseRepository.java b/src/main/java/com/example/smartair/repository/ScheduledCourseRepository.java deleted file mode 100644 index 6c1f48e..0000000 --- a/src/main/java/com/example/smartair/repository/ScheduledCourseRepository.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.smartair.repository; - -public class ScheduledCourseRepository { -} diff --git a/src/main/java/com/example/smartair/repository/UserRepository.java b/src/main/java/com/example/smartair/repository/UserRepository.java deleted file mode 100644 index f9d6330..0000000 --- a/src/main/java/com/example/smartair/repository/UserRepository.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.smartair.repository; - -public class UserRepository { -}