[Team-05 iOS JEJE, 만사] OAuth 로그인 화면 & Issue 전체 조회 화면 #27
+5,537
−0
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // | ||
| // EndPoint.swift | ||
| // issueTrackerApp | ||
| // | ||
| // Created by 조중윤 on 2021/06/11. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct IssueEndPoint { | ||
| static let scheme = "https" | ||
| static let host = "f88e009a-3e2b-4862-838e-1f2cde9b95ed.mock.pstmn.io" | ||
| static let basicPath = "/api/issues" | ||
| // static let countPath = "/count" | ||
|
|
||
| static func url() -> URL { | ||
| var components = URLComponents() | ||
| components.scheme = IssueEndPoint.scheme | ||
| components.host = IssueEndPoint.host | ||
| components.path = IssueEndPoint.basicPath | ||
| return components.url! | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // | ||
| // IssueNetworkController.swift | ||
| // issueTrackerApp | ||
| // | ||
| // Created by 조중윤 on 2021/06/13. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| class IssueNetworkController { | ||
| private var requests: [URL: AnyObject] = [:] | ||
|
|
||
| init() { | ||
|
|
||
| } | ||
|
|
||
| func fetchIssues(completion: @escaping ([Issue]) -> Void) { | ||
| let req = IssueRequest() | ||
|
There was a problem hiding this comment. fetchIssues, deleteIssue 호출할 때마다 Request 객체 매번 생성하는 것보다 IssueNetworkController 생성하는 시점에서 한 번만 생성해서 사용해도 무방할거 같은데, 이 부분은 의견이 궁금합니다! |
||
| let requestURL = req.fetchReq.url! | ||
| requests[requestURL] = req | ||
|
|
||
| req.execute { (result) in | ||
| if let _ = result { | ||
| self.requests[requestURL] = nil | ||
| completion(result!) | ||
|
There was a problem hiding this comment.
|
||
| } | ||
| } | ||
| } | ||
|
|
||
| func deleteIssue(with issueId: Int, completion: @escaping (Status) -> Void) { | ||
| let req = IssuePatchRequest() | ||
| var requestURL = req.fetchReq.url! | ||
| requestURL.appendPathComponent(String(issueId), isDirectory: false) | ||
| requests[requestURL] = req | ||
|
|
||
| req.execute { (status) in | ||
| if let _ = status { | ||
|
|
||
| self.requests[requestURL] = nil | ||
| completion(status!) | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // | ||
| // IssuePatchRequest.swift | ||
| // issueTrackerApp | ||
| // | ||
| // Created by 조중윤 on 2021/06/15. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| class IssuePatchRequest { | ||
| let session = URLSession(configuration: .ephemeral, delegate: nil, delegateQueue: .main) | ||
| var task: URLSessionDataTask? | ||
|
|
||
| init() { | ||
| } | ||
| } | ||
|
|
||
| extension IssuePatchRequest: JSONDataRequest { | ||
| typealias ModelType = Status | ||
|
|
||
| var fetchReq: URLRequest { | ||
| let urlComponents = URLComponents(url: IssueEndPoint.url(), resolvingAgainstBaseURL: false)! | ||
| var request = try! URLRequest(url: urlComponents, method: .patch) | ||
| let body = ["delete": true] | ||
| let bodyData = try? JSONSerialization.data( | ||
| withJSONObject: body, | ||
| options: []) | ||
| request.httpBody = bodyData | ||
| return request | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // | ||
| // IssueNetworkRequest.swift | ||
| // issueTrackerApp | ||
| // | ||
| // Created by 조중윤 on 2021/06/11. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| class IssueRequest { | ||
| let session = URLSession(configuration: .ephemeral, delegate: nil, delegateQueue: .main) | ||
| var task: URLSessionDataTask? | ||
|
|
||
| init() { | ||
| } | ||
| } | ||
|
|
||
| extension IssueRequest: JSONDataRequest { | ||
| typealias ModelType = [Issue] | ||
|
|
||
| var fetchReq: URLRequest { | ||
| let urlComponents = URLComponents(url: IssueEndPoint.url(), resolvingAgainstBaseURL: false)! | ||
| let request = try! URLRequest(url: urlComponents, method: .get) | ||
| return request | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // | ||
| // Status.swift | ||
| // issueTrackerApp | ||
| // | ||
| // Created by 조중윤 on 2021/06/15. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| struct Status: Codable { | ||
| let status: String | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // | ||
| // NotificationNameExtension.swift | ||
| // issueTrackerApp | ||
| // | ||
| // Created by 조중윤 on 2021/06/14. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| extension Notification.Name { | ||
| static let didFilterIssueData = Notification.Name("didFilterIssueData") | ||
| static let didReceiveIssueData = Notification.Name("didReceiveIssueData") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // | ||
| // IssueSelectTableViewController.swift | ||
| // issueTrackerApp | ||
| // | ||
| // Created by 조중윤 on 2021/06/15. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class IssueSelectTableViewController: UITableViewController { | ||
|
|
||
| var issues: [Issue] = [] | ||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
|
|
||
| self.configureTableView() | ||
| self.configureBackBarButtonItem() | ||
| self.configureRightBarButtonItem() | ||
| } | ||
|
|
||
| public func prepare(with issues: [Issue]) { | ||
| self.issues = issues | ||
| } | ||
|
|
||
| private func configureTableView() { | ||
| self.tableView.register(IssueCell.nib, forCellReuseIdentifier: IssueCell.identifier) | ||
| self.tableView.allowsMultipleSelection = true | ||
| } | ||
|
|
||
| private func configureBackBarButtonItem() { | ||
| self.navigationItem.hidesBackButton = true | ||
| } | ||
|
|
||
| private func configureRightBarButtonItem() { | ||
| let rightBarButtonItem = UIBarButtonItem(title: "취소", image: nil, primaryAction: UIAction.init(handler: { (touch) in | ||
| self.navigationController?.popViewController(animated: true) | ||
| }), menu: nil) | ||
|
|
||
| self.navigationItem.rightBarButtonItem = rightBarButtonItem | ||
| } | ||
|
|
||
| // MARK: - Table view data source | ||
|
|
||
| override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { | ||
| return self.issues.count | ||
| } | ||
|
|
||
| override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { | ||
|
|
||
| guard let cell = self.tableView.dequeueReusableCell(withIdentifier: IssueCell.identifier) as? IssueCell else { return UITableViewCell() } | ||
| cell.configureAll(with: issues[indexPath.row]) | ||
|
|
||
| return cell | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // | ||
| // IssueViewModel.swift | ||
| // issueTrackerApp | ||
| // | ||
| // Created by 조중윤 on 2021/06/14. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| protocol IssueViewModelProtocol { | ||
| var issues: [Issue] { get } | ||
| var filteredIssues: [Issue] { get set } | ||
| func fetchAllIssue() | ||
| func filterIssuesWithSearchText(_ string: String) | ||
| func deleteIssue(at index: Int, completionHandler: @escaping () -> Void) | ||
| } | ||
|
|
||
| class IssueViewModel: IssueViewModelProtocol { | ||
| var networkController: IssueNetworkController? | ||
| var issues: [Issue] = [] { | ||
| didSet { | ||
| NotificationCenter.default.post(name: .didReceiveIssueData, object: nil) | ||
| } | ||
| } | ||
|
|
||
| var filteredIssues: [Issue] = [] { | ||
| didSet { | ||
| NotificationCenter.default.post(name: .didFilterIssueData, object: nil) | ||
| } | ||
| } | ||
|
|
||
| init(issueNetworkController: IssueNetworkController) { | ||
| self.networkController = issueNetworkController | ||
| } | ||
|
|
||
| func fetchAllIssue() { | ||
| // networkController?.fetchIssues(completion: { (issues) in | ||
| // self.issues = issues | ||
| // }) | ||
| let label1 = Label(id: 1, title: "123", colorCode: "#912939") | ||
| let label2 = Label(id: 1, title: "121233", colorCode: "#153239") | ||
|
|
||
|
|
||
| let issue1 = Issue(id: 123, title: "sdf", description: "sdfsdfsdf", authorAvatarURL: "sdf", labelList: [label1, label2], issueNumber: 1, createdAt: "sdf", milestoneTitle: "milsteon1") | ||
|
|
||
| let issue2 = Issue(id: 13, title: "ssdfsdfdf", description: "sdfsdfsdf", authorAvatarURL: "sdf", labelList: [label1, label2], issueNumber: 1, createdAt: "sdf", milestoneTitle: "milsteon1") | ||
|
|
||
| self.issues = [issue1, issue2] | ||
| } | ||
|
|
||
| func filterIssuesWithSearchText(_ string: String) { | ||
| self.filteredIssues = issues.filter({ (issue: Issue) -> Bool in | ||
| return issue.title.lowercased().contains(string.lowercased()) | ||
| }) | ||
| } | ||
|
|
||
| func deleteIssue(at index: Int, completionHandler: @escaping () -> Void) { | ||
| let issueId = issues[index].id | ||
| networkController?.deleteIssue(with: issueId, completion: { (res) in | ||
| if res.status == "success" { | ||
| self.issues.remove(at: index) | ||
| completionHandler() | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
외부에서 사용하지 않는다면 private 접근제어자 사용하세요🤔