Release Version 1.6.3 (#354)

Boolti/Boolti/Application/AppDelegate.swift

@@ -14,13 +14,13 @@ import FirebaseMessaging
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
-
+    
     private let pushNotificationRepository = PushNotificationRepository(networkService: NetworkProvider())
-
+    
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         RxKakaoSDK.initSDK(appKey: Environment.KAKAO_NATIVE_APP_KEY)
         FirebaseApp.configure()
-
+        
         /// 앱 실행 시 알림 허용 권한 받기 및 필요한 권한 설정
         UNUserNotificationCenter.current().delegate = self
         let authOptions: UNAuthorizationOptions = [.alert, .badge, .sound]
@@ -29,59 +29,59 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             completionHandler: { _, _ in }
         )
         application.registerForRemoteNotifications()
-
+        
         /// 메시지 대리자 설정
         Messaging.messaging().delegate = self
-
+        
         /// 자동 초기화 방지
         Messaging.messaging().isAutoInitEnabled = true
-
+        
         /// 탭 Bar index 초기화하기/destination 초기화하기
         UserDefaults.tabBarIndex = 0
         UserDefaults.landingDestination = nil
-
+        
         return true
     }
-
+    
     /// fcm에 device token 등록
     func application(_ application: UIApplication,
                      didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         Messaging.messaging().apnsToken = deviceToken
     }
-
+    
     // MARK: UISceneSession Lifecycle
-
+    
     func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
         return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
     }
-
+    
     func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) { }
 }
 
 // MARK: - MessagingDelegate
 
 extension AppDelegate: MessagingDelegate {
-
+    
     /// 토큰 갱신 모니터링 & 토큰 가져오기
     func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
         guard let fcmToken else { return }
         debugPrint(fcmToken)
         self.registerSubject()
-
+        
         // 토큰이 갱신될 경우
         self.pushNotificationRepository.registerDeviceToken()
     }
