v2.3.6 (#778)

build.gradle

@@ -99,6 +99,7 @@ dependencies {
 
  // Sentry
  implementation 'io.sentry:sentry-logback:7.14.0'
+ implementation 'io.sentry:sentry-openfeign:7.14.0'
 }
 
 tasks.named('test') {

src/main/java/com/gdschongik/gdsc/domain/discord/domain/DiscordValidator.java

@@ -32,7 +32,7 @@ public void validateVerifyDiscordCode(
  }
 
  public void validateAdminPermission(Member currentMember) {
- if (!currentMember.getManageRole().equals(MemberManageRole.ADMIN)) {
+ if (currentMember.getManageRole() != MemberManageRole.ADMIN) {
  throw new CustomException(INVALID_ROLE);
  }
  }

src/main/java/com/gdschongik/gdsc/domain/member/domain/Member.java

@@ -137,7 +137,7 @@ private void validateStatusUpdatable() {
  * 준회원 승급 가능 여부를 검증합니다.
  */
  private void validateAssociateAvailable() {
- if (role.equals(ASSOCIATE)) {
+ if (isAssociate()) {
  throw new CustomException(MEMBER_ALREADY_ASSOCIATE);
  }
 
@@ -152,7 +152,7 @@ private void validateRegularAvailable() {
  throw new CustomException(MEMBER_ALREADY_REGULAR);
  }
 
- if (!role.equals(ASSOCIATE)) {
+ if (!isAssociate()) {
  throw new CustomException(MEMBER_NOT_ASSOCIATE);
  }
  }
@@ -335,26 +335,26 @@ public void updateMemberInfo(
 
  // 데이터 전달 로직
  public boolean isGuest() {
- return role.equals(GUEST);
+ return role == GUEST;
  }
 
  public boolean isAssociate() {
- return role.equals(ASSOCIATE);
+ return role == ASSOCIATE;
  }
 
  public boolean isRegular() {
- return role.equals(REGULAR);
+ return role == REGULAR;
  }
 
  public boolean isAdmin() {
- return manageRole.equals(ADMIN);
+ return manageRole == ADMIN;
  }
 
  public boolean isMentor() {
- return studyRole.equals(MENTOR);
+ return studyRole == MENTOR;
  }
 
  public boolean isStudent() {
- return studyRole.equals(STUDENT);
+ return studyRole == STUDENT;
  }
 }

src/main/java/com/gdschongik/gdsc/domain/member/domain/MemberStatus.java

@@ -13,10 +13,10 @@ public enum MemberStatus {
  private final String value;
 
  public boolean isDeleted() {
- return this.equals(DELETED);
+ return this == DELETED;
  }
 
  public boolean isForbidden() {
- return this.equals(FORBIDDEN);
+ return this == FORBIDDEN;
  }
 }

src/main/java/com/gdschongik/gdsc/domain/membership/application/MembershipService.java

@@ -44,11 +44,6 @@ public void verifyPaymentStatus(String orderNanoId) {
  findMembershipAndVerifyPayment(membershipId);
  }
 
- @Transactional
- public void verifyPaymentStatus(Long membershipId) {
- findMembershipAndVerifyPayment(membershipId);
- }
-
  private void findMembershipAndVerifyPayment(Long membershipId) {
  Membership currentMembership = membershipRepository
  .findById(membershipId)

src/main/java/com/gdschongik/gdsc/domain/membership/domain/Membership.java

@@ -62,7 +62,7 @@ public static Membership createMembership(Member member, RecruitmentRound recrui
 
  // 검증 로직
 
- public void validateRegularRequirement() {
+ private void validateRegularRequirement() {
  if (isRegularRequirementAllSatisfied()) {
  throw new CustomException(MEMBERSHIP_ALREADY_SATISFIED);
  }

src/main/java/com/gdschongik/gdsc/domain/recruitment/domain/RecruitmentRound.java

@@ -94,6 +94,6 @@ public void validatePeriodNotStarted() {
  }
 
  public boolean isFirstRound() {
- return roundType.equals(RoundType.FIRST);
+ return roundType == RoundType.FIRST;
  }
 }

src/main/java/com/gdschongik/gdsc/domain/recruitment/domain/RecruitmentRoundValidator.java

@@ -1,6 +1,5 @@
 package com.gdschongik.gdsc.domain.recruitment.domain;
 
-import static com.gdschongik.gdsc.domain.recruitment.domain.RoundType.*;
 import static com.gdschongik.gdsc.global.common.constant.TemporalConstant.*;
 import static com.gdschongik.gdsc.global.exception.ErrorCode.*;
 
@@ -67,7 +66,7 @@ private void validatePeriodOverlap(
  // 학년도, 학기, 모집회차가 모두 같은 경우
  private void validateRoundOverlap(List<RecruitmentRound> recruitmentRounds, RoundType roundType) {
  recruitmentRounds.stream()
- .filter(recruitmentRound -> recruitmentRound.getRoundType().equals(roundType))
+ .filter(recruitmentRound -> recruitmentRound.getRoundType() == roundType)
  .findAny()
  .ifPresent(ignored -> {
  throw new CustomException(RECRUITMENT_ROUND_TYPE_OVERLAP);
@@ -76,14 +75,14 @@ private void validateRoundOverlap(List<RecruitmentRound> recruitmentRounds, Roun
 
  // 1차 모집이 없는데 2차 모집을 생성하려고 하는 경우
  private void validateRoundOneExist(List<RecruitmentRound> recruitmentRounds, RoundType roundType) {
- if (roundType.equals(SECOND) && recruitmentRounds.stream().noneMatch(RecruitmentRound::isFirstRound)) {
+ if (roundType.isSecond() && recruitmentRounds.stream().noneMatch(RecruitmentRound::isFirstRound)) {
  throw new CustomException(ROUND_ONE_DOES_NOT_EXIST);
  }
  }
 
  // 1차 모집을 비워둬서는 안되므로, 1차 모집을 2차 모집으로 수정하려고 하는 경우 예외 발생
  private void validateRoundOneToTwo(RoundType previousRoundType, RoundType newRoundType) {
- if (previousRoundType.equals(FIRST) && newRoundType.equals(SECOND)) {
+ if (previousRoundType.isFirst() && newRoundType.isSecond()) {
  throw new CustomException(ROUND_ONE_DOES_NOT_EXIST);
  }
  }

src/main/java/com/gdschongik/gdsc/domain/recruitment/domain/RoundType.java

@@ -10,4 +10,12 @@ public enum RoundType {
  SECOND("2차");
 
  private final String value;
+
+ public boolean isFirst() {
+ return this == FIRST;
+ }
+
+ public boolean isSecond() {
+ return this == SECOND;
+ }
 }

src/main/java/com/gdschongik/gdsc/domain/study/application/StudentStudyService.java

@@ -93,17 +93,15 @@ public void attend(Long studyDetailId, StudyAttendCreateRequest request) {
  final Study study = studyDetail.getStudy();
  final boolean isAlreadyAttended =
  attendanceRepository.existsByStudentIdAndStudyDetailId(currentMember.getId(), studyDetailId);
- final StudyHistory studyHistory = studyHistoryRepository
- .findByStudentAndStudy(currentMember, study)
- .orElseThrow(() -> new CustomException(STUDY_HISTORY_NOT_FOUND));
+ boolean isAppliedToStudy = studyHistoryRepository.existsByStudentAndStudy(currentMember, study);
 
  attendanceValidator.validateAttendance(
- studyDetail, request.attendanceNumber(), LocalDate.now(), isAlreadyAttended);
+ studyDetail, request.attendanceNumber(), LocalDate.now(), isAlreadyAttended, isAppliedToStudy);
 
  Attendance attendance = Attendance.create(currentMember, studyDetail);
  attendanceRepository.save(attendance);
 
- log.info("[StudyService] 스터디 출석: attendanceId={}", attendance.getId());
+ log.info("[StudyService] 스터디 출석: attendanceId={}, memberId={}", attendance.getId(), currentMember.getId());
  }
 
  @Transactional(readOnly = true)

src/main/java/com/gdschongik/gdsc/domain/study/domain/AttendanceValidator.java

@@ -8,8 +8,13 @@
 
 @DomainService
 public class AttendanceValidator {
+
  public void validateAttendance(
- StudyDetail studyDetail, String attendanceNumber, LocalDate date, boolean isAlreadyAttended) {
+ StudyDetail studyDetail,
+ String attendanceNumber,
+ LocalDate date,
+ boolean isAlreadyAttended,
+ boolean isAppliedToStudy) {
  // 출석체크 날짜 검증
  LocalDate attendanceDay = studyDetail.getAttendanceDay();
  if (!attendanceDay.equals(date)) {
@@ -25,5 +30,10 @@ public void validateAttendance(
  if (isAlreadyAttended) {
  throw new CustomException(STUDY_DETAIL_ALREADY_ATTENDED);
  }
+
+ // 스터디 신청 여부 검증
+ if (!isAppliedToStudy) {
+ throw new CustomException(STUDY_HISTORY_NOT_FOUND);
+ }
  }
 }

src/main/java/com/gdschongik/gdsc/global/common/constant/SentryConstant.java

@@ -0,0 +1,12 @@
+package com.gdschongik.gdsc.global.common.constant;
+
+import java.util.List;
+
+public class SentryConstant {
+
+ private SentryConstant() {}
+
+ public static final String ACTUATOR_KEYWORD = "actuator";
+
+ public static final List<String> KEYWORDS_TO_IGNORE = List.of(ACTUATOR_KEYWORD);
+}

src/main/java/com/gdschongik/gdsc/global/config/SentryConfig.java

@@ -3,20 +3,29 @@
 import com.gdschongik.gdsc.global.property.DockerProperty;
 import io.sentry.Sentry;
 import io.sentry.SentryOptions;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 @Configuration
 @RequiredArgsConstructor
 public class SentryConfig {
 
  private final DockerProperty dockerProperty;
 
+ private final List<Class<? extends Throwable>> exceptionsToIgnore = List.of(
+ NoResourceFoundException.class, // 존재하지 않는 정적 리소스 요청
+ MethodArgumentNotValidException.class // @Valid 검증 실패
+ );
+
  @Bean
  Sentry.OptionsConfiguration<SentryOptions> customOptionsConfiguration() {
  return options -> {
  options.setRelease(convertTagToRelease(dockerProperty.getTag()));
+ exceptionsToIgnore.forEach(options::addIgnoredExceptionForType);
  };
  }
 

src/main/java/com/gdschongik/gdsc/global/exception/ErrorCode.java

@@ -116,6 +116,7 @@ public enum ErrorCode {
  STUDY_DETAIL_ASSIGNMENT_INVALID_UPDATE_DEADLINE(HttpStatus.CONFLICT, "수정하려고 하는 과제의 마감기한은 기존의 마감기한보다 빠르면 안됩니다."),
  STUDY_DETAIL_ID_INVALID(HttpStatus.CONFLICT, "수정하려는 스터디 상세정보가 서버에 존재하지 않거나 유효하지 않습니다."),
  STUDY_DETAIL_CURRICULUM_SIZE_MISMATCH(HttpStatus.BAD_REQUEST, "스터디 커리큘럼의 총 개수가 일치하지 않습니다."),
+
  // StudyHistory
  STUDY_HISTORY_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 스터디 수강 기록입니다."),
  STUDY_HISTORY_DUPLICATE(HttpStatus.CONFLICT, "이미 해당 스터디를 신청했습니다."),

src/main/java/com/gdschongik/gdsc/infra/feign/global/config/FeignConfig.java

@@ -3,9 +3,11 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import feign.Capability;
 import feign.Logger;
 import feign.codec.Decoder;
 import feign.jackson.JacksonDecoder;
+import io.sentry.openfeign.SentryCapability;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignFormatterRegistrar;
 import org.springframework.context.annotation.Bean;
@@ -41,4 +43,9 @@ public FeignFormatterRegistrar dateTimeFormatterRegistrar() {
  registrar.registerFormatters(registry);
  };
  }
+
+ @Bean
+ public Capability sentryCapability() {
+ return new SentryCapability();
+ }
 }

src/main/java/com/gdschongik/gdsc/infra/sentry/CustomBeforeSendTransactionCallback.java

@@ -0,0 +1,28 @@
+package com.gdschongik.gdsc.infra.sentry;
+
+import static com.gdschongik.gdsc.global.common.constant.SentryConstant.*;
+
+import io.sentry.Hint;
+import io.sentry.SentryOptions;
+import io.sentry.protocol.SentryTransaction;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CustomBeforeSendTransactionCallback implements SentryOptions.BeforeSendTransactionCallback {
+
+ @Override
+ public SentryTransaction execute(@NotNull SentryTransaction transaction, @NotNull Hint hint) {
+ String transactionEndpoint = transaction.getTransaction();
+
+ if (transactionEndpoint == null) {
+ return transaction;
+ }
+
+ if (KEYWORDS_TO_IGNORE.stream().anyMatch(transactionEndpoint::contains)) {
+ return null;
+ }
+
+ return transaction;
+ }
+}

src/main/resources/application-dev.yml

@@ -8,5 +8,5 @@ spring:
 
 logging:
  level:
- org.springframework.orm.jpa: DEBUG
- org.springframework.transaction: DEBUG
+ com.gdschongik.gdsc.domain.*.api.*: info
+ com.gdschongik.gdsc.infra.feign: debug

src/main/resources/application-local.yml

@@ -10,11 +10,14 @@ spring:
  properties:
  hibernate:
  format_sql: ${FORMAT_SQL:true}
+ highlight_sql: ${HIGHLIGHT_SQL:true}
  defer-datasource-initialization: true
  open-in-view: false
 
 logging:
  level:
- org.springframework.orm.jpa: DEBUG
- org.springframework.transaction: DEBUG
+ com.gdschongik.gdsc.domain.*.api.*: debug
+ com.gdschongik.gdsc.infra.feign: debug
+ org.hibernate.orm.jdbc.bind: trace
+ org.hibernate.SQL: debug
  org.kohsuke.github: debug

src/main/resources/application-prod.yml

@@ -8,5 +8,4 @@ spring:
 
 logging:
  level:
- org.springframework.orm.jpa: DEBUG
- org.springframework.transaction: DEBUG
+ com.gdschongik.gdsc.domain.*.api.*: info

src/main/resources/application-sentry.yml

@@ -10,7 +10,7 @@ sentry:
  environment: ${spring.profiles.active:local}
  send-default-pii: true
  logging:
- minimum-event-level: info
+ minimum-event-level: warn
  minimum-breadcrumb-level: debug
 
 docker:

src/main/resources/application.yml

@@ -17,5 +17,4 @@ spring:
 
 logging:
  level:
- com.gdschongik.gdsc.domain.*.api.*: debug
- com.gdschongik.gdsc.infra.feign: debug
+ com.gdschongik.gdsc.domain.*.api.*: info

src/test/java/com/gdschongik/gdsc/domain/member/domain/MemberValidatorTest.java

@@ -1,6 +1,7 @@
 package com.gdschongik.gdsc.domain.member.domain;
 
 import static com.gdschongik.gdsc.global.common.constant.RecruitmentConstant.*;
+import static com.gdschongik.gdsc.global.common.constant.TemporalConstant.*;
 import static com.gdschongik.gdsc.global.exception.ErrorCode.*;
 import static org.assertj.core.api.Assertions.*;