Skip to content

코드 리뷰, 일부 코드 리팩토링 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

코드 리뷰, 일부 코드 리팩토링 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2b9371
refactor: Modify MemberService, code-review.yml
comeevery-git Oct 19, 2024
5bd163d
fix: Modify code-review.yml
comeevery-git Oct 19, 2024
e5aca70
fix: Modify code-review.yml
comeevery-git Oct 19, 2024
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
84 changes: 53 additions & 31 deletions .github/workflows/code-review.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ jobs:
# 시스템 프롬프트 및 모델명 가져오기
system_prompt = """${{ secrets.SYSTEM_PROMPT }}"""
model_name = "${{ secrets.OPENAI_MODEL }}"
summary_system_prompt = """${{ secrets.SUMMARY_SYSTEM_PROMPT }}"""

# 처리된 파일과 라인 기록 (중복 방지)
# 처리된 파일 기록 (중복 방지)
processed_files = set() # 각 파일을 기록
processed_lines = {} # 각 파일별로 라인을 기록하기 위한 딕셔너리로 수정
review_history = [] # 각 파일의 리뷰 기록을 저장

# GitHub API 호출 로그
print("Fetching changed files from GitHub API...")
Expand Down Expand Up @@ -85,10 +86,6 @@ jobs:
patch = file.get('patch', '')
print(f"Analyzing patch for file: {file_path}")

# 각 파일마다 중복 라인 처리를 위한 집합 생성
if file_path not in processed_lines:
processed_lines[file_path] = set()

# 전체 패치 내용을 GPT에게 전달
if patch: # 패치가 존재할 경우에만 처리
print(f"Calling GPT API for patch in file: {file_path}")
Expand All @@ -99,6 +96,7 @@ jobs:
{"role": "system", "content": system_prompt},
{"role": "user", "content": f"Here is the code diff for context:\n{patch}"}
],
max_tokens=500,
timeout=30
)
except Exception as e:
Expand All @@ -109,40 +107,64 @@ jobs:
print(f"GPT response received for file: {file_path}")
print(f"Review comment: {review_comment}")

# 리뷰 히스토리 기록
review_history.append(f"File: {file_path}\nReview: {review_comment}")

# 변경된 파일과 라인에 리뷰 코멘트를 추가
commit_id = "${{ github.event.pull_request.head.sha }}"
line_number = file.get('patch').split('\n').index(next(line for line in file['patch'].split('\n') if line.startswith('+'))) + 1
comment_body = {
"body": review_comment,
"path": file_path,
"line": line_number,
"side": "RIGHT",
"commit_id": commit_id
}

# 코멘트를 추가하기 전 파일 경로와 위치를 로그로 출력
print(f"Commenting on file: {file_path}, line: {line_number}")

comment_url = f"https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/comments"
response = requests.post(comment_url, headers=headers, data=json.dumps(comment_body))

# 응답 상태 확인
if response.status_code == 201:
print(f"Comment posted successfully for file: {file_path}")
else:
print(f"Failed to post comment. Status code: {response.status_code}, Response: {response.text}")
position = file.get('position', None) # 'position' 필드 사용
if position is not None:
comment_body = {
"body": review_comment,
"path": file_path,
"position": position, # 'line' 대신 'position' 사용
"side": "RIGHT",
"commit_id": commit_id
}

# 코멘트를 추가하기 전 파일 경로와 위치를 로그로 출력
print(f"Commenting on file: {file_path}, position: {position}")

comment_url = f"https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/comments"
response = requests.post(comment_url, headers=headers, data=json.dumps(comment_body))

# 응답 상태 확인
if response.status_code == 201:
print(f"Comment posted successfully for file: {file_path}")
else:
print(f"Failed to post comment. Status code: {response.status_code}, Response: {response.text}")

# 각 파일을 처리한 후 파일 이름을 기록
processed_files.add(file_path)

# 최종 요약 요청
review_history_text = "\n\n".join(review_history)
print("Requesting final review summary from GPT...")
try:
final_review_response = openai.chat.completions.create(
model=model_name,
messages=[
{"role": "system", "content": summary_system_prompt},
{"role": "user", "content": review_history_text}
],
max_tokens=1000,
timeout=60 # 타임아웃을 60초로 설정
)
except Exception as e:
print(f"Error in GPT summary request: {e}")
exit(1)

final_review_comment = final_review_response.choices[0].message.content
print(f"Final review comment received: {final_review_comment}")

# 최종 요약 코멘트 추가
comment_url = f"https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments"
requests.post(comment_url, headers=headers, data=json.dumps({"body": final_review_comment}))
print("Final review comment posted.")

else:
print(f"Unexpected status code: {response.status_code}")
exit(1)

# 최종 리뷰 요약 코멘트 추가
final_comment = "### 최종 리뷰 요약: .java 파일에 대한 모든 변경 사항을 검토 완료했습니다."
comment_url = f"https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments"
requests.post(comment_url, headers=headers, data=json.dumps({"body": final_comment}))
print("Final review comment posted.")
exit(0)
EOF
35 changes: 19 additions & 16 deletions src/main/java/app/member/domain/service/MemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,33 +55,36 @@ public MemberVo getMember(Long memberId) {
@Transactional
public UpdateMemberVo updateMember(UpdateMemberDto dto) {
try {
Member member = memberRepository.findById(dto.getMemberId()).orElseThrow(() -> new CustomException(
ResponseCode.NOT_EXIST));
log.info("### 회원 조회 결과: {}", member);
Member member = memberRepository.findById(dto.getMemberId())
.orElseThrow(() -> new CustomException(ResponseCode.NOT_EXIST));

log.debug("### 회원 조회 결과: {}", member);

if (!dto.getName().isBlank()) {
member.setName(dto.getName());
}
if (!dto.getEmail().isBlank()) {
member.setEmail(dto.getEmail());
}
if (!dto.getRole().equals(member.getRole())) {
member.setRole(dto.getRole());
}
member.setUpdatedMemberId(dto.getMemberId());
updateMemberFields(member, dto);

Member result = memberRepository.save(member);
log.info("### 회원 수정 결과: {}", result);
log.debug("### 회원 수정 결과: {}", result);

return UpdateMemberVo.toVo(result);
} catch (DataIntegrityViolationException e) {
throw new CustomException(ResponseCode.CONFLICT_DATA);
} catch (CustomException e) {
throw new CustomException(e.getResponseCode());
} catch (Exception e) {
throw e;
}
}

private void updateMemberFields(Member member, UpdateMemberDto dto) {
if (!dto.getName().isBlank()) {
member.setName(dto.getName());
}
if (!dto.getEmail().isBlank()) {
member.setEmail(dto.getEmail());
}
if (!dto.getRole().equals(member.getRole())) {
member.setRole(dto.getRole());
}
member.setUpdatedMemberId(dto.getMemberId());
}


}
Loading