From 5073627a955e73a0e4a39aade05d7cf31dc38bb5 Mon Sep 17 00:00:00 2001 From: doyeonk429 <80318425+doyeonk429@users.noreply.github.com> Date: Fri, 20 Dec 2024 04:58:59 +0900 Subject: [PATCH] =?UTF-8?q?#4=20CoreModule=20=EB=84=A4=EC=9D=B4=EB=B0=8D?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DE/DE/Sources/Core/Utilities/Constants.swift | 24 ++-- .../Endpoints/AuthorizationEndpoints.swift | 1 + .../Comment/Endpoints/CommentEndpoints.swift | 1 + .../Endpoints/RecommentEndpoints.swift | 1 + .../Sources/Network/Course/WineClassAPI.swift | 104 +++++++++--------- .../Sources/Network/Home/MemberInfoAPI.swift | 78 ++++++------- DE/Project.swift | 20 ++-- 7 files changed, 115 insertions(+), 114 deletions(-) diff --git a/DE/DE/Sources/Core/Utilities/Constants.swift b/DE/DE/Sources/Core/Utilities/Constants.swift index 8dab4bd7..7eb97102 100644 --- a/DE/DE/Sources/Core/Utilities/Constants.swift +++ b/DE/DE/Sources/Core/Utilities/Constants.swift @@ -2,27 +2,27 @@ import Foundation -struct Constants { - static let appname = "Drink-EG" +public struct Constants { + public static let appname = "Drink-EG" - struct Auth { - static var Tokens : [String : String] = [:] + public struct Auth { + public static var Tokens : [String : String] = [:] // iOS test id : iOSadmin // iOS test pw : 0000 } - struct API { - static let baseURL = "https://drinkeg.com" - static let commentURL = "https://drinkeg.com/comments" - static let recommentURL = "https://drinkeg.com/recomments" + public struct API { + public static let baseURL = "https://drinkeg.com" + public static let commentURL = "https://drinkeg.com/comments" + public static let recommentURL = "https://drinkeg.com/recomments" } - struct Design { + public struct Design { } - struct Policy { - static let service = + public struct Policy { + public static let service = """ 서비스 이용약관 @@ -201,7 +201,7 @@ struct Constants { 2. 미디어, 통신사 등을 통한 홍보목적으로 이용자의 콘텐츠를 제공, 전시하도록 하는 등의 사용. """ - static let privacy = + public static let privacy = """ 개인정보처리방침 diff --git a/DE/DE/Sources/Network/Auth/Endpoints/AuthorizationEndpoints.swift b/DE/DE/Sources/Network/Auth/Endpoints/AuthorizationEndpoints.swift index 1bf8b243..2ea5776b 100644 --- a/DE/DE/Sources/Network/Auth/Endpoints/AuthorizationEndpoints.swift +++ b/DE/DE/Sources/Network/Auth/Endpoints/AuthorizationEndpoints.swift @@ -1,5 +1,6 @@ // Copyright © 2024 DRINKIG. All rights reserved +import CoreModule import Foundation import Moya diff --git a/DE/DE/Sources/Network/Comment/Endpoints/CommentEndpoints.swift b/DE/DE/Sources/Network/Comment/Endpoints/CommentEndpoints.swift index 267fb4f1..913479b2 100644 --- a/DE/DE/Sources/Network/Comment/Endpoints/CommentEndpoints.swift +++ b/DE/DE/Sources/Network/Comment/Endpoints/CommentEndpoints.swift @@ -1,5 +1,6 @@ // Copyright © 2024 DRINKIG. All rights reserved +import CoreModule import Foundation import Moya diff --git a/DE/DE/Sources/Network/Comment/Endpoints/RecommentEndpoints.swift b/DE/DE/Sources/Network/Comment/Endpoints/RecommentEndpoints.swift index 5f480fd3..2215db9d 100644 --- a/DE/DE/Sources/Network/Comment/Endpoints/RecommentEndpoints.swift +++ b/DE/DE/Sources/Network/Comment/Endpoints/RecommentEndpoints.swift @@ -1,5 +1,6 @@ // Copyright © 2024 DRINKIG. All rights reserved +import CoreModule import Foundation import Moya diff --git a/DE/DE/Sources/Network/Course/WineClassAPI.swift b/DE/DE/Sources/Network/Course/WineClassAPI.swift index 0bc30bc9..7e34e7c9 100644 --- a/DE/DE/Sources/Network/Course/WineClassAPI.swift +++ b/DE/DE/Sources/Network/Course/WineClassAPI.swift @@ -1,56 +1,54 @@ +//// +//// WineClassAPI.swift +//// Drink-EG // -// WineClassAPI.swift -// Drink-EG +//import Core +//import Foundation +//import Moya // -// Created by 김도연 on 8/12/24. +//enum WineClassAPI { +// case getAllWineClass +// case getWineClass(id: Int) +//} // - -import Foundation -import Moya - -enum WineClassAPI { - case getAllWineClass - case getWineClass(id: Int) -} - -extension WineClassAPI: TargetType { - var baseURL: URL { - return URL(string: Constants.API.baseURL)! - } - - var path: String { - switch self { - case .getAllWineClass: - return "/wine-class" - case .getWineClass(let id): - return "/wine-class/\(id)" - } - } - - var method: Moya.Method { - switch self { - case .getAllWineClass, .getWineClass: - return .get - } - } - - var task: Moya.Task { - switch self { - case .getAllWineClass: - return .requestPlain - case .getWineClass(let id): - return .requestParameters(parameters: ["wineClassId" : id], encoding: JSONEncoding.default) - } - } - - var headers: [String : String]? { - return [ - "Content-type": "application/json" - ] - } - - var validationType: ValidationType { - return .successCodes - } - -} +//extension WineClassAPI: TargetType { +// var baseURL: URL { +// return URL(string: Constants.API.baseURL)! +// } +// +// var path: String { +// switch self { +// case .getAllWineClass: +// return "/wine-class" +// case .getWineClass(let id): +// return "/wine-class/\(id)" +// } +// } +// +// var method: Moya.Method { +// switch self { +// case .getAllWineClass, .getWineClass: +// return .get +// } +// } +// +// var task: Moya.Task { +// switch self { +// case .getAllWineClass: +// return .requestPlain +// case .getWineClass(let id): +// return .requestParameters(parameters: ["wineClassId" : id], encoding: JSONEncoding.default) +// } +// } +// +// var headers: [String : String]? { +// return [ +// "Content-type": "application/json" +// ] +// } +// +// var validationType: ValidationType { +// return .successCodes +// } +// +//} diff --git a/DE/DE/Sources/Network/Home/MemberInfoAPI.swift b/DE/DE/Sources/Network/Home/MemberInfoAPI.swift index 5d09be21..7cb6ec99 100644 --- a/DE/DE/Sources/Network/Home/MemberInfoAPI.swift +++ b/DE/DE/Sources/Network/Home/MemberInfoAPI.swift @@ -1,43 +1,43 @@ // Copyright © 2024 DRINKIG. All rights reserved - +import Core import Foundation import Moya -enum MemberInfoAPI { - case patchMember(data: MemberInfoRequest) -} - -extension MemberInfoAPI: TargetType { - var baseURL: URL { - return URL(string: Constants.API.baseURL)! - } - - var path: String { - switch self { - case .patchMember: - return "/member" - } - } - - var method: Moya.Method { - return .patch - } - - var task: Moya.Task { - switch self { - case .patchMember(let data): - return .requestJSONEncodable(data) - } - } - - var headers: [String : String]? { - return [ - "Content-type": "application/json" - ] - } - - var validationType: ValidationType { - return .successCodes - } -} - +//enum MemberInfoAPI { +// case patchMember(data: MemberInfoRequest) +//} +// +//extension MemberInfoAPI: TargetType { +// var baseURL: URL { +// return URL(string: Constants.API.baseURL)! +// } +// +// var path: String { +// switch self { +// case .patchMember: +// return "/member" +// } +// } +// +// var method: Moya.Method { +// return .patch +// } +// +// var task: Moya.Task { +// switch self { +// case .patchMember(let data): +// return .requestJSONEncodable(data) +// } +// } +// +// var headers: [String : String]? { +// return [ +// "Content-type": "application/json" +// ] +// } +// +// var validationType: ValidationType { +// return .successCodes +// } +//} +// diff --git a/DE/Project.swift b/DE/Project.swift index 804992a2..c97bd29e 100644 --- a/DE/Project.swift +++ b/DE/Project.swift @@ -68,7 +68,7 @@ let project = Project( [ "CFBundleTypeRole" : "Editor", "CFBundleURLName" : "kakaologin", - "CFBundleURLSchemes" : ["kakao74177ce7b14b89614c47ac7d51464b95"] + "CFBundleURLSchemes" : ["kakao180ebe6367eb8ee6eafe439aa551744a"] ], ], // 다른 설정은 여기에다가 추가 @@ -79,11 +79,11 @@ let project = Project( entitlements: "DE/DE.entitlements", scripts: [ swiftLintScript ], dependencies: [ - .target(name: "Core"), + .target(name: "CoreModule"), .target(name: "Network"), .target(name: "Authentication"), - .external(name: "KeychainSwift"), + .external(name: "KeychainSwift"), .external(name: "KakaoSDK") // .target(name: "Core"), // .target(name: "Network"), @@ -167,20 +167,20 @@ let project = Project( entitlements: "DE/DE.entitlements", scripts: [ swiftLintScript ], dependencies: [ - .target(name: "Core"), + .target(name: "CoreModule"), .target(name: "Network"), .target(name: "Authentication"), - .external(name: "KeychainSwift"), + .external(name: "KeychainSwift"), .external(name: "KakaoSDK") ] ), // module .target( - name: "Core", + name: "CoreModule", destinations: .iOS, product: .staticFramework, - bundleId: "\(bundleId).\(bundleMid).Core", + bundleId: "\(bundleId).\(bundleMid).CoreModule", sources: ["DE/Sources/Core/**"], resources: ["DE/Resources/**"], dependencies: [ @@ -191,7 +191,6 @@ let project = Project( .external(name: "SwiftyToaster"), .external(name: "Then"), .external(name: "Cosmos"), - ] ), .target( @@ -202,7 +201,8 @@ let project = Project( sources: ["DE/Sources/Network/**"], resources: ["DE/Resources/**"], dependencies: [ - .external(name: "Moya"), + .target(name: "CoreModule"), + .external(name: "Moya") ] ), .target( @@ -213,7 +213,7 @@ let project = Project( sources: ["DE/Sources/Features/Authentication/**"], resources: ["DE/Resources/**"], dependencies: [ - .target(name: "Core"), + .target(name: "CoreModule"), .target(name: "Network") ] ),