[Team-11] 새로운 이슈 만들기 기능 추가, DIContainer 에 대한 고찰

IssueTracker/IssueTracker.xcodeproj/project.pbxproj

@@ -14,6 +14,7 @@
 		005E48D62862AE91004BD5F6 /* Container.swift in Sources */ = {isa = PBXBuildFile; fileRef = 005E48D52862AE91004BD5F6 /* Container.swift */; };
 		005E48D828630635004BD5F6 /* NewIssueViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 005E48D728630635004BD5F6 /* NewIssueViewController.swift */; };
 		005E48DA28636064004BD5F6 /* Devider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 005E48D928636064004BD5F6 /* Devider.swift */; };
+		00AF8F282869A7060009674C /* Repository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00AF8F272869A7060009674C /* Repository.swift */; };
 		00BCB406285B01AA005E87BC /* Issue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00BCB405285B01AA005E87BC /* Issue.swift */; };
 		00BCB408285B0262005E87BC /* Label.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00BCB407285B0262005E87BC /* Label.swift */; };
 		00BCB40A285B027B005E87BC /* Milestone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00BCB409285B027B005E87BC /* Milestone.swift */; };
@@ -68,6 +69,7 @@
 		005E48D52862AE91004BD5F6 /* Container.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Container.swift; sourceTree = "<group>"; };
 		005E48D728630635004BD5F6 /* NewIssueViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewIssueViewController.swift; sourceTree = "<group>"; };
 		005E48D928636064004BD5F6 /* Devider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Devider.swift; sourceTree = "<group>"; };
+		00AF8F272869A7060009674C /* Repository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Repository.swift; sourceTree = "<group>"; };
 		00BCB405285B01AA005E87BC /* Issue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Issue.swift; sourceTree = "<group>"; };
 		00BCB407285B0262005E87BC /* Label.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = "<group>"; };
 		00BCB409285B027B005E87BC /* Milestone.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Milestone.swift; sourceTree = "<group>"; };
@@ -145,9 +147,9 @@
 		981BD438285B123A00DDDE64 /* Issue */ = {
 			isa = PBXGroup;
 			children = (
-				988FA2E92864034C0058C333 /* OptionSelectViewController.swift */,
 				98130E1A285AC8A5001B6DA1 /* IssueViewController.swift */,
 				005E48D728630635004BD5F6 /* NewIssueViewController.swift */,
+				988FA2E92864034C0058C333 /* OptionSelectViewController.swift */,
 				00567EEA2861B43600F3E8EC /* Model */,
 				00567EE92861B42A00F3E8EC /* Service */,
 				981BD439285B124E00DDDE64 /* View */,
@@ -182,6 +184,7 @@
 				00BCB407285B0262005E87BC /* Label.swift */,
 				00BCB409285B027B005E87BC /* Milestone.swift */,
 				00BCB40B285B076B005E87BC /* State.swift */,
+				00AF8F272869A7060009674C /* Repository.swift */,
 			);
 			path = Entity;
 			sourceTree = "<group>";
@@ -437,6 +440,7 @@
 				00BCB40C285B076B005E87BC /* State.swift in Sources */,
 				988FA2EA2864034C0058C333 /* OptionSelectViewController.swift in Sources */,
 				00BCB406285B01AA005E87BC /* Issue.swift in Sources */,
+				00AF8F282869A7060009674C /* Repository.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

IssueTracker/IssueTracker/AppDelegate.swift

@@ -11,10 +11,10 @@ import UIKit
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-    private let container = Container()
-
     var window: UIWindow?
 
+    let container = Container()
+
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // TODO: - 토큰 유효기간 판단
         // 토큰저장할때: 토큰 & 토큰이 저장된 시간 & 유효시간(1일)

IssueTracker/IssueTracker/Container.swift

@@ -7,11 +7,14 @@
 
 import UIKit
 
+import UIKit
+
 struct Container {
     enum Screen {
         case login
         case issue(token: String)
         case newIssue
+        case optionSelect(token: String, repositories: [Repository])
     }
 
     func buildRootViewController() -> UIViewController {
@@ -30,9 +33,11 @@ struct Container {
             let service = IssueService()
             let model = IssueModel(service: service, token: token)
             let viewController = IssueViewController(model: model)
-            return UINavigationController(rootViewController: vc)
+            return UINavigationController(rootViewController: viewController)
         case .newIssue:
             return NewIssueViewController()
+        case .optionSelect(let token, let repositories):
+            return OptionSelectViewController(token: token, options: repositories)
         }
     }
 }

IssueTracker/IssueTracker/Entity/Issue.swift

@@ -16,11 +16,6 @@ struct Issue: Codable {
     let repository: Repository
 }
 
-struct Repository: Codable {
-    let name: String
-    let owner: Owner
-}
-
 struct Owner: Codable {
     let login: String
 }

IssueTracker/IssueTracker/Entity/Repository.swift

@@ -0,0 +1,14 @@
+//
+//  Repository.swift
+//  IssueTracker
+//
+//  Created by Bibi on 2022/06/27.
+//
+
+import Foundation
+
+
+struct Repository: Codable {
+    let name: String
+    let owner: Owner
+}

IssueTracker/IssueTracker/GitHub/RequestURL.swift

@@ -4,6 +4,7 @@ enum RequestURL: CustomStringConvertible {
     case authorize
     case accessToken
     case issues
+    case userIssues
     case createIssue(owner: String, repo: String)
     case repos
 
@@ -15,10 +16,12 @@ enum RequestURL: CustomStringConvertible {
             return "https://github.com/login/oauth/access_token"
         case .issues:
             return "https://api.github.com/issues"
+        case .userIssues:
+            return "https://api.github.com/user/issues"
         case let .createIssue(owner, repo):
             return "https://api.github.com/repos/\(owner)/\(repo)/issues"
         case .repos:
-            return "https://github.com/user/repos"
+            return "https://api.github.com/user/repos"
         }
     }
 }

IssueTracker/IssueTracker/Issue/IssueViewController.swift

@@ -25,8 +25,6 @@ final class IssueViewController: UIViewController {
         }))
         button.setImage(UIImage(systemName: "plus"), for: .normal)
 
-//        button.layer.cornerRadius = 50 / 2
-
         return button
     }()
 
@@ -48,7 +46,7 @@ final class IssueViewController: UIViewController {
         setupViews()
         model.requestIssue()
         model.updatedIssues = { [weak self] issues in
-            DispatchQueue.main.async { [weak self] in 
+            DispatchQueue.main.async { [weak self] in
                 self?.collectionView.reloadData()
             }
         }
@@ -64,7 +62,14 @@ final class IssueViewController: UIViewController {
     }
 
     @objc func touchedAddButton() {
-        self.navigationController?.pushViewController(Container().buildViewController(.newIssue), animated: true)
+        guard let appdelegate = UIApplication.shared.delegate as? AppDelegate else {
+            return
+        }
+        guard let viewController = appdelegate.container.buildViewController(.newIssue) as? NewIssueViewController else {
+            return
+        }
+        self.navigationController?.pushViewController(viewController, animated: true)
+        viewController.delegate = self
     }
 
     private func setupNavigationBar() {
@@ -149,3 +154,9 @@ extension IssueViewController: UICollectionViewDelegateFlowLayout {
         return CGSize(width: collectionView.frame.width, height: 200)
     }
 }
+
+extension IssueViewController: NewIssueCreateDelegate {
+    func created() {
+        model.requestIssue()
+    }
+}

IssueTracker/IssueTracker/Issue/NewIssueViewController.swift

@@ -6,9 +6,43 @@
 //
 
 import UIKit
+import SwiftUI
+
+protocol NewIssueCreateDelegate: AnyObject {
+    func created()
+}
 
 class NewIssueViewController: UIViewController {
 
+    weak var delegate: NewIssueCreateDelegate?
+
+    private let service = IssueService()
+
+    private let optionList = Option.allCases
+    private var selectedList = Array<String>(repeating: "", count: Option.allCases.count)
+
+    private var selectedRepo: Repository?
+
+    enum Option: CaseIterable {
+        case repository
+        case label
+        case milestone
+        case assignee
+
+        var description: String {
+            switch self {
+            case .repository:
+                return "저장소"
+            case .label:
+                return "레이블"
+            case .milestone:
+                return "마일스톤"
+            case .assignee:
+                return "담당자"
+            }
+        }
+    }
+
     private lazy var navSegmentedControl: UISegmentedControl = {
         let buttonList = ["마크다운", "미리보기"]
         var control = UISegmentedControl(items: buttonList)
@@ -38,7 +72,6 @@ class NewIssueViewController: UIViewController {
         return devider
     }()
 
-    private let optionList = ["저장소", "레이블", "마일스톤", "담당자"]
     private let optionTableCellIdentifier = "optionTableCellIdentifier"
 
     private lazy var optionTable: UITableView = {
@@ -109,7 +142,6 @@ class NewIssueViewController: UIViewController {
             make.top.equalTo(horizontalDevider.snp.bottom)
             make.leading.trailing.equalTo(self.view.safeAreaLayoutGuide)
             make.bottom.equalTo(optionTable.snp.top)
-
         }
     }
 
@@ -129,18 +161,53 @@ class NewIssueViewController: UIViewController {
     }()
 
     private func touchedCreateButton() {
-        // TODO: 이슈생성
-        //1. api 호출
-        //2. api 가 성공적으로 응답을 보내줬다면 =>
-            //2-1. 이전 화면으로 돌아가고
-            //2-2. 이슈 목록 조회 다시해서 보여주기
-        //3. api 가 실패했다면 => issue 생성실패 얼럿띄우기
-
+        guard let token = GithubUserDefaults.getToken(),
+            let selectedRepo = selectedRepo else {
+            return
+        }
+        guard let titleString = self.titleField.text,
+           !titleString.isEmpty else {
+            // TODO: - 타이틀 입력 값이 없다 => 얼럿
+            return
+        }
+
+        service.createIssue(title: titleString, repo: selectedRepo, accessToken: token) { boolResult in
+            if boolResult {
+                self.navigationController?.popViewController(animated: true)
+                self.delegate?.created()
+            }
+        }
     }
 }
 
 extension NewIssueViewController: UITableViewDelegate {
-
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        switch optionList[indexPath.row] {
+        case .repository:
+            // TODO: issueService의 requestRepos() 연결해서 저장소목록 보여주기
+            guard let appdelegate = UIApplication.shared.delegate as? AppDelegate,
+                  let token = GithubUserDefaults.getToken() else {
+                return
+            }
+
+            service.requestRepos(accessToken: token) { result in
+                switch result {
+                case .success(let repositoryList):
+                    guard let viewController = appdelegate.container.buildViewController(.optionSelect(token: token, repositories: repositoryList)) as? OptionSelectViewController else {
+                        return
+                    }
+                    self.navigationController?.pushViewController(viewController, animated: true)
+                    viewController.delegate = self
+                case .failure(let error):
+                    print(error)
+                }
+            }
+
+
+        default:
+            break
+        }
+    }
 }
 
 extension NewIssueViewController: UITableViewDataSource {
@@ -152,8 +219,8 @@ extension NewIssueViewController: UITableViewDataSource {
         let cell = tableView.dequeueReusableCell(withIdentifier: optionTableCellIdentifier,
                                                  for: indexPath)
         var sidebarCell = UIListContentConfiguration.sidebarCell()
-        sidebarCell.text = optionList[indexPath.item]
-        sidebarCell.secondaryText = "선택내용"
+        sidebarCell.text = optionList[indexPath.item].description
+        sidebarCell.secondaryText = selectedList[indexPath.item]
         sidebarCell.prefersSideBySideTextAndSecondaryText = true
 
         cell.contentConfiguration = sidebarCell
@@ -162,3 +229,11 @@ extension NewIssueViewController: UITableViewDataSource {
     }
 
 }
+
+extension NewIssueViewController: OptionSelectDelegate {
+    func selected(item: Repository) {
+        selectedList[0] = item.name
+        selectedRepo = item
+        self.optionTable.reloadData()
+    }
+}

IssueTracker/IssueTracker/Issue/OptionSelectViewController.swift

@@ -1,11 +1,30 @@
 import UIKit
 import SnapKit
 
-class OptionSelectViewController: UIViewController {
+protocol OptionSelectDelegate: AnyObject {
+    func selected(item: Repository)
+}
 
-    private let dummy = ["bug", "feature", "document"]
+class OptionSelectViewController: UIViewController {
+
+    weak var delegate: OptionSelectDelegate?
+
+    private let service = IssueService()
+    private var token: String?
+    private var options: [Repository]?
+
     private let tableViewCellIdentifier = "tableViewCellIdentifier"
 
+    init(token: String, options: [Repository]) {
+        super.init(nibName: nil, bundle: nil)
+        self.token = token
+        self.options = options
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -32,20 +51,31 @@ class OptionSelectViewController: UIViewController {
 
 extension OptionSelectViewController: UITableViewDelegate {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        // TODO: - 선택한 옵션을 이전 ViewController 에 넘겨주기
+        guard let options = options else {
+            return
+        }
+        let selectedItem = options[indexPath.row]
+        delegate?.selected(item: selectedItem)
+        self.navigationController?.popViewController(animated: true)
     }
 }
 
 extension OptionSelectViewController: UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return dummy.count
+        guard let options = options else {
+            return 0
+        }
+        return options.count
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        guard let options = options else {
+            return UITableViewCell()
+        }
         let cell = tableView.dequeueReusableCell(withIdentifier: tableViewCellIdentifier,
                                                  for: indexPath)
         var content = cell.defaultContentConfiguration()
-        content.attributedText = NSAttributedString(string: dummy[indexPath.row])
+        content.attributedText = NSAttributedString(string: options[indexPath.row].name)
         cell.contentConfiguration = content
         return cell
     }