[BE] 테스트 서버 배포

.github/workflows/review_submit_notification.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Send Slack notification
         uses: slackapi/[email protected]
         with:
-          channel-id: ${{secrets.SLACK_FE_REVIEW_CHANNEL}}
+          channel-id: ${{secrets.SLACK_BE_REVIEW_CHANNEL}}
           payload: |
             {
               "text": "리뷰가 도착했어요✉️",

backend/src/main/java/site/coduo/common/infrastructure/swagger/config/SwaggerConfig.java

@@ -9,6 +9,7 @@
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
 
 @Configuration
 public class SwaggerConfig {
@@ -18,6 +19,7 @@ public OpenAPI openAPI() {
         return new OpenAPI()
                 .info(apiInfo())
                 .components(securitySchemeComponents())
+                .addServersItem(serverItem())
                 .addSecurityItem(securityRequirement());
     }
 
@@ -39,6 +41,12 @@ private Components securitySchemeComponents() {
         return new Components().addSecuritySchemes(HttpHeaders.AUTHORIZATION, bearerAuth);
     }
 
+    private Server serverItem() {
+        return new Server()
+                .url("https://coduo.site")
+                .description("클라우드에 배포된 서버");
+    }
+
     private SecurityRequirement securityRequirement() {
         return new SecurityRequirement().addList(HttpHeaders.AUTHORIZATION);
     }

backend/src/main/java/site/coduo/member/client/GithubApiClient.java

@@ -1,13 +1,16 @@
 package site.coduo.member.client;
 
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestClient;
+import org.springframework.web.client.RestClient.ResponseSpec.ErrorHandler;
 
 import lombok.extern.slf4j.Slf4j;
 import site.coduo.member.client.dto.GithubUserRequest;
 import site.coduo.member.client.dto.GithubUserResponse;
+import site.coduo.member.exception.ExternalApiCallException;
 
 @Slf4j
 @Component
@@ -30,13 +33,29 @@ public GithubApiClient() {
                 .build();
     }
 
+    GithubApiClient(final RestClient restClient) {
+        this.client = restClient;
+    }
+
     public GithubUserResponse getUser(final GithubUserRequest request) {
 
         return client.get()
                 .uri("/user")
                 .accept()
                 .headers(httpHeaders -> httpHeaders.addAll(request.getHeaders()))
                 .retrieve()
+                .onStatus(HttpStatusCode::isError, getErrorHandler())
                 .body(GithubUserResponse.class);
     }
+
+    private ErrorHandler getErrorHandler() {
+        return (request, response) -> {
+            if (response.getStatusCode().is4xxClientError()) {
+                throw new ExternalApiCallException("Github API 호출에 실패했습니다.");
+            }
+            if (response.getStatusCode().is5xxServerError()) {
+                throw new ExternalApiCallException("Github API 호출 과정 중 서버 내부에서 오류가 발생했습니다.");
+            }
+        };
+    }
 }

backend/src/main/java/site/coduo/member/client/GithubOAuthClient.java

@@ -2,14 +2,17 @@
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.http.converter.FormHttpMessageConverter;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestClient;
+import org.springframework.web.client.RestClient.ResponseSpec.ErrorHandler;
 
 import site.coduo.member.client.dto.TokenRequest;
 import site.coduo.member.client.dto.TokenResponse;
+import site.coduo.member.exception.ExternalApiCallException;
 import site.coduo.member.infrastructure.http.Basic;
 
 @Component
@@ -50,6 +53,7 @@ public TokenResponse grant(final TokenRequest request) {
                 .header(HttpHeaders.AUTHORIZATION, new Basic(oAuthClientId, oAuthClientSecret).getValue())
                 .body(request.toQueryParams())
                 .retrieve()
+                .onStatus(HttpStatusCode::isError, getErrorHandler())
                 .body(TokenResponse.class);
     }
 
@@ -60,4 +64,15 @@ public String getOAuthClientId() {
     public String getOAuthRedirectUri() {
         return oAuthRedirectUri;
     }
+
+    private ErrorHandler getErrorHandler() {
+        return (request, response) -> {
+            if (response.getStatusCode().is4xxClientError()) {
+                throw new ExternalApiCallException("Github OAuth API 호출에 실패했습니다.");
+            }
+            if (response.getStatusCode().is5xxServerError()) {
+                throw new ExternalApiCallException("Github OAuth 과정 중 서버 내부에서 오류가 발생했습니다.");
+            }
+        };
+    }
 }

backend/src/main/java/site/coduo/member/controller/MemberController.java

@@ -4,6 +4,7 @@
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -19,11 +20,17 @@ public class MemberController implements MemberControllerDocs {
     private final MemberService memberService;
 
     @GetMapping("/member")
-    public ResponseEntity<MemberReadResponse> getMember(
-            @CookieValue(SIGN_IN_COOKIE_NAME) final String token
-    ) {
+    public ResponseEntity<MemberReadResponse> getMember(@CookieValue(SIGN_IN_COOKIE_NAME) final String token) {
         final MemberReadResponse response = memberService.findMemberNameByCredential(token);
 
         return ResponseEntity.ok(response);
     }
+
+    @DeleteMapping("/member")
+    public ResponseEntity<Void> deleteMember(@CookieValue(SIGN_IN_COOKIE_NAME) final String token) {
+        memberService.deleteMember(token);
+
+        return ResponseEntity.noContent()
+                .build();
+    }
 }

backend/src/main/java/site/coduo/member/controller/MemberExceptionHandler.java

@@ -9,6 +9,7 @@
 import lombok.extern.slf4j.Slf4j;
 import site.coduo.common.controller.response.ApiErrorResponse;
 import site.coduo.member.controller.error.MemberApiError;
+import site.coduo.member.exception.ExternalApiCallException;
 import site.coduo.member.exception.MemberNotFoundException;
 
 @Slf4j
@@ -23,4 +24,12 @@ public ResponseEntity<ApiErrorResponse> handlerMemberNotFoundException(final Mem
         return ResponseEntity.status(MemberApiError.MEMBER_NOT_FOUND_ERROR.getHttpStatus())
                 .body(new ApiErrorResponse(MemberApiError.MEMBER_NOT_FOUND_ERROR.getMessage()));
     }
+
+    @ExceptionHandler(ExternalApiCallException.class)
+    public ResponseEntity<ApiErrorResponse> handlerExternalApiCallFailureException(final ExternalApiCallException e) {
+        log.error(e.getMessage());
+
+        return ResponseEntity.status(MemberApiError.API_CALL_FAILURE_ERROR.getHttpStatus())
+                .body(new ApiErrorResponse(MemberApiError.MEMBER_NOT_FOUND_ERROR.getMessage()));
+    }
 }

backend/src/main/java/site/coduo/member/controller/docs/MemberControllerDocs.java

@@ -29,4 +29,14 @@ ResponseEntity<MemberReadResponse> getMember(
                     schema = @Schema(type = "string")
             )
             String token);
