From c37ad5ecd2829d618adfe9e57b7f23f74679e1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=98=9C=EC=88=98?= Date: Tue, 20 Feb 2024 00:12:15 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor=20:=20=EB=B0=B0=ED=8F=AC=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-deploy.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dev-deploy.yml b/.github/workflows/dev-deploy.yml index 90dfc0b4..407d650a 100644 --- a/.github/workflows/dev-deploy.yml +++ b/.github/workflows/dev-deploy.yml @@ -34,12 +34,12 @@ jobs: run: | git submodule update --remote --recursive - - name: Log in to the Container registry - uses: docker/login-action@v2 + - name: Login to DockerHub + uses: docker/login-action@v1 with: - registry: ${{env.REGISTRY}} - username: ${{github.actor}} - password: ${{secrets.PERSONAL_TOKEN}} + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker id: meta @@ -58,13 +58,16 @@ jobs: arguments: clean build -x test - name: Build and push Docker image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v2 with: context: . push: true - tags: ${{ steps.meta.outputs.tags }} + tags: ${{ secrets.DOCKERHUB_USERNAME }}/reviewzip-server labels: ${{ steps.meta.outputs.labels }} + - name: Publish to docker hub + run: docker push {{ secrets.DOCKERHUB_USERNAME }} + code-deploy: needs: build-and-push-image runs-on: ubuntu-latest From 96bfefbdef403839032d5d9e52e7056033b7eb25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=98=9C=EC=88=98?= Date: Tue, 20 Feb 2024 00:24:55 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor=20:=20=EB=B0=B0=ED=8F=AC=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/dev-deploy.yml b/.github/workflows/dev-deploy.yml index 407d650a..89619b72 100644 --- a/.github/workflows/dev-deploy.yml +++ b/.github/workflows/dev-deploy.yml @@ -65,8 +65,6 @@ jobs: tags: ${{ secrets.DOCKERHUB_USERNAME }}/reviewzip-server labels: ${{ steps.meta.outputs.labels }} - - name: Publish to docker hub - run: docker push {{ secrets.DOCKERHUB_USERNAME }} code-deploy: needs: build-and-push-image From 44dcb7e2bb6736a2949361519d02e0aaca81a599 Mon Sep 17 00:00:00 2001 From: suyong Date: Tue, 20 Feb 2024 12:55:05 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EC=BF=BC=EB=A6=AC=20=EB=B0=98?= =?UTF-8?q?=ED=99=98=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/ReviewZIP/domain/user/UsersRepository.java | 2 +- src/main/java/com/example/ReviewZIP/global/sms/SmsService.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/ReviewZIP/domain/user/UsersRepository.java b/src/main/java/com/example/ReviewZIP/domain/user/UsersRepository.java index 19c134b5..3412434b 100644 --- a/src/main/java/com/example/ReviewZIP/domain/user/UsersRepository.java +++ b/src/main/java/com/example/ReviewZIP/domain/user/UsersRepository.java @@ -23,5 +23,5 @@ public interface UsersRepository extends JpaRepository { boolean existsBySocial(String social); Optional findBySocial(String social); - Optional findByPhoneNum(String phoneNum); + List findByPhoneNum(String phoneNum); } diff --git a/src/main/java/com/example/ReviewZIP/global/sms/SmsService.java b/src/main/java/com/example/ReviewZIP/global/sms/SmsService.java index 484938f8..1ba41a2f 100644 --- a/src/main/java/com/example/ReviewZIP/global/sms/SmsService.java +++ b/src/main/java/com/example/ReviewZIP/global/sms/SmsService.java @@ -52,6 +52,8 @@ public void resetPassword(SmsDto.PasswordResetRequestDto requestDto) { } String encodedPassword = passwordEncoder.encode(requestDto.getPassword()); Users user = usersRepository.findByPhoneNum(requestDto.getPhoneNum()) + .stream() + .findFirst() .orElseThrow(() -> new UsersHandler(ErrorStatus.USER_NOT_FOUND)); user.setPassword(encodedPassword); usersRepository.save(user);