Merge pull request #16 from enjoy-hack/Daeun

Daeun

Author: DaeunSon

src/main/java/com/example/enjoy/controller/FavoriteCourseController.java

@@ -0,0 +1,46 @@
+package com.example.enjoy.controller;
+
+import com.example.enjoy.dto.FavoriteCourseDto;
+import com.example.enjoy.entity.FavoriteCourse;
+import com.example.enjoy.service.FavoriteCourseService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/api/favorite-courses")
+@RequiredArgsConstructor
+public class FavoriteCourseController {
+    private final FavoriteCourseService favoriteCourseService;
+
+    @Operation(summary = "즐겨찾는 과목 추가", description = "학생의 즐겨찾는 과목을 추가합니다.")
+    @PostMapping("/add")
+    public ResponseEntity<Void> addFavoriteCourse(
+            @RequestParam String courseName,
+            @RequestParam String studentId) {
+
+        favoriteCourseService.addFavoriteCourse(studentId, courseName);
+        return ResponseEntity.ok().build();
+    }
+
+    @Operation(summary = "즐겨찾는 과목 조회", description = "학생의 즐겨찾는 과목을 조회합니다.")
+    @GetMapping("/get")
+    public ResponseEntity<List<FavoriteCourseDto>> getFavoriteCourse(
+            @RequestParam String studentId) {
+
+        List<FavoriteCourse> favoriteCourses = favoriteCourseService.getFavoriteCourses(studentId);
+        if (favoriteCourses == null || favoriteCourses.isEmpty()) {
+            return ResponseEntity.notFound().build();
+        }
+
+        List<FavoriteCourseDto> favoriteDtos = favoriteCourses.stream()
+                .map(FavoriteCourseDto::from)
+                .collect(Collectors.toList());
+
+        return ResponseEntity.ok(favoriteDtos);
+    }
+}

src/main/java/com/example/enjoy/controller/UserController.java

@@ -117,5 +117,12 @@ public ResponseEntity<Void> updateCourseStatus(
         userService.updateCourseStatus(studentId, courseName, newStatus);
         return ResponseEntity.ok().build();
     }
+
+    @Operation(summary = "유저 정보 저장", description = "학생의 정보를 저장합니다.")
+    @PostMapping("/save")
+    public ResponseEntity<MemberDto> saveUserInfo(@Valid @RequestBody MemberDto memberDto) {
+        userService.saveUserInfo(memberDto);
+        return ResponseEntity.ok().build();
+    }
 }
 

src/main/java/com/example/enjoy/dto/FavoriteCourseDto.java

@@ -0,0 +1,21 @@
+package com.example.enjoy.dto;
+
+import com.example.enjoy.entity.FavoriteCourse;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class FavoriteCourseDto {
+    private Long id;
+    private String courseName;
+    private String studentId;
+
+    public static FavoriteCourseDto from(FavoriteCourse favoriteCourse) {
+        return new FavoriteCourseDto(
+                favoriteCourse.getId(),
+                favoriteCourse.getCourseName(),
+                favoriteCourse.getUser().getStudentId()
+        );
+    }
+}

src/main/java/com/example/enjoy/dto/loginDto/MemberDto.java

@@ -11,5 +11,5 @@ public class MemberDto {
     private String studentName;
     private String grade;
     private String completedSemester;
-
+    private boolean hasLoginHistory;  // 로그인 이력 여부
 }

src/main/java/com/example/enjoy/entity/FavoriteCourse.java

@@ -3,12 +3,14 @@
 import com.example.enjoy.entity.user.User;
 import com.example.enjoy.util.BaseEntity;
 import jakarta.persistence.*;
+import lombok.Getter;
 import lombok.Setter;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Setter
+@Getter
 public class FavoriteCourse extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -18,8 +20,15 @@ public class FavoriteCourse extends BaseEntity {
     @JoinColumn(name = "user_id")
     private User user;
 
-    @ManyToOne
-    @JoinColumn(name = "track_course_id")
-    private TrackCourse trackCourse;
+    @JoinColumn(name = "course_name")
+    private String courseName;
+
+    public FavoriteCourse() {
+
+    }
 
+    public FavoriteCourse(User user, String courseName) {
+        this.user = user;
+        this.courseName = courseName;
+    }
 }

src/main/java/com/example/enjoy/repository/FavoriteCourseRepository.java

@@ -6,9 +6,11 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface FavoriteCourseRepository extends JpaRepository<FavoriteCourse, Long> {
-    Optional<FavoriteCourse> findByUserAndTrackCourse(User user, TrackCourse trackCourse);
+    Optional<FavoriteCourse> findByUserAndCourseName(User user, String courseName);
+    List<FavoriteCourse> findAllByUser(User user);
 }

