[ALL] 버전 3 출시(versionName1.1.4) (#526)

.github/workflows/backend_dev_merge_workflow.yml

@@ -5,22 +5,54 @@ on:
       - dev_backend
 
 jobs:
-  deploy:
-    runs-on: naaga
+  github_actions_setting:
+    runs-on: ubuntu-latest
+
     steps:
-      - name: change permission
-        run: |
-          sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/naaga/2023-naaga/2023-naaga
-      - name: checkout
+      - name: 📂 프로젝트 파일 가져오는 중... 📂
         uses: actions/checkout@v3
         with:
           submodules: true
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      - name: remove
+
+      - name: ☕️ 깃허브 액션에 JDK 17 적용시키는 중... ☕️
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+
+      - name: 🐘 Gradle 세팅 중... 🐘
+        uses: gradle/[email protected]
+
+      - name: ⚙️ Gradle 로 JAR 파일 테스트 및 빌드 중... ⚙️
+        run: |
+          cd backend
+          ./gradlew clean bootJar -Dspring.profiles.active=test
+
+      - name: 🐳 도커 세팅 중... 🐳
+        uses: docker/[email protected]
+
+      - name: 🐳 도커 허브에 로그인 중... 🐳
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
+
+      - name: 🐳 도커 이미지 빌드 중... 🐳
         run: |
-          sudo rm -rf /home/ubuntu/2023-naaga
-      - name: deploy
+          cd backend
+          docker build --platform linux/arm64/v8 -t ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }} -f Dockerfile-dev .
+
+      - name: 🐳 도커 허브에 Push 중... 🐳
+        run: docker push ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }}
+
+  naaga_dev_ec2_deploy:
+    needs: github_actions_setting
+    runs-on: naaga
+
+    steps:
+      - name: 🙏 쉘 스크립트 실행 중 ... 🙏
         run: |
-          sudo cp -r /home/ubuntu/actions-runner/naaga/2023-naaga/2023-naaga /home/ubuntu
           cd /home/ubuntu
-          sudo ./deploy.sh
+          sudo ./deploy_new.sh
+

.github/workflows/backend_rel_merge_workflow.yml

