[CHORE] 코드 리뷰용 PR #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

hey-sung wants to merge 255 commits into code-review from main

.github/ISSUE_TEMPLATE/bug_report.md

-Original file line number
+Diff line change
@@ -0,0 +1,30 @@
+    ---
+    name: Bug report
+    about: Create a report to help us improve
+    title: "[BUG]"
+    labels: ''
+    assignees: ''
+    ---
+    ### Issue 타입(하나 이상의 Issue 타입을 선택해주세요)
+    □ 기능 추가
+    □ 기능 삭제
+    ☑ 버그 리포트
+    □ 버그 수정
+    □ 의존성, 환경 변수, 빌드 관련 코드 업데이트
+    ### 상세 내용
+    #### 어떤 버그인가요?
+    > 어떤 버그인지 간결하게 설명해주세요
+    #### 어떤 상황에서 발생한 버그인가요?
+    > (가능하면) Given-When-Then 형식으로 서술해주세요
+    #### 예상 결과
+    > 예상했던 정상적인 결과가 어떤 것이었는지 설명해주세요
+    ### 라벨
+    - 예상 소요 시간: `E: 1h`
+    - 그룹: `client`, `server`
+    - 긴급도: `High`, `Middle`, `Low`

.github/ISSUE_TEMPLATE/feature_request.md

-Original file line number
+Diff line change
@@ -0,0 +1,35 @@
+    ---
+    name: Feature request
+    about: Suggest an idea for this project
+    title: ''
+    labels: ''
+    assignees: ''
+    ---
+    ### Issue 타입(하나 이상의 Issue 타입을 선택해주세요)
+    ☑ 기능 추가
+    □ 기능 삭제
+    □ 버그 리포트
+    □ 버그 수정
+    □ 의존성, 환경 변수, 빌드 관련 코드 업데이트
+    ### 상세 내용
+    #### 어떤 기능인가요?
+    > 추가하려는 기능에 대해 간결하게 설명해주세요
+    #### 작업 상세 내용
+    - [ ] TO DO
+    ### 예상 소요 시간
+    -[] `0.5h`
+    -[] `1h`
+    -[] `1.5h`
+    -[] `2h`
+    -[] `2.5h`
+    -[] `3h`
+    ### 라벨
+    - 예상 소요 시간: `E: 1h`
+    - 그룹: `client`, `server`
+    - 긴급도: `High`, `Middle`, `Low`

.github/pull_request_template.md

-Original file line number
+Diff line change
@@ -0,0 +1,34 @@
+    ### PR 타입(하나 이상의 PR 타입을 선택해주세요)
+    ☑ 기능 추가
+    □ 기능 삭제
+    □ 버그 수정
+    □ 의존성, 환경 변수, 빌드 관련 코드 업데이트
+    </br>
+    ### 반영 브랜치
+    ex) feat/login -> dev
+    </br>
+    ### 변경 사항
+    ex) 로그인 시, 구글 소셜 로그인 기능을 추가했습니다.
+    </br>
+    ### 테스트 결과
+    ex) 베이스 브랜치에 포함되기 위한 코드는 모두 정상적으로 동작해야 합니다. 결과물에 대한 스크린샷, GIF, 혹은 라이브 데모가 가능하도록 샘플API를 첨부할 수도 있습니다.
+    </br>
+    ### 연관된 이슈
+    ex) #이슈번호, #이슈번호
+    </br>
+    ### 리뷰 요구사항(선택)
+    > 리뷰어가 특별히 봐주었으면 하는 부분이 있다면 작성해주세요
+    > ex) 메서드 XXX의 이름을 더 잘 짓고 싶은데 혹시 좋은 명칭이 있을까요?

.github/workflows/main.yml