-
+    
     private func registerSubject() {
         /// 주제 구독
         let defaultTopic: String
-
-        #if DEBUG
+        
+#if DEBUG
         defaultTopic = "dev"
-        #elseif RELEASE
+#elseif RELEASE
         defaultTopic = "prod"
-        #endif
-
+#endif
+        
         Messaging.messaging().subscribe(toTopic: defaultTopic) { error in
             if let error {
                 debugPrint(error)
@@ -95,30 +95,30 @@ extension AppDelegate: MessagingDelegate {
 // MARK: - UNUserNotificationCenterDelegate
 
 extension AppDelegate: UNUserNotificationCenterDelegate {
-
+    
     /// 푸시 클릭시
     func userNotificationCenter(_ center: UNUserNotificationCenter,
                                 didReceive response: UNNotificationResponse,
                                 withCompletionHandler completionHandler: @escaping () -> Void) {
-
+        
         let userInfo = response.notification.request.content.userInfo
-
+        
         if let notificationMessage = titleData(from: userInfo) {
             self.configureDestination(with: notificationMessage)
         }
         completionHandler()
     }
-
+    
     /// Foreground에 푸시알림이 올 때 실행되는 메서드
     func userNotificationCenter(_ center: UNUserNotificationCenter,willPresent notification: UNNotification,withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
         completionHandler([.badge, .sound, .list, .banner])
     }
-
+    
     private func titleData(from userInfo: [AnyHashable : Any]) -> NotificationMessage? {
         guard let messageType = userInfo["type"] as? String else { return nil }
         return NotificationMessage(messageType)
     }
-
+    
     private func configureDestination(with notificationMessage: NotificationMessage) {
         UserDefaults.tabBarIndex = notificationMessage.tabBarIndex
         NotificationCenter.default.post(

Boolti/Boolti/Resources/Assets.xcassets/add_circle.imageset/Contents.json

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

Boolti/Boolti/Resources/Assets.xcassets/camera.imageset/Contents.json

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

Boolti/Boolti/Resources/Assets.xcassets/delete.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Boolti/Boolti/Resources/Assets.xcassets/link.imageset/Contents.json

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

Boolti/Boolti/Resources/Assets.xcassets/pencil.imageset/Contents.json

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

Boolti/Boolti/Sources/Entities/Auth/ProfileEntity.swift

@@ -0,0 +1,13 @@
+//
+//  ProfileEntity.swift
+//  Boolti
+//
+//  Created by Juhyeon Byun on 9/7/24.
+//
+
+struct ProfileEntity {
+    let profileImageURL: String
+    let nickname: String
+    let introduction: String
+    var links: [LinkEntity]
+}

Boolti/Boolti/Sources/Network/APIs/AuthAPI.swift

@@ -17,10 +17,22 @@ enum AuthAPI {
     case refresh(requestDTO: TokenRefreshRequestDTO)
     case resign(requestDTO: ResignRequestDTO)
     case user
+    case editProfile(requestDTO: EditProfileRequestDTO)
+    case getUploadImageURL
+    case uploadProfileImage(data: UploadProfileImageRequestDTO)
 }
 
 extension AuthAPI: ServiceAPI {
 
+    var baseURL: URL {
+        switch self {
+        case .uploadProfileImage(let data):
+            return URL(string: data.uploadUrl)!
+        default:
+            return URL(string: Environment.BASE_URL)!
+        }
+    }
+
     var path: String {
         switch self {
         case .login(let provider, _):
@@ -31,8 +43,12 @@ extension AuthAPI: ServiceAPI {
             return "/papi/v1/signup/sns"
         case .refresh:
             return "/papi/v1/login/refresh"
-        case .resign, .user:
+        case .resign, .user, .editProfile:
             return "/api/v1/user"
+        case .getUploadImageURL:
+            return "/api/v1/user/profile-images/upload-urls"
+        case .uploadProfileImage:
+            return ""
         }
     }
 
@@ -42,17 +58,23 @@ extension AuthAPI: ServiceAPI {
             return .delete
         case .user:
             return .get
+        case .editProfile:
+            return .patch
+        case .uploadProfileImage:
+            return .put
         default:
             return .post
         }
     }
 
     var headers: [String : String]? {
         switch self {
-        case .logout, .user:
+        case .logout, .user, .getUploadImageURL:
             return nil
-        case .login, .refresh, .signup, .resign:
+        case .login, .refresh, .signup, .resign, .editProfile:
             return ["Content-Type": "application/json"]
+        case .uploadProfileImage:
+            return ["Content-Type": "image/jpeg"]
         }
     }
 
@@ -67,14 +89,18 @@ extension AuthAPI: ServiceAPI {
                 params = ["idToken": DTO.accessToken]
             }
             return .requestParameters(parameters: params, encoding: JSONEncoding.prettyPrinted)
-        case .logout, .user:
+        case .logout, .user, .getUploadImageURL:
             return .requestPlain
         case .signup(let DTO):
             return .requestJSONEncodable(DTO)
         case .refresh(let DTO):
             return .requestJSONEncodable(DTO)
         case .resign(let DTO):
             return .requestJSONEncodable(DTO)
+        case .editProfile(let DTO):
+            return .requestJSONEncodable(DTO)
+        case .uploadProfileImage(let DTO):
+            return .requestData(DTO.imageData.jpegData(compressionQuality: 0.8) ?? Data())
         }
     }
 }

Boolti/Boolti/Sources/Network/DTO/Auth/Request/EditProfileRequestDTO.swift

@@ -0,0 +1,13 @@
+//
+//  EditProfileRequestDTO.swift
+//  Boolti
+//
+//  Created by Juhyeon Byun on 9/5/24.
+//
+
+struct EditProfileRequestDTO: Encodable {
+    let nickname: String
+    let profileImagePath: String
+    let introduction: String
+    let link: [LinkEntity]
+}

Boolti/Boolti/Sources/Network/DTO/Auth/Request/UploadProfileImageRequestDTO.swift

@@ -0,0 +1,20 @@
+//
+//  UploadProfileImageRequestDTO.swift
+//  Boolti
+//
+//  Created by Juhyeon Byun on 9/6/24.
+//
+
+import UIKit
+
+struct UploadProfileImageRequestDTO {
+
+    let uploadUrl: String
+    let imageData: UIImage
+
+    init(uploadUrl: String, image: UIImage) {
+        self.uploadUrl = uploadUrl
+        self.imageData = image
+    }
+
+}

Boolti/Boolti/Sources/Network/DTO/Auth/Response/GetUploadURLReponseDTO.swift

@@ -0,0 +1,13 @@
+//
+//  GetUploadURLReponseDTO.swift
+//  Boolti
+//
+//  Created by Juhyeon Byun on 9/6/24.
+//
+
+struct GetUploadURLReponseDTO: Decodable {
+
+    let uploadUrl: String
+    let expectedUrl: String
+
+}

Boolti/Boolti/Sources/Network/DTO/Auth/Response/UserResponseDTO.swift

@@ -14,4 +14,12 @@ struct UserResponseDTO: Decodable {
     let userCode: String?
     let email: String?
     let imgPath: String?
+    let introduction: String?
+    let link: [LinkEntity]?
+
+}
+
+struct LinkEntity: Codable, Equatable {
+    let title: String
+    let link: String
 }

Boolti/Boolti/Sources/Network/Foundation/AuthInterceptor.swift

@@ -21,10 +21,14 @@ final class AuthInterceptor: RequestInterceptor {
 
         var urlRequest = urlRequest
 
-        urlRequest.headers.add(.authorization(bearerToken: UserDefaults.accessToken))
-
-        debugPrint("🔥 요청한 AccessToken: \(UserDefaults.accessToken) 🔥")
-        debugPrint("🔥 요청한 userId: \(UserDefaults.userId) 🔥")
+        if urlRequest.method == .put {
+            debugPrint("🔥 이미지 업로드 요청 🔥")
+        } else {
+            urlRequest.headers.add(.authorization(bearerToken: UserDefaults.accessToken))
+
+            debugPrint("🔥 요청한 AccessToken: \(UserDefaults.accessToken) 🔥")
+            debugPrint("🔥 요청한 userId: \(UserDefaults.userId) 🔥")
+        }
 
         completion(.success(urlRequest))
     }