[DEPLOY] v.45 성주 서버 1차 리팩토링

src/main/java/com/assu/server/domain/admin/controller/AdminController.java

@@ -6,27 +6,37 @@
 import com.assu.server.global.apiPayload.code.status.SuccessStatus;
 import com.assu.server.global.util.PrincipalDetails;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+@Tag(name = "Admin", description = "관리자 관련 API")
 @RestController
-@RequestMapping("/admin")
 @RequiredArgsConstructor
+@RequestMapping("/admin")
 public class AdminController {
 
     private final AdminService adminService;
 
     @Operation(
-            summary = "파트너 추천 API",
-            description = "제휴하지 않은 파트너 중 한 곳을 랜덤으로 조회합니다."
-    )
+            summary = "제휴업체 추천 API",
+            description = "# [v1.3 (2026-01-04)](https://clumsy-seeder-416.notion.site/2591197c19ed80f5b05cffcfecef9c24?source=copy_link)\n" +
+                    "- 현재 로그인 한 관리자와 제휴하지 않은 제휴업체 중 한 곳을 랜덤으로 조회합니다.\n" +
+                    "\n**Response:**\n" +
+                    "  - 성공 시 200(OK)과 `RandomPartnerResponse` 객체 반환\n" +
+                    "  - `partnerId` (Long): 제휴업체 ID\n" +
+                    "  - `partnerAddress` (String): 제휴업체 주소\n" +
+                    "  - `partnerDetailAddress` (String): 제휴업체 상세주소\n" +
+                    "  - `partnerName` (String): 제휴업체 상호명\n" +
+                    "  - `partnerUrl` (String): 제휴업체 카카오맵 URL\n" +
+                    "  - `partnerPhone` (String): 제휴업체 전화번호\n")
     @GetMapping("/partner-recommend")
-    public BaseResponse<AdminResponseDTO.RandomPartnerResponseDTO> randomPartnerRecommend(
+    public BaseResponse<AdminResponseDTO> randomPartnerRecommend(
             @AuthenticationPrincipal PrincipalDetails pd
-            ) {
+    ) {
         return BaseResponse.onSuccess(SuccessStatus._OK, adminService.suggestRandomPartner(pd.getId()));
     }
 }

src/main/java/com/assu/server/domain/admin/dto/AdminResponseDTO.java