-Original file line number
+Diff line change
@@ -0,0 +1,78 @@
+    name: Build and Deploy to EC2
+    on:
+      push:
+        branches: [ "production" ]
+    #  pull_request:
+    #    branches: [ "production" ]
+    env:
+      AWS_REGION: ap-northeast-2
+      AWS_S3_BUCKET: gitget-deploy-bucket2
+      AWS_CODE_DEPLOY_APPLICATION: GitGet-Application
+      AWS_CODE_DEPLOY_GROUP: GitGet-Deployment-Group
+    jobs:
+      deploy:
+        runs-on: ubuntu-latest
+        permissions:
+          contents: read
+          packages: write
+        steps:
+          - uses: actions/checkout@v4
+            with:
+              token: ${{ secrets.ACTIONS_TOKEN }}
+              submodules: true
+          - name: make application.yml
+            run: |
+              mkdir -p src/main/resources
+              cp GitGet-BACK-SECRET/main/resources/application.yml src/main/resources/
+              cp GitGet-BACK-SECRET/main/resources/application-prod.yml src/main/resources/
+              cp GitGet-BACK-SECRET/main/resources/application-common.yml src/main/resources/
+              mkdir -p src/test/resources
+              cp GitGet-BACK-SECRET/test/resources/application.yml src/test/resources/
+              cp GitGet-BACK-SECRET/test/resources/application-test.yml src/test/resources/
+              echo "Main resources contents:"
+              ls -la src/main/resources/
+              echo "Test resources contents:"
+              ls -la src/test/resources/
+          - name: Grant execute permission for gradlew
+            run: chmod +x ./gradlew
+            shell: bash
+          - name: Build with Gradle and Test
+            run: ./gradlew build test
+          - name: Make zip file
+            run: zip -r ./$GITHUB_SHA.zip .
+            shell: bash
+          - name: AWS credential 설정
+            uses: aws-actions/configure-aws-credentials@v1
+            with:
+              aws-region: ${{ env.AWS_REGION }}
+              aws-access-key-id: ${{ secrets.CICD_ACCESS_KEY }}
+              aws-secret-access-key: ${{ secrets.CICD_SECRET_KEY }}
+          - name: Upload to S3
+            run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://$AWS_S3_BUCKET/$GITHUB_SHA.zip
+          - name: EC2에 배포
+            run: aws deploy create-deployment --application-name ${{ env.AWS_CODE_DEPLOY_APPLICATION }} --deployment-config-name CodeDeployDefault.AllAtOnce --deployment-group-name ${{ env.AWS_CODE_DEPLOY_GROUP }} --s3-location bucket=$AWS_S3_BUCKET,key=$GITHUB_SHA.zip,bundleType=zip
+          - name: action-slack (Slack notification after deploy)
+            uses: 8398a7/action-slack@v3
+            with:
+              status: ${{ job.status }}
+              author_name: Backend
+              fields: repo,commit,message,author
+              mention: here
+              if_mention: failure,cancelled
+            env:
+              SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+            if: always()

.github/workflows/prTest.yml

-Original file line number
+Diff line change
@@ -0,0 +1,47 @@
+    name: Run gradlew clean test when PR
+    on:
+      pull_request:
+        branches: [ "main", "production" ]
+    jobs:
+      PRTest:
+        runs-on: ubuntu-latest
+        permissions: write-all
+        steps:
+          - uses: actions/checkout@v4
+            with:
+              token: ${{ secrets.ACTIONS_TOKEN }}
+              submodules: true
+          - name: make application.yml
+            run: |
+              mkdir -p src/main/resources
+              cp GitGet-BACK-SECRET/main/resources/application.yml src/main/resources/
+              cp GitGet-BACK-SECRET/main/resources/application-prod.yml src/main/resources/
+              cp GitGet-BACK-SECRET/main/resources/application-common.yml src/main/resources/
+              mkdir -p src/test/resources
+              cp GitGet-BACK-SECRET/test/resources/application.yml src/test/resources/
+              cp GitGet-BACK-SECRET/test/resources/application-test.yml src/test/resources/
+              echo "Main resources contents:"
+              ls -la src/main/resources/
+              echo "Test resources contents:"
+              ls -la src/test/resources/
+          - name: Grant execute permission for gradlew
+            run: chmod +x ./gradlew
+            shell: bash
+          - name: Build and Test
+            run: ./gradlew clean test
+          # Test 후 Report 생성
+          - name: Publish Test Results
+            uses: EnricoMi/publish-unit-test-result-action@v2
+            if: always()
+            with:
+              junit_files: '**/build/test-results/test/TEST-*.xml'

todoffin/.gitignore → .gitignore

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    @@ -0,0 +1,42 @@
     HELP.md
     .gradle
     build/
@@ Expand Down Expand Up / @@ -39,4 +40,5 @@ out/ @@
     .vscode/
     ### MAC ###
-    *.DS_Store
+    *.DS_Store
+    src/main/generated/**

.gitmodules

-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    [submodule "GitGet-BACK-SECRET"]
+    	path = GitGet-BACK-SECRET
+    	url = https://github.com/TeamTheGenius/GitGet-BACK-SECRET

GitGet-BACK-SECRET

Submodule GitGet-BACK-SECRET added at 5cbf06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CHORE] 코드 리뷰용 PR #246

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

[CHORE] 코드 리뷰용 PR #246

Are you sure you want to change the base?

Uh oh!

[CHORE] 코드 리뷰용 PR #246

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!