Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.example.enjoy.controller;

public class StudentDataController {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.example.enjoy.controller;

public class TrackController {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.smartair.dto;
package com.example.enjoy.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand All @@ -14,4 +14,4 @@ public class CourseDto {

private String courseName; // 현재 과목명
private String courseAlias; // 과거 과목명 (없으면 null)
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.smartair.dto;
package com.example.enjoy.dto;

import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.smartair.dto;
package com.example.enjoy.dto;

import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.smartair.dto;
package com.example.enjoy.dto;

import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.smartair.entity;
package com.example.enjoy.entity;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.smartair.entity;
package com.example.enjoy.entity;

import jakarta.persistence.*;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.smartair.entity;
package com.example.enjoy.entity;

import jakarta.persistence.*;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.example.enjoy.repository;

public interface ScheduledCourseRepository {
}
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -12,4 +12,4 @@ public interface StudentCourseRepository extends JpaRepository<StudentCourse, Lo

@Transactional
void deleteByStudentId(Long studentId); // 학생 ID로 이수과목 한번에 삭제
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.smartair.repository;
package com.example.enjoy.repository;

import com.example.smartair.entity.TrackCourse;
import com.example.enjoy.entity.TrackCourse;
import org.springframework.data.jpa.repository.JpaRepository;

public interface TrackCourseRepository extends JpaRepository<TrackCourse, Long> {
}
}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -9,4 +9,4 @@ public interface TrackRepository extends JpaRepository<Track, Long> {

@Query("SELECT DISTINCT t FROM Track t LEFT JOIN FETCH t.courses")
List<Track> findAllWithCourses();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.example.enjoy.repository;

public interface UserRepository {
}
Original file line number Diff line number Diff line change
@@ -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;

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading