Merge pull request #63 from HD152521/develop

1.
소개 페이지 필터 로직 안정화
•
검색 시: 검색어 포함 학과는 진하게, 미포함 학과는 연하게 표시
•
단과대 카테고리 클릭 시: 해당 단과대 카드만 표시
•
학사/대학원 섹션 모두 동일하게 동작하도록 정리
2.
단과대 입력 UI 정리
•
단과대 설명 입력칸 제거
•
단과대 이름 + 학위 구분을 한 줄(2컬럼) 배치
•
소속학과 입력창 높이 축소 (min-h-[80px] → min-h-[64px])
3.
수정/추가 모달 상태 초기화
•
확인/취소/닫기 후 모달 입력값과 dataset 초기화
•
다른 학교로 전환 시 이전 값이 남지 않도록 reset 로직 추가
•
카테고리 추가 시 전역 selector 대신 모달 내부 스코프로 값 조회하도록 변경

Author: HD152521

.gitignore

@@ -4,9 +4,10 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 src/main/resources/application-local.yml
+src/main/resources/logback-spring.xml
 *.env
 .env
-
+docker-compose.yml
 uploads
 ### STS ###
 .apt_generated

build.gradle

@@ -66,6 +66,8 @@ dependencies {
 	//swagger
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13'
 
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	implementation 'io.micrometer:micrometer-registry-prometheus'
 }
 
 node {

src/main/java/com/cooperation/project/cooperationcenter/domain/agency/controller/homepage/AgencyRestController.java

@@ -2,6 +2,7 @@
 
 import com.cooperation.project.cooperationcenter.domain.member.dto.AgencyRegion;
 import com.cooperation.project.cooperationcenter.global.exception.BaseResponse;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,6 +18,8 @@
 @RequestMapping("/api/v1/agency")
 @Slf4j
 public class AgencyRestController {
+
+    @Operation(summary = "유학원 지역 리스트 반환")
     @GetMapping("/region")
     public BaseResponse<?> getRegionList(){
         List<String> regions = Arrays.stream(AgencyRegion.values())

src/main/java/com/cooperation/project/cooperationcenter/domain/agency/controller/homepage/AgengyController.java

@@ -2,6 +2,7 @@
 
 import com.cooperation.project.cooperationcenter.domain.agency.dto.AgencyRequest;
 import com.cooperation.project.cooperationcenter.domain.agency.service.homepage.AgencyService;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;
@@ -24,6 +25,7 @@ public class AgengyController {
     private final String agencyPath = "homepage/user/agency";
 
     @RequestMapping("/list")
+    @Operation(summary = "해당 지역과 키워드 값을 가진 유학원 반환")
     public String agencyList(
             Model model,
             @PageableDefault(size = 12, sort = "createdAt", direction = Sort.Direction.DESC)

src/main/java/com/cooperation/project/cooperationcenter/domain/agency/exception/AgencyHandler.java

@@ -0,0 +1,8 @@
+package com.cooperation.project.cooperationcenter.domain.agency.exception;
+
+import com.cooperation.project.cooperationcenter.global.exception.BaseException;
+import com.cooperation.project.cooperationcenter.global.exception.codes.BaseCode;
+
+public class AgencyHandler extends BaseException {
+    public AgencyHandler(BaseCode code){super(code);}
+}

src/main/java/com/cooperation/project/cooperationcenter/domain/agency/exception/status/AgencyErrorStatus.java

@@ -0,0 +1,28 @@
+package com.cooperation.project.cooperationcenter.domain.agency.exception.status;
+
+import com.cooperation.project.cooperationcenter.global.exception.codes.BaseCode;
+import com.cooperation.project.cooperationcenter.global.exception.codes.reason.Reason;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+@AllArgsConstructor
+public enum AgencyErrorStatus implements BaseCode {
+
+    AGENCY_NOT_FOUND(HttpStatus.BAD_REQUEST,"AGENCY-0001","해당 유학원은 가입 되지 않은 상태입니다. 확인 후에 다시 가입해주세요");
+
+    private final HttpStatus httpStatus;
+    private final String code;
+    private final String message;
+
+    @Override
+    public Reason.ReasonDto getReasonHttpStatus() {
+        return Reason.ReasonDto.builder()
+                .message(message)
+                .code(code)
+                .isSuccess(false)
+                .httpStatus(httpStatus)
+                .build();
+    }
+}

src/main/java/com/cooperation/project/cooperationcenter/domain/agency/model/Agency.java

@@ -74,9 +74,9 @@ public void removeMember(Member member){
         this.member.remove(member);
     }
 
-    public void setShare(){
-        this.share = !this.share;
-    }
+    public void setShare(boolean share){
+        this.share = share;
+    }
 
     public static Agency fromDto(
             MemberRequest.SignupNewAgencyDto dto

src/main/java/com/cooperation/project/cooperationcenter/domain/agency/repository/AgencyRepository.java

@@ -10,9 +10,10 @@
 import java.util.Optional;
 
 public interface AgencyRepository extends JpaRepository<Agency,Long> {
-    long countByAgencyPicture(FileAttachment file);
-    Optional<Agency> findAgencyByAgencyNameAndAgencyEmailAndShare(String name, String email,Boolean share);
-    List<Agency> findAgenciesByShare(boolean share);
-    Page<Agency> findAgenciesByShare(boolean share, Pageable pageable);
-
-}
+    long countByAgencyPicture(FileAttachment file);
+    Optional<Agency> findAgencyByAgencyNameAndAgencyEmailAndShare(String name, String email,Boolean share);
+    Optional<Agency> findAgencyByAgencyNameAndAgencyEmail(String name, String email);
+    List<Agency> findAgenciesByShare(boolean share);
+    Page<Agency> findAgenciesByShare(boolean share, Pageable pageable);
+
+}

src/main/java/com/cooperation/project/cooperationcenter/domain/file/controller/FileRestController.java

@@ -2,6 +2,7 @@
 
 import com.cooperation.project.cooperationcenter.domain.file.service.FileService;
 import com.cooperation.project.cooperationcenter.domain.oss.OssService;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
@@ -27,41 +28,48 @@ public class FileRestController {
     private final FileService fileService;
     private final OssService ossService;
 
-
-    //note 다운로드용
     @GetMapping("/{type}/{fileId}")
+    @Operation(summary = "파일 다운로드")
     public ResponseEntity<Void> downloadFile(@PathVariable String type,@PathVariable String fileId) throws MalformedURLException {
         log.info("enter file controller");
         return fileService.loadFile(fileId,type);
     }
 
-    //note 이미지 뷰용
     @GetMapping("/img/{type}/{fileId}")
+    @Operation(summary = "이미지 뷰")
     public ResponseEntity<Void> viewImage(@PathVariable String type,@PathVariable String fileId) throws IOException {
         log.info("enter file controller-img");
         return fileService.viewFile(fileId,type);
     }
 
-    //note 이미지 뷰용
     @GetMapping("/pdf/{type}/{fileId}")
+    @Operation(summary = "pdf새 탭으로 열기")
     public ResponseEntity<StreamingResponseBody> viewPdf(@PathVariable String type, @PathVariable String fileId) throws IOException {
         log.info("enter file controller-img");
         return fileService.viewPdf(fileId,type);
     }
 
+    @Operation(
+            summary = "학교 이미지 저장",
+            description = """
+        학교에 사용되는 이미지를 저장하고 URL을 반환.
+        """
+    )
     @PostMapping("/{type}")
     public ResponseEntity<Void> saveFile(@PathVariable String type,@RequestParam("file-0") MultipartFile file) throws IOException {
         log.info("save file");
         return fileService.saveSchoolImgAndReturnUrl(type, file);
     }
 
     @GetMapping("/default/agency")
+    @Operation(summary = "유학원 대체 이미지")
     public ResponseEntity<Void> getAgencyDefaultImage(){
         log.info("enter agency");
         return fileService.viewDefaultImg("agency");
     }
 
     @GetMapping("/default/school")
+    @Operation(summary = "학교 대체 이미지")
     public ResponseEntity<Void> getSchoolDefaultImage(){
         return fileService.viewDefaultImg("school");
     }

src/main/java/com/cooperation/project/cooperationcenter/domain/file/exception/FileHandler.java

@@ -0,0 +1,8 @@
+package com.cooperation.project.cooperationcenter.domain.file.exception;
+
+import com.cooperation.project.cooperationcenter.global.exception.BaseException;
+import com.cooperation.project.cooperationcenter.global.exception.codes.BaseCode;
+
+public class FileHandler extends BaseException {
+    public FileHandler(BaseCode code){super(code);}
+}