src/main/java/com/example/enjoy/repository/TrackCourseRepository.java

@@ -6,8 +6,12 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
+
 @Repository
 public interface TrackCourseRepository extends JpaRepository<TrackCourse, Long> {
 
     List<TrackCourse> findAllByTrack(Track track);
+
+    Optional<TrackCourse> findByCourseName(String courseName);
 }

src/main/java/com/example/enjoy/repository/UserRepository.java

@@ -9,4 +9,5 @@
 @Repository
 public interface UserRepository extends JpaRepository<User,Long> {
     Optional<User> findByStudentId(String studentId);
+    boolean existsByStudentId(String studentId);
 }

src/main/java/com/example/enjoy/service/FavoriteCourseService.java

@@ -10,6 +10,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Optional;
 
 @Service
@@ -20,22 +21,29 @@ public class FavoriteCourseService {
     private final UserRepository userRepository;
 
     @Transactional
-    public void toggleFavoriteCourse(Long userId, Long trackCourseId) {
-        User user = userRepository.findById(userId)
+    public void addFavoriteCourse(String studentId, String courseName) {
+        User user = userRepository.findByStudentId(studentId)
                 .orElseThrow(() -> new RuntimeException("사용자를 찾을 수 없습니다."));
-        TrackCourse trackCourse = trackCourseRepository.findById(trackCourseId)
+
+
+        TrackCourse trackCourse = trackCourseRepository.findByCourseName(courseName)
                 .orElseThrow(() -> new RuntimeException("과목을 찾을 수 없습니다."));
 
-        Optional<FavoriteCourse> existingFavorite = favoriteCourseRepository
-                .findByUserAndTrackCourse(user, trackCourse);
+        // 이미 즐겨찾기한 과목인지 확인
+        boolean alreadyExists = favoriteCourseRepository
+                .findByUserAndCourseName(user, courseName)
+                .isPresent();
 
-        if (existingFavorite.isPresent()) {
-            favoriteCourseRepository.delete(existingFavorite.get());
-        } else {
-            FavoriteCourse favoriteCourse = new FavoriteCourse();
-            favoriteCourse.setUser(user);
-            favoriteCourse.setTrackCourse(trackCourse);
+        if (!alreadyExists) {
+            FavoriteCourse favoriteCourse = new FavoriteCourse(user, trackCourse.getCourseName());
             favoriteCourseRepository.save(favoriteCourse);
         }
     }
+
+    public List<FavoriteCourse> getFavoriteCourses(String studentId) {
+        User user = userRepository.findByStudentId(studentId)
+                .orElseThrow(() -> new RuntimeException("사용자를 찾을 수 없습니다."));
+
+        return favoriteCourseRepository.findAllByUser(user);
+    }
 }

src/main/java/com/example/enjoy/service/loginService/SejongLoginService.java

@@ -34,25 +34,31 @@ public class SejongLoginService {
     private final UserRepository userRepository;
 
     public MemberDto login(MemberCommand memberCommand){
+        boolean hasLoginHistory = userRepository.existsByStudentId(memberCommand.getSejongPortalId());
         SejongMemberInfo info = sejongPortalLoginService.getMemberAuthInfos(memberCommand.getSejongPortalId(), memberCommand.getSejongPortalPassword());
-        updateUserInfo(info.getStudentId(), info.getName(), info.getMajor(), info.getGrade(), info.getCompletedSemester()); //로그인 시 유저 정보 DB에 저장
+
+        // 로그인 성공 시 사용자 정보 저장 (첫 로그인인 경우)
+        if (!hasLoginHistory) {
+            User newUser = User.builder()
+                    .major(info.getMajor())
+                    .studentId(info.getStudentId())
+                    .username(info.getName())
+                    .grade(info.getGrade())
+                    .completedSemester(info.getCompletedSemester())
+                            .build();
+            userRepository.save(newUser);
+        }
+
         return MemberDto.builder()
                 .major(info.getMajor())
                 .studentIdString(info.getStudentId())
                 .studentName(info.getName())
                 .grade(info.getGrade())
                 .completedSemester(info.getCompletedSemester())
+                .hasLoginHistory(hasLoginHistory)
                 .build();
     }
 
-    private void updateUserInfo(String studentId, String username, String major, String grade, String completedSemester) {
-        User user = userRepository.findByStudentId(studentId)
-                .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
-
-        user.updateUserInfo(studentId, username, major, grade, completedSemester);
-        userRepository.save(user);
-    }
-
     public MemberDto getMemberAuthInfos(MemberCommand memberCommand) throws IOException {
         try {
             SejongMemberInfo info = sejongPortalLoginService.getMemberAuthInfos(memberCommand.getSejongPortalId(), memberCommand.getSejongPortalPassword());