Merge pull request #113 from EAT-SSU/develop

[QA] v2.1.1.2 테스트 플라이트 업로드
EAT-SSU · Sep 24, 2024 · dd888b4 · dd888b4
2 parents 58828e0 + e6e02dd
commit dd888b4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -22,15 +22,17 @@ jobs:
           BASE_URL: ${{ secrets.BASE_URL }}
           KAKAO_API_KEY: ${{ secrets.KAKAO_API_KEY }}
         run: |
+          cd EATSSU_MVC/EATSSU_MVC/Resources
+          mkdir Secrets
+          cd Secrets
+
           echo "BASE_URL = $BASE_URL" >> Release.xcconfig
           echo "KAKAO_API_KEY = $KAKAO_API_KEY" >> Release.xcconfig
           cat Release.xcconfig
-          mv Release.xcconfig EATSSU_MVC/EATSSU_MVC/Resources/Secrets
 
           echo "BASE_URL = $BASE_URL" >> Debug.xcconfig
           echo "KAKAO_API_KEY = $KAKAO_API_KEY" >> Debug.xcconfig
           cat Debug.xcconfig
-          mv Debug.xcconfig EATSSU_MVC/EATSSU_MVC/Resources/Secrets
 
       - name: Install Dependencies
         run: |

diff --git a/EATSSU_MVC/EATSSU_MVC/Sources/Notification/NotificationManager.swift b/EATSSU_MVC/EATSSU_MVC/Sources/Notification/NotificationManager.swift
@@ -56,11 +56,13 @@ class NotificationManager {
 
 	/// 평일 11시에 앱의 유입을 유도하는 푸시 알림을 취소하는 메소드
 	func cancelWeekday11AMNotification() {
-		let weekday = [2, 3, 4, 5, 6]
-		let identifier = "weekdayNotification-\(weekday)"
+		let weekdays = [2, 3, 4, 5, 6]
 
-		let center = UNUserNotificationCenter.current()
-		center.removePendingNotificationRequests(withIdentifiers: [identifier])
+		for weekday in weekdays {
+			let identifier = "weekdayNotification-\(weekday)"
+			let center = UNUserNotificationCenter.current()
+			center.removePendingNotificationRequests(withIdentifiers: [identifier])
+		}
 	}
 
 	/// 앱 실행 시 알림 발송 권한을 요청하는 팝업 호출 메소드

diff --git a/EATSSU_MVC/EATSSU_MVC/Sources/Presentation/MyPage/ViewController/MyPageViewController.swift b/EATSSU_MVC/EATSSU_MVC/Sources/Presentation/MyPage/ViewController/MyPageViewController.swift
@@ -146,7 +146,7 @@ extension MyPageViewController: UITableViewDataSource {
 
 			NotificationManager.shared.checkNotificationSetting { setting in
 				switch setting.authorizationStatus {
-				case .authorized,.notDetermined, .provisional, .ephemeral:
+				case .authorized, .notDetermined, .provisional, .ephemeral:
 					DispatchQueue.main.async {
 						cell.toggleSwitch.setOn(self.switchState, animated: true)
 					}