Merge pull request #100 from EAT-SSU/develop

[QA] v2.1.0 을 테스트 플라이트에 올립니다.

Author: jayn2u

Diff for: EATSSU_MVC/EATSSU_MVC/Resources/Color.xcassets/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Color.xcassets/Contents.json

@@ -2,5 +2,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "provides-namespace" : true
   }
 }

Diff for: EATSSU_MVC/EATSSU_MVC/Resources/Color.xcassets/GrayScale/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Color.xcassets/GrayScale/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "KakaoLoginButton.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Diff for: EATSSU_MVC/EATSSU_MVC/Resources/Color.xcassets/GrayScale/gray100.colorset/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Color.xcassets/GrayScale/gray100.colorset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "LookAroundButton.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Diff for: EATSSU_MVC/EATSSU_MVC/Resources/Color.xcassets/GrayScale/gray200.colorset/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Color.xcassets/GrayScale/gray200.colorset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Unsubscribe.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Diff for: EATSSU_MVC/EATSSU_MVC/Resources/Color.xcassets/GrayScale/gray300.colorset/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Color.xcassets/GrayScale/gray300.colorset/Contents.json

@@ -9,7 +9,8 @@ import UIKit
 
 import SnapKit
 
-class NoticeViewController:BaseViewController {
+/// FirebaseRemoteConfig 관련 ViewController
+class NoticeViewController: BaseViewController {
 
     // MARK: - Properties
     var noticeMessage: String

Diff for: EATSSU_MVC/EATSSU_MVC/Resources/Color.xcassets/GrayScale/gray400.colorset/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Color.xcassets/GrayScale/gray400.colorset/Contents.json

@@ -13,6 +13,10 @@ class RealmService{
     static let shared = RealmService()
 
     let realm = try! Realm()
+    
+    init() {
+        print("Realm Location: ", realm.configuration.fileURL ?? "cannot find location.")
+    }
 
     func addToken(accessToken:String,refreshToken:String) {
         let token = Token(accessToken: accessToken,refreshToken: refreshToken)
@@ -40,20 +44,19 @@ class RealmService{
         try! realm.write {
             realm.deleteAll()
         }
-        
     }
-
-    func addUser(accessToken: String, nickName: String) {
-        let nickName = NickName(accessToken: accessToken, nickName: nickName)
-        try! realm.write {
-            realm.add(nickName)
+    
+    func deleteAll<T: Object>(_ objectType: T.Type) {
+        do {
+            let objects = realm.objects(objectType)
+            try realm.write {
+                realm.delete(objects)
+                print("Successfully deleted all objects of type \(objectType)")
+            }
+        } catch let error {
+            print(error)
         }
     }
-
-    init() {
-        print("Realm Location: ", realm.configuration.fileURL ?? "cannot find location.")
-    }
-
 }
 
 

Diff for: EATSSU_MVC/EATSSU_MVC/Resources/Color.xcassets/GrayScale/gray500.colorset/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Color.xcassets/GrayScale/gray500.colorset/Contents.json

@@ -0,0 +1,40 @@
+//
+//  UserInfo.swift
+//  EatSSU-iOS
+//
+//  Created by 박윤빈 on 2023/08/02.
+//
+
+import RealmSwift
+import Realm
+
+class UserInfo: Object {
+
+    @Persisted(primaryKey: true) var id: String = UUID().uuidString
+    @Persisted var nickname: String = ""
+    @Persisted private var accountTypeRaw: String?
+
+    var accountType: AccountType? {
+        get {
+            guard let rawValue = accountTypeRaw else { return nil }
+            return AccountType(rawValue: rawValue)
+        }
+        set {
+            accountTypeRaw = newValue?.rawValue
+        }
+    }
+    
+    convenience init(accountType: AccountType) {
+        self.init()
+        self.accountType = accountType
+    }
+    
+    func updateNickname(_ nickname: String) {
+        self.nickname = nickname
+    }
+    
+    enum AccountType: String {
+        case apple = "Apple"
+        case kakao = "Kakao"
+    }
+}

Diff for: EATSSU_MVC/EATSSU_MVC/Resources/Color.xcassets/GrayScale/gray600.colorset/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Color.xcassets/GrayScale/gray600.colorset/Contents.json

@@ -0,0 +1,48 @@
+//
+//  UserInfoManager.swift
+//  EATSSU
+//
+//  Created by 최지우 on 9/19/24.
+//
+
+import RealmSwift
+
+class UserInfoManager {
+    static let shared = UserInfoManager()
+    private init() {}
+    
+    private var realm: Realm {
+        do {
+            return try Realm()
+        } catch {
+            fatalError("Realm을 초기화하는데 실패했습니다: \(error)")
+        }
+    }
+    
+    func createUserInfo(accountType: UserInfo.AccountType) -> UserInfo {
+        let userInfo = UserInfo(accountType: accountType)
+        do {
+            try realm.write {
+                realm.add(userInfo)
+            }
+            return userInfo
+        } catch {
+            print("UserInfo 생성 중 오류 발생: \(error)")
+            return userInfo
+        }
+    }
+    
+    func updateNickname(for userInfo: UserInfo, nickname: String) {
+        do {
+            try realm.write {
+                userInfo.updateNickname(nickname)
+            }
+        } catch {
+            print("닉네임 업데이트 중 오류 발생: \(error)")
+        }
+    }
+    
+    func getCurrentUserInfo() -> UserInfo? {
+        return realm.objects(UserInfo.self).first
+    }
+}

Diff for: EATSSU_MVC/EATSSU_MVC/Resources/Color.xcassets/GrayScale/gray700.colorset/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Color.xcassets/GrayScale/gray700.colorset/Contents.json

@@ -9,63 +9,65 @@ import Foundation
 import UserNotifications
 
 class NotificationManager {
-  
-  // MARK: - Properties
-  
-  static let shared = NotificationManager()
+	// MARK: - Properties
 
-  // MARK: - Methods
+	static let shared = NotificationManager()
 
-  /// 평일 11시에 앱의 유입을 유도하는 알림을 발송하는 메소드
-  ///
-  /// - Title : 🤔 오늘 밥 뭐 먹지…
-  /// - Body : 오늘의 학식을 확인해보세요!
-  func scheduleWeekday11AMNotification() {
-    let center = UNUserNotificationCenter.current()
+	// MARK: - Methods
 
-    // 알림 콘텐츠 설정
-    let content = UNMutableNotificationContent()
+	/// 평일 11시에 앱의 유입을 유도하는 푸시 알림을 발송하는 메소드
+	///
+	/// - Title : 🤔 오늘 밥 뭐 먹지…
+	/// - Body : 오늘의 학식을 확인해보세요!
+	func scheduleWeekday11AMNotification() {
+		let center = UNUserNotificationCenter.current()
 
-    content.title = TextLiteral.Notification.dailyWeekdayNotificationTitle
-    content.body = TextLiteral.Notification.dailyWeekdayNotificationBody
-    content.sound = .default
+		// 알림 콘텐츠 설정
+		let content = UNMutableNotificationContent()
 
-    // 반복할 요일 및 시간 설정 (평일 오전 11시)
-    let calendar = Calendar.current
-    let weekdays = [2, 3, 4, 5, 6]  // 월, 화, 수, 목, 금 (Calendar에서 1이 일요일)
+		content.title = TextLiteral.Notification.dailyWeekdayNotificationTitle
+		content.body = TextLiteral.Notification.dailyWeekdayNotificationBody
+		content.sound = .default
 
-    for weekday in weekdays {
-      var dateComponents = DateComponents()
-      dateComponents.hour = 11
-      dateComponents.minute = 0
-      dateComponents.weekday = weekday
+		// 반복할 요일 및 시간 설정 (평일 오전 11시)
+		let weekdays = [2, 3, 4, 5, 6] // 월, 화, 수, 목, 금 (Calendar에서 1이 일요일)
 
-      let trigger = UNCalendarNotificationTrigger(dateMatching: dateComponents, repeats: true)
+		for weekday in weekdays {
+			var dateComponents = DateComponents()
+			dateComponents.hour = 11
+			dateComponents.minute = 0
+			dateComponents.weekday = weekday
 
-      // 고유한 식별자를 위해 weekday를 사용
-      let identifier = "weekdayNotification-\(weekday)"
-      let request = UNNotificationRequest(
-        identifier: identifier, content: content, trigger: trigger)
+			let trigger = UNCalendarNotificationTrigger(dateMatching: dateComponents, repeats: true)
 
-      // 알림 등록
-      center.add(request) { error in
-        if let error = error {
-          print("알림 등록 간 에러 메시지: \(error.localizedDescription)")
-        }
-      }
-    }
-  }
+			// 고유한 식별자를 위해 weekday를 사용
+			let identifier = "weekdayNotification-\(weekday)"
+			let request = UNNotificationRequest(
+				identifier: identifier, content: content, trigger: trigger)
 
-  /// 앱 실행 시 알림 발송 권한을 요청하는 팝업 호출 메소드
-  func requestNotificationPermission() {
-    UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) {
-      granted, error in
-      if granted {
-        print("알림 권한 승인됨")
-      } else {
-        print("알림 권한 거부됨")
-      }
-    }
-  }
+			// 알림 등록
+			center.add(request) { error in
+				if let error = error {
+					print("알림 등록 간 에러 메시지: \(error.localizedDescription)")
+				}
+			}
+		}
+	}
 
+	/// 평일 11시에 앱의 유입을 유도하는 푸시 알림을 취소하는 메소드
+	func cancelWeekday11AMNotification() {
+		let weekday = [2, 3, 4, 5, 6]
+		let identifier = "weekdayNotification-\(weekday)"
+
+		let center = UNUserNotificationCenter.current()
+		center.removePendingNotificationRequests(withIdentifiers: [identifier])
+	}
+
+	/// 앱 실행 시 알림 발송 권한을 요청하는 팝업 호출 메소드
+	func requestNotificationPermission(completion: @escaping (_ granted : Bool) -> Void) {
+		UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) {
+			granted, _ in
+			completion(granted)
+		}
+	}
 }

Diff for: EATSSU_MVC/EATSSU_MVC/Resources/Color.xcassets/Main/Contents.json renamed to EATSSU_MVC/EATSSU_MVC/Resources/Assets/Color.xcassets/Main/Contents.json

@@ -135,6 +135,9 @@ final class LoginViewController: BaseViewController {
         case nil:
             self.pushToNicknameVC()
         default:
+            if let currentUserInfo = UserInfoManager.shared.getCurrentUserInfo() {
+                UserInfoManager.shared.updateNickname(for: currentUserInfo, nickname: info.nickname ?? "")
+            }
             self.changeIntoHomeViewController()
         }
     }
@@ -194,6 +197,7 @@ extension LoginViewController {
                     let responseData = try moyaResponse.map(BaseResponse<SignResponse>.self)
                     self.addTokenInRealm(accessToken: responseData.result.accessToken,
                                          refreshToken: responseData.result.refreshToken)
+                    let userInfo = UserInfoManager.shared.createUserInfo(accountType: .kakao)
                     self.getMyInfo()
                 } catch(let err) {
                     self.presentBottomAlert(err.localizedDescription)
@@ -231,6 +235,7 @@ extension LoginViewController {
                   let responseData = try JSONDecoder().decode(BaseResponse<SignResponse>.self, from: moyaResponse.data)
                     self.addTokenInRealm(accessToken: responseData.result.accessToken,
                                          refreshToken: responseData.result.refreshToken)
+                    let userInfo = UserInfoManager.shared.createUserInfo(accountType: .apple)
                     self.getMyInfo()
                 } catch(let err) {
                     self.presentBottomAlert(err.localizedDescription)