@@ -8,53 +8,53 @@ on:
       - backend/**
 
 jobs:
-  deploy:
-    runs-on: naaga
+  github_actions_setting:
+    runs-on: ubuntu-latest
+
     steps:
-      - name: change permission
-        run: |
-          sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/naaga/2023-naaga/2023-naaga
-
-      - name: checkout
+      - name: 📂 프로젝트 파일 가져오는 중... 📂
         uses: actions/checkout@v3
         with:
           submodules: true
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-
-      - name: project remove
-        run: |
-          sudo rm -rf /home/ubuntu/prod/2023-naaga
-
-      - name: project copy
-        run: |
-          sudo cp -r /home/ubuntu/actions-runner/naaga/2023-naaga/2023-naaga /home/ubuntu/prod
 
-      - name: build
+      - name: ☕️ 깃허브 액션에 JDK 17 적용시키는 중... ☕️
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+
+      - name: 🐘 Gradle 세팅 중... 🐘
+        uses: gradle/[email protected]
+
+      - name: ⚙️ Gradle 로 JAR 파일 테스트 및 빌드 중... ⚙️
         run: |
-          cd /home/ubuntu/prod/2023-naaga/backend
-          sudo chmod +x ./gradlew
-          sudo ./gradlew clean bootJar
-
-      - name: transfer & run
+          cd backend
+          ./gradlew clean bootJar -Dspring.profiles.active=test
+
+      - name: 🐳 도커 세팅 중... 🐳
+        uses: docker/[email protected]
+
+      - name: 🐳 도커 허브에 로그인 중... 🐳
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESSTOKEN }}
+
+      - name: 🐳 도커 이미지 빌드 중... 🐳
         run: |
-          cd /home/ubuntu/prod
-          chmod +x ./deploy_prod.sh
-          sudo ./deploy_prod.sh
+          cd backend
+          docker build --platform linux/arm64/v8 -t ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }} -f Dockerfile-prod .
 
-  sync-dev_backend:
-    needs: deploy
+      - name: 🐳 도커 허브에 Push 중... 🐳
+        run: docker push ${{ secrets.DOCKERHUB_REPOSITORY }}/${{ secrets.DOCKERHUB_APPNAME }}
 
-    runs-on: ubuntu-latest
+  naaga_prod_ec2_deploy:
+    needs: github_actions_setting
+    runs-on: naaga
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          ref: main
-
-      - name: merge release -> dev_backend
-        uses: devmasx/merge-branch@master
-        with:
-          type: now
-          target_branch: dev_backend
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: 🙏 쉘 스크립트 실행 중 ... 🙏
+        run: |
+          cd /home/ubuntu/prod
+          sudo ./deploy_prod.sh

README.md

@@ -0,0 +1,16 @@
+![제목](etc/images/header.png)
+
+## 💌 나아가로부터의 초대장이 도착했습니다
+
+반복되는 인스타 피드를 보고, 게임을 하며 보내는 일상이 지루하지 않으시나요?
+공부와 일에 치여 실내에서 보내는 시간이 많을 텐데요. 작은 화면 속을 벗어나 현실 세계의 경험을 해보고 싶지 않으신가요?
+
+그런 당신을 ‘나아가’로 초대합니다.
+
+## 🚶🏻 추리와 발걸음의 만남
+나아가는 현실 세계를 누비며 진행되는 추리 게임입니다. 게임을 시작하면, 당신 주변 어딘가의 사진이 제공됩니다. 사진이 알쏭달쏭하여 그곳이 어딘지 알아맞히기 어렵겠지만, 우선 발걸음을 옮겨보세요.
+
+
+<a href="https://play.google.com/store/apps/details?id=com.now.naaga&pcampaignid=web_share"><img src="etc/images/google play store.png"/></a>
+
+![상세 페이지](etc/images/service%20intro.png)

android/app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "com.now.naaga"
         minSdk 28
         targetSdk 33
-        versionCode 9
-        versionName "1.1.3"
+        versionCode 10
+        versionName "1.1.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunner "com.now.naaga.HiltTestRunner"
@@ -31,8 +31,15 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled true
+            firebaseCrashlytics {
+                mappingFileUploadEnabled false
+            }
+        }
         release {
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 
             ndk.debugSymbolLevel 'FULL'

android/app/src/main/AndroidManifest.xml

@@ -2,14 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
-
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
 
     <application
         android:name=".NaagaApplication"
@@ -73,6 +70,10 @@
             android:name=".presentation.setting.SettingActivity"
             android:screenOrientation="portrait"
             android:exported="false" />
+        <activity
+            android:name=".presentation.adventuredetail.AdventureDetailActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">

android/app/src/main/java/com/now/naaga/data/firebase/analytics/ButtonNames.kt

@@ -6,9 +6,6 @@ const val BEGIN_GO_SETTING = "GO_SETTING"
 const val BEGIN_GO_UPLOAD = "GO_UPLOAD"
 const val BEGIN_GO_MYPAGE = "GO_MYPAGE"
 
-// LocationPermissionDialog
-const val LOCATION_PERMISSION_OPEN_SETTING = "OPEN_SETTING"
-
 // AdventureResultActivity
 const val RESULT_RESULT_RETURN = "RESULT_RETURN"
 
@@ -23,7 +20,6 @@ const val ON_ADVENTURE_END_ADVENTURE = "END_ADVENTURE"
 
 // UploadActivity
 const val UPLOAD_OPEN_CAMERA = "OPEN_CAMERA"
-const val UPLOAD_SET_COORDINATE = "SET_COORDINATE"
 
 // CameraPermissionDialog
 const val CAMERA_PERMISSION_OPEN_SETTING = "OPEN_SETTING"

android/app/src/main/java/com/now/naaga/data/mapper/AdventureResultMapper.kt

@@ -1,7 +1,7 @@
 package com.now.naaga.data.mapper
 
 import com.now.domain.model.AdventureResult
-import com.now.domain.model.AdventureResultType
+import com.now.domain.model.type.AdventureResultType
 import com.now.naaga.data.remote.dto.AdventureResultDto
 import java.time.LocalDateTime
 

android/app/src/main/java/com/now/naaga/data/mapper/AuthMapper.kt

@@ -1,7 +1,7 @@
 package com.now.naaga.data.mapper
 
-import com.now.domain.model.AuthPlatformType
 import com.now.domain.model.PlatformAuth
+import com.now.domain.model.type.AuthPlatformType
 import com.now.naaga.data.remote.dto.PlatformAuthDto
 
 fun PlatformAuthDto.toDomain(): PlatformAuth {