[21기_하니홈] 프백 합동과제 최종 미션 제출합니다.

.dockerignore

@@ -0,0 +1,24 @@
+# 빌드 아웃풋/임시파일/불필요한 것들 무시
+*.class
+*.jar
+*.war
+*.log
+*.iml
+*.swp
+*.swo
+*~
+.DS_Store
+
+# IDE/빌드 시스템 폴더
+.gradle/
+.idea/
+.vscode/
+build/
+out/
+target/
+
+# Git
+.git
+.gitignore
+
+do

.github/workflows/deploy.yml

@@ -0,0 +1,61 @@
+name: CI/CD Deploy
+
+on:
+  push:
+    branches: [develop] #dev에 push 될 때 마다 실행
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest #GitHub에서 제공하는 ubuntu-latest에서 실행
+
+    steps:
+      - name: Checkout repository #깃허브 저장소의 코드를 runner로 가져옴
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx #도커 setup
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/vote-server:latest
+
+      - name: Deploy to EC2 via SSH
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USER }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            set -e
+            echo "Stopping containers..."
+            sudo docker-compose down
+            CONTAINER_ID=$(sudo docker ps -qf "ancestor=${{ secrets.DOCKERHUB_USERNAME }}/vote-server:latest")
+
+            if [ -n "$CONTAINER_ID" ]; then
+              USED_ID=$(sudo docker inspect "$CONTAINER_ID" --format='{{.Image}}')
+            else
+              USED_ID="none"
+            fi
+
+            echo "Removing unused vote-server images..."
+            for IMG_ID in $(sudo docker images ${{ secrets.DOCKERHUB_USERNAME }}/vote-server -q); do
+              if [ "$IMG_ID" != "$USED_ID" ]; then
+                echo "Removing unused image: $IMG_ID"
+                sudo docker rmi $IMG_ID || true
+              fi
+            done
+
+            echo "Pulling latest image..."
+            sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/vote-server:latest
+
+            echo "Starting up containers..."
+            sudo docker-compose up -d

Dockerfile

@@ -12,6 +12,7 @@ WORKDIR /app
 #현재 디렉토리(소스코드 전체)를 컨테이너의 /app으로 복사.
 #도커파일 .과 ..은 각각 내 컴퓨터의 현재 디렉토리, 컨테이너의 현재 학업 디렉토리를 의미한다고 한다.
 COPY . .
+RUN head -20 src/main/java/com/ceos/spring_vote_21st/security/config/SecurityConfig.java
 
 #gradle로 프로젝트 빌드 => JAR 파일 생성
 RUN gradle clean build -x test

build.gradle

@@ -45,8 +45,13 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+	//swagger
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
 
+	// dotenv
+	testImplementation 'io.github.cdimascio:dotenv-java:3.0.0'
 	implementation 'com.h2database:h2'
+
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -16,8 +16,14 @@ services:                   #컨테이너들 정의. 여기선 app(server)와 db
       SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
       SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD} #db 비밀번호
       SERVER_PORT: ${SERVER_PORT}
+      REDIS_HOST: ${REDIS_HOST}             # redis 컨테이너 이름을 host로 사용 (Docker 네트워크상에서 가능)
+      REDIS_PORT: ${REDIS_PORT}
+      JWT_SECRET_KEY: ${JWT_SECRET_KEY}
+      JWT_ACCESS_TOKEN_EXPIRATION: ${JWT_ACCESS_TOKEN_EXPIRATION}
+      JWT_REFRESH_TOKEN_EXPIRATION: ${JWT_REFRESH_TOKEN_EXPIRATION}
     depends_on:             # db가 먼저 실행되어야 app이 실행됨
       - db
+      - redis
 
   db: #컨테이너 이름 db
     image: mysql:8.0        #공식 mysql:8.0 이미지를 다운받아 컨테이너에서 바로 띄움
@@ -31,8 +37,19 @@ services:                   #컨테이너들 정의. 여기선 app(server)와 db
     volumes:               #DB 데이터가 컨테이너 재시작/삭제되어도 날아가지 않게 호스트 pc에 저장
       - mysql_data:/var/lib/mysql
 
+  redis:
+    image: redis:7.2-alpine             # 공식 경량 이미지 추천
+    container_name: vote-redis
+    ports:
+      - "${REDIS_HOST_PORT}:${REDIS_PORT}"                     # 필요에 따라 외부 노출 (보통은 내부 연결만 해도 충분)
+    volumes:
+    - redis_data:/data                # Redis 데이터 영속화 (optional)
+    restart: unless-stopped
+
+
 volumes:
   mysql_data:
+  redis_data:
 
 #환경변수 흐름
 #.env → docker-compose.yml →  application-docker.yaml

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/com/ceos/spring_vote_21st/admin/controller/AdminController.java

