Skip to content

Commit

Permalink
[refactor] #32 코드 통일 및 보수 (#37)
Browse files Browse the repository at this point in the history
* refactor: 필드 주입 대신 생성자 주입으로 변경

* refactor: 개행 및 EOL 추가

* refactor: 서류, 최종 메일 분리 및 비동기 처리

* refactor: 빌더 생성자로 변경

* test: displayName 추가

* fix: 스레드 작업 대기 시간 연장

* feat: 메일 예외 추가

* feat: 메일 병렬처리 추가

* fix: 대기시간 연장

* refactor: 메일 예약, 메일 전송 로직 분리

* fix: 메일 전송 테스트 비활성화
  • Loading branch information
ay-eonii authored Sep 8, 2024
1 parent f792b8f commit ba26e6b
Show file tree
Hide file tree
Showing 74 changed files with 612 additions and 270 deletions.
12 changes: 9 additions & 3 deletions src/main/java/land/leets/domain/admin/domain/Admin.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
package land.leets.domain.admin.domain;

import jakarta.persistence.*;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import land.leets.domain.shared.BaseTimeEntity;
import lombok.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.GenericGenerator;

import java.util.UUID;

@Entity(name = "admins")
@Builder
@Getter
@Setter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
public class Admin extends BaseTimeEntity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

import land.leets.domain.admin.domain.Admin;
import land.leets.domain.admin.presentation.dto.AdminDetailsResponse;
import org.mapstruct.*;
import org.mapstruct.BeanMapping;
import org.mapstruct.Mapper;
import org.mapstruct.NullValuePropertyMappingStrategy;
import org.mapstruct.ReportingPolicy;

