feat #47: 투두 API 연동

+ UI/UX 일부 수정, 온보딩 화면에서 isJoining 임시로 추가

Author: seungyooooong

dogether/Data/Network/Response/GetMyTodosResponse.swift

@@ -0,0 +1,12 @@
+//
+//  GetMyTodosResponse.swift
+//  dogether
+//
+//  Created by seungyooooong on 2/19/25.
+//
+
+import Foundation
+
+struct GetMyTodosResponse: Decodable {
+    let todos: [TodoInfo]
+}

dogether/Data/Network/Router/TodosRouter.swift

@@ -10,6 +10,7 @@ import Foundation
 enum TodosRouter: NetworkEndpoint {
     case createTodos(createTodosRequest: CreateTodosRequest)
     case certifyTodo(todoId: String, certifyTodoRequest: CertifyTodoRequest)
+    case getMyTodos(date: String, status: TodoStatus?)
     case getMyYesterdayTodos
 
     var path: String {
@@ -18,14 +19,16 @@ enum TodosRouter: NetworkEndpoint {
             return Path.api + Path.todos
         case .certifyTodo(let todoId, _):
             return Path.api + Path.todos + "/\(todoId)/certify"
+        case .getMyTodos:
+            return Path.api + Path.todos + "/my"
         case .getMyYesterdayTodos:
             return Path.api + Path.todos + "/my/yesterday"
         }
     }
 
     var method: NetworkMethod {
         switch self {
-        case .getMyYesterdayTodos:
+        case .getMyTodos, .getMyYesterdayTodos:
             return .get
         case .createTodos, .certifyTodo:
             return .post
@@ -34,6 +37,10 @@ enum TodosRouter: NetworkEndpoint {
 
     var parameters: [URLQueryItem]? {
         switch self {
+        case .getMyTodos(let date, let status):
+            var parameters: [URLQueryItem] = [.init(name: "date", value: date)]
+            if let status { parameters.append(.init(name: "status", value: status.rawValue)) }
+            return parameters
         default:
             return nil
         }

dogether/Domain/Entity/TodoInfo.swift

@@ -7,20 +7,27 @@
 
 import Foundation
 
-struct TodoInfo {
+struct TodoInfo: Decodable {
     let id: Int
     let content: String
-    var status: TodoStatus
-    var mediaUrl: String?
-    var todoContent: String?
+    var status: String
+    var certificationContent: String?
+    var certificationMediaUrl: String?
     var rejectReason: String?
 
-    init(id: Int, content: String, status: TodoStatus, mediaUrl: String? = nil, todoContent: String? = nil, rejectReason: String? = nil) {
+    init(
+        id: Int,
+        content: String,
+        status: String,
+        certificationContent: String? = nil,
+        certificationMediaUrl: String? = nil,
+        rejectReason: String? = nil
+    ) {
         self.id = id
         self.content = content
         self.status = status
-        self.mediaUrl = mediaUrl
-        self.todoContent = todoContent
+        self.certificationContent = certificationContent
+        self.certificationMediaUrl = certificationMediaUrl
         self.rejectReason = rejectReason
     }
 }

dogether/Domain/Entity/TodoStatus.swift

@@ -8,11 +8,24 @@
 import Foundation
 import UIKit
 
-enum TodoStatus {
-    case waitCertificattion
-    case waitExamination
-    case reject
-    case approve
+enum TodoStatus: String, CaseIterable {
+    case waitCertificattion = "CERTIFY_PENDING"
+    case waitExamination = "REVIEW_PENDING"
+    case reject = "REJECT"
+    case approve = "APPROVE"
+    
+    var tag: Int {
+        switch self {
+        case .waitCertificattion:
+            return 0
+        case .waitExamination:
+            return 1
+        case .reject:
+            return 2
+        case .approve:
+            return 3
+        }
+    }
 
     var image: UIImage? {
         switch self {

dogether/Presentation/Common/CertificationImageView.swift

@@ -9,11 +9,11 @@ import Foundation
 import UIKit
 
 final class CertificationImageView: UIImageView {
-    private(set) var todoContent: String
+    private(set) var certificationContent: String
     private(set) var certificator: String
 
-    init(image: UIImage?, todoContent: String = "", certificator: String = "") {
-        self.todoContent = todoContent
+    init(image: UIImage?, certificationContent: String = "", certificator: String = "") {
+        self.certificationContent = certificationContent
         self.certificator = certificator
 
         super.init(image: image)
@@ -39,7 +39,7 @@ final class CertificationImageView: UIImageView {
         return view
     }()
 
-    private let todoContentLabel = {
+    private let certificationContentLabel = {
         let label = UILabel()
         label.textColor = .grey100
         label.font = Fonts.body1R
@@ -63,16 +63,16 @@ final class CertificationImageView: UIImageView {
         layer.cornerRadius = 12
         contentMode = .scaleAspectFit
 
-        todoContentLabel.text = todoContent
+        certificationContentLabel.text = certificationContent
         certificatorLabel.text = certificator
 
-        [gradientView, todoContentLabel, certificatorLabel].forEach { addSubview($0) }
+        [gradientView, certificationContentLabel, certificatorLabel].forEach { addSubview($0) }
 
         gradientView.snp.makeConstraints {
             $0.edges.equalToSuperview()
         }
 
-        todoContentLabel.snp.makeConstraints {
+        certificationContentLabel.snp.makeConstraints {
             $0.centerX.equalToSuperview()
             $0.bottom.equalTo(certificatorLabel.snp.top).inset(4)
             $0.height.equalTo(25)

dogether/Presentation/Common/CertificationInfoPopupView.swift

@@ -78,14 +78,13 @@ final class CertificationInfoPopupView: UIView {
         // TODO: 추후 수정
         imageView = CertificationImageView(
             image: .logo,
-            todoContent: todoInfo.todoContent ?? "",
+            certificationContent: todoInfo.certificationContent ?? "",
             certificator: UserDefaultsManager.shared.userFullName ?? ""
         )
 
-        statusView = FilterButton(
-            action: { _ in },
-            type: todoInfo.status == .waitExamination ? .wait : todoInfo.status == .reject ? .reject : .approve
-        )
+        guard let status = TodoStatus(rawValue: todoInfo.status),
+              let filterType = FilterTypes.allCases.first(where: { $0.tag == status.tag }) else { return }
+        statusView = FilterButton(action: { _ in }, type: filterType)
 
         contentLabel.attributedText = NSAttributedString(
             string: todoInfo.content,

dogether/Presentation/Common/CertificationPopupView.swift

@@ -16,9 +16,11 @@ final class CertificationPopupView: UIView {
     private let certificationMaxLength = 20
 
     // TODO: 추후 수정
+    private var todoInfo: TodoInfo
     private var completeAction: (String) -> Void
 
-    init(completeAction: @escaping (String) -> Void) {
+    init(todoInfo: TodoInfo, completeAction: @escaping (String) -> Void) {
+        self.todoInfo = todoInfo
         self.completeAction = completeAction
         super.init(frame: .zero)
         setUI()
@@ -188,7 +190,7 @@ final class CertificationPopupView: UIView {
 
         closeButton.addTarget(self, action: #selector(didTapCloseButton), for: .touchUpInside)
         todoContentLabel.attributedText = NSAttributedString(
-            string: "일이삼사오육칠팔구십일이삼사오육칠팔구십",
+            string: todoInfo.content,
             attributes: Fonts.getAttributes(for: Fonts.head1B, textAlignment: .center)
         )
 

dogether/Presentation/Common/DogetherGroupInfo.swift

@@ -87,7 +87,7 @@ final class DogetherGroupInfo: UIView {
 
         groupNameLabel.text = groupName
 
-        durationDescriptionLabel.text = "총 회차"
+        durationDescriptionLabel.text = "총 기간"
         memberCountDescriptionLabel.text = "그룹원"
         startDayDescriptionLabel.text = "시작일"
         endDayDescriptionLabel.text = "종료일"

dogether/Presentation/Common/DogetherTodoItem.swift

@@ -57,20 +57,21 @@ final class DogetherTodoItem: UIButton {
             $0.height.equalTo(64)
         }
 
-        if todo.status != .waitCertificattion {
+        if todo.status != TodoStatus.waitCertificattion.rawValue {
+            let imageSize = todo.status == TodoStatus.waitExamination.rawValue ? 22 : todo.status == TodoStatus.reject.rawValue ? 26 : 28 // MARK: 임의로 사이즈 조정
             todoImageView.snp.makeConstraints {
                 $0.centerY.equalToSuperview()
                 $0.left.equalToSuperview().offset(16)
-                $0.width.height.equalTo(todo.status == .waitExamination ? 22 : todo.status == .reject ? 26 : 28)    // MARK: 임의로 사이즈 조정
+                $0.width.height.equalTo(imageSize)
             }
         }
 
         contentLabel.snp.makeConstraints {
             $0.centerY.equalToSuperview()
             $0.left.equalTo(
-                todo.status == .waitCertificattion ? dogetherTodoItem : todoImageView.snp.right
+                todo.status == TodoStatus.waitCertificattion.rawValue ? dogetherTodoItem : todoImageView.snp.right
             ).offset(
-                todo.status == .waitCertificattion ? 16 : 8
+                todo.status == TodoStatus.waitCertificattion.rawValue ? 16 : 8
             )
         }
 
@@ -83,25 +84,26 @@ final class DogetherTodoItem: UIButton {
     }
 
     func updateTodoStatus(_ status: TodoStatus) {
-        self.todo.status = status
+        self.todo.status = status.rawValue
         updateUI()
     }
 
     private func updateUI() {
-        todoImageView.image = todo.status.image
-        if todo.status == .waitCertificattion {
+        guard let status = TodoStatus(rawValue: todo.status) else { return }
+        todoImageView.image = status.image
+        if status == .waitCertificattion {
             contentLabel.text = todo.content
         } else {
             let attributes: [NSAttributedString.Key: Any] = [
                 .strikethroughStyle: NSUnderlineStyle.single.rawValue,
-                .strikethroughColor: todo.status.contentColor
+                .strikethroughColor: status.contentColor
             ]
             contentLabel.attributedText = NSAttributedString(string: todo.content, attributes: attributes)
         }
-        contentLabel.textColor = todo.status.contentColor
-        buttonLabel.text = todo.status.buttonText
-        buttonLabel.textColor = todo.status.buttonTextColor
-        buttonLabel.backgroundColor = todo.status.buttonColor
+        contentLabel.textColor = status.contentColor
+        buttonLabel.text = status.buttonText
+        buttonLabel.textColor = status.buttonTextColor
+        buttonLabel.backgroundColor = status.buttonColor
     }
 
     @objc private func didTapTodoItem() {

dogether/Presentation/Common/ExaminationModalityView.swift

@@ -81,7 +81,7 @@ final class ExaminationModalityView: UIView {
         // TODO: 추후 수정
         imageView = CertificationImageView(
             image: .logo,
-            todoContent: todoInfo.todoContent ?? "",
+            certificationContent: todoInfo.certificationContent ?? "",
             certificator: UserDefaultsManager.shared.userFullName ?? ""
         )
 

dogether/Presentation/View/CompleteViewController.swift

@@ -152,6 +152,6 @@ final class CompleteViewController: BaseViewController {
 
     @objc private func didTapJoinCodeShareButton() {
         // TODO: 추후 수정
-        present(UIActivityViewController(activityItems: ["123456"], applicationActivities: nil), animated: true)
+        present(UIActivityViewController(activityItems: [viewModel.joinCode], applicationActivities: nil), animated: true)
     }
 }