feat #47: 그룹 API 연동

+ 그룹 탈퇴 추가, '인증 대기' -> '검사 대기' 문구 수정, UI 일부 개선

Author: seungyooooong

dogether/Data/Model/RankingModel.swift

@@ -10,6 +10,5 @@ import Foundation
 struct RankingModel: Codable {
     let rank: Int
     let name: String
-    let certificationRate: Int
-    let approvalRate: Int
+    let certificationRate: Double
 }

dogether/Data/Network/Request/CreateGroupRequest.swift

@@ -7,18 +7,18 @@
 
 import Foundation
 
-struct CreateGroupRequest: GroupInfo, Encodable {
-    let groupName: String
-    let memberCount: Int
+struct CreateGroupRequest: Encodable {
+    let name: String
+    let maximumMemberCount: Int
     let startAt: String
-    let challengeDuration: Int
-    let dailyTodoLimit: Int
+    let durationOption: Int
+    let maximumTodoCount: Int
 
-    init(groupName: String, memberCount: Int, startAt: GroupStartAts, challengeDuration: GroupChallengeDurations, dailyTodoLimit: Int) {
-        self.groupName = groupName
-        self.memberCount = memberCount
+    init(name: String, maximumMemberCount: Int, startAt: GroupStartAts, durationOption: GroupChallengeDurations, maximumTodoCount: Int) {
+        self.name = name
+        self.maximumMemberCount = maximumMemberCount
         self.startAt = startAt.rawValue
-        self.challengeDuration = challengeDuration.rawValue
-        self.dailyTodoLimit = dailyTodoLimit
+        self.durationOption = durationOption.rawValue
+        self.maximumTodoCount = maximumTodoCount
     }
 }

dogether/Data/Network/Response/GetGroupInfoResponse.swift

@@ -7,8 +7,10 @@
 
 import Foundation
 
-struct GetGroupInfoResponse: GroupInfo, Decodable {
-    let groupName: String
-    let memberCount: Int
-    let dailyTodoLimit: Int
+struct GetGroupInfoResponse: Decodable {
+    let name: String
+    let duration: Int
+    let joinCode: String
+    let endAt: String
+    let remainingDays: Int
 }

dogether/Data/Network/Response/GetGroupStatusResponse.swift

@@ -0,0 +1,12 @@
+//
+//  GetGroupStatusResponse.swift
+//  dogether
+//
+//  Created by seungyooooong on 2/20/25.
+//
+
+import Foundation
+
+struct GetGroupStatusResponse: Decodable {
+    let status : String
+}

dogether/Data/Network/Response/GetIsJoiningResponse.swift

@@ -0,0 +1,12 @@
+//
+//  GetIsJoiningResponse.swift
+//  dogether
+//
+//  Created by seungyooooong on 2/19/25.
+//
+
+import Foundation
+
+struct GetIsJoiningResponse: Decodable {
+    let isJoining: Bool
+}

dogether/Data/Network/Response/GetMySummaryResponse.swift

@@ -7,14 +7,11 @@
 
 import Foundation
 
-/// 참여중인 그룹의 내 누적 활동 통계 조회
-struct GetMySummaryResponse: TotalCount, Decodable {
-    /// 작성한 전체 투두 개수
+struct GetMySummaryResponse: Decodable {
     let totalTodoCount: Int
     /// 인증한 전체 투두 개수
     let totalCertificatedCount: Int
     /// 인정받은 투두 개수
     let totalApprovedCount: Int
-    /// 노인정 투두 개수
     let totalRejectedCount: Int
 }

dogether/Data/Network/Response/GetTeamSummaryResponse.swift

@@ -7,9 +7,6 @@
 
 import Foundation
 
-struct GetTeamSummaryResponse: TotalCount, Decodable {
-    let totalTodoCount: Int
-    let totalCertificatedCount: Int
-    let totalApprovedCount: Int
+struct GetTeamSummaryResponse: Decodable {
     let ranking: [RankingModel]
 }

dogether/Data/Network/Router/GroupsRouter.swift

@@ -13,6 +13,9 @@ enum GroupsRouter: NetworkEndpoint {
     case getGroupInfo
     case getMySummary
     case getTeamSummary
+    case getIsJoining
+    case leaveGroup
+    case getGroupStatus
 
     var path: String {
         switch self {
@@ -26,15 +29,23 @@ enum GroupsRouter: NetworkEndpoint {
             return Path.api + Path.groups + Path.summary + "/my"
         case .getTeamSummary:
             return Path.api + Path.groups + Path.summary + "/team"
+        case .getIsJoining:
+            return Path.api + Path.groups + "/isJoining"
+        case .leaveGroup:
+            return Path.api + Path.groups + "/leave"
+        case .getGroupStatus:
+            return Path.api + Path.groups + "/my" + "/status"
         }
     }
 
     var method: NetworkMethod {
         switch self {
-        case .getGroupInfo, .getMySummary, .getTeamSummary:
+        case .getGroupInfo, .getMySummary, .getTeamSummary, .getIsJoining, .getGroupStatus:
             return .get
         case .createGroup, .joinGroup:
             return .post
+        case .leaveGroup:
+            return .delete
         }
     }
 

dogether/Data/Protocol/GroupInfo.swift

@@ -10,7 +10,7 @@ import UIKit
 
 enum FilterTypes: String, CaseIterable {
     case all = "전체"
-    case wait = "인증 대기"
+    case wait = "검사 대기"
     case reject = "노인정"
     case approve = "인정"
 

dogether/Data/Protocol/TotalCount.swift

@@ -0,0 +1,24 @@
+//
+//  GroupInfo.swift
+//  dogether
+//
+//  Created by seungyooooong on 2/19/25.
+//
+
+import Foundation
+
+struct GroupInfo {
+    let name: String
+    let duration: Int
+    let joinCode: String
+    let endAt: String
+    let remainingDays: Int
+    
+    init(name: String = "", duration: Int = 0, joinCode: String = "", endAt: String = "", remainingDays: Int = 0) {
+        self.name = name
+        self.duration = duration
+        self.joinCode = joinCode
+        self.endAt = endAt
+        self.remainingDays = remainingDays
+    }
+}

dogether/Domain/Entity/FilterTypes.swift

@@ -8,7 +8,7 @@
 import Foundation
 import UIKit
 
-enum GroupTypes {
+enum GroupTypes: Int {
     case join
     case create
 

dogether/Domain/Entity/GroupInfo.swift

@@ -50,6 +50,6 @@ final class DogetherHeader: UIView {
     }
 
     @objc private func didTapMyPageButton() {
-        // TODO: 추후 마이페이지로 이동하도록 구현
+        NavigationManager.shared.pushViewController(MyPageViewController())
     }
 }

dogether/Domain/Entity/GroupTypes.swift

@@ -12,6 +12,8 @@ import SnapKit
 final class CompleteViewController: BaseViewController {
     private let groupType: GroupTypes
 
+    var viewModel = CompleteViewModel()
+    
     private let firecrackerImageView = {
         let imageView = UIImageView()
         imageView.image = .firecracker
@@ -83,7 +85,7 @@ final class CompleteViewController: BaseViewController {
             groupInfoView = DogetherGroupInfo(groupName: "groupName", memberCount: 0, duration: .threeDays, startAt: .today)
         case .create:
             noticeLabel.text = groupType.completeNoticeText
-            joinCodeLabel.text = "123456"
+            joinCodeLabel.text = viewModel.joinCode
             joinCodeShareButton.addTarget(self, action: #selector(didTapJoinCodeShareButton), for: .touchUpInside)
         }
     }

dogether/Presentation/Common/DogetherHeader.swift

@@ -73,6 +73,7 @@ final class GroupCreateViewController: BaseViewController {
         let view = UIView()
         view.backgroundColor = .grey800
         view.layer.cornerRadius = 12
+        view.layer.borderWidth = 1
         return view
     }()
     private let groupNameTextField = {
@@ -89,13 +90,21 @@ final class GroupCreateViewController: BaseViewController {
         return textField
     }()
     private let groupNameCountLabel = {
+        let label = UILabel()
+        label.text = "0"
+        label.font = Fonts.smallS
+        return label
+    }()
+    private let groupNameMaxLengthLabel = {
         let label = UILabel()
         label.textColor = .grey300
         label.font = Fonts.smallS
         return label
     }()
     private var memberCountView = UIView()
     private var todoLimitView = UIView()
+    
+    // TODO: 추후 durationStackView, startAtStackView 공용 컴포넌트로 빼기
     private func durationButton(duration: GroupChallengeDurations) -> UIButton {
         let button = UIButton()
         button.backgroundColor = .grey800
@@ -190,9 +199,11 @@ final class GroupCreateViewController: BaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        groupNameTextField.becomeFirstResponder()
         setupKeyboardHandling()
     }
 
+    // TODO: 추후 확인 필요 (하도 헤메다가 추가한 부분이라.. 무슨 의미를 갖는지 모르겠네요)
     deinit {
         NotificationCenter.default.removeObserver(self)
     }
@@ -213,7 +224,9 @@ final class GroupCreateViewController: BaseViewController {
 
         completeButton.action = { @MainActor in
             if self.viewModel.currentStep == .four {
-                NavigationManager.shared.setNavigationController(CompleteViewController(type: .create))
+                let completeViewController = CompleteViewController(type: .create)
+                completeViewController.viewModel.joinCode = await self.viewModel.getJoinCode()
+                NavigationManager.shared.setNavigationController(completeViewController)
             } else {
                 await self.viewModel.completeAction()
                 self.updateStep()
@@ -223,7 +236,7 @@ final class GroupCreateViewController: BaseViewController {
         groupName = componentTitleLabel(componentTitle: "그룹명")
         groupNameTextField.delegate = self
         groupNameTextField.addTarget(self, action: #selector(didChangeGroupName), for: .editingChanged)
-        groupNameCountLabel.text = "0/\(viewModel.groupNameMaxLength)"
+        groupNameMaxLengthLabel.text = "/\(viewModel.groupNameMaxLength)"
         memberCount = componentTitleLabel(componentTitle: "그룹 인원")
         memberCountView = DogetherCountView(changeCountAction: {
             self.viewModel.updateMemberCount(count: $0)
@@ -265,7 +278,7 @@ final class GroupCreateViewController: BaseViewController {
         ].forEach { view.addSubview($0) }
 
         [
-            groupName, groupNameView, groupNameTextField, groupNameCountLabel,
+            groupName, groupNameView, groupNameTextField, groupNameCountLabel, groupNameMaxLengthLabel,
             memberCount, memberCountView
         ].forEach { stepOneView.addSubview($0) }
 
@@ -325,6 +338,11 @@ final class GroupCreateViewController: BaseViewController {
             $0.height.equalTo(25)
         }
         groupNameCountLabel.snp.makeConstraints {
+            $0.centerY.equalTo(groupNameView)
+            $0.right.equalTo(groupNameMaxLengthLabel.snp.left)
+            $0.height.equalTo(18)
+        }
+        groupNameMaxLengthLabel.snp.makeConstraints {
             $0.centerY.equalTo(groupNameView)
             $0.right.equalTo(groupNameView).inset(16)
             $0.height.equalTo(18)
@@ -466,9 +484,9 @@ final class GroupCreateViewController: BaseViewController {
         }
 
         Task { @MainActor in
-            let (groupName, countLabelText, buttonStatus) = await viewModel.updateGroupName(groupName: groupNameTextField.text)
+            let (groupName, buttonStatus) = await viewModel.updateGroupName(groupName: groupNameTextField.text)
             groupNameTextField.text = groupName
-            groupNameCountLabel.text = countLabelText
+            groupNameCountLabel.text = String(groupName.count)
             completeButton.setButtonStatus(status: buttonStatus)
         }
     }
@@ -545,17 +563,21 @@ extension GroupCreateViewController: UITextFieldDelegate {
 
     @objc private func keyboardWillShow(_ notification: NSNotification) {
         guard let keyboardFrame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue else { return }
+        groupNameView.layer.borderColor = UIColor.blue300.cgColor
+        groupNameCountLabel.textColor = .blue300
         completeButton.snp.updateConstraints {
             $0.bottom.equalToSuperview().inset(keyboardFrame.cgRectValue.height + 16)
         }
-        UIView.animate(withDuration: 0.3) { self.view.layoutIfNeeded() }
+        self.view.layoutIfNeeded()
     }
 
     @objc private func keyboardWillHide(_ notification: NSNotification) {
+        groupNameView.layer.borderColor = UIColor.grey800.cgColor
+        groupNameCountLabel.textColor = .grey300
         completeButton.snp.updateConstraints {
             $0.bottom.equalToSuperview().inset(48)
         }
-        UIView.animate(withDuration: 0.3) { self.view.layoutIfNeeded() }
+        self.view.layoutIfNeeded()
     }
 
     @objc private func dismissKeyboard() { view.endEditing(true) }