@@ -1,22 +1,37 @@
 package com.assu.server.domain.admin.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-public class AdminResponseDTO {
-
-    @Getter
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    public static class RandomPartnerResponseDTO {
-        private Long partnerId;
-        private String partnerAddress;
-        private String partnerDetailAddress;
-        private String partnerName;
-        private String partnerUrl;
-        private String partnerPhone;
+import com.assu.server.domain.partner.entity.Partner;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+
+public record AdminResponseDTO (
+        @Schema(description = "제휴업체 ID", example = "101")
+        @NotNull Long partnerId,
+
+        @Schema(description = "제휴업체 이름", example = "역전할머니 맥주 숭실대점")
+        @NotNull String partnerName,
+
+        @Schema(description = "제휴업체 주소", example = "서울특별시 동작구")
+        @NotNull String partnerAddress,
+
+        @Schema(description = "제휴업체 상세주소", example = "2층 201호")
+        String partnerDetailAddress,
+
+        @Schema(description = "제휴업체 URL", example = "https://www.beer.co.kr")
+        String partnerUrl,
+
+        @Schema(description = "제휴업체 전화번호", example = "02-123-4567")
+        String partnerPhone
+) {
+    public static AdminResponseDTO from(Partner partner) {
+        return new AdminResponseDTO(
+                partner.getId(),
+                partner.getName(),
+                partner.getAddress(),
+                partner.getDetailAddress(),
+                partner.getMember() != null ? partner.getMember().getProfileUrl() : null,
+                partner.getMember() != null ? partner.getMember().getPhoneNum() : null
+        );
     }
+
 }

src/main/java/com/assu/server/domain/admin/entity/Admin.java

@@ -1,18 +1,9 @@
 package com.assu.server.domain.admin.entity;
 
-
+import com.assu.server.domain.member.entity.Member;
 import com.assu.server.domain.user.entity.enums.Department;
 import com.assu.server.domain.user.entity.enums.Major;
-import com.assu.server.domain.member.entity.Member;
 import com.assu.server.domain.user.entity.enums.University;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.MapsId;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Id;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
@@ -38,13 +29,16 @@ public class Admin {
     @JoinColumn(name = "id")
     private Member member;
 
+    @Column(name = "name", length = 255, nullable = false)
     private String name;
 
+    @Column(name = "office_address", length = 255, nullable = false)
     private String officeAddress;
 
+    @Column(name = "detail", length = 255)
     private String detailAddress;
 
-    private String signUrl;
+    private String signImageUrl;
 
     private Boolean isSignVerified;
 
@@ -66,7 +60,7 @@ public class Admin {
     private double latitude;
     private double longitude;
 
-    public void setMember(Member member) {
+    public void updateMember(Member member) {
         this.member = member;
     }
 }

src/main/java/com/assu/server/domain/admin/repository/AdminRepository.java

@@ -4,24 +4,25 @@
 import java.util.Optional;
 
 import com.assu.server.domain.admin.entity.Admin;
-import com.assu.server.domain.common.enums.ActivationStatus;
-import com.assu.server.domain.member.entity.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import com.assu.server.domain.admin.entity.Admin;
 import com.assu.server.domain.user.entity.enums.Department;
 import com.assu.server.domain.user.entity.enums.Major;
 import com.assu.server.domain.user.entity.enums.University;
 
 public interface AdminRepository extends JpaRepository<Admin, Long> {
 
-	// 여기 예원이 머지하고 수정
-	@Query("SELECT a FROM Admin a WHERE " +
-		"(a.university = :university AND a.department IS NULL AND a.major IS NULL) OR " +
-		"(a.university = :university AND a.department = :department AND a.major IS NULL) OR " +
-		"(a.university = :university AND a.department = :department AND a.major = :major)")
+	@Query("""
+		SELECT a FROM Admin a
+		WHERE a.university = :university
+		  AND (
+		    (a.department IS NULL AND a.major IS NULL) OR
+		    (a.department = :department AND a.major IS NULL) OR
+		    (a.department = :department AND a.major = :major)
+		  )
+		""")
 	List<Admin> findMatchingAdmins(@Param("university") University university,
 		@Param("department") Department department,
 		@Param("major") Major major);
@@ -32,47 +33,47 @@ List<Admin> findMatchingAdmins(@Param("university") University university,
     @Query(value = """
         SELECT COUNT(*)
         FROM admin a
-        LEFT JOIN paper pa
-          ON pa.admin_id = a.id
-         AND pa.partner_id = :partnerId
-         AND pa.is_activated = 'ACTIVE'
-        WHERE pa.id IS NULL
+        WHERE NOT EXISTS (
+            SELECT 1 FROM paper pa
+            WHERE pa.admin_id = a.id
+              AND pa.partner_id = :partnerId
+              AND pa.is_activated = 'ACTIVE'
+        )
         """, nativeQuery = true)
     long countPartner(@Param("partnerId") Long partnerId);
 
     // 랜덤 오프셋으로 1~N건 가져오기 (LIMIT :offset, :limit)
     @Query(value = """
         SELECT a.*
         FROM admin a
-        LEFT JOIN paper pa
-          ON pa.admin_id = a.id
-         AND pa.partner_id = :partnerId
-         AND pa.is_activated = 'ACTIVE'
-        WHERE pa.id IS NULL
+        WHERE NOT EXISTS (
+            SELECT 1 FROM paper pa
+            WHERE pa.admin_id = a.id
+              AND pa.partner_id = :partnerId
+              AND pa.is_activated = 'ACTIVE'
+        )
         LIMIT :offset, :limit
         """, nativeQuery = true)
     List<Admin> findPartnerWithOffset(@Param("partnerId") Long partnerId,
-                                                         @Param("offset") int offset,
-                                                         @Param("limit") int limit);
+                                       @Param("offset") int offset,
+                                       @Param("limit") int limit);
 
-    @Query(value = """
-        SELECT a.*
-        FROM admin a
+    @Query("""
+        SELECT DISTINCT a
+        FROM Admin a
+        LEFT JOIN FETCH a.member
         WHERE a.point IS NOT NULL
-          AND ST_Contains(ST_GeomFromText(:wkt, 4326), a.point)
-        """, nativeQuery = true)
-    List<Admin> findAllWithinViewport(@Param("wkt") String wkt);
+          AND function('ST_Contains', function('ST_GeomFromText', :wkt, 4326), a.point) = true
+        """)
+    List<Admin> findAllWithinViewportWithMember(@Param("wkt") String wkt);
 
     @Query("""
-        select distinct a
-        from Admin a
-        where lower(a.name) like lower(concat('%', :keyword, '%'))
+        SELECT DISTINCT a
+        FROM Admin a
+        LEFT JOIN FETCH a.member
+        WHERE LOWER(a.name) LIKE LOWER(CONCAT('%', :keyword, '%'))
         """)
-    List<Admin> searchAdminByKeyword(
+    List<Admin> searchAdminByKeywordWithMember(
             @Param("keyword") String keyword
     );
-
-    Long member(Member member);
-
-	Optional<Admin> findById(Long id);
 }

src/main/java/com/assu/server/domain/admin/service/AdminService.java

@@ -12,6 +12,6 @@
 public interface AdminService {
 	List<Admin> findMatchingAdmins(University university, Department department, Major major);
 
-    AdminResponseDTO.RandomPartnerResponseDTO suggestRandomPartner(Long adminId);
+    AdminResponseDTO suggestRandomPartner(Long adminId);
 
 }

src/main/java/com/assu/server/domain/admin/service/AdminServiceImpl.java

@@ -1,41 +1,41 @@
 package com.assu.server.domain.admin.service;
 
-
 import java.util.List;
 import org.springframework.stereotype.Service;
 import com.assu.server.domain.admin.dto.AdminResponseDTO;
 import com.assu.server.domain.admin.entity.Admin;
 import com.assu.server.domain.admin.repository.AdminRepository;
 import com.assu.server.domain.user.entity.enums.Department;
 import com.assu.server.domain.user.entity.enums.Major;
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import com.assu.server.domain.partner.entity.Partner;
 import com.assu.server.domain.partner.repository.PartnerRepository;
 import com.assu.server.domain.user.entity.enums.University;
 import com.assu.server.global.apiPayload.code.status.ErrorStatus;
 import com.assu.server.global.exception.DatabaseException;
-import java.util.concurrent.ThreadLocalRandom;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.concurrent.ThreadLocalRandom;
 
 @Service
 @RequiredArgsConstructor
 public class AdminServiceImpl implements AdminService {
 
     private final AdminRepository adminRepository;
     private final PartnerRepository partnerRepository;
+
 	@Override
 	@Transactional
 	public List<Admin> findMatchingAdmins(University university, Department department, Major major){
 
-
-		List<Admin> adminList = adminRepository.findMatchingAdmins(university, department,major);
+		List<Admin> adminList = adminRepository.findMatchingAdmins(university, department, major);
 
 		return adminList;
 	}
+
     @Override
-	@Transactional
-    public AdminResponseDTO.RandomPartnerResponseDTO suggestRandomPartner(Long adminId) {
+    @Transactional(readOnly = true)
+    public AdminResponseDTO suggestRandomPartner(Long adminId) {
 
         Admin admin = adminRepository.findById(adminId)
                 .orElseThrow(() -> new DatabaseException(ErrorStatus.NO_SUCH_ADMIN));
@@ -52,14 +52,7 @@ public AdminResponseDTO.RandomPartnerResponseDTO suggestRandomPartner(Long admin
             throw new DatabaseException(ErrorStatus.NO_AVAILABLE_PARTNER);
         }
 
-        return AdminResponseDTO.RandomPartnerResponseDTO.builder()
-                .partnerId(picked.getId())
-                .partnerName(picked.getName())
-                .partnerAddress(picked.getAddress())
-                .partnerDetailAddress(picked.getDetailAddress())
-                .partnerUrl(picked.getMember().getProfileUrl())
-                .partnerPhone(picked.getMember().getPhoneNum())
-                .build();
+        return AdminResponseDTO.from(picked);
     }
 
 }

src/main/java/com/assu/server/domain/auth/service/SignUpServiceImpl.java

@@ -247,7 +247,7 @@ public SignUpResponseDTO signupAdmin(AdminSignUpRequestDTO req, MultipartFile si
                         .name(info.name())
                         .officeAddress(address)
                         .detailAddress(info.detailAddress())
-                        .signUrl(signUrl)
+                        .signImageUrl(signUrl)
                         .point(point)
                         .latitude(lat)
                         .longitude(lng)