Skip to content
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.

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

[BG-205]: 워크스페이스 가입 승인 요청이 10명 이상일 때 가입 승인 요청 API가 거절된다 (6h / 3h) #71

Merged
merged 50 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
6023add
refactor: CaughtHttpExchange 패키지 변경
Dltmd202 Jul 31, 2024
8f4acec
feat: workspace의 인원을 유지할 수 있도록 처리
Dltmd202 Jul 31, 2024
a9e7ae4
fix: RestClientAspect의 pointcut 수정
Dltmd202 Jul 31, 2024
d285eb9
chore: 레디스 세팅
Dltmd202 Jul 31, 2024
b35dd93
feat: 분산 락 세팅
Dltmd202 Jul 31, 2024
e2c3884
feat: 워크스페이스의 사용자 인원이 제한되도록 수정
Dltmd202 Jul 31, 2024
e900205
feat: 테스트 수정
Dltmd202 Jul 31, 2024
70e5481
refactor: 불필요한 부분 삭제
GGHDMS Jul 30, 2024
13b58da
feat: main branch ci cd 구성
GGHDMS Jul 30, 2024
c813985
fix: 오타 수정
GGHDMS Jul 30, 2024
9e15cc8
feat: git action 수정
GGHDMS Jul 30, 2024
4dd8725
feat: main branch ci cd 구성
GGHDMS Jul 30, 2024
b958854
feat: ec2 private subnet 사용으로 proxy 서버 접속
GGHDMS Jul 31, 2024
fbd07a1
refactor: 불필요한 주석 제거
GGHDMS Jul 31, 2024
dc9d7db
feat: main github action 수정
GGHDMS Jul 31, 2024
b4913d2
refactor: main github action 수정
GGHDMS Jul 31, 2024
0f6a595
refactor: main github action 수정
GGHDMS Jul 31, 2024
940fcdb
refactor: cd 테스트 끝
GGHDMS Jul 31, 2024
ec390b1
chore: api 모듈 레디스 설정 추가
GGHDMS Jul 31, 2024
0172b02
chore: infra 모듈 레디스 설정 추가
GGHDMS Jul 31, 2024
7e2ca1e
rename: callbackService 이름 변경
GGHDMS Jul 31, 2024
c796fba
feat: 레디스 broker 기능 구현
GGHDMS Jul 31, 2024
98c7c06
chore: notifiaction 모듈 레디스 설정 추가
GGHDMS Jul 31, 2024
97d9771
rename: 단순 이름 변경
GGHDMS Jul 31, 2024
12b9443
feat: notifiaction cd 구현
GGHDMS Aug 1, 2024
f1624e0
refactor: github action script 수정
GGHDMS Aug 1, 2024
918591a
refactor: github action script 수정
GGHDMS Aug 1, 2024
d3cdc94
feat: docker compose 분리
GGHDMS Aug 1, 2024
b5b9dec
refactor: 오타 수정
GGHDMS Aug 1, 2024
62a1686
feat: yaml 경로 수정
GGHDMS Aug 1, 2024
57e4fa1
feat: notification docker-compose
GGHDMS Aug 1, 2024
83575c5
test: 배포 테스트 끝
GGHDMS Aug 1, 2024
9661071
test: 테스트 컨테이너 환경 세팅
Dltmd202 Aug 1, 2024
05153c3
test: 의존성 수정
Dltmd202 Aug 1, 2024
5cfc64e
test: notification test 컨테이너 세팅
Dltmd202 Aug 1, 2024
c08f878
feat: 워크스페이스 초대 API 개발
Dltmd202 Aug 1, 2024
36dc5d1
fix: 기존 로직 request 매핑 수정
Dltmd202 Aug 1, 2024
f462a42
feat: 워크스페이스 유저 초대 테스트
Dltmd202 Aug 1, 2024
4b405eb
refactor: 단순 변수명 변경
GGHDMS Aug 3, 2024
3edf78d
chore: common 모듈 생성
Dltmd202 Aug 3, 2024
91abaa9
refactor: common의 컴포넌트로 리팩토링
Dltmd202 Aug 3, 2024
4962ba3
fix: rebase 내용 반영
Dltmd202 Aug 3, 2024
5db7b53
feat: 분산 락 세팅
Dltmd202 Jul 31, 2024
be12f2c
feat: 워크스페이스의 사용자 인원이 제한되도록 수정
Dltmd202 Jul 31, 2024
e5b6303
refactor: 리베이싱
Dltmd202 Aug 4, 2024
75da7f1
Merge branch 'develop' into feature/BG-205-workspace-people-count
Dltmd202 Aug 4, 2024
0d6ed77
fix: 잘못된 쿼리 수정
GGHDMS Aug 8, 2024
e66478f
feat: 잘못된 쿼리 수정
Dltmd202 Aug 8, 2024
6ce8127
Merge branch 'develop' into feature/BG-205-workspace-people-count
Dltmd202 Aug 8, 2024
5c2002d
fix: 빈 중복 등록 제거
Dltmd202 Aug 8, 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
Prev Previous commit
Next Next commit
fix: 기존 로직 request 매핑 수정
  • Loading branch information
Dltmd202 committed Aug 4, 2024
commit 36dc5d154d0121648e0469fb45fe7d3bb399e68b
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ package com.backgu.amaker.api.user.controller

import com.backgu.amaker.api.common.dto.response.ApiResult
import com.backgu.amaker.api.common.infra.ApiHandler
import com.backgu.amaker.api.user.dto.request.EmailExistsRequest
import com.backgu.amaker.api.user.dto.response.EmailExistsResponse
import com.backgu.amaker.api.user.service.UserFacadeService
import jakarta.validation.constraints.Email
import jakarta.validation.Valid
import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.ModelAttribute
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RequestParam
import org.springframework.web.bind.annotation.RestController

@RestController
Expand All @@ -19,12 +20,12 @@ class UserController(
) : UserSwagger {
@GetMapping("/email/exists")
override fun checkEmail(
@RequestParam @Email email: String,
@ModelAttribute @Valid emailExistsRequest: EmailExistsRequest,
): ResponseEntity<ApiResult<EmailExistsResponse>> =
ResponseEntity.ok().body(
apiHandler.onSuccess(
EmailExistsResponse.of(
userFacadeService.existsByEmail(email),
userFacadeService.existsByEmail(emailExistsRequest.email),
),
),
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.backgu.amaker.api.user.controller

import com.backgu.amaker.api.common.dto.response.ApiResult
import com.backgu.amaker.api.user.dto.request.EmailExistsRequest
import com.backgu.amaker.api.user.dto.response.EmailExistsResponse
import io.swagger.v3.oas.annotations.Operation
import io.swagger.v3.oas.annotations.responses.ApiResponse
Expand All @@ -21,6 +22,6 @@ interface UserSwagger {
],
)
fun checkEmail(
@Email email: String,
@Email email: EmailExistsRequest,
): ResponseEntity<ApiResult<EmailExistsResponse>>
}