Merge branch 'dev' into feat/#113

# Conflicts: # backend/src/main/java/com/festago/dto/FestivalCreateRequest.java # backend/src/main/java/com/festago/dto/StageCreateRequest.java # backend/src/main/java/com/festago/dto/TicketCreateRequest.java # backend/src/main/java/com/festago/dto/TicketValidationRequest.java # backend/src/main/java/com/festago/dto/TicketingRequest.java
woowacourse-teams · Sep 14, 2023 · f0a308a · f0a308a
2 parents d23932a + f0c7e76
commit f0a308a
Show file tree

Hide file tree

Showing 129 changed files with 2,062 additions and 705 deletions.
diff --git a/.github/workflows/assign-reviewer.yml b/.github/workflows/assign-reviewer.yml
@@ -1,8 +1,11 @@
 name: Assign Reviewer By Label
 on:
   pull_request:
-    types: [ opened, edited, labeled, unlabeled ]
-
+    types:
+      - opened
+      - edited
+      - labeled
+      - unlabeled
 jobs:
   assign-reviewer:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/ci-back.yml b/.github/workflows/ci-back.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - dev
+      - main
     paths: 'backend/**'
 
 defaults:

diff --git a/.github/workflows/ci-user-aos.yml b/.github/workflows/ci-user-aos.yml
@@ -4,10 +4,12 @@ on:
   push:
     branches:
       - dev
-    paths: ['android/festago/**']
+      - main
+    paths: [ 'android/festago/**' ]
   pull_request:
     branches:
       - dev
+      - main
     paths: 'android/festago/**'
 
 defaults:
@@ -20,35 +22,35 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: 17
-        distribution: zulu
-        cache: gradle
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: add google-services.json
-      run: echo '${{ secrets.ANDROID_USER_GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
-      
-    - name: add local.properties
-      run: |
-        echo kakao_native_app_key=\"${{ secrets.ANDROID_USER_KAKAO_NATIVE_APP_KEY }}\" >> ./local.properties
-        echo kakao_redirection_scheme=\"${{ secrets.ANDROID_USER_KAKAO_REDIRECTION_SCHEME }}\" >> ./local.properties
-        echo base_url=\"$${{ secrets.ANDROID_USER_BASE_URL }}\" >> ./local.properties
-      
-    - name: Build with Gradle
-      run: ./gradlew build
-
-    - name: Run ktlint
-      run: ./gradlew ktlintCheck
-
-    - name: Run unit tests
-      run: ./gradlew testDebugUnitTest
-        
-    - name: Build assemble release apk
-      run: ./gradlew assembleRelease      
+      - uses: actions/checkout@v3
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: zulu
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: add google-services.json
+        run: echo '${{ secrets.ANDROID_USER_GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
+
+      - name: add local.properties
+        run: |
+          echo kakao_native_app_key=\"${{ secrets.ANDROID_USER_KAKAO_NATIVE_APP_KEY }}\" >> ./local.properties
+          echo kakao_redirection_scheme=\"${{ secrets.ANDROID_USER_KAKAO_REDIRECTION_SCHEME }}\" >> ./local.properties
+          echo base_url=\"$${{ secrets.ANDROID_USER_BASE_URL }}\" >> ./local.properties
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Run ktlint
+        run: ./gradlew ktlintCheck
+
+      - name: Run unit tests
+        run: ./gradlew testDebugUnitTest
+
+      - name: Build assemble release apk
+        run: ./gradlew assembleRelease
 
diff --git a/.github/workflows/closed-issue-notification.yml b/.github/workflows/closed-issue-notification.yml
@@ -1,39 +1,40 @@
 name: Closed Issue Notification
 on:
-  issues: 
-    types: [closed]
-
+  issues:
+    types:
+      - closed
+
 jobs:
-  create-issue: 
+  create-issue:
     name: Send closed issue notification to slack
-    runs-on: ubuntu-latest 
-    steps: 
-    - name: Send Issue
-      uses: 8398a7/action-slack@v3
-      with:
-        status: custom
-        custom_payload: |
-          {
-            text: "*이슈가 닫혔습니다!*",
-            attachments: [{
-              fallback: 'fallback',
-              color: '#7539DE',
-              title: 'Title',
-              text: '<${{ github.event.issue.html_url }}|${{ github.event.issue.title }}>',
-              fields: [{
-                title: 'Issue number',
-                value: '#${{ github.event.issue.number }}',
-                short: true
-              },
-              {
-                title: 'Author',
-                value: '${{ github.event.issue.user.login }}',
-                short: true
-              }],
-              actions: [{
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Issue
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              text: "*이슈가 닫혔습니다!*",
+              attachments: [{
+                fallback: 'fallback',
+                color: '#7539DE',
+                title: 'Title',
+                text: '<${{ github.event.issue.html_url }}|${{ github.event.issue.title }}>',
+                fields: [{
+                  title: 'Issue number',
+                  value: '#${{ github.event.issue.number }}',
+                  short: true
+                },
+                {
+                  title: 'Author',
+                  value: '${{ github.event.issue.user.login }}',
+                  short: true
+                }],
+                actions: [{
+                }]
               }]
-            }]
-          }
-      env:
-        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ISSUE_WEBHOOK_URL }}
-      if: always()
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ISSUE_WEBHOOK_URL }}
+        if: always()
diff --git a/.github/workflows/closed-pr-notification.yml b/.github/workflows/closed-pr-notification.yml
@@ -1,8 +1,11 @@
 name: Closed PR Notification
 on:
   pull_request:
-    branches: [ dev ]
-    types: [ closed ]
+    branches:
+      - dev
+      - main
+    types:
+      - closed
 
 jobs:
   create-issue:

diff --git a/.github/workflows/opend-issue-notification.yml b/.github/workflows/opend-issue-notification.yml
@@ -1,39 +1,40 @@
 name: Opend Issue Notification
 on:
-  issues: 
-    types: [opened]
-
+  issues:
+    types:
+      - opened
+
 jobs:
-  create-issue: 
+  create-issue:
     name: Send opend issue notification to slack
-    runs-on: ubuntu-latest 
-    steps: 
-    - name: Send Issue
-      uses: 8398a7/action-slack@v3
-      with:
-        status: custom
-        custom_payload: |
-          {
-            text: "*새로운 이슈가 생성되었습니다!*",
-            attachments: [{
-              fallback: 'fallback',
-              color: '#1F7629',
-              title: 'Title',
-              text: '<${{ github.event.issue.html_url }}|${{ github.event.issue.title }}>',
-              fields: [{
-                title: 'Issue number',
-                value: '#${{ github.event.issue.number }}',
-                short: true
-              },
-              {
-                title: 'Author',
-                value: '${{ github.event.issue.user.login }}',
-                short: true
-              }],
-              actions: [{
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Issue
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              text: "*새로운 이슈가 생성되었습니다!*",
+              attachments: [{
+                fallback: 'fallback',
+                color: '#1F7629',
+                title: 'Title',
+                text: '<${{ github.event.issue.html_url }}|${{ github.event.issue.title }}>',
+                fields: [{
+                  title: 'Issue number',
+                  value: '#${{ github.event.issue.number }}',
+                  short: true
+                },
+                {
+                  title: 'Author',
+                  value: '${{ github.event.issue.user.login }}',
+                  short: true
+                }],
+                actions: [{
+                }]
               }]
-            }]
-          }
-      env:
-        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ISSUE_WEBHOOK_URL }}
-      if: always()
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ISSUE_WEBHOOK_URL }}
+        if: always()
diff --git a/.github/workflows/opened-pr-notification.yml b/.github/workflows/opened-pr-notification.yml
@@ -1,8 +1,11 @@
 name: Opened PR Notification
 on:
   pull_request:
-    branches: [ dev ]
-    types: [ opened ]
+    branches:
+      - dev
+      - main
+    types:
+      - opened
 
 jobs:
   create-issue:

diff --git a/...om/festago/festago/presentation/ui/reservationcomplete/ReservationCompleteActivityTest.kt b/...om/festago/festago/presentation/ui/reservationcomplete/ReservationCompleteActivityTest.kt
@@ -7,14 +7,13 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import com.festago.festago.R
-import com.festago.festago.presentation.model.ReservedTicketUiModel
 import org.junit.Rule
 import org.junit.Test
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
 class ReservationCompleteActivityTest {
-    private val reservationComplete = ReservedTicketUiModel(1L, 123, LocalDateTime.now())
+    private val reservationComplete = ReservedTicketArg(1L, 123, LocalDateTime.now())
 
     private val intent =
         ReservationCompleteActivity.getIntent(

diff --git a/android/festago/app/src/main/java/com/festago/festago/presentation/mapper/FestivalMapper.kt b/android/festago/app/src/main/java/com/festago/festago/presentation/mapper/FestivalMapper.kt
diff --git a/...id/festago/app/src/main/java/com/festago/festago/presentation/mapper/ReservationMapper.kt b/...id/festago/app/src/main/java/com/festago/festago/presentation/mapper/ReservationMapper.kt
diff --git a/...stago/app/src/main/java/com/festago/festago/presentation/mapper/ReservationStageMapper.kt b/...stago/app/src/main/java/com/festago/festago/presentation/mapper/ReservationStageMapper.kt
diff --git a/...tago/app/src/main/java/com/festago/festago/presentation/mapper/ReservationTicketMapper.kt b/...tago/app/src/main/java/com/festago/festago/presentation/mapper/ReservationTicketMapper.kt
diff --git a/...festago/app/src/main/java/com/festago/festago/presentation/mapper/ReservedTicketMapper.kt b/...festago/app/src/main/java/com/festago/festago/presentation/mapper/ReservedTicketMapper.kt
diff --git a/android/festago/app/src/main/java/com/festago/festago/presentation/mapper/StageMapper.kt b/android/festago/app/src/main/java/com/festago/festago/presentation/mapper/StageMapper.kt
diff --git a/...oid/festago/app/src/main/java/com/festago/festago/presentation/mapper/TicketCodeMapper.kt b/...oid/festago/app/src/main/java/com/festago/festago/presentation/mapper/TicketCodeMapper.kt