rookedsysc
diff --git a/‎.DS_Store
-6 KB b/‎.DS_Store
-6 KB
diff --git a/‎.github/workflows/cd-wordflow.yml
+34-28 b/‎.github/workflows/cd-wordflow.yml
+34-28
diff --git a/‎.gitignore
+11 b/‎.gitignore
+11
diff --git a/‎appspec.yml
+20 b/‎appspec.yml
+20
diff --git a/‎build.gradle
+34-2 b/‎build.gradle
+34-2
diff --git a/‎scripts/start.sh
+17 b/‎scripts/start.sh
+17
diff --git a/‎scripts/stop.sh
+14 b/‎scripts/stop.sh
+14
diff --git a/‎src/main/java/com/gamemoonchul/application/AppleService.java
+40 b/‎src/main/java/com/gamemoonchul/application/AppleService.java
+40
diff --git a/‎src/main/java/com/gamemoonchul/application/MatchGameService.java
+28 b/‎src/main/java/com/gamemoonchul/application/MatchGameService.java
+28
diff --git a/‎src/main/java/com/gamemoonchul/application/MatchUserService.java
+35 b/‎src/main/java/com/gamemoonchul/application/MatchUserService.java
+35
@@ -4,9 +4,9 @@ name: CD with Gradle
 # main 브랜치로 push되거나 pull request가 발생했을 때 워크플로우를 실행
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "develop" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "develop" ]
 
 # 워크플로우에서는 저장소 내용을 읽을 수 있는 권한만 설정
 permissions:
@@ -30,37 +30,43 @@ jobs:
           distribution: "adopt"
 
       # 세 번째 단계: GitHub secrets에서 데이터를 가져와 application.properties 파일 생성
-#      - name: Make application.properties
-#        run: |
-#          cd ./src/main/resources
-#          touch ./application.properties
-#          echo "${{ secrets.PROPERTIES }}" > ./application.properties
-#        shell: bash
+      - name: Make application.yaml
+        run: |
+          cd ./src/main/resources
+          touch ./application.yaml
+          echo "${{ secrets.APPLICATION_YAML }}" > ./application.yaml
+          echo "${{ secrets.AWS_KEYSTORE }}" | base64 --decode > ./keystore-aws.p12
+          cd ../../test/resources
+          touch ./application.yaml
+          echo "${{ secrets.APPLICATION_TEST_YAML }}" > ./application.yaml
+        shell: bash
 
-      # 네 번째 단계: Gradle을 사용해 프로젝트 빌드, 테스트는 제외
+      # 네 번째 단계: Gradle을 사용해 프로젝트 빌
       - name: Build with Gradle
         run: |
           chmod +x ./gradlew
-          ./gradlew clean build -x test
+          ./gradlew test -i
+          ./gradlew clean build --warning-mode all 
+
+
+      # 전송할 파일을 담을 디렉토리 생성
+      - name: Make Directory for deliver
+        run: mkdir deploy
 
-      # 다섯 번째 단계: Docker 이미지를 빌드하고 Docker 저장소에 푸시
-      - name: Docker build & push to docker repo
+      # Jar 파일 Copy
+      - name: Copy Jar
         run: |
