Release v1.2.0

fix-be: applicantCard 조회 시 평가 점수와 갯수가 모든 프로세스에 대해 나오는 버그 수정 (#902) fix-be: 이메일 인증 시 이미 가입된 이메일은 예외를 던지도록 변경 (#906) feat-be: RTR 방식 Redis로 변경 (#889) feat-be: 이메일 전송 템플릿 적용 (#897) feat-be: 이메일 인증 후, 회원가입 이메일의 인증 여부 확인 (#882) refactor-be: 식별자에 Tsid 적용 (#856) feat-be: 이메일 전송 로직 중 지원자 일괄 조회 로직 구현 (#869) fix-be: github action의 Redis 환경 변수 추가 (#871) feat-be: 이메일 인증 기능 구현 (#848)
woowacourse-teams · Oct 23, 2024 · cf8baf2 · cf8baf2
1 parent 8169298
commit cf8baf2
Show file tree

Hide file tree

Showing 60 changed files with 1,003 additions and 287 deletions.
diff --git a/.github/workflows/be-cd_dev-docker.yml b/.github/workflows/be-cd_dev-docker.yml
@@ -135,6 +135,7 @@ jobs:
         REDIS_PORT=${{ secrets.REDIS_PORT }}
         REDIS_HOST=${{ secrets.REDIS_HOST }}
         REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}
+        REDIS_IP_ADDRESS=${{ secrets.REDIS_IP_ADDRESS }}
         EOF
 
     # - name: Check if MySQL container is running

