diff --git a/Segno/Segno.xcodeproj/project.pbxproj b/Segno/Segno.xcodeproj/project.pbxproj index 6d618fb..4aae17e 100644 --- a/Segno/Segno.xcodeproj/project.pbxproj +++ b/Segno/Segno.xcodeproj/project.pbxproj @@ -53,6 +53,10 @@ 66A8CF6D29379A9900C17F84 /* UserDetailEndpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66A8CF6C29379A9900C17F84 /* UserDetailEndpoint.swift */; }; 66F0D7EE2925FF8B0074872E /* DiaryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 66F0D7ED2925FF8B0074872E /* DiaryCell.swift */; }; 66F0D7F729260BA20074872E /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 66F0D7F629260BA20074872E /* GoogleSignIn */; }; + 791529D82932F364005A8DDB /* DiaryEditUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791529D72932F364005A8DDB /* DiaryEditUseCase.swift */; }; + 791529DC29332CF2005A8DDB /* ImageDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791529DB29332CF2005A8DDB /* ImageDTO.swift */; }; + 791529DE29333D40005A8DDB /* ImageEndpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791529DD29333D40005A8DDB /* ImageEndpoint.swift */; }; + 791529E0293344E9005A8DDB /* DiaryPostEndpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 791529DF293344E8005A8DDB /* DiaryPostEndpoint.swift */; }; 791837FA292225C600BC6992 /* Cafe24Shiningstar.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 791837F7292225BF00BC6992 /* Cafe24Shiningstar.ttf */; }; 791837FB292225C800BC6992 /* Cafe24Ssurround.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 791837F9292225BF00BC6992 /* Cafe24Ssurround.ttf */; }; 791837FC292225CB00BC6992 /* Cafe24SsurroundAir.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 791837F8292225BF00BC6992 /* Cafe24SsurroundAir.ttf */; }; @@ -62,6 +66,8 @@ 7940FB2F292E063100276EFC /* DiaryDetailDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7940FB2E292E063100276EFC /* DiaryDetailDTO.swift */; }; 7940FB31292E065100276EFC /* DiaryDetailEndpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7940FB30292E065100276EFC /* DiaryDetailEndpoint.swift */; }; 7940FB33292E065F00276EFC /* DiaryDetailUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7940FB32292E065F00276EFC /* DiaryDetailUseCase.swift */; }; + 9825F41B29377875005F2163 /* ChangeUserNameUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9825F41A29377875005F2163 /* ChangeUserNameUseCase.swift */; }; + 9825F41D29377ACF005F2163 /* SettingsRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9825F41C29377ACF005F2163 /* SettingsRepository.swift */; }; 982A2A472924AE74006F6ACD /* UserDefaultsKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 982A2A462924AE74006F6ACD /* UserDefaultsKey.swift */; }; 982A3699292C905300FDC6CF /* DiaryDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 982A3698292C905300FDC6CF /* DiaryDetailViewController.swift */; }; 982B3B7F292E68FB0077A44B /* DiaryDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 982B3B7E292E68FB0077A44B /* DiaryDetailViewModel.swift */; }; @@ -75,6 +81,8 @@ 988414D72923304F007C9132 /* KeychainError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 988414D62923304F007C9132 /* KeychainError.swift */; }; 988414D929235345007C9132 /* DiaryCollectionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 988414D829235345007C9132 /* DiaryCollectionViewModel.swift */; }; 988414DB2923606B007C9132 /* DiaryListUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 988414DA2923606B007C9132 /* DiaryListUseCase.swift */; }; + 9894EAF529373385005F2B15 /* SettingsUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9894EAF429373385005F2B15 /* SettingsUseCase.swift */; }; + 9894EAF829375281005F2B15 /* DarkMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9894EAF729375281005F2B15 /* DarkMode.swift */; }; 98B5263E292CA46C00446413 /* TagView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98B5263D292CA46C00446413 /* TagView.swift */; }; 98B52640292CB92900446413 /* MusicContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98B5263F292CB92900446413 /* MusicContentView.swift */; }; 98BEE36E2934907700B20143 /* LoginError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98BEE36D2934907700B20143 /* LoginError.swift */; }; @@ -129,6 +137,10 @@ 66A8CF6C29379A9900C17F84 /* UserDetailEndpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailEndpoint.swift; sourceTree = ""; }; 66F0D7ED2925FF8B0074872E /* DiaryCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiaryCell.swift; sourceTree = ""; }; 66F0D7EF292605AE0074872E /* Segno.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Segno.entitlements; sourceTree = ""; }; + 791529D72932F364005A8DDB /* DiaryEditUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiaryEditUseCase.swift; sourceTree = ""; }; + 791529DB29332CF2005A8DDB /* ImageDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageDTO.swift; sourceTree = ""; }; + 791529DD29333D40005A8DDB /* ImageEndpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageEndpoint.swift; sourceTree = ""; }; + 791529DF293344E8005A8DDB /* DiaryPostEndpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiaryPostEndpoint.swift; sourceTree = ""; }; 791837F7292225BF00BC6992 /* Cafe24Shiningstar.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Cafe24Shiningstar.ttf; sourceTree = ""; }; 791837F8292225BF00BC6992 /* Cafe24SsurroundAir.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Cafe24SsurroundAir.ttf; sourceTree = ""; }; 791837F9292225BF00BC6992 /* Cafe24Ssurround.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Cafe24Ssurround.ttf; sourceTree = ""; }; @@ -138,6 +150,8 @@ 7940FB2E292E063100276EFC /* DiaryDetailDTO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiaryDetailDTO.swift; sourceTree = ""; }; 7940FB30292E065100276EFC /* DiaryDetailEndpoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiaryDetailEndpoint.swift; sourceTree = ""; }; 7940FB32292E065F00276EFC /* DiaryDetailUseCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiaryDetailUseCase.swift; sourceTree = ""; }; + 9825F41A29377875005F2163 /* ChangeUserNameUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeUserNameUseCase.swift; sourceTree = ""; }; + 9825F41C29377ACF005F2163 /* SettingsRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsRepository.swift; sourceTree = ""; }; 982A2A462924AE74006F6ACD /* UserDefaultsKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsKey.swift; sourceTree = ""; }; 982A3698292C905300FDC6CF /* DiaryDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiaryDetailViewController.swift; sourceTree = ""; }; 982B3B7E292E68FB0077A44B /* DiaryDetailViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiaryDetailViewModel.swift; sourceTree = ""; }; @@ -151,6 +165,8 @@ 988414D62923304F007C9132 /* KeychainError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainError.swift; sourceTree = ""; }; 988414D829235345007C9132 /* DiaryCollectionViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiaryCollectionViewModel.swift; sourceTree = ""; }; 988414DA2923606B007C9132 /* DiaryListUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiaryListUseCase.swift; sourceTree = ""; }; + 9894EAF429373385005F2B15 /* SettingsUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsUseCase.swift; sourceTree = ""; }; + 9894EAF729375281005F2B15 /* DarkMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DarkMode.swift; sourceTree = ""; }; 98B5263D292CA46C00446413 /* TagView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagView.swift; sourceTree = ""; }; 98B5263F292CB92900446413 /* MusicContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicContentView.swift; sourceTree = ""; }; 98BEE36D2934907700B20143 /* LoginError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginError.swift; sourceTree = ""; }; @@ -235,6 +251,7 @@ 4F317792291BEB5E0019BDFC /* Presentation */ = { isa = PBXGroup; children = ( + 9894EAF629375272005F2B15 /* Utility */, 4F31779C291BEE900019BDFC /* Coordinator */, 4F31779B291BEE890019BDFC /* View */, 4F31779A291BEE810019BDFC /* ViewController */, @@ -293,6 +310,9 @@ 7940FB32292E065F00276EFC /* DiaryDetailUseCase.swift */, 988414DA2923606B007C9132 /* DiaryListUseCase.swift */, 66A8CF682937945300C17F84 /* UserDetailUseCase.swift */, + 791529D72932F364005A8DDB /* DiaryEditUseCase.swift */, + 9894EAF429373385005F2B15 /* SettingsUseCase.swift */, + 9825F41A29377875005F2163 /* ChangeUserNameUseCase.swift */, ); path = UseCase; sourceTree = ""; @@ -371,6 +391,7 @@ 982A2A462924AE74006F6ACD /* UserDefaultsKey.swift */, 4F4E0D3D2924B925005ABA8F /* LoginRepository.swift */, 66A8CF642937934A00C17F84 /* MyPageRepository.swift */, + 9825F41C29377ACF005F2163 /* SettingsRepository.swift */, ); path = Repository; sourceTree = ""; @@ -391,6 +412,7 @@ 7940FB2E292E063100276EFC /* DiaryDetailDTO.swift */, 4F4E0D7A29252526005ABA8F /* TokenDTO.swift */, 66A8CF6A2937947A00C17F84 /* UserDetailDTO.swift */, + 791529DB29332CF2005A8DDB /* ImageDTO.swift */, ); path = DTO; sourceTree = ""; @@ -400,8 +422,10 @@ children = ( 4FA3242A2923646F00DB04D5 /* DiaryListItemEndpoint.swift */, 7940FB30292E065100276EFC /* DiaryDetailEndpoint.swift */, + 791529DF293344E8005A8DDB /* DiaryPostEndpoint.swift */, 4F4E0D7529252236005ABA8F /* LoginEndpoint.swift */, 66A8CF6C29379A9900C17F84 /* UserDetailEndpoint.swift */, + 791529DD29333D40005A8DDB /* ImageEndpoint.swift */, ); path = Endpoints; sourceTree = ""; @@ -433,6 +457,14 @@ path = Font; sourceTree = ""; }; + 9894EAF629375272005F2B15 /* Utility */ = { + isa = PBXGroup; + children = ( + 9894EAF729375281005F2B15 /* DarkMode.swift */, + ); + path = Utility; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -521,14 +553,17 @@ buildActionMask = 2147483647; files = ( 98F5AD2A292DDDEB00E53E25 /* LocationContentView.swift in Sources */, + 791529DE29333D40005A8DDB /* ImageEndpoint.swift in Sources */, 4F4E0D3E2924B925005ABA8F /* LoginRepository.swift in Sources */, 4F9A00212922338E007D9057 /* AppDelegate.swift in Sources */, 983AE9D82935CEE2006547BD /* SettingsViewModel.swift in Sources */, + 9825F41D29377ACF005F2163 /* SettingsRepository.swift in Sources */, 66F0D7EE2925FF8B0074872E /* DiaryCell.swift in Sources */, 4F9A00202922337F007D9057 /* LoginViewController.swift in Sources */, 982A2A472924AE74006F6ACD /* UserDefaultsKey.swift in Sources */, 66A8CF6B2937947A00C17F84 /* UserDetailDTO.swift in Sources */, 4F9A001B292227D7007D9057 /* NetworkManager.swift in Sources */, + 9894EAF529373385005F2B15 /* SettingsUseCase.swift in Sources */, 9841D6172925FACC00318EA9 /* LoginUseCase.swift in Sources */, 66A8CF6D29379A9900C17F84 /* UserDetailEndpoint.swift in Sources */, 4FEBFAAD291CF62E00E78139 /* DiaryDetail.swift in Sources */, @@ -544,6 +579,7 @@ 666E6F81291CF49E00CECD4B /* LoginCoordinator.swift in Sources */, 7940FB31292E065100276EFC /* DiaryDetailEndpoint.swift in Sources */, 666E6F85291CF4AD00CECD4B /* MyPageCoordinator.swift in Sources */, + 9894EAF829375281005F2B15 /* DarkMode.swift in Sources */, 983AE9D22934F041006547BD /* NicknameCell.swift in Sources */, 983AE9D4293513AD006547BD /* SettingsCellModel.swift in Sources */, 4F4E0D79292522B7005ABA8F /* BaseURL.swift in Sources */, @@ -555,11 +591,13 @@ 66A8CF672937937300C17F84 /* UserDetailItem.swift in Sources */, 666E6F7D291CF45600CECD4B /* Coordinator.swift in Sources */, 982A3699292C905300FDC6CF /* DiaryDetailViewController.swift in Sources */, + 9825F41B29377875005F2163 /* ChangeUserNameUseCase.swift in Sources */, 666E6F8C291CFAC200CECD4B /* DiaryCollectionViewController.swift in Sources */, 666E6F8A291CF82700CECD4B /* TabBarPageCase.swift in Sources */, 66A8CF652937934A00C17F84 /* MyPageRepository.swift in Sources */, 79183800292225DC00BC6992 /* UIFont+.swift in Sources */, 666E6F83291CF4A600CECD4B /* TabBarCoordinator.swift in Sources */, + 791529E0293344E9005A8DDB /* DiaryPostEndpoint.swift in Sources */, 4F9A001D29222B1B007D9057 /* Endpoint.swift in Sources */, 4F9A001F29222C97007D9057 /* NetworkError.swift in Sources */, 98FDF8A1292F56580083FA05 /* Location.swift in Sources */, @@ -573,12 +611,14 @@ 4FA3242B2923646F00DB04D5 /* DiaryListItemEndpoint.swift in Sources */, 791837FF292225DC00BC6992 /* UIColor+.swift in Sources */, 666E6F7F291CF46800CECD4B /* AppCoordinator.swift in Sources */, + 791529DC29332CF2005A8DDB /* ImageDTO.swift in Sources */, 9841D61B2926131200318EA9 /* LoginViewModel.swift in Sources */, 988414D72923304F007C9132 /* KeychainError.swift in Sources */, 98BEE36E2934907700B20143 /* LoginError.swift in Sources */, 98B5263E292CA46C00446413 /* TagView.swift in Sources */, 7940FB2F292E063100276EFC /* DiaryDetailDTO.swift in Sources */, 4F4E0D7629252236005ABA8F /* LoginEndpoint.swift in Sources */, + 791529D82932F364005A8DDB /* DiaryEditUseCase.swift in Sources */, 4FA324262923600C00DB04D5 /* DiaryListDTO.swift in Sources */, 666E6F87291CF4B400CECD4B /* DiaryCoordinator.swift in Sources */, 4F31777F291BE4710019BDFC /* SceneDelegate.swift in Sources */, diff --git a/Segno/Segno/Data/Network/Endpoint.swift b/Segno/Segno/Data/Network/Endpoint.swift index b524300..e390bf2 100644 --- a/Segno/Segno/Data/Network/Endpoint.swift +++ b/Segno/Segno/Data/Network/Endpoint.swift @@ -20,6 +20,7 @@ enum HTTPMethod: String { enum HTTPRequestParameter { case queries(Queries) case body(Body) + case data(Data) } // MARK: Endpoint 본체 @@ -35,7 +36,12 @@ protocol Endpoint { extension Endpoint { var headers: Headers { - return ["Content-Type": "application/json"] + switch self.parameters { + case .data(_): + return ["Content-Type": "multipart/form-data; boundary=SEGNO"] + default: + return ["Content-Type": "application/json"] + } } func toURLRequest() throws -> URLRequest { diff --git a/Segno/Segno/Data/Network/Endpoints/DiaryPostEndpoint.swift b/Segno/Segno/Data/Network/Endpoints/DiaryPostEndpoint.swift new file mode 100644 index 0000000..ed4bd91 --- /dev/null +++ b/Segno/Segno/Data/Network/Endpoints/DiaryPostEndpoint.swift @@ -0,0 +1,31 @@ +// +// DiaryPostEndpoint.swift +// Segno +// +// Created by TaehoYoo on 2022/11/27. +// + +import Foundation + +enum DiaryPostEndpoint: Endpoint { + case item(DiaryDetail) + + var baseURL: URL? { + return URL(string: BaseURL.urlString) + } + + var httpMethod: HTTPMethod { + return .GET + } + + var path: String { + return "diary" + } + + var parameters: HTTPRequestParameter? { + switch self { + case .item(let diary): + return HTTPRequestParameter.body(diary) + } + } +} diff --git a/Segno/Segno/Data/Network/Endpoints/ImageEndpoint.swift b/Segno/Segno/Data/Network/Endpoints/ImageEndpoint.swift new file mode 100644 index 0000000..25ecd06 --- /dev/null +++ b/Segno/Segno/Data/Network/Endpoints/ImageEndpoint.swift @@ -0,0 +1,31 @@ +// +// ImageEndpoint.swift +// Segno +// +// Created by TaehoYoo on 2022/11/27. +// + +import Foundation + +enum ImageEndpoint: Endpoint { + case item(Data) + + var baseURL: URL? { + return URL(string: BaseURL.urlString) + } + + var httpMethod: HTTPMethod { + return .POST + } + + var path: String { + return "image" + } + + var parameters: HTTPRequestParameter? { + switch self { + case .item(let image): + return HTTPRequestParameter.data(image) + } + } +} diff --git a/Segno/Segno/Data/Network/NetworkManager.swift b/Segno/Segno/Data/Network/NetworkManager.swift index 7b758fe..d5ff632 100644 --- a/Segno/Segno/Data/Network/NetworkManager.swift +++ b/Segno/Segno/Data/Network/NetworkManager.swift @@ -23,13 +23,17 @@ struct NetworkManager { return Disposables.create() } } - - return call(request) + switch endpoint.parameters { + case .data(let data): + return call(request, type: .uploadTask, data: buildDataBody(data)) + default: + return call(request) + } } - private func call(_ request: URLRequest) -> Single { - return Single.create { observer -> Disposable in - let task = URLSession.shared.dataTask(with: request) { data, response, error in + private func call(_ request: URLRequest, type: SessionType = .dataTask, data: Data? = nil) -> Single { + Single.create { observer -> Disposable in + let completeHandler: (Data?, URLResponse?, Error?) -> Void = { data, response, error in if error != nil { observer(.failure(NetworkError.unknownNetworkError)) return @@ -53,8 +57,37 @@ struct NetworkManager { } } + let task = { + switch type { + case .dataTask: + return URLSession.shared.dataTask(with: request, completionHandler: completeHandler) + case .uploadTask: + return URLSession.shared.uploadTask(with: request, from: data, completionHandler: completeHandler) + } + }() + task.resume() return Disposables.create() } } + + func buildDataBody(_ data: Data) -> Data? { + let boundary = "SEGNO" + let headerLines = [ + "--\(boundary)", + "Content-Disposition: form-data; name=\"image\"; filename=\"testImage\"", + "Content-Type: image/png", + "\r\n" + ] + var body = headerLines.joined(separator: "\r\n").data(using: .utf8)! + body.append(contentsOf: data) + body.append(contentsOf: "\r\n--\(boundary)--".data(using: .utf8)!) + + return body + } + + enum SessionType { + case dataTask + case uploadTask + } } diff --git a/Segno/Segno/Data/Repository/DTO/ImageDTO.swift b/Segno/Segno/Data/Repository/DTO/ImageDTO.swift new file mode 100644 index 0000000..5b0f2b5 --- /dev/null +++ b/Segno/Segno/Data/Repository/DTO/ImageDTO.swift @@ -0,0 +1,10 @@ +// +// ImageDTO.swift +// Segno +// +// Created by TaehoYoo on 2022/11/27. +// + +struct ImageDTO: Decodable { + let filename: String? +} diff --git a/Segno/Segno/Data/Repository/DiaryRepository.swift b/Segno/Segno/Data/Repository/DiaryRepository.swift index e6f6de6..5e5e97f 100644 --- a/Segno/Segno/Data/Repository/DiaryRepository.swift +++ b/Segno/Segno/Data/Repository/DiaryRepository.swift @@ -12,6 +12,7 @@ import RxSwift protocol DiaryRepository { func getDiaryListItem() -> Single func getDiary(id: String) -> Single + func postDiary(_ diary: DiaryDetail, image: Data) -> Single } final class DiaryRepositoryImpl: DiaryRepository { @@ -47,4 +48,35 @@ final class DiaryRepositoryImpl: DiaryRepository { // return Disposables.create() // } } + + func postDiary(_ diary: DiaryDetail, image: Data) -> Single { + // Dummy endpoint + + let imageEndpoint = ImageEndpoint.item(image) + + let single = NetworkManager.shared.call(imageEndpoint) + .compactMap { + // image 전송 후 이름 받아오기 + let imageDTO = try JSONDecoder().decode(ImageDTO.self, from: $0) + return imageDTO.filename + }.map { imagePath in + // diary에 imagePath넣어 전달 + return DiaryDetail(diary, imagePath: imagePath) + }.flatMap { diaryDetail in + // diary를 다시 서버에 전달 + // TODO: - token 넣어야됩니당 + let testDiaryDetail = DiaryDetail(diaryDetail, token: "0KjV78s0YPKbrlVP3QeAwUJcjohs2h2ysdWDLWg") + + let diaryDetailEndpoint = DiaryPostEndpoint.item(testDiaryDetail) + + return NetworkManager.shared.call(diaryDetailEndpoint) + .map { try JSONDecoder().decode(DiaryDetailDTO.self, from: $0) } + .asObservable() + .asMaybe() + } + .asObservable() + .asSingle() + + return single + } } diff --git a/Segno/Segno/Data/Repository/SettingsRepository.swift b/Segno/Segno/Data/Repository/SettingsRepository.swift new file mode 100644 index 0000000..d432626 --- /dev/null +++ b/Segno/Segno/Data/Repository/SettingsRepository.swift @@ -0,0 +1,16 @@ +// +// SettingsRepository.swift +// Segno +// +// Created by YOONJONG on 2022/11/30. +// + +import RxSwift + +protocol SettingsRepository { + +} + +final class SettingsRepositoryImpl: SettingsRepository { + +} diff --git a/Segno/Segno/Domain/UseCase/ChangeUserNameUseCase.swift b/Segno/Segno/Domain/UseCase/ChangeUserNameUseCase.swift new file mode 100644 index 0000000..296a51e --- /dev/null +++ b/Segno/Segno/Domain/UseCase/ChangeUserNameUseCase.swift @@ -0,0 +1,27 @@ +// +// ChangeUserNameUseCase.swift +// Segno +// +// Created by YOONJONG on 2022/11/30. +// + +import RxSwift + +protocol ChangeUserNameUseCase { + func requestChangeNickname(to nickname: String) -> Bool +} + +final class ChangeUserNameUseCaseImpl: ChangeUserNameUseCase { + let repository: SettingsRepository + private let disposeBag = DisposeBag() + + init(repository: SettingsRepository = SettingsRepositoryImpl()) { + self.repository = repository + } + + func requestChangeNickname(to nickname: String) -> Bool { + // 임시 처리입니다. + debugPrint("SettingsUseCase - requestChangeNickname : \(nickname)으로 변경") + return true + } +} diff --git a/Segno/Segno/Domain/UseCase/DiaryEditUseCase.swift b/Segno/Segno/Domain/UseCase/DiaryEditUseCase.swift new file mode 100644 index 0000000..5fe04ad --- /dev/null +++ b/Segno/Segno/Domain/UseCase/DiaryEditUseCase.swift @@ -0,0 +1,37 @@ +// +// DiaryEditUseCase.swift +// Segno +// +// Created by TaehoYoo on 2022/11/27. +// +import Foundation + +import RxSwift + +protocol DiaryEditUseCase { + func postDiary(_ diary: DiaryDetail, image: Data) -> Single +} + +final class DiaryEditUseCaseImpl: DiaryEditUseCase { + let repository: DiaryRepository + private let disposeBag = DisposeBag() + + init(repository: DiaryRepository = DiaryRepositoryImpl()) { + self.repository = repository + } + + func postDiary(_ diary: DiaryDetail, image: Data) -> Single { + repository.postDiary(diary, image: image).map { dto in + DiaryDetail( + identifier: dto.id, + title: dto.title, + tags: dto.tags, + imagePath: dto.imagePath, + bodyText: dto.bodyText, + // TODO: MusicInfo, location 업데이트 + musicInfo: nil, + location: nil + ) + } + } +} diff --git a/Segno/Segno/Domain/UseCase/SettingsUseCase.swift b/Segno/Segno/Domain/UseCase/SettingsUseCase.swift new file mode 100644 index 0000000..11e3f76 --- /dev/null +++ b/Segno/Segno/Domain/UseCase/SettingsUseCase.swift @@ -0,0 +1,56 @@ +// +// SettingsUseCase.swift +// Segno +// +// Created by YOONJONG on 2022/11/30. +// + +import RxSwift + +protocol SettingsUseCase { + func getAutoPlayMode() -> Bool + func changeAutoPlayMode(to mode: Bool) + func getDarkMode() -> Int + func changeDarkMode(to mode: Int) +} + +final class SettingsUseCaseImpl: SettingsUseCase { + let repository: LocalUtilityRepository + private let disposeBag = DisposeBag() + + init(repository: LocalUtilityRepository = LocalUtilityRepositoryImpl()) { + self.repository = repository + } + + func getAutoPlayMode() -> Bool { + if let isEnabled = repository.getUserDefaultsObject(forKey: .isAutoPlayEnabled) as? Bool { + debugPrint("SettingsUseCase - getAutoPlayMode : 키가 있습니다 - \(isEnabled)") + return isEnabled + } else { + repository.setUserDefaults(true, forKey: .isAutoPlayEnabled) + debugPrint("SettingsUseCase - getAutoPlayMode : 키가 없어 true 로 설정합니다.") + return true + } + } + + func changeAutoPlayMode(to mode: Bool) { + repository.setUserDefaults(mode, forKey: .isAutoPlayEnabled) + debugPrint("SettingsUseCase - changeAutoPlayMode : \(mode)로 설정") + } + + func getDarkMode() -> Int { + if let mode = repository.getUserDefaultsObject(forKey: .darkmode) as? Int { + debugPrint("SettingsUseCase - getDarkMode : 키가 있습니다 - \(mode)") + return mode + } else { + repository.setUserDefaults(DarkMode.system.rawValue, forKey: .darkmode) + debugPrint("SettingsUseCase - getDarkMode : 키가 없어 \(DarkMode.system.rawValue) 로 설정합니다.") + return DarkMode.system.rawValue + } + } + + func changeDarkMode(to mode: Int) { + repository.setUserDefaults(mode, forKey: .darkmode) + debugPrint("SettingsUseCase - changeDarkMode : \(mode)로 설정") + } +} diff --git a/Segno/Segno/Entity/DiaryDetail.swift b/Segno/Segno/Entity/DiaryDetail.swift index 89ecbc2..0d1afe3 100644 --- a/Segno/Segno/Entity/DiaryDetail.swift +++ b/Segno/Segno/Entity/DiaryDetail.swift @@ -5,15 +5,52 @@ // Created by Gordon Choi on 2022/11/10. // -// TODO: 코어 로케이션에서 좌표만 뽑아와서 저장하기 -import CoreLocation - -struct DiaryDetail { +struct DiaryDetail: Encodable { let identifier: String let title: String let tags: [String] let imagePath: String let bodyText: String? let musicInfo: MusicInfo? - let location: CLLocation? + let location: Location? + + var token: String? + + init(identifier: String, title: String, tags: [String], imagePath: String, bodyText: String?, musicInfo: MusicInfo?, location: Location?, token: String? = nil) { + self.identifier = identifier + self.title = title + self.tags = tags + self.imagePath = imagePath + self.bodyText = bodyText + self.musicInfo = musicInfo + self.location = location + self.token = token + } + + init(_ diary: DiaryDetail, imagePath: String) { + self.init( + identifier: diary.identifier, + title: diary.title, + tags: diary.tags, + imagePath: imagePath, + bodyText: diary.bodyText, + musicInfo: diary.musicInfo, + location: diary.location, + token: diary.token + ) + } + + // DUMMY + init(_ diary: DiaryDetail, token: String) { + self.init( + identifier: diary.identifier, + title: diary.title, + tags: diary.tags, + imagePath: diary.imagePath, + bodyText: diary.bodyText, + musicInfo: diary.musicInfo, + location: diary.location, + token: token + ) + } } diff --git a/Segno/Segno/Entity/Location.swift b/Segno/Segno/Entity/Location.swift index 4a748ab..54c695f 100644 --- a/Segno/Segno/Entity/Location.swift +++ b/Segno/Segno/Entity/Location.swift @@ -6,8 +6,14 @@ // import Foundation +import CoreLocation -struct Location { +struct Location: Encodable { let latitude: Double let longitude: Double + + // TODO: 이 방법이 옳은지 논의를 해봐야합니다. + func createCLLocation() -> CLLocation { + CLLocation(latitude: self.latitude, longitude: self.longitude) + } } diff --git a/Segno/Segno/Entity/MusicInfo.swift b/Segno/Segno/Entity/MusicInfo.swift index cae9297..b1f1d7a 100644 --- a/Segno/Segno/Entity/MusicInfo.swift +++ b/Segno/Segno/Entity/MusicInfo.swift @@ -8,7 +8,7 @@ import Foundation import ShazamKit -struct MusicInfo { +struct MusicInfo: Encodable { let title: String let artist: String let album: String diff --git a/Segno/Segno/Presentation/Utility/DarkMode.swift b/Segno/Segno/Presentation/Utility/DarkMode.swift new file mode 100644 index 0000000..2ad45c9 --- /dev/null +++ b/Segno/Segno/Presentation/Utility/DarkMode.swift @@ -0,0 +1,25 @@ +// +// DarkMode.swift +// Segno +// +// Created by YOONJONG on 2022/11/30. +// + +import Foundation + +enum DarkMode: Int, CaseIterable { + case system + case light + case dark + + var title: String { + switch self { + case .system: + return "시스템 설정" + case .light: + return "항상 밝게" + case .dark: + return "항상 어둡게" + } + } +} diff --git a/Segno/Segno/Presentation/View/SettingsCellModel.swift b/Segno/Segno/Presentation/View/SettingsCellModel.swift index 7403fbc..1da7940 100644 --- a/Segno/Segno/Presentation/View/SettingsCellModel.swift +++ b/Segno/Segno/Presentation/View/SettingsCellModel.swift @@ -8,5 +8,5 @@ enum SettingsCellModel { case nickname case settingsSwitch(title: String, isOn: Bool) - case settingsActionSheet(title: String) + case settingsActionSheet(title: String, mode: Int) } diff --git a/Segno/Segno/Presentation/ViewController/DiaryDetailViewController.swift b/Segno/Segno/Presentation/ViewController/DiaryDetailViewController.swift index a71d975..bb6a931 100644 --- a/Segno/Segno/Presentation/ViewController/DiaryDetailViewController.swift +++ b/Segno/Segno/Presentation/ViewController/DiaryDetailViewController.swift @@ -218,6 +218,7 @@ final class DiaryDetailViewController: UIViewController { viewModel.locationObservable .compactMap { $0 } + .map { $0.createCLLocation() } .observe(on: MainScheduler.instance) .subscribe(onNext: { [weak self] location in self?.locationContentView.setLocation(location: location) diff --git a/Segno/Segno/Presentation/ViewController/SettingsViewController.swift b/Segno/Segno/Presentation/ViewController/SettingsViewController.swift index e90686e..6eb369d 100644 --- a/Segno/Segno/Presentation/ViewController/SettingsViewController.swift +++ b/Segno/Segno/Presentation/ViewController/SettingsViewController.swift @@ -74,11 +74,10 @@ final class SettingsViewController: UIViewController { guard let newNickname = cell.nicknameTextField.text else { return Observable.empty() } - debugPrint("입력된 아이디 : ", newNickname) return self.viewModel.changeNickname(to: newNickname) } .subscribe(onNext: { result in - debugPrint("viewModel 메서드 실행 결과 : ", result) + debugPrint("여기에서 \(result)에 대한 피드백 Alert 띄웁니다.") }) .disposed(by: self.disposeBag) @@ -102,9 +101,10 @@ final class SettingsViewController: UIViewController { cell.configure(title: title, isOn: isOn, action: action) return cell - case .settingsActionSheet(let title): + case .settingsActionSheet(let title, let mode): guard let cell = tableView.dequeueReusableCell(withIdentifier: "SettingsActionSheetCell") as? SettingsActionSheetCell else { return UITableViewCell() } - cell.configure(left: title) + let darkModeTitle = DarkMode.allCases[mode].title + cell.configure(left: title, right: darkModeTitle) return cell } } @@ -116,15 +116,19 @@ final class SettingsViewController: UIViewController { guard let action = SettingsCellActions(rawValue: indexPath.row) else { return } switch action { case .darkmode: // 다크 모드 설정 + guard let cell = self?.tableView.cellForRow(at: indexPath) as? SettingsActionSheetCell else { return } let actionSheet = UIAlertController(title: "다크 모드 설정", message: nil, preferredStyle: .actionSheet) - actionSheet.addAction(UIAlertAction(title: "시스템 설정", style: .default, handler: { _ in - self?.viewModel.changeDarkMode(to: 0) + actionSheet.addAction(UIAlertAction(title: DarkMode.system.title, style: .default, handler: { _ in + self?.viewModel.changeDarkMode(to: DarkMode.system.rawValue) + cell.configure(right: DarkMode.system.title) })) - actionSheet.addAction(UIAlertAction(title: "항상 밝게", style: .default, handler: { _ in - self?.viewModel.changeDarkMode(to: 1) + actionSheet.addAction(UIAlertAction(title: DarkMode.light.title, style: .default, handler: { _ in + self?.viewModel.changeDarkMode(to: DarkMode.light.rawValue) + cell.configure(right: DarkMode.light.title) })) - actionSheet.addAction(UIAlertAction(title: "항상 어둡게", style: .default, handler: { _ in - self?.viewModel.changeDarkMode(to: 2) + actionSheet.addAction(UIAlertAction(title: DarkMode.dark.title, style: .default, handler: { _ in + self?.viewModel.changeDarkMode(to: DarkMode.dark.rawValue) + cell.configure(right: DarkMode.dark.title) })) self?.present(actionSheet, animated: true) default: diff --git a/Segno/Segno/Presentation/ViewModel/SettingsViewModel.swift b/Segno/Segno/Presentation/ViewModel/SettingsViewModel.swift index 037f506..d180bf7 100644 --- a/Segno/Segno/Presentation/ViewModel/SettingsViewModel.swift +++ b/Segno/Segno/Presentation/ViewModel/SettingsViewModel.swift @@ -10,49 +10,43 @@ import Foundation import RxSwift final class SettingsViewModel { - let dataSource = Observable<[SettingsCellModel]>.just([ + lazy var dataSource = Observable<[SettingsCellModel]>.just([ .nickname, - .settingsSwitch(title: "음악 자동 재생", isOn: true), // TODO: isOn은 로컬 디비로부터 불러와야 합니다. - .settingsActionSheet(title: "다크 모드") + .settingsSwitch(title: "음악 자동 재생", isOn: settingsUseCase.getAutoPlayMode()), + .settingsActionSheet(title: "다크 모드", mode: settingsUseCase.getDarkMode()) ]) - init() { - + private let settingsUseCase: SettingsUseCase + private let changeUserNameUseCase: ChangeUserNameUseCase + + init(settingsUseCase: SettingsUseCase = SettingsUseCaseImpl(), + changeUserNameUseCase: ChangeUserNameUseCase = ChangeUserNameUseCaseImpl() + ) { + self.settingsUseCase = settingsUseCase + self.changeUserNameUseCase = changeUserNameUseCase } - // TODO: 닉네임 변경 로직 func changeNickname(to nickname: String) -> Observable { -// return useCase.requestChangeNickname(to: nickname) - - // 임시 처리입니다. return Observable.create { emitter in - emitter.onNext(true) + let result = self.changeUserNameUseCase.requestChangeNickname(to: nickname) + emitter.onNext(result) return Disposables.create() } } - // TODO: 음악 자동 재생 여부 불러오기 / 클릭 시 반영하기 func getAutoPlayMode() -> Bool { - // return useCase.getAutoPlayMode() - - return true + return settingsUseCase.getAutoPlayMode() } func changeAutoPlayMode(to mode: Bool) { -// useCase.changeAutoPlayMode(to: mode) - - debugPrint("changeAutoPlayMode에서 \(mode)로 변경합니다") + settingsUseCase.changeAutoPlayMode(to: mode) } - // TODO: 다크모드 설정 불러오기 / 액션 시트 선택 시 반영하기 func getDarkMode() -> Int { - // return useCase.getDarkMode() - - return 0 + return settingsUseCase.getDarkMode() } func changeDarkMode(to mode: Int) { - // TODO: 액션 시트를 띄워야 합니다. - debugPrint("changeDarkMode에서 \(mode)로 변경합니다") + settingsUseCase.changeDarkMode(to: mode) } }