-          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -f Dockerfile -t ${{ secrets.DOCKER_REPO }}/directors-dev .
-          docker push ${{ secrets.DOCKER_REPO }}/directors-dev
-      # 실행주체: GitHub Actions > GitHub Infra // End
+          cp ./build/libs/*.jar ./deploy/
+          cp ./appspec.yml ./deploy/
+          cp -r ./scripts ./deploy/
 
-      # 여섯 번째 단계: SSH를 사용하여 서버에 배포
-      - name: Deploy to server
-        uses: appleboy/ssh-action@master
+      - name: Deliver to AWS S3
+        uses: aws-actions/configure-aws-credentials@v1
         with:
-          host: ${{ secrets.HOST }}
-          username: ubuntu
-          key: ${{ secrets.KEY }}
-          envs: GITHUB_SHA
-          script: |
-            sudo docker rm -f $(docker ps -qa)
-            sudo docker pull ${{ secrets.DOCKER_REPO }}/directors-dev
-            docker-compose up -d
-            docker image prune -f
+          aws-region: ap-southeast-2
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: S3에 업로드
+        run: aws deploy push --application-name ${{ secrets.AWS_CODE_DEPLOY_APPLICATION }} --ignore-hidden-files --s3-location s3://gamemuncheol-s3/deploy.zip --source ./deploy
+      - name: EC2에 배포
+        run: aws deploy create-deployment --application-name ${{ secrets.AWS_CODE_DEPLOY_APPLICATION }} --deployment-config-name CodeDeployDefault.AllAtOnce --deployment-group-name ${{ secrets.AWS_CODE_DEPLOY_APPLICATION }} --s3-location bucket=gamemuncheol-s3,key=deploy.zip,bundleType=zip
@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+**.DS_Store
 
 ### STS ###
 .apt_generated
@@ -38,3 +39,13 @@ out/
 
 ### Security ###
 /src/main/resources/application.yaml
+AuthKey_P2J7JVJRGF.p8
+/src/main/resources/keystore.p12
+/src/test/resources/application.yaml
+src/main/resources/lol_scrapers.py
+src/main/resources/client_secrets.json
+
+### Video ### 
+src/main/resources/static/video/**
+
+
@@ -0,0 +1,20 @@
+version: 0.0
+os: linux
+
+files:
+  - source: /
+    destination: /home/ubuntu/spring-github-action
+    overwrite: yes
+
+permissions:
+  - object: /
+    owner: ubuntu
+    group: ubuntu
+
+hooks:
+  AfterInstall:
+    - location: scripts/stop.sh
+      timeout: 60
+  ApplicationStart:
+    - location: scripts/start.sh
+      timeout: 60
@@ -27,28 +27,60 @@ dependencies {
 	implementation 'javax.xml.bind:jaxb-api:2.3.1' // xml 에러 방지
 	// Swagger end
 
+	// aws s3를 위한 설정 - start
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+	// aws s3를 위한 설정 - end
+
+
 	// spring security start
     implementation 'org.springframework.boot:spring-boot-starter-security'
-	testImplementation 'org.springframework.security:spring-security-test'
+    implementation 'org.projectlombok:lombok:1.18.30'
+    testImplementation 'org.springframework.security:spring-security-test'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' // oauth2
 	implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
 	runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
 	runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'
+	implementation 'com.auth0:jwks-rsa:0.22.1' // apple oauth
+	implementation 'com.auth0:java-jwt:4.4.0' // apple oauth
 	// spring security end
 
+
+	// Process Executor
+	implementation 'org.zeroturnaround:zt-exec:1.12'
+	// Process Executor
+
+	// prometheus + grafana
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	implementation 'io.micrometer:micrometer-registry-prometheus'
+
 	// JPA start
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     runtimeOnly 'com.mysql:mysql-connector-j'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis' // redis
 	// JPA end
 
+	// Test를 위한 H2database
+	runtimeOnly 'com.h2database:h2'
+	// Test를 위한 H2database
+
+	// youtube
+	implementation 'com.google.apis:google-api-services-youtube:v3-rev222-1.25.0'
+	implementation 'com.google.oauth-client:google-oauth-client-jetty:1.35.0'
+	// youtube
+
+	// Apple Oauth 관련 라이브러리 Start
+	implementation 'com.google.code.gson:gson:2.10.1'
+	// Apple Oauth 관련 라이브러리 End
+
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 tasks.named('test') {
 	useJUnitPlatform()
-}
+}
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+ROOT_PATH="/home/ubuntu/spring-github-action"
+JAR="$ROOT_PATH/gamemoonchul-0.0.1-SNAPSHOT.jar"
+
+APP_LOG="$ROOT_PATH/application.log"
+ERROR_LOG="$ROOT_PATH/error.log"
+START_LOG="$ROOT_PATH/start.log"
+
+NOW=$(date +%c)
+
+
+echo "[$NOW] > $JAR 실행" >> $START_LOG
+nohup java -jar $JAR > $APP_LOG 2> $ERROR_LOG &
+
+SERVICE_PID=$(pgrep -f $JAR)
+echo "[$NOW] > 서비스 PID: $SERVICE_PID" >> $START_LOG
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+ROOT_PATH="/home/ubuntu/spring-github-action"
+JAR="$ROOT_PATH/gamemoonchul-0.0.1-SNAPSHOT.jar"
+STOP_LOG="$ROOT_PATH/stop.log"
+SERVICE_PID=$(pgrep -f $JAR) # 실행중인 Spring 서버의 PID
+
+if [ -z "$SERVICE_PID" ]; then
+  echo "서비스 NotFound" >> $STOP_LOG
+else
+  echo "서비스 종료 " >> $STOP_LOG
+  kill "$SERVICE_PID"
+  # kill -9 $SERVICE_PID # 강제 종료를 하고 싶다면 이 명령어 사용
+fi
@@ -0,0 +1,40 @@
+package com.gamemoonchul.application;
+
+import com.gamemoonchul.common.exception.ApiException;
+import com.gamemoonchul.config.apple.AppleIDTokenValidator;
+import com.gamemoonchul.config.apple.entities.AppleCredential;
+import com.gamemoonchul.config.apple.enums.AppleTokenStatus;
+import com.gamemoonchul.config.jwt.TokenDto;
+import com.gamemoonchul.config.jwt.TokenHelper;
+import com.gamemoonchul.config.oauth.user.AppleOAuth2UserInfo;
+import com.gamemoonchul.domain.entity.Member;
+import com.gamemoonchul.domain.converter.MemberConverter;
+import com.gamemoonchul.infrastructure.web.dto.AppleSignUpRequestDto;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@RequiredArgsConstructor
+public class AppleService {
+  private final AppleIDTokenValidator appleIDTokenValidator;
+  private final MemberService memberService;
+  private final TokenHelper tokenHelper;
+
+  public AppleCredential validateRequest(AppleSignUpRequestDto signUpRequest) {
+    AppleCredential appleUserInfo = appleIDTokenValidator.extractAppleUserinfoFromIDToken(signUpRequest.getIdentityToken());
+    if(signUpRequest.getName() == null || signUpRequest.getName().isEmpty()) {
+      throw new ApiException(AppleTokenStatus.INVALID_SIGNUP_FORM);
+    }
+    appleUserInfo.setName(signUpRequest.getName());
+    return appleUserInfo;
+  }
+
+  public TokenDto signInOrUp(AppleCredential credential) {
+    Member member = MemberConverter.toEntity(credential);
+    AppleOAuth2UserInfo userInfo = new AppleOAuth2UserInfo(credential);
+    memberService.signInOrUp(member);
+    TokenDto token  = tokenHelper.generateToken(userInfo);
+    return token;
+  }
+}
@@ -0,0 +1,28 @@
+package com.gamemoonchul.application;
+
+import com.gamemoonchul.domain.converter.riot.MatchGameConverter;
+import com.gamemoonchul.domain.entity.riot.MatchGame;
+import com.gamemoonchul.domain.model.vo.riot.MatchRecord;
+import com.gamemoonchul.infrastructure.repository.MatchGameRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class MatchGameService {
+    private final MatchGameRepository matchGameRepository;
+    private final MatchGameConverter matchConverter;
+
+    public Optional<MatchGame> findByGameId(String gameId) {
+        return matchGameRepository.findByGameId(gameId);
+    }
+
+    public MatchGame save(MatchRecord vo) {
+        MatchGame matchGame = matchConverter.toMatchGame(vo);
+        return matchGameRepository.save(matchGame);
+    }
+}
@@ -0,0 +1,35 @@
+package com.gamemoonchul.application;
+
+import com.gamemoonchul.domain.converter.riot.MatchUserConverter;
+import com.gamemoonchul.domain.entity.riot.MatchGame;
+import com.gamemoonchul.domain.entity.riot.MatchUser;
+import com.gamemoonchul.domain.model.vo.riot.ParticipantRecord;
+import com.gamemoonchul.infrastructure.repository.MatchUserRepository;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class MatchUserService {
+    private final MatchUserRepository matchUserRepository;
+    private final MatchUserConverter matchUserConverter;
+
+    public List<MatchUser> saveAll(List<ParticipantRecord> participants, MatchGame matchGame) {
+        List<MatchUser> matchUsers = new ArrayList<>();
+        participants.stream().map(
+                participant -> matchUserConverter.toEntities(participant, matchGame)
+        ).forEach(matchUser -> {
+            matchUsers.add(matchUserRepository.save(matchUser));
+        });
+        return matchUsers;
+    }
+
+    public List<MatchUser> findByMatchGameId(MatchGame matchGame) {
+        return matchUserRepository.findByMatchGame(matchGame);
+    }
+}