From 3e8df865a55d1f1c6b682ef9fa1b196ea5c415ef Mon Sep 17 00:00:00 2001 From: yeonee Date: Tue, 18 Aug 2026 17:32:39 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20#494=20=EC=A2=8B=EC=95=84?= =?UTF-8?q?=EC=9A=94=20true=EC=9D=BC=20=EB=95=8C=EB=A7=8C=20=EC=A7=91?= =?UTF-8?q?=EA=B3=84=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewController/CommonQuestHistoryViewController.swift | 4 +++- .../ViewController/CommonQuestMyAnswersViewController.swift | 4 +++- .../Quest/ViewController/CommonQuestViewController.swift | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestHistoryViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestHistoryViewController.swift index bf8d662e..6fbe4710 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestHistoryViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestHistoryViewController.swift @@ -304,7 +304,9 @@ extension CommonQuestHistoryViewController { let entity = result.entity self?.rootView.questContentView.updateUI(likeCount: entity.likeCount, isLiked: entity.isLiked) - Mixpanel.mainInstance().track(event: CommonJourneyEvents.Name.commonJourneyLike) + if entity.isLiked { + Mixpanel.mainInstance().track(event: CommonJourneyEvents.Name.commonJourneyLike) + } case .failure(let error): ByeBooLogger.error(error) } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestMyAnswersViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestMyAnswersViewController.swift index 03f79a82..a14ef3d8 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestMyAnswersViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestMyAnswersViewController.swift @@ -115,7 +115,9 @@ extension CommonQuestMyAnswersViewController { isLiked: entity.isLiked ) - Mixpanel.mainInstance().track(event: CommonJourneyEvents.Name.commonJourneyLike) + if entity.isLiked { + Mixpanel.mainInstance().track(event: CommonJourneyEvents.Name.commonJourneyLike) + } case .failure(let error): ByeBooLogger.error(error) } diff --git a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestViewController.swift b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestViewController.swift index 0b620031..3c450872 100644 --- a/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestViewController.swift +++ b/ByeBoo-iOS/ByeBoo-iOS/Presentation/Feature/Quest/ViewController/CommonQuestViewController.swift @@ -95,7 +95,9 @@ extension CommonQuestViewController { let entity = result.entity self?.updateLikeCount(answerID: result.answerID, likeCount: entity.likeCount, isLiked: entity.isLiked) - Mixpanel.mainInstance().track(event: CommonJourneyEvents.Name.commonJourneyLike) + if entity.isLiked { + Mixpanel.mainInstance().track(event: CommonJourneyEvents.Name.commonJourneyLike) + } case .failure(let error): ByeBooLogger.error(error) } From 435b0de255f8ba507f707312e02c41f775917371 Mon Sep 17 00:00:00 2001 From: Lee Nayeon Date: Tue, 18 Aug 2026 17:35:23 +0900 Subject: [PATCH 2/2] =?UTF-8?q?docs:=20#494=20yml=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/fastlane_ci.yml | 34 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/fastlane_ci.yml b/.github/workflows/fastlane_ci.yml index f401f7e5..89853d8f 100644 --- a/.github/workflows/fastlane_ci.yml +++ b/.github/workflows/fastlane_ci.yml @@ -1,9 +1,12 @@ name: Fastlane CI on: + push: + branches: + - release pull_request: branches: - - main + - release - develop types: [closed] @@ -11,11 +14,14 @@ jobs: fastlane: name: Run Fastlane runs-on: macos-latest - if: github.event.pull_request.merged == true - + if: github.event_name == 'push' || github.event.pull_request.merged == true + defaults: + run: + working-directory: ./ByeBoo-iOS + steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -36,12 +42,10 @@ jobs: - name: Run upload_testflight if: github.event.pull_request.base.ref == 'develop' env: - APPLE_ID: ${{ secrets.APPLE_ID }} - APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} - FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} - FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} + APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }} + APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }} + APP_STORE_CONNECT_API_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }} APP_IDENTIFIER: ${{ secrets.APP_IDENTIFIER }} - FASTLANE_ITC_TEAM_ID: ${{ secrets.FASTLANE_ITC_TEAM_ID }} TEAM_ID: ${{ secrets.TEAM_ID }} PRIVATE_REPOSITORY: ${{ secrets.PRIVATE_REPOSITORY }} MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }} @@ -49,15 +53,13 @@ jobs: DISCORD_URL: ${{ secrets.DISCORD_URL }} run: bundle exec fastlane upload_testflight - - name: Run release_app_store on main - if: github.event.pull_request.base.ref == 'main' + - name: Run release_app_store on release + if: github.event_name == 'push' || github.event.pull_request.base.ref == 'release' env: - APPLE_ID: ${{ secrets.APPLE_ID }} - APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} - FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} - FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} + APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }} + APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }} + APP_STORE_CONNECT_API_KEY_CONTENT: ${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }} APP_IDENTIFIER: ${{ secrets.APP_IDENTIFIER }} - FASTLANE_ITC_TEAM_ID: ${{ secrets.FASTLANE_ITC_TEAM_ID }} TEAM_ID: ${{ secrets.TEAM_ID }} PRIVATE_REPOSITORY: ${{ secrets.PRIVATE_REPOSITORY }} MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}