[Release] v2.0.2 릴리즈 (#217)

* feat: 마이페이지 API 개발 (#211)

* feat: /user/v2/my api추가

* feat: 단과대, 학과 조회 API추가

* feat: 유저 탈퇴 로직 -> 닉네임 파라미터 받게 변경

* refactor: gemini 리뷰에 맞춰 변경

* [FEATURE] 250818 수정사항 중, 제휴지도 관련 건 수정 (#213)

* feat: 학과 등록시 학과 id  파라미터로 전달하게끔 변경

* refactor: /users/department 학과, 단과대 추가

* feat: /user/mypage 단과대, 학과정보 추가

* refactor: 현재 날짜에 해당하는 제휴들만 조회되게 변경

* refactor: 유저의 학과별, 단과대별 제휴 로직 변경

* refactor: gemini 코드리뷰 바탕으로 수정

Author: JjungminLee

src/main/java/ssu/eatssu/domain/partnership/entity/Partnership.java

@@ -26,7 +26,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Builder
 @AllArgsConstructor
-@Where(clause = "end_date >= CURRENT_DATE")
+@Where(clause = "start_date <= CURRENT_DATE AND end_date >= CURRENT_DATE")
 public class Partnership {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRepository.java

@@ -4,16 +4,29 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import ssu.eatssu.domain.partnership.entity.Partnership;
+import ssu.eatssu.domain.partnership.entity.PartnershipRestaurant;
 import ssu.eatssu.domain.user.department.entity.College;
 import ssu.eatssu.domain.user.department.entity.Department;
 
 import java.util.List;
 
 public interface PartnershipRepository extends JpaRepository<Partnership, Long> {
-    @Query("SELECT DISTINCT p FROM Partnership p " +
-            "LEFT JOIN p.partnershipCollege pc " +
-            "LEFT JOIN p.partnershipDepartment pd " +
-            "WHERE (pc = :college OR pd = :department OR (pc IS NOT NULL AND pc.name = '총학'))")
-    List<Partnership> findRelevantPartnerships(@Param("college") College college,
-                                               @Param("department") Department department);
+    @Query("""
+            select distinct pr
+            from PartnershipRestaurant pr
+            join fetch pr.partnerships p
+            left join fetch p.partnershipCollege pc
+            left join fetch p.partnershipDepartment pd
+            where
+              (pc = :college
+               or pd = :department
+               or (pc is not null and pc.name = '총학'))
+              and p.startDate <= current_date
+              and (p.endDate is null or p.endDate >= current_date)
+            """)
+    List<PartnershipRestaurant> findRestaurantsWithMyPartnerships(
+            @Param("college") College college,
+            @Param("department") Department department
+                                                                 );
+
 }

src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRestaurantRepository.java

@@ -7,9 +7,11 @@
 import java.util.List;
 
 public interface PartnershipRestaurantRepository extends JpaRepository<PartnershipRestaurant, Long> {
-    @Query("SELECT DISTINCT pr FROM PartnershipRestaurant pr " +
-            "LEFT JOIN FETCH pr.partnerships p " +
-            "LEFT JOIN FETCH p.partnershipCollege " +
-            "LEFT JOIN FETCH p.partnershipDepartment ")
+    @Query("""
+            SELECT DISTINCT pr FROM PartnershipRestaurant pr
+            LEFT JOIN FETCH pr.partnerships p
+            LEFT JOIN FETCH p.partnershipCollege
+            LEFT JOIN FETCH p.partnershipDepartment
+            WHERE p.startDate <= CURRENT_DATE and (p.endDate is null or p.endDate >= CURRENT_DATE)""")
     List<PartnershipRestaurant> findAllWithDetails();
 }

src/main/java/ssu/eatssu/domain/partnership/service/PartnershipService.java

@@ -115,14 +115,10 @@ public List<PartnershipResponse> getUserDepartmentPartnerships(CustomUserDetails
         College college = department.getCollege();
 
         return partnershipRepository
-                .findRelevantPartnerships(college, department)
+                .findRestaurantsWithMyPartnerships(college, department)
                 .stream()
-                .map(partnership -> {
-                    PartnershipRestaurant partnershipRestaurant = partnership.getPartnershipRestaurant();
-
-                    return PartnershipResponse.fromEntity(partnershipRestaurant,
-                                                          customUserDetails.getId());
-                })
+                .map(partnershipRestaurant -> PartnershipResponse.fromEntity(partnershipRestaurant,
+                                                                             customUserDetails.getId()))
                 .collect(Collectors.toList());
     }
 }

src/main/java/ssu/eatssu/domain/user/department/persistence/DepartmentRepository.java

@@ -1,10 +1,14 @@
 package ssu.eatssu.domain.user.department.persistence;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import ssu.eatssu.domain.user.department.entity.College;
 import ssu.eatssu.domain.user.department.entity.Department;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface DepartmentRepository extends JpaRepository<Department, Long> {
     Optional<Department> findByName(String name);
+
+    List<Department> findByCollege(College college);
 }

src/main/java/ssu/eatssu/domain/user/dto/DepartmentResponse.java

@@ -1,10 +1,24 @@
 package ssu.eatssu.domain.user.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Builder;
+import ssu.eatssu.domain.user.department.entity.College;
+import ssu.eatssu.domain.user.department.entity.Department;
 
-@Getter
-@AllArgsConstructor
-public class DepartmentResponse {
-    private String departmentName;
+@Builder
+public record DepartmentResponse(
+        Long departmentId, String departmentName, Long collegeId, String collegeName
+) {
+    public static DepartmentResponse from(Department department) {
+        if (department == null) {
+            return new DepartmentResponse(null, null, null, null);
+        }
+        final College college = department.getCollege();
+        return DepartmentResponse.builder()
+                                 .departmentId(department.getId())
+                                 .departmentName(department.getName())
+                                 .collegeId(college != null ? college.getId() : null)
+                                 .collegeName(college != null ? college.getName() : null)
+                                 .build();
+    }
 }
+

src/main/java/ssu/eatssu/domain/user/dto/GetCollegeResponse.java

@@ -0,0 +1,10 @@
+package ssu.eatssu.domain.user.dto;
+
+import lombok.Builder;
+
+@Builder
+public record GetCollegeResponse(
+        Long id,
+        String name
+) {
+}

src/main/java/ssu/eatssu/domain/user/dto/GetDepartmentResponse.java

@@ -0,0 +1,8 @@
+package ssu.eatssu.domain.user.dto;
+
+import lombok.Builder;
+
+@Builder
+public record GetDepartmentResponse(Long id,
+                                   String name) {
+}

src/main/java/ssu/eatssu/domain/user/dto/MyPageResponse.java

@@ -5,15 +5,49 @@
 import lombok.Builder;
 import lombok.Getter;
 import ssu.eatssu.domain.auth.entity.OAuthProvider;
+import ssu.eatssu.domain.user.department.entity.College;
+import ssu.eatssu.domain.user.department.entity.Department;
+import ssu.eatssu.domain.user.entity.User;
 
 @AllArgsConstructor
 @Builder
 @Schema(title = "마이페이지 정보")
 @Getter
 public class MyPageResponse {
+
     @Schema(description = "닉네임", example = "피치푸치")
     private String nickname;
 
-    @Schema(description = "연결 계정 정보", example = "피치푸치")
+    @Schema(description = "연결 계정 정보", example = "GOOGLE")
     private OAuthProvider provider;
+
+    @Schema(description = "학과 id", example = "1")
+    private Long departmentId;
+
+    @Schema(description = "학과 이름", example = "컴퓨터학부")
+    private String departmentName;
+
+    @Schema(description = "단과대 id", example = "1")
+    private Long collegeId;
+
+    @Schema(description = "단과대 이름", example = "IT 대학")
+    private String collegeName;
+
+    public static MyPageResponse from(User user) {
+        if (user == null) {
+            return MyPageResponse.builder().build();
+        }
+
+        Department department = user.getDepartment();
+        College college = department != null ? department.getCollege() : null;
+
+        return MyPageResponse.builder()
+                             .nickname(user.getNickname())
+                             .provider(user.getProvider())
+                             .departmentId(department != null ? department.getId() : null)
+                             .departmentName(department != null ? department.getName() : null)
+                             .collegeId(college != null ? college.getId() : null)
+                             .collegeName(college != null ? college.getName() : null)
+                             .build();
+    }
 }

src/main/java/ssu/eatssu/domain/user/dto/UpdateDepartmentRequest.java

@@ -10,6 +10,6 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class UpdateDepartmentRequest {
-    @Schema(description = "학과 이름", example = "소프트")
-    private String departmentName;
+    @Schema(description = "학과 id", example = "1")
+    private Long departmentId;
 }