Merge branch 'develop' into feature/ringus-25

Author: jbh010204

.github/pull_request_template.md

@@ -0,0 +1,6 @@
+## ✨ 구현한 기능
+-
+## 📢 논의하고 싶은 내용
+-
+## 🎸 기타
+-

.github/workflows/ci.yml

@@ -0,0 +1,52 @@
+name: CI Workflow
+
+on:
+  push:
+    branches:
+      - main         # main 브랜치
+      - develop      # develop 브랜치
+      - feature/*    # 모든 feature/* 브랜치
+  pull_request:
+    branches:
+      - main         # main 브랜치로의 PR
+      - develop      # develop 브랜치로의 PR
+      - feature/*    # feature/* 브랜치로의 PR
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      # 1. 리포지토리 체크아웃
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+      # 2. JDK 23 설정
+      - name: Set up JDK 23
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: '23'
+
+      # 3. Gradle 캐시 적용
+      - name: Cache Gradle packages
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      # 4. dev.sh 실행 (환경 변수 로드 및 빌드 준비)
+      - name: Run dev.sh
+        run: |
+          chmod +x ./dev.sh    # dev.sh에 실행 권한 부여
+          ./dev.sh             # dev.sh 실행
+
+      # 5. Gradle 빌드 및 테스트 실행
+      - name: Build and Test (Gradle)
+        run: |
+          ./gradlew clean build -x test
+          ./gradlew test

.github/workflows/main-cd.yml

@@ -0,0 +1,41 @@
+name: CI/CD Workflow for EC2 Deployment
+
+on:
+  push:
+    branches:
+      - main  # main 브랜치에 푸시될 때 실행
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      # 1.코드 체크아웃
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # 2. EC2로 코드 복사 및 스크립트 실행
+      - name: Deploy to EC2
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USER }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            echo "[GitHub Actions] Starting deployment on EC2"
+
+            # 레포지토리 클론 또는 Pull
+            if [ -d "/home/ubuntu/ring-us-server" ]; then
+              echo "[GitHub Actions] Pulling latest code"
+              cd /home/ubuntu/ring-us-server && git pull origin main
+            else
+              echo "[GitHub Actions] Cloning repository"
+              git clone [email protected]:Ring-Us/ring-us-server.git /home/ubuntu/ring-us-server
+              cd /home/ubuntu/ring-us-server
+            fi
+
+            # 권한 설정 (dev.sh 실행 가능하도록, 추후에 deploy.sh와 분리)
+            chmod +x dev.sh
+
+            # 스크립트 실행 (환경 변수 로드, 빌드, 배포 포함)
+            ./dev.sh

src/main/java/es/princip/ringus/application/auth/service/AuthService.java

@@ -1,5 +1,6 @@
 package es.princip.ringus.application.auth.service;
 
+
 import es.princip.ringus.application.member.service.MemberService;
 import es.princip.ringus.application.serviceTerm.ServiceTermAgreementService;
 import es.princip.ringus.domain.email.EmailSessionRepository;
@@ -13,6 +14,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Set;
+
 @RequiredArgsConstructor
 @Service
 public class AuthService {

src/main/java/es/princip/ringus/application/member/service/MemberService.java

@@ -37,6 +37,7 @@ public Member createMember(SignUpRequest request, Set<ServiceTermAgreement> serv
         boolean isUniversityVerified = UniversityDomainUtil.isUniversityVerified(request.email());
 
         Member member = Member.of(request.email(), request.password(), passwordEncoder, request.memberType(), serviceTerm, isUniversityVerified);
+
         memberRepository.save(member);
 
         return member;