Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import gg.agit.konect.domain.club.dto.ClubRecruitmentCreateRequest;
import gg.agit.konect.domain.club.dto.ClubRecruitmentResponse;
import gg.agit.konect.domain.club.dto.ClubRecruitmentUpdateRequest;
import gg.agit.konect.domain.club.dto.ClubTagsResponse;
import gg.agit.konect.domain.club.dto.ClubsResponse;
import gg.agit.konect.domain.club.dto.MyManagedClubResponse;
import gg.agit.konect.domain.club.dto.MemberPositionChangeRequest;
Expand Down Expand Up @@ -138,10 +137,6 @@ ResponseEntity<Void> updateBasicInfo(
@UserId Integer userId
);

@Operation(summary = "사용 가능한 전체 태그 목록을 조회한다.")
@GetMapping("/tags")
ResponseEntity<ClubTagsResponse> getTags();

@Operation(summary = "가입한 동아리 리스트를 조회한다.")
@GetMapping("/joined")
ResponseEntity<ClubMembershipsResponse> getJoinedClubs(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import gg.agit.konect.domain.club.dto.ClubRecruitmentCreateRequest;
import gg.agit.konect.domain.club.dto.ClubRecruitmentResponse;
import gg.agit.konect.domain.club.dto.ClubRecruitmentUpdateRequest;
import gg.agit.konect.domain.club.dto.ClubTagsResponse;
import gg.agit.konect.domain.club.dto.ClubsResponse;
import gg.agit.konect.domain.club.dto.MyManagedClubResponse;
import gg.agit.konect.domain.club.dto.MemberPositionChangeRequest;
Expand Down Expand Up @@ -111,12 +110,6 @@ public ResponseEntity<Void> updateBasicInfo(
return ResponseEntity.noContent().build();
}

@Override
public ResponseEntity<ClubTagsResponse> getTags() {
ClubTagsResponse response = clubService.getTags();
return ResponseEntity.ok(response);
}

@Override
public ResponseEntity<ClubMembershipsResponse> getJoinedClubs(@UserId Integer userId) {
ClubMembershipsResponse response = clubService.getJoinedClubs(userId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;

import java.time.LocalDate;
import java.util.List;

import gg.agit.konect.domain.club.enums.RecruitmentStatus;
import gg.agit.konect.domain.club.model.Club;
import gg.agit.konect.domain.club.model.ClubMember;
import gg.agit.konect.domain.club.model.ClubRecruitment;
import gg.agit.konect.domain.club.model.ClubTagMap;
import io.swagger.v3.oas.annotations.media.Schema;

public record ClubDetailResponse(
Expand Down Expand Up @@ -54,9 +52,6 @@ public record ClubDetailResponse(
@Schema(description = "동아리 회장 이름", example = "김철수", requiredMode = REQUIRED)
String presidentName,

@Schema(description = "동아리 태그 목록", requiredMode = REQUIRED)
List<ClubTagResponse> tags,

@Schema(description = "동아리 소속 여부", example = "true", requiredMode = REQUIRED)
Boolean isMember,

Expand Down Expand Up @@ -88,14 +83,9 @@ public static ClubDetailResponse of(
Integer memberCount,
ClubRecruitment clubRecruitment,
ClubMember president,
List<ClubTagMap> clubTagMaps,
Boolean isMember,
Boolean isApplied
) {
List<ClubTagResponse> tags = clubTagMaps.stream()
.map(tagMap -> ClubTagResponse.from(tagMap.getTag()))
.toList();

return new ClubDetailResponse(
club.getId(),
club.getName(),
Expand All @@ -107,7 +97,6 @@ public static ClubDetailResponse of(
memberCount,
InnerRecruitment.from(clubRecruitment),
president.getUser().getName(),
tags,
isMember,
isApplied
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package gg.agit.konect.domain.club.dto;

import java.util.List;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;

public record ClubProfileUpdateRequest(
Expand All @@ -18,11 +15,6 @@ public record ClubProfileUpdateRequest(
requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "이미지 URL은 필수 입력입니다.")
@Size(max = 255, message = "이미지 URL은 255자 이하여야 합니다.")
String imageUrl,

@Schema(description = "동아리 태그 ID 목록", example = "[1, 2, 3]",
requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "태그 목록은 필수 입력입니다.")
List<Integer> tagIds
String imageUrl
) {
}
16 changes: 0 additions & 16 deletions src/main/java/gg/agit/konect/domain/club/dto/ClubTagResponse.java

This file was deleted.

18 changes: 0 additions & 18 deletions src/main/java/gg/agit/konect/domain/club/dto/ClubTagsResponse.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@ public record InnerClubResponse(

@Schema(description = "지원 마감일(상시 모집이거나 모집 공고가 없으면 null)", example = "2025.12.31", requiredMode = NOT_REQUIRED)
@JsonFormat(pattern = "yyyy.MM.dd")
LocalDate applicationDeadline,

@Schema(description = "동아리 태그 리스트", example = "[\"IT\", \"프로그래밍\"]", requiredMode = REQUIRED)
List<String> tags
LocalDate applicationDeadline
) {
public static InnerClubResponse from(ClubSummaryInfo clubSummaryInfo, boolean isPendingApproval) {
return new InnerClubResponse(
Expand All @@ -73,8 +70,7 @@ public static InnerClubResponse from(ClubSummaryInfo clubSummaryInfo, boolean is
clubSummaryInfo.status(),
isPendingApproval,
clubSummaryInfo.isAlwaysRecruiting(),
clubSummaryInfo.applicationDeadline(),
clubSummaryInfo.tags()
clubSummaryInfo.applicationDeadline()
);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package gg.agit.konect.domain.club.model;

import java.time.LocalDate;
import java.util.List;

import gg.agit.konect.domain.club.enums.RecruitmentStatus;

Expand All @@ -13,8 +12,7 @@ public record ClubSummaryInfo(
String description,
RecruitmentStatus status,
Boolean isAlwaysRecruiting,
LocalDate applicationDeadline,
List<String> tags
LocalDate applicationDeadline
) {

}
44 changes: 0 additions & 44 deletions src/main/java/gg/agit/konect/domain/club/model/ClubTag.java

This file was deleted.

42 changes: 0 additions & 42 deletions src/main/java/gg/agit/konect/domain/club/model/ClubTagMap.java

This file was deleted.

29 changes: 0 additions & 29 deletions src/main/java/gg/agit/konect/domain/club/model/ClubTagMapId.java

This file was deleted.

Loading
Loading