Merge pull request #415 from DeveloperAcademy-POSTECH/release/v1.3.0

[CHORE] v1.3.0 출시에 따른 main 브랜치 업데이트

Author: dangsal

Manito/Manito.xcodeproj/project.pbxproj

@@ -13,8 +13,8 @@ class BaseCollectionViewCell: UICollectionViewCell {
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-        render()
-        configUI()
+        setupLayout()
+        configureUI()
     }
 
     required init?(coder: NSCoder) {
@@ -23,11 +23,11 @@ class BaseCollectionViewCell: UICollectionViewCell {
 
     // MARK: - func
 
-    func render() {
+    func setupLayout() {
         // Override Layout
     }
 
-    func configUI() {
+    func configureUI() {
         // View Configuration
     }
 }

Manito/Manito/Global/Base/BaseCollectionViewCell.swift

@@ -0,0 +1,22 @@
+//
+//  LetterImageError.swift
+//  Manito
+//
+//  Created by SHIN YOON AH on 2023/02/21.
+//
+
+import Foundation
+
+enum LetterImageError: LocalizedError {
+    case invalidImage
+    case invalidPhotoLibrary
+}
+
+extension LetterImageError {
+    var errorDescription: String? {
+        switch self {
+        case .invalidImage: return TextLiteral.letterImageViewControllerErrorMessage
+        case .invalidPhotoLibrary: return TextLiteral.letterImageViewControllerErrorMessage
+        }
+    }
+}

Manito/Manito/Global/Error/Screens/Letter/LetterImageError.swift

@@ -25,6 +25,7 @@ extension UIViewController {
                           message: String,
                           okTitle: String = "확인",
                           cancelTitle: String = "취소",
+                          okStyle: UIAlertAction.Style = .destructive,
                           okAction: ((UIAlertAction) -> Void)?,
                           cancelAction: ((UIAlertAction) -> Void)? = nil,
                           completion : (() -> Void)? = nil) {
@@ -37,7 +38,7 @@ extension UIViewController {
         let cancelAction = UIAlertAction(title: cancelTitle, style: .default, handler: cancelAction)
         alertViewController.addAction(cancelAction)
 
-        let okAction = UIAlertAction(title: okTitle, style: .destructive, handler: okAction)
+        let okAction = UIAlertAction(title: okTitle, style: okStyle, handler: okAction)
         alertViewController.addAction(okAction)
 
         self.present(alertViewController, animated: true, completion: completion)

Manito/Manito/Global/Extension/UIViewController+Extension.swift

@@ -8,6 +8,9 @@
 import Foundation
 
 enum TextLiteral {
+
+    // MARK: - App Name
+    static let appName = Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String ?? "애니또"
 
     // MARK: - AnyWhere
     static let done: String = "완료"
@@ -62,6 +65,8 @@ enum TextLiteral {
     static let mainViewControllerGuideTitle: String = "공통 미션이란?"
     static let mainViewControllerGuideDescription: String = "공통 미션이란?\n마니또에 참여한 모두에게 \n수행하는 미션이에요. "
     static let mainViewControllerNewRoomAlert: String = "새로운 마니또 시작"
+    static let mainViewControllerShowIdErrorAlertTitle: String = "해당 마니또 방의 정보를 불러오지 못했습니다."
+    static let mainViewControllerShowIdErrorAlertMessage: String = "해당 마니또 방으로 이동할 수 없습니다."
 
     // MARK: - OpenManittoViewController
     static let openManittoViewController: String = "당신의 마니또는?"
@@ -90,23 +95,27 @@ enum TextLiteral {
     static let letterHeaderViewSegmentControlManitti: String = "마니띠에게"
     static let letterHeaderViewSegmentControlManitto: String = "마니또로부터"
 
-    // MARK: - SendLetterView
+    // MARK: - BottomSendLetterView
     static let sendLetterViewSendLetterButton: String = "쪽지 쓰기"
 
     // MARK: - IndividualMissionView
     static let individualMissionViewTitleLabel: String = "오늘의 개별 미션"
 
-    // MARK: - LetterTextView
+    // MARK: - CreateLetterTextView
     static let letterTextViewTitleLabel: String = "쪽지 작성"
 
-    // MARK: - LetterPhotoView
+    // MARK: - CreateLetterPhotoView
     static let letterPhotoViewTitleLabel: String = "사진 추가"
     static let letterPhotoViewTakePhoto: String = "사진 촬영"
     static let letterPhotoViewChoosePhoto: String = "사진 보관함에서 선택"
     static let letterPhotoViewDeletePhoto: String = "사진 지우기"
     static let letterPhotoViewChoosePhotoToManitto: String = "마니또에게 보낼 사진 선택"
     static let letterPhotoViewSetting: String = "설정"
     static let letterPhotoViewFail: String = "사진을 불러올 수 없습니다."
+    static let letterPhotoViewErrorTitle: String = "오류"
+    static let letterPhotoViewSettingFail = "설정 화면을 연결할 수 없습니다."
+    static let letterPhotoViewDeviceFail = "해당 기기에서 카메라를 사용할 수 없습니다."
+    static let letterPhotoViewSettingAuthorization = "\(appName)가 카메라에 접근이 허용되어 있지 않습니다. 설정화면으로 가시겠습니까?"
 
     // MARK: - LetterViewController
     static let letterViewControllerTitle = "쪽지함"
@@ -130,6 +139,8 @@ enum TextLiteral {
     // MARK: - CreateLetterViewController
     static let createLetterViewControllerSendButton: String = "보내기"
     static let createLetterViewControllerTitle: String = "쪽지 작성하기"
+    static let createLetterViewControllerErrorTitle = "오류 발생"
+    static let createLetterViewControllerErrorMessage = "쪽지 전송에 실패했습니다. 다시 시도해주세요."
 
 
     // MARK: - DetailIngViewController

Manito/Manito/Global/Literal/TextLiteral.swift

@@ -29,9 +29,9 @@ struct LetterAPI: LetterProtocol {
     }
 
     @discardableResult
-    func dispatchLetter(roomId: String, image: Data? = nil, letter: LetterDTO) async throws -> Int {
+    func dispatchLetter(roomId: String, image: Data? = nil, letter: LetterDTO, missionId: String) async throws -> Int {
         let request = LetterEndPoint
-            .dispatchLetter(roomId: roomId, image: image, letter: letter)
+            .dispatchLetter(roomId: roomId, image: image, letter: letter, missionId: missionId)
             .createRequest()
         return try await self.apiService.request(request)
     }

Manito/Manito/Network/API/LetterAPI.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 enum LetterEndPoint: EndPointable {
-    case dispatchLetter(roomId: String, image: Data?, letter: LetterDTO)
+    case dispatchLetter(roomId: String, image: Data?, letter: LetterDTO, missionId: String)
     case fetchSendLetter(roomId: String)
     case fetchReceiveLetter(roomId: String)
     case patchReadMessage(roomId: String, status: String)
@@ -32,9 +32,10 @@ enum LetterEndPoint: EndPointable {
 
     var requestBody: Data? {
         switch self {
-        case .dispatchLetter(_, let image, let letter):
+        case .dispatchLetter(_, let image, let letter, let missionId):
             let parameters: [String: String?] = ["manitteeId": letter.manitteeId,
-                                                "messageContent": letter.messageContent]
+                                                 "messageContent": letter.messageContent,
+                                                 "missionId": missionId]
             let dataBody = createDataBody(withParameters: parameters,
                                           media: image ?? nil,
                                           boundary: APIEnvironment.boundary)
@@ -51,12 +52,12 @@ enum LetterEndPoint: EndPointable {
 
     func getURL(baseURL: String) -> String {
         switch self {
-        case .dispatchLetter(let roomId,_,_):
+        case .dispatchLetter(let roomId, _, _, _):
             return "\(baseURL)/rooms/\(roomId)/messages-separate"
         case .fetchSendLetter(let roomId):
-            return "\(baseURL)/rooms/\(roomId)/messages-sent"
+            return "https://dev.aenitto.shop/api/v2/rooms/\(roomId)/messages-sent"
         case .fetchReceiveLetter(let roomId):
-            return "\(baseURL)/rooms/\(roomId)/messages-received"
+            return "https://dev.aenitto.shop/api/v2/rooms/\(roomId)/messages-received"
         case .patchReadMessage(let roomId, _):
             return "\(baseURL)/rooms/\(roomId)/messages/status"
         }

Manito/Manito/Network/EndPoint/LetterEndPoint.swift

@@ -11,4 +11,5 @@ enum NetworkError: Error {
     case encodingError
     case clientError(message: String?)
     case serverError
+    case unknownError
 }

Manito/Manito/Network/Foundation/NetworkError.swift

@@ -23,11 +23,20 @@ struct Message: Codable {
     var content: String?
     var imageUrl: String?
     var createdDate: String?
+    var missionInfo: Mission?
+
+    var isToday: Bool {
+        return Date().letterDateToString == createdDate
+    }
 
     var date: String {
         guard let createdDate = createdDate else { return "" }
-        let isToday = Date().letterDateToString == createdDate
-        
-        return isToday ? "오늘" : createdDate
+        return self.isToday ? "오늘" : createdDate
+    }
+
+    var mission: String? {
+        guard let mission = missionInfo?.content else { return nil }
+
+        return "\(date)의 개별미션\n[\(mission)]"
     }
 }

Manito/Manito/Network/Models/Letter.swift

@@ -10,5 +10,5 @@ import Foundation
 protocol LetterProtocol {
     func fetchSendLetter(roomId: String) async throws -> Letter?
     func fetchReceiveLetter(roomId: String) async throws -> Letter?
-    func dispatchLetter(roomId: String, image: Data?, letter: LetterDTO) async throws -> Int
+    func dispatchLetter(roomId: String, image: Data?, letter: LetterDTO, missionId: String) async throws -> Int
 }