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
@@ -1,15 +1,16 @@
package com.mycom.backenddaengplace.trait.controller;

import com.mycom.backenddaengplace.auth.dto.CustomOAuth2User;
import com.mycom.backenddaengplace.common.dto.ApiResponse;
import com.mycom.backenddaengplace.trait.dto.request.MemberTraitResponseRequestList;
import com.mycom.backenddaengplace.trait.dto.response.TraitQuestionResponse;
import com.mycom.backenddaengplace.trait.enums.QuestionTarget;
import com.mycom.backenddaengplace.trait.service.MemberTraitService;
import com.mycom.backenddaengplace.trait.service.TraitService;
import lombok.RequiredArgsConstructor;
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 org.springframework.web.bind.annotation.RestController;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;

import java.util.List;

Expand All @@ -19,10 +20,18 @@
public class TraitController {

private final TraitService traitService;
private final MemberTraitService memberTraitService;

@GetMapping("/questions")
public ResponseEntity<ApiResponse<List<TraitQuestionResponse>>> getTraitQuestions(@RequestParam QuestionTarget target) {
return ResponseEntity.ok(ApiResponse.success("μ„±ν–₯ 질문 λͺ©λ‘μ„ μ‘°νšŒν–ˆμŠ΅λ‹ˆλ‹€.",
traitService.getTraitQuestions(target)));
}

@PostMapping("/register")
public ResponseEntity<ApiResponse<Void>> registerMemberTraitResponse(@RequestBody MemberTraitResponseRequestList request,
@AuthenticationPrincipal CustomOAuth2User customOAuth2User) {
memberTraitService.saveMemberTraitResponse(request, customOAuth2User.getMember());
return ResponseEntity.ok(ApiResponse.success("μ„±ν–₯ 검사 κ²°κ³Όλ₯Ό λ“±λ‘ν–ˆμŠ΅λ‹ˆλ‹€."));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.mycom.backenddaengplace.member.domain.Member;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

Expand All @@ -29,4 +30,11 @@ public class MemberTraitResponse {
@JoinColumn(name = "trait_question_id", nullable = false)
private TraitQuestion traitQuestion;

@Builder
public MemberTraitResponse(MemberTraitResponseId id, Member member, TraitAnswer traitAnswer, TraitQuestion traitQuestion) {
this.id = id;
this.member = member;
this.traitAnswer = traitAnswer;
this.traitQuestion = traitQuestion;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.mycom.backenddaengplace.trait.dto.request;

import lombok.Builder;
import lombok.Data;

@Data
@Builder
public class MemberTraitResponseRequest {
private Long memberId;
private Long traitQuestionId;
private Long traitAnswerId;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.mycom.backenddaengplace.trait.dto.request;

import lombok.Data;

import java.util.List;

@Data
public class MemberTraitResponseRequestList {
private List<MemberTraitResponseRequest> memberTraitResponseRequestList;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.mycom.backenddaengplace.trait.exception;

import com.mycom.backenddaengplace.common.exception.BaseException;
import org.springframework.http.HttpStatus;

public class TraitAnswerNotFoundException extends BaseException {
public TraitAnswerNotFoundException(Long answerId) {
super(String.format("μ„±ν–₯ λ‹΅λ³€ ID [%d]λ₯Ό 찾을 수 μ—†μŠ΅λ‹ˆλ‹€.", answerId),
HttpStatus.NOT_FOUND);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.mycom.backenddaengplace.trait.exception;

import com.mycom.backenddaengplace.common.exception.BaseException;
import org.springframework.http.HttpStatus;

public class TraitQuestionNotFoundException extends BaseException {
public TraitQuestionNotFoundException(Long questionId) {
super(String.format("μ„±ν–₯ 질문 ID [%d]λ₯Ό 찾을 수 μ—†μŠ΅λ‹ˆλ‹€.", questionId),
HttpStatus.NOT_FOUND);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.mycom.backenddaengplace.trait.repository;

import com.mycom.backenddaengplace.trait.domain.MemberTraitResponse;
import com.mycom.backenddaengplace.trait.domain.MemberTraitResponseId;
import org.springframework.data.jpa.repository.JpaRepository;

public interface MemberTraitResponseRepository extends JpaRepository<MemberTraitResponse, MemberTraitResponseId> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.mycom.backenddaengplace.trait.repository;

import com.mycom.backenddaengplace.trait.domain.TraitAnswer;
import org.springframework.data.jpa.repository.JpaRepository;

public interface TraitAnswerRepository extends JpaRepository<TraitAnswer, Long> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package com.mycom.backenddaengplace.trait.service;

import com.mycom.backenddaengplace.member.domain.Member;
import com.mycom.backenddaengplace.trait.domain.MemberTraitResponse;
import com.mycom.backenddaengplace.trait.domain.MemberTraitResponseId;
import com.mycom.backenddaengplace.trait.domain.TraitAnswer;
import com.mycom.backenddaengplace.trait.domain.TraitQuestion;
import com.mycom.backenddaengplace.trait.dto.request.MemberTraitResponseRequest;
import com.mycom.backenddaengplace.trait.dto.request.MemberTraitResponseRequestList;
import com.mycom.backenddaengplace.trait.exception.TraitAnswerNotFoundException;
import com.mycom.backenddaengplace.trait.exception.TraitQuestionNotFoundException;
import com.mycom.backenddaengplace.trait.repository.MemberTraitResponseRepository;
import com.mycom.backenddaengplace.trait.repository.TraitAnswerRepository;
import com.mycom.backenddaengplace.trait.repository.TraitQuestionRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

@Service
@RequiredArgsConstructor
public class MemberTraitService {

private final TraitAnswerRepository traitAnswerRepository;
private final TraitQuestionRepository traitQuestionRepository;
private final MemberTraitResponseRepository memberTraitResponseRepository;

public void saveMemberTraitResponse(MemberTraitResponseRequestList requestList, Member member) {
for (MemberTraitResponseRequest request : requestList.getMemberTraitResponseRequestList()) {

TraitQuestion traitQuestion = traitQuestionRepository.findById(request.getTraitQuestionId())
.orElseThrow(() -> new TraitQuestionNotFoundException(request.getTraitQuestionId()));

TraitAnswer traitAnswer = traitAnswerRepository.findById(request.getTraitAnswerId())
.orElseThrow(() -> new TraitAnswerNotFoundException(request.getTraitAnswerId()));

// 볡합킀 생성
MemberTraitResponseId responseId = new MemberTraitResponseId(
member.getId(),
request.getTraitAnswerId(),
request.getTraitQuestionId()
);

MemberTraitResponse response = MemberTraitResponse.builder()
.id(responseId)
.member(member)
.traitQuestion(traitQuestion)
.traitAnswer(traitAnswer)
.build();

memberTraitResponseRepository.save(response);
}
}

}
Loading