@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface AdminMapper {

@BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
AdminDetailsResponse mappingAdminToDto(Admin admin);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;

@RequiredArgsConstructor
@Service
@RequiredArgsConstructor
public class AdminLoginImpl implements AdminLogin {

private final JwtProvider jwtProvider;
private final AdminRepository adminRepository;
private final PasswordEncoder passwordEncoder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@

import java.util.UUID;

@RequiredArgsConstructor
@Service
@RequiredArgsConstructor
public class AdminRefreshTokenImpl implements AdminRefreshToken {

private final JwtProvider jwtProvider;

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
package land.leets.domain.application.domain;

import java.time.LocalDateTime;

import jakarta.persistence.*;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.OneToOne;
import land.leets.domain.application.type.ApplicationStatus;
import land.leets.domain.application.type.Position;
import land.leets.domain.application.type.SubmitStatus;
import land.leets.domain.shared.BaseTimeEntity;
import land.leets.domain.user.domain.User;
import lombok.*;

import java.time.LocalDateTime;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Entity(name = "applications")
@Builder
@Getter
@Setter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
public class Application extends BaseTimeEntity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ public class ApplicationAlreadyExistsException extends ServiceException {
public ApplicationAlreadyExistsException() {
super(ErrorCode.APPLICATION_ALREADY_EXISTS);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ public class ApplicationNotFoundException extends ServiceException {
public ApplicationNotFoundException() {
super(ErrorCode.APPLICATION_NOT_FOUND);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
import land.leets.domain.application.presentation.dto.StatusRequest;
import land.leets.domain.interview.presentation.dto.res.InterviewDetailsResponse;
import land.leets.domain.interview.presentation.dto.res.InterviewResponse;
import org.mapstruct.*;
import org.mapstruct.BeanMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.MappingTarget;
import org.mapstruct.NullValuePropertyMappingStrategy;
import org.mapstruct.ReportingPolicy;

@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface ApplicationMapper {
Expand All @@ -23,4 +28,4 @@ public interface ApplicationMapper {
@BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
@Mapping(target = "id", source = "application.id")
ApplicationDetailsResponse mappingDetailsToDto(Application application, InterviewDetailsResponse interview, String phone);
}
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
package land.leets.domain.application.type;

import java.util.List;

import lombok.AllArgsConstructor;
import lombok.Getter;

@Getter
@AllArgsConstructor
public enum ApplicationStatus {
PASS_PAPER("서류 합격"),
FAIL_PAPER("서류 불합격"),
PASS("최종 합격"),
FAIL("최종 불합격"),
PENDING("보류");
PASS_PAPER("서류 합격"),
FAIL_PAPER("서류 불합격"),
PASS("최종 합격"),
FAIL("최종 불합격"),
PENDING("보류");

private String statusKo;

public static List<ApplicationStatus> finals() {
return List.of(PASS, FAIL);
}

private String statusKo;
}
public static List<ApplicationStatus> papers() {
return List.of(PASS_PAPER, FAIL_PAPER);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ public enum Position {
UX_UI("UX/UI");

private final String statusKo;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
public enum SubmitStatus {
NONE("미제출"),
SAVE("임시저장"),
SUBMIT("제출")
;
SUBMIT("제출");

private String statusKo;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
@Service
@RequiredArgsConstructor
public class CreateApplicationImpl implements CreateApplication {

private final ApplicationRepository applicationRepository;
private final UserRepository userRepository;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@Service
@RequiredArgsConstructor
public class GetAllApplicationImpl implements GetAllApplication {

private final ApplicationRepository applicationRepository;
private final ApplicationMapper applicationMapper;
private final GetInterview getInterview;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@RequiredArgsConstructor
@Service
public class AdminAuthDetailsService implements UserDetailsService {

private final AdminRepository adminRepository;

@Override
Expand Down
1 change: 1 addition & 0 deletions src/main/java/land/leets/domain/auth/AuthDetails.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@Getter
@AllArgsConstructor
public class AuthDetails implements UserDetails {

private final UUID uid;
private final String email;
private final AuthRole role;
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/land/leets/domain/auth/AuthService.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,14 @@

import java.io.IOException;
import java.security.GeneralSecurityException;
import java.util.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;

@Service
public class AuthService {

private final String googleAuthUrl;
private final String googleRedirectUrl;
private final String googleClientId;
Expand Down Expand Up @@ -91,4 +95,4 @@ public User getUser(String idToken) throws GeneralSecurityException, IOException

return userRepository.save(user);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;

@RequiredArgsConstructor
@Service
@RequiredArgsConstructor
public class UserAuthDetailsService implements UserDetailsService {
private final UserRepository userRepository;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
@RestController
@RequiredArgsConstructor
public class AuthController {

private final AuthService authService;
private final JwtProvider jwtProvider;

Expand Down
14 changes: 11 additions & 3 deletions src/main/java/land/leets/domain/comment/domain/Comment.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
package land.leets.domain.comment.domain;

import jakarta.persistence.*;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.OneToOne;
import land.leets.domain.admin.domain.Admin;
import land.leets.domain.shared.BaseTimeEntity;
import lombok.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Entity(name = "comments")
@Builder
@Getter
@Setter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
public class Comment extends BaseTimeEntity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@Getter
@NoArgsConstructor
public class CommentRequest {

@NotBlank
private Long applicationId;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@Getter
@AllArgsConstructor
public class CommentResponse {

@NotBlank
private String content;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
public interface CommentMapper {
@BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
CommentResponse mappingCommentToDto(Comment comment);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@Service
@RequiredArgsConstructor
public class CreateCommentImpl implements CreateComment {

private final CommentRepository commentRepository;
private final AdminRepository adminRepository;
private final CommentMapper commentMapper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@Service
@RequiredArgsConstructor
public class GetCommentsImpl implements GetComments {

private final CommentRepository commentRepository;
private final CommentMapper commentMapper;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
package land.leets.domain.contributor.domain;

import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.*;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import land.leets.domain.portfolio.domain.Portfolio;
import lombok.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Entity(name = "contributors")
@Builder
Expand Down Expand Up @@ -38,4 +50,3 @@ public class Contributor {
@Column
private String profile;
}

Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
@Getter
@AllArgsConstructor
public enum Position {

BACK_END("BackEnd"),
FRONT_END("FrontEnd"),
BX_BI("BX/BI"),
UX_UI("UX/UI");

private final String position;
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package land.leets.domain.contributor.domain.repository;

import land.leets.domain.comment.domain.Comment;
import land.leets.domain.contributor.domain.Contributor;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;
public interface ContributorRepository extends JpaRepository<Contributor, Long> {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@

@Service
@RequiredArgsConstructor
public class CreateContributorImpl implements CreateContributor{
public class CreateContributorImpl implements CreateContributor {

private final ContributorRepository contributorRepository;

@Override
public void execute(List<Contributor> request, Portfolio portfolio) {
for (Contributor contributor : request) {
Expand Down
Loading

0 comments on commit ba26e6b

Please sign in to comment.