+
+    @ApiResponse(responseCode = "204", description = "회원 정보를 삭제한다.",
+            content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE))
+    ResponseEntity<Void> deleteMember(
+            @Parameter(
+                    in = ParameterIn.COOKIE,
+                    name = "coduo_whoami",
+                    description = "사용자가 인증에 성공하면 서버에서 발급하는 쿠키",
+                    schema = @Schema(type = "string")
+            ) String token);
 }

backend/src/main/java/site/coduo/member/controller/error/MemberApiError.java

@@ -10,7 +10,8 @@
 public enum MemberApiError {
 
     AUTHENTICATION_ERROR(HttpStatus.UNAUTHORIZED, "인증되지 않은 접근입니다."),
-    MEMBER_NOT_FOUND_ERROR(HttpStatus.NOT_FOUND, "존재하지 않는 회원입니다.");
+    MEMBER_NOT_FOUND_ERROR(HttpStatus.NOT_FOUND, "존재하지 않는 회원입니다."),
+    API_CALL_FAILURE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "외부 API와 상호작용 중 실패했습니다.");
 
     private final HttpStatus httpStatus;
     private final String message;

backend/src/main/java/site/coduo/member/domain/Member.java

@@ -1,5 +1,6 @@
 package site.coduo.member.domain;
 
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 import jakarta.persistence.Column;
@@ -9,6 +10,8 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -41,14 +44,19 @@ public class Member extends BaseTimeEntity {
     @Column(name = "USER_NAME")
     private String username;
 
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+    @Column(name = "DELETED_AT")
+    private LocalDateTime deletedAt;
+
     @Builder
     private Member(final String accessToken, final String loginId, final String userId, final String profileImage,
-                   final String username) {
+                   final String username, final LocalDateTime deletedAt) {
         this.accessToken = accessToken;
         this.loginId = loginId;
         this.userId = userId;
         this.profileImage = profileImage;
         this.username = username;
+        this.deletedAt = deletedAt;
     }
 
     public void update(final Member other) {
@@ -57,6 +65,15 @@ public void update(final Member other) {
         this.userId = other.userId;
         this.profileImage = other.profileImage;
         this.username = other.username;
+        this.deletedAt = other.deletedAt;
+    }
+
+    public void delete() {
+        this.deletedAt = LocalDateTime.now();
+    }
+
+    public boolean isDeleted() {
+        return deletedAt != null;
     }
 
     @Override

backend/src/main/java/site/coduo/member/domain/repository/MemberRepository.java

@@ -1,15 +1,33 @@
 package site.coduo.member.domain.repository;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import site.coduo.member.domain.Member;
+import site.coduo.member.exception.MemberNotFoundException;
 
 public interface MemberRepository extends JpaRepository<Member, Long> {
 
     Optional<Member> findByUserId(String userId);
 
+    List<Member> findByDeletedAtIsNull();
+
+    @Override
+    default List<Member> findAll() {
+        return findByDeletedAtIsNull();
+    }
+
+    default Member fetchByUserId(final String userId) {
+        final Member member = findByUserId(userId)
+                .orElseThrow(() -> new MemberNotFoundException(String.format("%s는 찾을 수 없는 회원 아이디입니다.", userId)));
+        if (member.isDeleted()) {
+            throw new MemberNotFoundException(String.format("%s는 삭제된 회원입니다.", userId));
+        }
+        return member;
+    }
+
     boolean existsByUserId(String userId);
 
 }

backend/src/main/java/site/coduo/member/exception/ExternalApiCallException.java

@@ -0,0 +1,8 @@
+package site.coduo.member.exception;
+
+public class ExternalApiCallException extends MemberException {
+
+    public ExternalApiCallException(final String message) {
+        super(message);
+    }
+}

backend/src/main/java/site/coduo/member/service/MemberService.java

@@ -10,7 +10,6 @@
 import site.coduo.member.client.dto.GithubUserResponse;
 import site.coduo.member.domain.Member;
 import site.coduo.member.domain.repository.MemberRepository;
-import site.coduo.member.exception.MemberNotFoundException;
 import site.coduo.member.infrastructure.http.Bearer;
 import site.coduo.member.infrastructure.security.JwtProvider;
 import site.coduo.member.service.dto.member.MemberReadResponse;
@@ -36,15 +35,22 @@ public void createMember(final String username, final String encryptedAccessToke
 
     public MemberReadResponse findMemberNameByCredential(final String token) {
         final String userId = jwtProvider.extractSubject(token);
-        final Member member = memberRepository.findByUserId(userId)
-                .orElseThrow(() -> new MemberNotFoundException(String.format("%s는 찾을 수 없는 회원 아이디입니다.", userId)));
+        final Member member = memberRepository.fetchByUserId(userId);
 
         return new MemberReadResponse(member.getUsername());
     }
 
     public Member findMemberByCredential(final String token) {
         final String userId = jwtProvider.extractSubject(token);
-        return memberRepository.findByUserId(userId)
-                .orElseThrow(() -> new MemberNotFoundException(String.format("%s는 찾을 수 없는 회원 아이디입니다.", userId)));
+
+        return memberRepository.fetchByUserId(userId);
+    }
+
+    @Transactional
+    public void deleteMember(final String token) {
+        final String userId = jwtProvider.extractSubject(token);
+        final Member member = memberRepository.fetchByUserId(userId);
+
+        member.delete();
     }
 }

backend/src/main/java/site/coduo/pairroom/controller/PairRoomController.java

@@ -9,6 +9,7 @@
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -92,4 +93,10 @@ public ResponseEntity<PairRoomExistResponse> pairRoomExists(@RequestParam("acces
 
         return ResponseEntity.ok(response);
     }
+
+    @DeleteMapping("/pair-room/{accessCode}")
+    public ResponseEntity<Void> deletePairRoom(@PathVariable("accessCode") final String accessCode) {
+        pairRoomService.deletePairRoom(accessCode);
+        return ResponseEntity.noContent().build();
+    }
 }

backend/src/main/java/site/coduo/pairroom/controller/docs/PairRoomDocs.java

@@ -35,7 +35,7 @@ ResponseEntity<PairRoomReadResponse> getPairRoom(
     @ApiResponse(responseCode = "201", description = "페어룸 저장 성공", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
             schema = @Schema(implementation = PairRoomCreateResponse.class)))
     ResponseEntity<PairRoomCreateResponse> createPairRoom(
-            @Parameter(description = "페어 프로그래밍에 참여하는 드라이버 이름, 내비게이터 이름, 타이머 시간, 타이머 남은 시간", required = true)
+            @Parameter(description = "페어 프로그래밍에 참여하는 드라이버 이름, 내비게이터 이름, 타이머 시간, 타이머 남은 시간, 미션 리포지토리 링크", required = true)
             PairRoomCreateRequest pairRoomCreateRequest,
             @Parameter(description = "로그인 유저 토큰")
             String token
@@ -75,4 +75,10 @@ ResponseEntity<List<PairRoomMemberResponse>> getPairRooms(
             schema = @Schema(implementation = PairRoomExistResponse.class)))
     ResponseEntity<PairRoomExistResponse> pairRoomExists(String accessCode);
 
+    @Operation(summary = "페어룸을 삭제한다.")
+    @ApiResponse(responseCode = "204", description = "페어룸 삭제 성공")
+    ResponseEntity<Void> deletePairRoom(
+            @Parameter(description = "페어룸 접근 코드", required = true)
+            String accessCode
+    );
 }

backend/src/main/java/site/coduo/pairroom/domain/MissionUrl.java

@@ -0,0 +1,13 @@
+package site.coduo.pairroom.domain;
+
+import lombok.Getter;
+
+@Getter
+public class MissionUrl {
+
+    private final String value;
+
+    public MissionUrl(final String value) {
+        this.value = value;
+    }
+}