diff --git a/backend/build.gradle b/backend/build.gradle
@@ -40,6 +40,7 @@ dependencies {
     runtimeOnly 'com.mysql:mysql-connector-j'
     implementation 'org.flywaydb:flyway-core:9.22.3'
     implementation 'org.flywaydb:flyway-mysql'
+    implementation 'io.hypersistence:hypersistence-utils-hibernate-60:3.5.2'
 
     // Redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'

diff --git a/backend/docker-compose.dev.yml b/backend/docker-compose.dev.yml
@@ -23,6 +23,7 @@ services:
     platform: linux/arm64
     depends_on:
       - database-mysql
+      - redis
     restart: always
     image: ${DOCKER_REPO_NAME}/cruru:${DOCKER_IMAGE_VERSION_TAG}
     ports:
@@ -39,6 +40,19 @@ services:
       cruru_network:
         ipv4_address: ${APP_IP_ADDRESS}
 
+  redis:
+    container_name: redis-container
+    image: redis:latest
+    environment:
+      TZ: Asia/Seoul
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
+    ports:
+      - ${REDIS_PORT}:6379
+    command: [ "redis-server", "--requirepass", "${REDIS_PASSWORD}" ]
+    networks:
+      cruru_network:
+        ipv4_address: ${REDIS_IP_ADDRESS}
+
   promtail:
     environment:
       TZ: Asia/Seoul

diff --git a/backend/src/docs/asciidoc/applyform.adoc b/backend/src/docs/asciidoc/applyform.adoc
@@ -4,7 +4,7 @@
 
 ==== 성공
 
-operation::applyform/submit[snippets="http-request,path-parameters,request-fields,http-response"]
+operation::applyform/submit-id[snippets="http-request,path-parameters,request-fields,http-response"]
 
 ==== 실패: 개인정보 활용 거부
 
@@ -42,7 +42,7 @@ operation::applicant/submit-fail/required-not-replied[snippets="http-request,pat
 
 ==== 성공
 
-operation::applicant/read-applyform[snippets="http-request,path-parameters,http-response,response-fields"]
+operation::applicant/read-applyform-id[snippets="http-request,path-parameters,http-response,response-fields"]
 
 ==== 실패: 존재하지 않는 지원폼
 
@@ -52,7 +52,7 @@ operation::applicant/read-applyform-fail/applyform-not-found[snippets="http-requ
 
 ==== 성공
 
-operation::applicant/update[snippets="http-request,request-cookies,path-parameters,request-fields,http-response"]
+operation::applicant/update-id[snippets="http-request,request-cookies,path-parameters,request-fields,http-response"]
 
 ==== 실패: 존재하지 않는 지원폼
 

diff --git a/backend/src/docs/asciidoc/email.adoc b/backend/src/docs/asciidoc/email.adoc
@@ -13,3 +13,35 @@ operation::email/send-fail/invalid-email[snippets="http-request,request-cookies,
 ==== 실패: 존재하지 않는 동아리
 
 operation::email/send-fail/club-not-found[snippets="http-request,request-cookies,request-parts,http-response"]
+
+=== 이메일 인증 번호 발송
+
+==== 성공
+
+operation::email/verification-code[snippets="http-request,request-fields,http-response"]
+
+==== 실패: 이메일 형식이 올바르지 않은 이메일 형식
+
+operation::email/verification-code-fail/invalid-email[snippets="http-request,request-fields,http-response"]
+
+==== 실패: 이미 가입된 이메일
+
+operation::email/verification-code-fail/already-signed-up[snippets="http-request,request-fields,http-response"]
+
+=== 이메일 인증 확인
+
+==== 성공
+
+operation::email/verify-code[snippets="http-request,request-fields,http-response"]
+
+==== 실패: 이메일 형식이 올바르지 않은 이메일 형식
+
+operation::email/verify-code-fail/invalid-email[snippets="http-request,request-fields,http-response"]
+
+==== 실패: 인증 번호가 없는 이메일
+
+operation::email/verify-code-fail/code-not-found[snippets="http-request,request-fields,http-response"]
+
+==== 실패: 인증 번호가 다른 이메일
+
+operation::email/verify-code-fail/code-mismatch[snippets="http-request,request-fields,http-response"]
diff --git a/backend/src/docs/asciidoc/member.adoc b/backend/src/docs/asciidoc/member.adoc
@@ -9,3 +9,7 @@ operation::member/signup[snippets="http-request,request-fields,http-response"]
 ==== 실패: 유효하지 않은 요청
 
 operation::member/signup-fail/invalid-request[snippets="http-request,request-fields,http-response"]
+
+==== 실패: 인증되지 않은 이메일
+
+operation::member/signup-fail/not-verified-email[snippets="http-request,request-fields,http-response"]
diff --git a/backend/src/docs/asciidoc/question.adoc b/backend/src/docs/asciidoc/question.adoc
@@ -4,7 +4,7 @@
 
 ==== 성공
 
-operation::question/update[snippets="http-request,request-cookies,query-parameters,request-fields,http-response"]
+operation::question/update-id[snippets="http-request,request-cookies,query-parameters,request-fields,http-response"]
 
 ==== 실패: 존재하지 않는 지원폼
 

diff --git a/backend/src/main/java/com/cruru/applicant/domain/repository/ApplicantRepository.java b/backend/src/main/java/com/cruru/applicant/domain/repository/ApplicantRepository.java
@@ -24,11 +24,11 @@ public interface ApplicantRepository extends JpaRepository<Applicant, Long> {
     long countByProcess(Process process);
 
     @Query("""
-           SELECT new com.cruru.applicant.domain.dto.ApplicantCard( 
+           SELECT new com.cruru.applicant.domain.dto.ApplicantCard(
                a.id, a.name, a.createdDate, a.isRejected, COUNT(e), COALESCE(AVG(e.score), 0.00), a.process.id
            )
            FROM Applicant a
-           LEFT JOIN Evaluation e ON e.applicant = a
+           LEFT JOIN Evaluation e ON e.applicant = a AND e.process = a.process
            WHERE a.process IN :processes
            GROUP BY a.id, a.name, a.createdDate, a.isRejected, a.process.id
            """)
@@ -39,7 +39,7 @@ a.id, a.name, a.createdDate, a.isRejected, COUNT(e), COALESCE(AVG(e.score), 0.00
                       a.id, a.name, a.createdDate, a.isRejected, COUNT(e), COALESCE(AVG(e.score), 0.00), a.process.id
                   )
                   FROM Applicant a
-                  LEFT JOIN Evaluation e ON e.applicant = a
+                  LEFT JOIN Evaluation e ON e.applicant = a AND e.process = a.process
                   WHERE a.process = :process
                   GROUP BY a.id, a.name, a.createdDate, a.isRejected
            """)

diff --git a/backend/src/main/java/com/cruru/applicant/service/ApplicantService.java b/backend/src/main/java/com/cruru/applicant/service/ApplicantService.java
@@ -30,10 +30,6 @@ public Applicant create(ApplicantCreateRequest request, Process firstProcess) {
         return applicantRepository.save(new Applicant(request.name(), request.email(), request.phone(), firstProcess));
     }
 
-    public List<Applicant> findAllByProcess(Process process) {
-        return applicantRepository.findAllByProcess(process);
-    }
-
     @Transactional
     public void updateApplicantInformation(long applicantId, ApplicantUpdateRequest request) {
         Applicant applicant = findById(applicantId);
@@ -147,8 +143,16 @@ public List<Applicant> findAllByProcesses(List<Process> processes) {
                 .toList();
     }
 
+    public List<Applicant> findAllByProcess(Process process) {
+        return applicantRepository.findAllByProcess(process);
+    }
+
     @Transactional
     public void deleteAllInBatch(List<Applicant> applicants) {
         applicantRepository.deleteAllInBatch(applicants);
     }
+
+    public List<Applicant> findAllByIds(List<Long> ids) {
+        return applicantRepository.findAllById(ids);
+    }
 }
diff --git a/backend/src/main/java/com/cruru/applyform/controller/ApplyFormController.java b/backend/src/main/java/com/cruru/applyform/controller/ApplyFormController.java
@@ -30,14 +30,14 @@ public class ApplyFormController {
     @PostMapping("/{applyformId}/submit")
     public ResponseEntity<Void> submit(
             @RequestBody @Valid ApplyFormSubmitRequest request,
-            @PathVariable("applyformId") long applyFormId
+            @PathVariable("applyformId") Long applyFormId
     ) {
         applyFormFacade.submit(applyFormId, request);
         return ResponseEntity.created(URI.create("/v1/applyform/" + applyFormId)).build();
     }
 
     @GetMapping("/{applyformId}")
-    public ResponseEntity<ApplyFormResponse> read(@PathVariable("applyformId") long applyFormId) {
+    public ResponseEntity<ApplyFormResponse> read(@PathVariable("applyformId") Long applyFormId) {
         ApplyFormResponse response = applyFormFacade.readApplyFormById(applyFormId);
         return ResponseEntity.ok(response);
     }

diff --git a/backend/src/main/java/com/cruru/applyform/domain/ApplyForm.java b/backend/src/main/java/com/cruru/applyform/domain/ApplyForm.java
@@ -4,11 +4,11 @@
 import com.cruru.applyform.exception.badrequest.StartDateAfterEndDateException;
 import com.cruru.auth.util.SecureResource;
 import com.cruru.dashboard.domain.Dashboard;
+import com.cruru.global.util.TsidSupplier;
 import com.cruru.member.domain.Member;
+import io.hypersistence.utils.hibernate.id.Tsid;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.OneToOne;
@@ -27,7 +27,7 @@
 public class ApplyForm extends BaseEntity implements SecureResource {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Tsid(TsidSupplier.class)
     @Column(name = "apply_form_id")
     private Long id;
 

diff --git a/backend/src/main/java/com/cruru/auth/domain/RefreshToken.java b/backend/src/main/java/com/cruru/auth/domain/RefreshToken.java
@@ -1,45 +1,16 @@
 package com.cruru.auth.domain;
 
-import com.cruru.BaseEntity;
-import com.cruru.member.domain.Member;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
 import java.util.Objects;
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
-@Entity
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 @Getter
-public class RefreshToken extends BaseEntity implements Token {
+public class RefreshToken implements Token {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "refresh_token_id")
-    private Long id;
-
-    @Column(nullable = false, unique = true)
     private String token;
 
-    @OneToOne
-    @JoinColumn(name = "member_id", nullable = false)
-    private Member member;
-
-    public RefreshToken(String token, Member member) {
-        this(null, token, member);
-    }
-
-    public boolean isSameToken(String token) {
-        return this.token.equals(token);
-    }
+    private String email;
 
     @Override
     public boolean equals(Object o) {
@@ -50,20 +21,19 @@ public boolean equals(Object o) {
             return false;
         }
         RefreshToken that = (RefreshToken) o;
-        return Objects.equals(getId(), that.getId());
+        return Objects.equals(getToken(), that.getToken());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(getId());
+        return Objects.hashCode(getToken());
     }
 
     @Override
     public String toString() {
         return "RefreshToken{" +
-                "id=" + id +
-                ", token='" + token + '\'' +
-                ", member=" + member +
+                "token='" + token + '\'' +
+                ", email='" + email + '\'' +
                 '}';
     }
 }
diff --git a/backend/src/main/java/com/cruru/auth/domain/repository/RefreshTokenRepository.java b/backend/src/main/java/com/cruru/auth/domain/repository/RefreshTokenRepository.java
diff --git a/backend/src/main/java/com/cruru/auth/facade/AuthFacade.java b/backend/src/main/java/com/cruru/auth/facade/AuthFacade.java
@@ -30,8 +30,8 @@ public TokenResponse login(LoginRequest request) {
     }
 
     private TokenResponse createTokens(Member member) {
-        Token accessToken = authService.createAccessToken(member);
-        Token refreshToken = authService.createRefreshToken(member);
+        Token accessToken = authService.createAccessToken(member.getEmail(), member.getRole());
+        Token refreshToken = authService.createRefreshToken(member.getEmail(), member.getRole());
         return new TokenResponse(accessToken.getToken(), refreshToken.getToken());
     }
 }