develop -> main

src/main/java/gg/agit/konect/domain/club/dto/ClubInformationUpdateRequestDto.java

@@ -31,11 +31,6 @@ public record ClubInformationUpdateRequestDto(
     @Size(max = 20, message = "동아리 주제는 최대 20자입니다.")
     String clubTopic,
 
-    @Schema(description = "동아리 이모지", example = "💻", requiredMode = REQUIRED)
-    @NotBlank(message = "동아리 이모지는 필수입니다.")
-    @Size(max = 10, message = "동아리 이모지는 최대 10자입니다.")
-    String clubEmoji,
-
     @Schema(
         description = "한 줄 소개 (최대 30자)",
         example = "코딩 동아리입니다.",

src/main/java/gg/agit/konect/domain/club/event/ClubInformationUpdateRequestedEvent.java

@@ -15,12 +15,11 @@ public record ClubInformationUpdateRequestedEvent(
     String requestedCategory,
     String currentTopic,
     String requestedTopic,
-    String requestedEmoji,
     String currentDescription,
     String requestedDescription,
     String currentFullIntroduction,
     String requestedFullIntroduction,
-    String currentImageUrl,
+    String currentCategoryEmoji,
     List<String> requestedImageUrls
 ) {
 
@@ -36,12 +35,11 @@ public static ClubInformationUpdateRequestedEvent from(ClubInformationUpdateRequ
             request.getClubCategory().getDescription(),
             request.getClub().getTopic(),
             request.getClubTopic(),
-            request.getClubEmoji(),
             request.getClub().getDescription(),
             request.getShortDescription(),
             request.getClub().getIntroduce(),
             request.getFullIntroduction(),
-            request.getClub().getImageUrl(),
+            request.getClub().getCategoryEmoji(),
             request.getImages().stream()
                 .map(image -> image.getImageUrl())
                 .toList()

src/main/java/gg/agit/konect/domain/club/model/ClubInformationUpdateRequest.java

@@ -63,10 +63,6 @@ public class ClubInformationUpdateRequest extends BaseEntity {
     @Column(name = "club_topic", length = 20, nullable = false)
     private String clubTopic;
 
-    @NotNull
-    @Column(name = "club_emoji", length = 10, nullable = false)
-    private String clubEmoji;
-
     @NotNull
     @Column(name = "short_description", length = 30, nullable = false)
     private String shortDescription;
@@ -92,7 +88,6 @@ private ClubInformationUpdateRequest(
         String clubName,
         ClubCategory clubCategory,
         String clubTopic,
-        String clubEmoji,
         String shortDescription,
         String fullIntroduction,
         UpdateRequestStatus status
@@ -103,7 +98,6 @@ private ClubInformationUpdateRequest(
         this.clubName = clubName;
         this.clubCategory = clubCategory;
         this.clubTopic = clubTopic;
-        this.clubEmoji = clubEmoji;
         this.shortDescription = shortDescription;
         this.fullIntroduction = fullIntroduction;
         this.status = status != null ? status : UpdateRequestStatus.PENDING;

src/main/java/gg/agit/konect/domain/club/service/ClubRegistrationRequestService.java

@@ -58,7 +58,6 @@ public void requestInformationUpdate(Integer clubId, ClubInformationUpdateReques
             .clubName(request.clubName())
             .clubCategory(request.clubCategory())
             .clubTopic(request.clubTopic())
-            .clubEmoji(request.clubEmoji())
             .shortDescription(request.shortDescription())
             .fullIntroduction(request.fullIntroduction())
             .status(ClubInformationUpdateRequest.UpdateRequestStatus.PENDING)

src/main/java/gg/agit/konect/domain/university/controller/UniversityApi.java

@@ -3,21 +3,25 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import gg.agit.konect.domain.university.dto.UniversitiesResponse;
 
 import gg.agit.konect.global.auth.annotation.PublicApi;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-@Tag(name = "(Normal) University: 대학", description = "대학 API")
+@Tag(name = "(Normal) University: 대학교", description = "대학교 API")
 @RequestMapping("/universities")
 public interface UniversityApi {
 
-    @Operation(summary = "대학 리스트를 조회한다.", description = """
-        - 응답값은 이름 기준 오름차순 정렬됩니다
+    @Operation(summary = "대학교 리스트를 조회한다.", description = """
+        - 응답값은 이름 기준 오름차순 정렬됩니다.
+        - query 파라미터로 대학교 이름, 초성, 약칭 검색을 지원합니다.
         """)
     @GetMapping
     @PublicApi
-    ResponseEntity<UniversitiesResponse> getUniversities();
+    ResponseEntity<UniversitiesResponse> getUniversities(
+        @RequestParam(name = "query", required = false) String query
+    );
 }

src/main/java/gg/agit/konect/domain/university/controller/UniversityController.java

@@ -16,8 +16,8 @@ public class UniversityController implements UniversityApi {
     private final UniversityService universityService;
 
     @Override
-    public ResponseEntity<UniversitiesResponse> getUniversities() {
-        UniversitiesResponse response = universityService.getUniversities();
+    public ResponseEntity<UniversitiesResponse> getUniversities(String query) {
+        UniversitiesResponse response = universityService.getUniversities(query);
         return ResponseEntity.ok(response);
     }
 }

src/main/java/gg/agit/konect/domain/university/service/UniversitySearchMatcher.java

@@ -0,0 +1,162 @@
+package gg.agit.konect.domain.university.service;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import gg.agit.konect.domain.university.model.University;
+
+@Component
+public class UniversitySearchMatcher {
+
+    private static final int HANGUL_SYLLABLE_START = 0xAC00;
+    private static final int HANGUL_SYLLABLE_END = 0xD7A3;
+    private static final int HANGUL_SYLLABLE_INTERVAL = 588;
+    private static final int UNIVERSITY_SUFFIX_LENGTH = "대학교".length();
+
+    private static final List<String> CHOSEONG = List.of(
+        "ㄱ", "ㄲ", "ㄴ", "ㄷ", "ㄸ", "ㄹ", "ㅁ", "ㅂ", "ㅃ", "ㅅ",
+        "ㅆ", "ㅇ", "ㅈ", "ㅉ", "ㅊ", "ㅋ", "ㅌ", "ㅍ", "ㅎ"
+    );
+
+    private static final Map<String, String> COMPATIBILITY_JAMO_CLUSTERS = Map.ofEntries(
+        Map.entry("ㄳ", "ㄱㅅ"),
+        Map.entry("ㄵ", "ㄴㅈ"),
+        Map.entry("ㄶ", "ㄴㅎ"),
+        Map.entry("ㄺ", "ㄹㄱ"),
+        Map.entry("ㄻ", "ㄹㅁ"),
+        Map.entry("ㄼ", "ㄹㅂ"),
+        Map.entry("ㄽ", "ㄹㅅ"),
+        Map.entry("ㄾ", "ㄹㅌ"),
+        Map.entry("ㄿ", "ㄹㅍ"),
+        Map.entry("ㅀ", "ㄹㅎ"),
+        Map.entry("ㅄ", "ㅂㅅ")
+    );
+
+    private static final Map<String, List<String>> UNIVERSITY_ALIASES = Map.ofEntries(
+        Map.entry("가톨릭대학교", List.of("가대")),
+        Map.entry("건국대학교", List.of("건대")),
+        Map.entry("경북대학교", List.of("경대", "경북대")),
+        Map.entry("경희대학교", List.of("경희대")),
+        Map.entry("고려대학교", List.of("고대")),
+        Map.entry("광주과학기술원", List.of("광주과기원", "지스트", "gist")),
+        Map.entry("단국대학교", List.of("단대")),
+        Map.entry("대구경북과학기술원", List.of("대경과기원", "디지스트", "dgist")),
+        Map.entry("동국대학교", List.of("동대")),
+        Map.entry("부산대학교", List.of("부대", "부산대")),
+        Map.entry("서강대학교", List.of("서강대")),
+        Map.entry("서울과학기술대학교", List.of("과기대", "서울과기대")),
+        Map.entry("서울대학교", List.of("설대", "서울대")),
+        Map.entry("서울시립대학교", List.of("시립대", "서울시립대")),
+        Map.entry("성균관대학교", List.of("성대")),
+        Map.entry("연세대학교", List.of("연대")),
+        Map.entry("울산과학기술원", List.of("울산과기원", "유니스트", "unist")),
+        Map.entry("육군사관학교", List.of("육사")),
+        Map.entry("이화여자대학교", List.of("이대", "이화여대")),
+        Map.entry("전남대학교", List.of("전대", "전남대")),
+        Map.entry("중앙대학교", List.of("중대")),
+        Map.entry("충남대학교", List.of("충대", "충남대")),
+        Map.entry("충북대학교", List.of("충북대")),
+        Map.entry("포항공과대학교", List.of("포공", "포스텍", "postech")),
+        Map.entry("한국공학대학교", List.of("한공대", "한국공대")),
+        Map.entry("한국과학기술원", List.of("카이스트", "kaist")),
+        Map.entry("한국교통대학교", List.of("교통대", "한국교통대")),
+        Map.entry("한국기술교육대학교", List.of("한기대", "코리아텍", "koreatech")),
+        Map.entry("한국외국어대학교", List.of("외대", "한국외대")),
+        Map.entry("한국체육대학교", List.of("한체대")),
+        Map.entry("한국항공대학교", List.of("항공대", "한국항공대")),
+        Map.entry("한국해양대학교", List.of("해양대", "한국해양대")),
+        Map.entry("해군사관학교", List.of("해사")),
+        Map.entry("홍익대학교", List.of("홍대"))
+    );
+
+    public boolean matches(University university, String query) {
+        return matches(university.getKoreanName(), query);
+    }
+
+    public boolean matches(String universityName, String query) {
+        if (!StringUtils.hasText(query)) {
+            return true;
+        }
+
+        String normalizedQuery = normalize(query);
+        return getSearchTokens(universityName)
+            .anyMatch(token -> token.contains(normalizedQuery));
+    }
+
+    private Stream<String> getSearchTokens(String universityName) {
+        Set<String> aliases = getDefaultAliases(universityName);
+        aliases.addAll(UNIVERSITY_ALIASES.getOrDefault(universityName, List.of()));
+
+        List<String> normalizedAliases = aliases.stream()
+            .map(this::normalize)
+            .toList();
+
+        return Stream.concat(
+            normalizedAliases.stream(),
+            normalizedAliases.stream().map(this::getChoseong)
+        ).distinct();
+    }
+
+    private Set<String> getDefaultAliases(String universityName) {
+        String withoutWhitespace = universityName.replaceAll("\\s", "");
+        String withoutCampus = withoutWhitespace.replaceAll("(서울|세종|글로벌|ERICA|WISE)캠퍼스$", "");
+        Set<String> aliases = new HashSet<>();
+
+        aliases.add(withoutWhitespace);
+        aliases.add(withoutCampus);
+
+        if (withoutCampus.endsWith("대학교")) {
+            aliases.add(withoutCampus.substring(0, withoutCampus.length() - UNIVERSITY_SUFFIX_LENGTH) + "대");
+        }
+
+        if (withoutCampus.startsWith("국립")) {
+            String withoutNational = withoutCampus.substring(2);
+            aliases.add(withoutNational);
+
+            if (withoutNational.endsWith("대학교")) {
+                aliases.add(withoutNational.substring(0, withoutNational.length() - UNIVERSITY_SUFFIX_LENGTH) + "대");
+            }
+        }
+
+        return aliases;
+    }
+
+    private String normalize(String value) {
+        return expandCompatibilityJamoClusters(value)
+            .replaceAll("\\s", "")
+            .toLowerCase();
+    }
+
+    private String expandCompatibilityJamoClusters(String value) {
+        StringBuilder builder = new StringBuilder();
+
+        value.codePoints()
+            .mapToObj(Character::toString)
+            .forEach(character -> builder.append(COMPATIBILITY_JAMO_CLUSTERS.getOrDefault(character, character)));
+
+        return builder.toString();
+    }
+
+    private String getChoseong(String value) {
+        StringBuilder builder = new StringBuilder();
+
+        value.codePoints()
+            .forEach(codePoint -> builder.append(toChoseong(codePoint)));
+
+        return builder.toString();
+    }
+
+    private String toChoseong(int codePoint) {
+        if (codePoint < HANGUL_SYLLABLE_START || codePoint > HANGUL_SYLLABLE_END) {
+            return Character.toString(codePoint);
+        }
+
+        return CHOSEONG.get((codePoint - HANGUL_SYLLABLE_START) / HANGUL_SYLLABLE_INTERVAL);
+    }
+}

src/main/java/gg/agit/konect/domain/university/service/UniversityService.java

@@ -17,9 +17,14 @@
 public class UniversityService {
 
     private final UniversityRepository universityRepository;
+    private final UniversitySearchMatcher universitySearchMatcher;
 
-    public UniversitiesResponse getUniversities() {
+    public UniversitiesResponse getUniversities(String query) {
         List<University> universities = universityRepository.findAllByOrderByKoreanNameAsc();
-        return UniversitiesResponse.from(universities);
+        List<University> filteredUniversities = universities.stream()
+            .filter(university -> universitySearchMatcher.matches(university, query))
+            .toList();
+
+        return UniversitiesResponse.from(filteredUniversities);
     }
 }

src/main/java/gg/agit/konect/domain/upload/controller/UploadApi.java

@@ -10,7 +10,7 @@
 
 import gg.agit.konect.domain.upload.dto.ImageUploadResponse;
 import gg.agit.konect.domain.upload.enums.UploadTarget;
-import gg.agit.konect.global.auth.annotation.UserId;
+import gg.agit.konect.global.auth.annotation.PublicApi;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
@@ -25,15 +25,15 @@ public interface UploadApi {
         - 응답의 fileUrl을 기존 도메인 API의 imageUrl로 사용합니다.
 
         ## 에러
-        - MISSING_ACCESS_TOKEN (401): 액세스 토큰이 필요합니다.
         - INVALID_REQUEST_BODY (400): 파일이 비어있거나 요청 형식이 올바르지 않은 경우
         - INVALID_FILE_CONTENT_TYPE (400): 지원하지 않는 Content-Type 인 경우
         - PAYLOAD_TOO_LARGE (413): 파일 크기가 제한을 초과한 경우
+        - TOO_MANY_REQUESTS (429): 업로드 요청 횟수가 제한을 초과한 경우
         - FAILED_UPLOAD_FILE (500): S3 업로드에 실패한 경우
         """)
     @PostMapping(value = "/image", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PublicApi
     ResponseEntity<ImageUploadResponse> uploadImage(
-        @UserId Integer userId,
         @RequestPart("file") MultipartFile file,
         @RequestParam(value = "target") UploadTarget target
     );

src/main/java/gg/agit/konect/domain/upload/controller/UploadController.java

@@ -7,7 +7,6 @@
 import gg.agit.konect.domain.upload.dto.ImageUploadResponse;
 import gg.agit.konect.domain.upload.enums.UploadTarget;
 import gg.agit.konect.domain.upload.service.UploadService;
-import gg.agit.konect.global.auth.annotation.UserId;
 import gg.agit.konect.global.ratelimit.annotation.RateLimit;
 import lombok.RequiredArgsConstructor;
 
@@ -17,10 +16,10 @@ public class UploadController implements UploadApi {
 
     private final UploadService uploadService;
 
-    @RateLimit(maxRequests = 20, timeWindowSeconds = 60, keyExpression = "#userId")
+    // 비로그인 공개 업로드는 계정 식별자가 없어 프록시가 복원한 클라이언트 IP 기준으로 시간당 총량을 제한한다.
+    @RateLimit(maxRequests = 60, timeWindowSeconds = 3600, keyExpression = "#clientIp")
     @Override
     public ResponseEntity<ImageUploadResponse> uploadImage(
-        @UserId Integer userId,
         MultipartFile file,
         UploadTarget target
     ) {

src/main/java/gg/agit/konect/domain/website/dto/WebsiteClubDetailResponse.java

@@ -15,8 +15,8 @@ public record WebsiteClubDetailResponse(
     @Schema(description = "동아리명", example = "BCSD Lab", requiredMode = REQUIRED)
     String name,
 
-    @Schema(description = "동아리 로고 이미지 URL", requiredMode = REQUIRED)
-    String imageUrl,
+    @Schema(description = "동아리 분과 이모지", requiredMode = REQUIRED)
+    String categoryEmoji,
 
     @Schema(description = "분과 코드", example = "ACADEMIC", requiredMode = REQUIRED)
     ClubCategory category,
@@ -71,7 +71,7 @@ public static WebsiteClubDetailResponse of(WebClub club, Long universityClubCoun
         return new WebsiteClubDetailResponse(
             club.getId(),
             club.getName(),
-            club.getImageUrl(),
+            club.getCategoryEmoji(),
             club.getClubCategory(),
             club.getClubCategory().getDescription(),
             club.getTopic(),

src/main/java/gg/agit/konect/domain/website/dto/WebsiteClubsResponse.java

@@ -99,8 +99,8 @@ public record ClubResponse(
         @Schema(description = "동아리명", example = "BCSD Lab", requiredMode = REQUIRED)
         String name,
 
-        @Schema(description = "동아리 로고 이미지 URL", requiredMode = REQUIRED)
-        String imageUrl,
+        @Schema(description = "동아리 분과 이모지", requiredMode = REQUIRED)
+        String categoryEmoji,
 
         @Schema(description = "분과 코드", example = "ACADEMIC", requiredMode = REQUIRED)
         ClubCategory category,
@@ -118,7 +118,7 @@ public static ClubResponse from(WebClub club) {
             return new ClubResponse(
                 club.getId(),
                 club.getName(),
-                club.getImageUrl(),
+                club.getCategoryEmoji(),
                 club.getClubCategory(),
                 club.getClubCategory().getDescription(),
                 club.getTopic(),