-
Notifications
You must be signed in to change notification settings - Fork 0
[FD1 - 2] 서버와 로컬 간의 폴더 정보를 동기화 한다. #134
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
klmyoungyun
wants to merge
1
commit into
client/develop
Choose a base branch
from
client/feature/#97
base: client/develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
24 changes: 24 additions & 0 deletions
24
client/Projects/OpenList/OpenList/Data/DTO/FolderResponseDTO.swift
This file contains hidden or 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 @@ | ||
// | ||
// FolderResponseDTO.swift | ||
// OpenList | ||
// | ||
// Created by 김영균 on 11/29/23. | ||
// | ||
|
||
import Foundation | ||
|
||
struct FolderResponseDTO: Decodable { | ||
let folderId: Int | ||
let title: String | ||
let user: UserResponseDTO | ||
let createdAt: String | ||
let updatedAt: String | ||
|
||
enum CodingKeys: String, CodingKey { | ||
case folderId | ||
case title | ||
case user = "owner" | ||
case createdAt | ||
case updatedAt | ||
} | ||
} |
20 changes: 20 additions & 0 deletions
20
client/Projects/OpenList/OpenList/Data/DTO/UserResponseDTO.swift
This file contains hidden or 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,20 @@ | ||
// | ||
// UserResponseDTO.swift | ||
// OpenList | ||
// | ||
// Created by 김영균 on 11/29/23. | ||
// | ||
|
||
import Foundation | ||
|
||
struct UserResponseDTO: Decodable { | ||
let userId: Int | ||
let email: String | ||
let providerId: String | ||
let provider: String | ||
let fullName: String | ||
let nickname: String | ||
let profileImage: String | ||
let createdAt: String | ||
let updatedAt: String | ||
} |
36 changes: 36 additions & 0 deletions
36
client/Projects/OpenList/OpenList/Data/Repositories/DefaultFolderRepository.swift
This file contains hidden or 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,36 @@ | ||
// | ||
// DefaultFolderRepository.swift | ||
// OpenList | ||
// | ||
// Created by 김영균 on 11/29/23. | ||
// | ||
|
||
import CustomNetwork | ||
import Foundation | ||
|
||
final class DefaultFolderRepository { | ||
private let session: CustomSession | ||
|
||
init(session: CustomSession = CustomSession(configuration: .default, interceptor: AccessTokenInterceptor())) { | ||
self.session = session | ||
} | ||
} | ||
|
||
extension DefaultFolderRepository: FolderRepository { | ||
enum Constant { | ||
static let baseUrl = "https://openlist.kro.kr/folders" | ||
} | ||
|
||
func fetchAllFolders() async throws -> [CheckListFolderItem] { | ||
var builder = URLRequestBuilder(url: Constant.baseUrl) | ||
builder.addHeader( | ||
field: "Content-Type", | ||
value: "application/json" | ||
) | ||
let service = NetworkService(customSession: session, urlRequestBuilder: builder) | ||
let data = try await service.getData() | ||
let folderResponseDTO = try JSONDecoder().decode([FolderResponseDTO].self, from: data) | ||
let folders = folderResponseDTO.map { CheckListFolderItem(folderId: $0.folderId, title: $0.title) } | ||
return folders | ||
} | ||
} |
15 changes: 15 additions & 0 deletions
15
client/Projects/OpenList/OpenList/Domain/Entites/CheckListFolderItem.swift
This file contains hidden or 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,15 @@ | ||
// | ||
// CheckListFolderItem.swift | ||
// OpenList | ||
// | ||
// Created by 김영균 on 11/29/23. | ||
// | ||
|
||
import Foundation | ||
|
||
struct CheckListFolderItem: Hashable { | ||
private var id: Int { folderId } | ||
let folderId: Int | ||
let title: String | ||
var saveCount: Int = 0 | ||
} |
12 changes: 12 additions & 0 deletions
12
client/Projects/OpenList/OpenList/Domain/Repositories/FolderRepository.swift
This file contains hidden or 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 @@ | ||
// | ||
// FolderRepository.swift | ||
// OpenList | ||
// | ||
// Created by 김영균 on 11/29/23. | ||
// | ||
|
||
import Foundation | ||
|
||
protocol FolderRepository { | ||
func fetchAllFolders() async throws -> [CheckListFolderItem] | ||
} |
31 changes: 31 additions & 0 deletions
31
client/Projects/OpenList/OpenList/Domain/UseCases/PrivateCheckListUseCase.swift
This file contains hidden or 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,31 @@ | ||
// | ||
// PrivateCheckListUseCase.swift | ||
// OpenList | ||
// | ||
// Created by 김영균 on 11/29/23. | ||
// | ||
|
||
import Foundation | ||
|
||
protocol PrivateCheckListUseCase { | ||
func fetchAllFolders() async -> Result<[CheckListFolderItem], Error> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 오 저는 기존에 Bool Type 리턴했는데 Result Type 사용해야겠네용 |
||
} | ||
|
||
final class DefaultPrivateCheckListUseCase { | ||
private let folderRepository: FolderRepository | ||
|
||
init(folderRepository: FolderRepository) { | ||
self.folderRepository = folderRepository | ||
} | ||
} | ||
|
||
extension DefaultPrivateCheckListUseCase: PrivateCheckListUseCase { | ||
func fetchAllFolders() async -> Result<[CheckListFolderItem], Error> { | ||
do { | ||
let folders = try await folderRepository.fetchAllFolders() | ||
return .success(folders) | ||
} catch { | ||
return .failure(error) | ||
} | ||
} | ||
} |
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
영균님 getData 다음 PR에서 사라지지 않나요? 다음 PR에서 수정할까요? 아니면 Network 모듈 PR 닫고 수정할까요?