From 7b6ce01fad5596a3fa8db7320c1f3ab3c0f712c4 Mon Sep 17 00:00:00 2001 From: rlarltj123 Date: Tue, 28 May 2024 00:07:57 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B0=95=ED=87=B4=EB=8B=B9=ED=95=9C=20?= =?UTF-8?q?=EC=86=8C=EC=86=8D=EC=9D=80=20=EB=82=B4=20=EC=86=8C=EC=86=8D=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=97=90=EC=84=9C=20=EB=AF=B8=EB=85=B8?= =?UTF-8?q?=EC=B6=9C=ED=95=9C=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-dev.yml | 2 +- .../domain/agency/repository/AgencyUserRepositoryImpl.java | 2 +- .../java/com/moneymong/domain/user/service/UserService.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 053a444..3b03cc6 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -4,7 +4,7 @@ on: push: branches: - dev - - feat/** + # 권한 설정 permissions: contents: read diff --git a/src/main/java/com/moneymong/domain/agency/repository/AgencyUserRepositoryImpl.java b/src/main/java/com/moneymong/domain/agency/repository/AgencyUserRepositoryImpl.java index 4a22b5c..3a3ea30 100644 --- a/src/main/java/com/moneymong/domain/agency/repository/AgencyUserRepositoryImpl.java +++ b/src/main/java/com/moneymong/domain/agency/repository/AgencyUserRepositoryImpl.java @@ -42,7 +42,7 @@ public List findAgencyListByUserId(Long userId) { return queryFactory.select(agency) .from(agencyUser) .join(agencyUser.agency, agency) - .where(agencyUser.userId.eq(userId)) + .where(agencyUser.userId.eq(userId), notBlocked()) .fetch(); } diff --git a/src/main/java/com/moneymong/domain/user/service/UserService.java b/src/main/java/com/moneymong/domain/user/service/UserService.java index d7e26e0..425f9d8 100644 --- a/src/main/java/com/moneymong/domain/user/service/UserService.java +++ b/src/main/java/com/moneymong/domain/user/service/UserService.java @@ -55,9 +55,6 @@ public User registerUser(OAuthUserInfo oauthUserInfo) { ); newUser = save(newUser); - log.info("[UserService] registerUserId = {}", newUser.getId()); - log.info("[UserService] refreshToken = {}", oauthUserInfo.getAppleRefreshToken()); - if (oauthUserInfo.getAppleRefreshToken() != null) { appleUserRepository.save( AppleUser.of(