@@ -0,0 +1,86 @@
+package com.ceos.spring_vote_21st.admin.controller;
+
+import com.ceos.spring_vote_21st.global.response.dto.CommonResponse;
+import com.ceos.spring_vote_21st.member.service.MemberService;
+import com.ceos.spring_vote_21st.vote.service.ElectionService;
+import com.ceos.spring_vote_21st.vote.web.dto.request.CandidateAddRequestDTO;
+import com.ceos.spring_vote_21st.vote.web.dto.request.CandidateModifyRequestDTO;
+import com.ceos.spring_vote_21st.vote.web.dto.request.ElectionCreateRequestDTO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("/api/v1/admin")
+@RequiredArgsConstructor
+@RestController
+public class AdminController {
+    private final MemberService memberService;
+    private final ElectionService electionService;
+
+    /**
+     * Member
+     * */
+    @DeleteMapping("/members/{memberId}")
+    public ResponseEntity<Void> delete(@PathVariable Long memberId) {
+        memberService.deleteMember(memberId);
+        return ResponseEntity.noContent().build();  // ResponseEntity.noContent()는 응답 바디를 아예 쓰지않음.(wrapping은 되지만 클라이언트는 바디를 안받는다)
+    }
+
+    @DeleteMapping("/members")
+    public ResponseEntity<Void> deleteAll() {
+        memberService.deleteAll();
+        return ResponseEntity.noContent().build();
+    }
+
+    /**
+     * Election
+     */
+    @PostMapping("/elections")
+    public ResponseEntity<CommonResponse<Long>> createElection(@RequestBody ElectionCreateRequestDTO dto) {
+        Long id = electionService.createElection(dto);
+        return ResponseEntity.ok(CommonResponse.success(id));
+    }
+
+
+    @DeleteMapping("/elections/{electionId}")
+    public ResponseEntity<Void> deleteElection(@PathVariable Long electionId) {
+        electionService.deleteElection(electionId);
+        return ResponseEntity.noContent().build();
+    }
+
+    @DeleteMapping("/elections")
+    public ResponseEntity<Void> deleteAllElections() {
+        electionService.deleteAll();
+        return ResponseEntity.noContent().build();
+    }
+
+    /**
+     * Candidate
+     */
+
+    // 후보 추가
+    @PostMapping("/elections/{electionId}/candidates")
+    public ResponseEntity<CommonResponse<Long>> addCandidate(
+            @RequestBody CandidateAddRequestDTO dto) {
+        Long id = electionService.addCandidate(dto);
+        return ResponseEntity.ok(CommonResponse.success(id));
+    }
+
+    // 후보 정보 수정
+    @PutMapping("/elections/{electionId}/candidates")
+    public ResponseEntity<CommonResponse<Long>> modifyCandidate(
+            @RequestBody CandidateModifyRequestDTO dto) {
+        Long id = electionService.modifyCandidate(dto);
+        return ResponseEntity.ok(CommonResponse.success(id));
+    }
+
+    // delete
+    @DeleteMapping("/elections/{electionId}/candidates/{candidateId}")
+    public ResponseEntity<CommonResponse<?>> deleteCandidate(@PathVariable Long electionId, @PathVariable Long candidateId) {
+        electionService.deleteCandidate(electionId, candidateId);
+
+        return ResponseEntity.ok(CommonResponse.success(null));
+    }
+
+
+}

src/main/java/com/ceos/spring_vote_21st/controller/HealthCheckController.java

@@ -7,8 +7,14 @@
 @RestController
 public class HealthCheckController {
 
+
+
     @GetMapping("/health")
     public String healthCheck() {
         return "OK";
     }
+    @GetMapping("/health/new")
+    public String healthCheckNew() {
+        return "OK2";
+    }
 }

src/main/java/com/ceos/spring_vote_21st/global/config/CorsConfig.java

@@ -0,0 +1,69 @@
+package com.ceos.spring_vote_21st.global.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+
+import java.util.List;
+
+/**
+ * CORS 전역 설정
+ * - Authorization 헤더를 클라이언트에 노출하여 Access Token 볼 수 있도록 지원함
+ */
+@Configuration
+public class CorsConfig {
+
+    @Bean
+    public CorsConfigurationSource corsConfigurationSource() {
+        CorsConfiguration config = new CorsConfiguration();
+        // 허용할 오리진 패턴 (필요 시 특정 도메인만 허용)
+        config.setAllowedOriginPatterns(List.of(
+                "http://localhost:3000",
+                "https://next-vote-21th.vercel.app",
+            "https://hanihome-fe-test-gnos-projects-ab4a3758.vercel.app",
+            "https://hanihome-vote.shop",
+            "https://hanihome-fe-test.vercel.app"
+        ));
+        // 허용할 HTTP 메서드
+        config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
+        // 허용할 요청 헤더
+        config.setAllowedHeaders(List.of("*"));
+        config.setExposedHeaders(List.of("Authorization")); // 클라이언트가 AccessToken 접근 가능하도록 지원
+        // 쿠키 전송 허용 여부
+        config.setAllowCredentials(true);
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", config);    // 모든 URI에 대해서
+        return source;
+    }
+    /*
+     *
+       @Bean
+    @Profile("local")              // 로컬 프로필
+    public CorsConfigurationSource devCorsConfig() {
+        CorsConfiguration c = new CorsConfiguration();
+        c.setAllowedOriginPatterns(List.of(
+                "http://localhost:*",
+                "https://*.ngrok-free.app"
+        ));
+        c.setAllowCredentials(false);
+        applyCommon(c);
+        return source(c);
+    }
+
+    @Bean
+    @Profile("prod")               // 운영 프로필
+    public CorsConfigurationSource prodCorsConfig() {
+        CorsConfiguration c = new CorsConfiguration();
+        c.setAllowedOriginPatterns(List.of(
+                "https://web.example.com",
+                "https://admin.example.com"
+        ));
+        c.setAllowCredentials(true);
+        applyCommon(c);
+        return source(c);
+    }
+     */
+}