Merge pull request #62 from Capstone-OpenStep/feature/#34-repo-suggest

Refactor: 사용자 관심언어 및 관심분야 선택 로직 변경

Author: ParkJh38

src/main/java/com/chungang/capstone/openstep/domain/Member/controller/MemberController.java

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.chungang.capstone.openstep.domain.Member.service.AuthService;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.*;
 
@@ -61,43 +62,59 @@ public ApiResponse<MemberResponseDTO.TokenRefreshResponseDTO> refresh(@Valid @Re
 		return ApiResponse.onSuccess(SuccessStatus.MEMBER_UPDATE_ACCESS_TOKEN_OK, response);
 	}
 
-
-	@Operation(summary = "관심사(domain) 조회 API", description = "사용자의 관심사(도메인)을 조회합니다.")
-	@GetMapping("/domains")
-	public ApiResponse<MemberResponseDTO.DomainsRes> getDomains(){
-		Long memberId= SecurityUtils.getCurrentMemberId();
-		log.info("memberId={}",memberId);
-		MemberResponseDTO.DomainsRes domainsRes =memberQueryService.getDomains(memberId);
-		return ApiResponse.onSuccess(SuccessStatus.MEMBER_GET_INTERESTS_OK, domainsRes);
+	@PostMapping("/{memberId}/interest/languages")
+	@Operation(summary = "관심언어(languages) 선택 API", description = "사용자의 기술스택 내역을 수정합니다.")
+	public ApiResponse<MemberResponseDTO.LanguagesRes> selectInterestLanguages(@PathVariable Long memberId,
+																	   @Valid @RequestBody MemberRequestDTO.UpdateLanguagesReq languagesReq) {
+		MemberResponseDTO.LanguagesRes languagesRes = memberCommandService.selectInterestLanguages(memberId, languagesReq);
+		return ApiResponse.onSuccess(SuccessStatus.MEMBER_SELECT_INTEREST_LANGUAGES_OK, languagesRes);
 	}
 
-	@Operation(summary = "관심사(domain) 수정 API", description = "사용자의 관심사(도메인)내역을 수정합니다.")
-	@PatchMapping("/domains")
-	public ApiResponse<MemberResponseDTO.DomainsRes> updateDomains(@RequestBody MemberRequestDTO.UpdateDomainsReq domainsReq){
-		Long memberId= SecurityUtils.getCurrentMemberId();
-		log.info("memberId={}",memberId);
-		MemberResponseDTO.DomainsRes domainsRes =memberCommandService.updateDomains(memberId,domainsReq);
-		return ApiResponse.onSuccess(SuccessStatus.MEMBER_PATCH_INTERESTS_OK, domainsRes);
+	@PostMapping("/{memberId}/interest/domains")
+	@Operation(summary = "관심분야(domains) 선택 API", description = "사용자가 관심있는 분야를 수정합니다.")
+	public ApiResponse<MemberResponseDTO.DomainsRes> selectInterestDomains(@PathVariable Long memberId,
+																   @Valid @RequestBody MemberRequestDTO.UpdateDomainsReq domainsReq) {
+		MemberResponseDTO.DomainsRes domainsRes = memberCommandService.selectInterestDomains(memberId, domainsReq);
+		return ApiResponse.onSuccess(SuccessStatus.MEMBER_SELECT_INTEREST_DOMAINS_OK, domainsRes);
 	}
 
-	@Operation(summary = "기술스택 조회 API", description = "사용자의 기술스택 내역을 조회합니다.")
-	@GetMapping("/skills")
-	public ApiResponse<MemberResponseDTO.SkillsRes> getSkills(){
+	@GetMapping("/languages")
+	@Operation(summary = "사용자 관심언어(languages) 조회 API", description = "사용자의 관심언어를 조회합니다.")
+	public ApiResponse<MemberResponseDTO.LanguagesRes> getMemberLanguages(){
 		Long memberId= SecurityUtils.getCurrentMemberId();
 		log.info("memberId={}",memberId);
-		MemberResponseDTO.SkillsRes skillRes =memberQueryService.getSkills(memberId);
-		return ApiResponse.onSuccess(SuccessStatus.MEMBER_GET_SKILLS_OK, skillRes);
+		MemberResponseDTO.LanguagesRes languageRes =memberQueryService.getLanguages(memberId);
+		return ApiResponse.onSuccess(SuccessStatus.MEMBER_GET_INTEREST_LANGUAGES_OK, languageRes);
 	}
 
-	@Operation(summary = "기술스택 수정 API", description = "사용자의 기술스택 내역을 수정합니다.")
-	@PatchMapping("/skills")
-	public ApiResponse<MemberResponseDTO.SkillsRes> updateSkills(@RequestBody MemberRequestDTO.UpdateSkillsReq skillsReq){
+	@GetMapping("/domains")
+	@Operation(summary = "사용자 관심분야(domains) 조회 API", description = "사용자의 관심분야을 조회합니다.")
+	public ApiResponse<MemberResponseDTO.DomainsRes> getMemberDomains(){
 		Long memberId= SecurityUtils.getCurrentMemberId();
 		log.info("memberId={}",memberId);
-		MemberResponseDTO.SkillsRes skillsRes =memberCommandService.updateSkills(memberId,skillsReq);
-		return ApiResponse.onSuccess(SuccessStatus.MEMBER_PATCH_SKILLS_OK, skillsRes);
+		MemberResponseDTO.DomainsRes domainsRes =memberQueryService.getDomains(memberId);
+		return ApiResponse.onSuccess(SuccessStatus.MEMBER_GET_INTEREST_DOMAINS_OK, domainsRes);
 	}
 
+//	@Operation(summary = "관심언어(languages) 선택 API", description = "사용자의 기술스택 내역을 수정합니다.")
+//	@PostMapping("/interest/languages")
+//	public ApiResponse<MemberResponseDTO.LanguagesRes> selectLanguages(@Valid @RequestBody MemberRequestDTO.UpdateLanguagesReq languagesReq){
+//		Long memberId= SecurityUtils.getCurrentMemberId();
+//		log.info("memberId={}",memberId);
+//		MemberResponseDTO.LanguagesRes languagesRes =memberCommandService.updateLanguages(memberId,languagesReq);
+//		return ApiResponse.onSuccess(SuccessStatus.MEMBER_PATCH_LANGUAGES_OK, languagesRes);
+//	}
+
+	//	@Operation(summary = "관심분야(domains) 선택 API", description = "사용자가 관심있는 분야를 선택합니다.")
+//	@PatchMapping("/interest/domains")
+//	public ApiResponse<MemberResponseDTO.DomainsRes> selectDomains(@Valid @RequestBody MemberRequestDTO.UpdateDomainsReq domainsReq){
+//		Long memberId= SecurityUtils.getCurrentMemberId();
+//		log.info("memberId={}",memberId);
+//		MemberResponseDTO.DomainsRes domainsRes =memberCommandService.updateDomains(memberId,domainsReq);
+//		return ApiResponse.onSuccess(SuccessStatus.MEMBER_PATCH_INTERESTS_OK, domainsRes);
+//	}
+
+
 	@Operation(summary = "기여내역 조회 API", description = "사용자의 기여내역을 조회합니다.")
 	@GetMapping("/contributions")
 	public ApiResponse<List<PullRequestResponse.PullRequestRes>> getContributions(){

src/main/java/com/chungang/capstone/openstep/domain/Member/converter/MemberConverter.java

@@ -5,6 +5,8 @@
 import com.chungang.capstone.openstep.domain.Member.dto.MemberRequestDTO;
 import com.chungang.capstone.openstep.domain.Member.dto.MemberResponseDTO;
 import com.chungang.capstone.openstep.domain.Member.entity.Member;
+import com.chungang.capstone.openstep.domain.common.InterestDomain;
+import com.chungang.capstone.openstep.domain.common.InterestLanguage;
 
 public class MemberConverter {
 	public static MemberResponseDTO.MemberRes memberTo(Member member,boolean isNewMember,String accessToken) {
@@ -16,16 +18,16 @@ public static MemberResponseDTO.MemberRes memberTo(Member member,boolean isNewMe
 			.build();
 	}
 
-	public static MemberResponseDTO.DomainsRes toDomainRes(List<String> domains) {
+	public static MemberResponseDTO.DomainsRes toDomainRes(List<InterestDomain> domains) {
 		return MemberResponseDTO.DomainsRes.builder()
-			.domains(domains)
-			.build();
+				.domains(domains.stream().map(Enum::name).toList())
+				.build();
 	}
 
-	public static MemberResponseDTO.SkillsRes toSkillRes(List<String> skills) {
-		return MemberResponseDTO.SkillsRes.builder()
-			.skills(skills)
-			.build();
+	public static MemberResponseDTO.LanguagesRes toLanguageRes(List<InterestLanguage> languages) {
+		return MemberResponseDTO.LanguagesRes.builder()
+				.languages(languages.stream().map(Enum::name).toList())
+				.build();
 	}
 
 	// 이메일 회원가입용

src/main/java/com/chungang/capstone/openstep/domain/Member/dto/MemberRequestDTO.java

@@ -6,20 +6,14 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 
 import java.time.LocalDate;
 import java.util.List;
 
 public class MemberRequestDTO {
-	public record UpdateDomainsReq(
-		List<String> domains
-	) { }
-
-	public record UpdateSkillsReq(
-		List<String> skills
-	){}
 
 	// 회원가입 요청 DTO
 	@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -64,5 +58,23 @@ public record refreshRequestDTO(
 			String refreshToken) {
 	}
 
+	public record UpdateDomainsReq(
+//			@Schema(description = "도메인 리스트", example = "[\"BACKEND\", \"AI\"]", allowableValues = {
+//					"FRONTEND", "BACKEND", "SPRING_BOOT", "REACT", "UI_UX", "DEVOPS", "CLOUD",
+//					"DOCKER", "DATABASE", "MYSQL", "AI", "DEEP_LEARNING", "MOBILE", "SECURITY",
+//					"EMBEDDED", "GAME_DEV", "BLOCKCHAIN", "DATA_SCIENCE", "LINUX", "GRAPHQL"
+//			})
+			List<String> domains
+	) {}
+
+	public record UpdateLanguagesReq(
+//			@Schema(description = "언어 리스트", example = "[\"JAVA\", \"PYTHON\"]", allowableValues = {
+//					"C", "CPP", "C_SHARP", "JAVA", "JAVASCRIPT", "TYPESCRIPT", "SWIFT", "KOTLIN",
+//					"PYTHON", "RUST", "GO", "R", "RUBY", "PERL", "PHP", "SQL", "MATLAB", "SCRATCH"
+//			})
+			List<String> languages
+	) {}
+
+
 
 }

src/main/java/com/chungang/capstone/openstep/domain/Member/dto/MemberResponseDTO.java

@@ -23,8 +23,8 @@ public record DomainsRes(
 	) {}
 
 	@Builder
-	public record SkillsRes(
-		List<String> skills
+	public record LanguagesRes(
+		List<String> languages
 	) {}
 
 	@Builder

src/main/java/com/chungang/capstone/openstep/domain/Member/entity/Domain.java

@@ -38,7 +38,7 @@ public class Member extends BaseEntity {
     private int xp;
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<MemberSkill> skills = new ArrayList<>();
+    private List<MemberLanguage> languages = new ArrayList<>();
 
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<MemberDomain> domains = new ArrayList<>();

src/main/java/com/chungang/capstone/openstep/domain/Member/entity/Member.java

@@ -2,12 +2,8 @@
 
 import com.chungang.capstone.openstep.domain.common.BaseEntity;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import com.chungang.capstone.openstep.domain.common.InterestDomain;
+import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -25,7 +21,7 @@ public class MemberDomain extends BaseEntity {
 	@JoinColumn(name = "member_id")
 	private Member member;
 
-	@ManyToOne
-	@JoinColumn(name = "domain_id")
-	private Domain domain;
+	@Enumerated(EnumType.STRING)
+	@Column(nullable = false)
+	private InterestDomain domain;
 }

src/main/java/com/chungang/capstone/openstep/domain/Member/entity/MemberDomain.java

@@ -1,11 +1,7 @@
 package com.chungang.capstone.openstep.domain.Member.entity;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import com.chungang.capstone.openstep.domain.common.InterestLanguage;
+import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +11,7 @@
 @Builder
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
-public class MemberSkill {
+public class MemberLanguage {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
@@ -24,7 +20,7 @@ public class MemberSkill {
 	@JoinColumn(name = "member_id")
 	private Member member;
 
-	@ManyToOne
-	@JoinColumn(name = "skill_id")
-	private Skill skill;
+	@Enumerated(EnumType.STRING)
+	@Column(nullable = false)
+	private InterestLanguage language;
 }