Skip to content

Commit b72adf3

Browse files
GuryssGuryss
authored
Merge pull request #532 from Team-WSS/Develop
[Release] v.1.2.0 업데이트
2 parents 53ffda8 + 08134bb commit b72adf3

File tree

161 files changed

+2197
-4843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+2197
-4843
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @Guryss @Naknakk @hyowon612 @ena-isme

‎WSSiOS/WSSiOS.xcodeproj/project.pbxproj‎

Lines changed: 80 additions & 2778 deletions
Large diffs are not rendered by default.

‎WSSiOS/WSSiOS.xcodeproj/xcshareddata/xcschemes/WSSiOS.xcscheme‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
buildConfiguration = "Debug">
8080
</AnalyzeAction>
8181
<ArchiveAction
82-
buildConfiguration = "Release"
83-
customArchiveName = "WSSiOS"
82+
buildConfiguration = "Debug"
83+
customArchiveName = "WSSiOS_DEV"
8484
revealArchiveInOrganizer = "YES">
8585
</ArchiveAction>
8686
</Scheme>

‎WSSiOS/WSSiOS/Network/Auth/AuthService.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ protocol AuthService {
1414
idToken: String) -> Single<LoginResponse>
1515
func loginWithKakao(_ kakaoAccessToken: String) -> Single<LoginResponse>
1616
func reissueToken() -> Single<ReissueResponse>
17-
func postWithdrawId(reason: String, refreshToken: String) -> Single<Void>
17+
func postWithdrawId(withdrawData: WithdrawRequest) -> Single<Void>
1818
func postLogout(logoutRequest: LogoutRequest) -> Single<Void>
1919
func checkUserisValid() -> Single<Void>
2020
}
@@ -90,8 +90,8 @@ final class DefaultAuthService: NSObject, Networking, AuthService {
9090
}
9191
}
9292

93-
func postWithdrawId(reason: String, refreshToken: String) -> Single<Void> {
94-
guard let data = try? JSONEncoder().encode(WithdrawRequest(reason: reason, refreshToken: refreshToken)) else {
93+
func postWithdrawId(withdrawData: WithdrawRequest) -> Single<Void> {
94+
guard let data = try? JSONEncoder().encode(withdrawData) else {
9595
return Single.error(NetworkServiceError.invalidRequestError)
9696
}
9797
do {

‎WSSiOS/WSSiOS/Network/Avatar/AvatarService.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import Foundation
1010
import RxSwift
1111

1212
protocol AvatarService {
13-
func getAvatarList() -> Single<AvatarResponse>
13+
func getAvatarList() -> Single<AvatarListResponse>
1414
}
1515

1616
final class DefaultAvatarService: NSObject, Networking {
1717
}
1818

1919
extension DefaultAvatarService: AvatarService {
20-
func getAvatarList() -> Single<AvatarResponse> {
20+
func getAvatarList() -> Single<AvatarListResponse> {
2121
do {
2222
let request = try makeHTTPRequest(method: .get,
2323
path: URLs.Avatar.getAvatar,
@@ -28,7 +28,7 @@ extension DefaultAvatarService: AvatarService {
2828

2929
return tokenCheckURLSession.rx.data(request: request)
3030
.map { try self.decode(data: $0,
31-
to: AvatarResponse.self) }
31+
to: AvatarListResponse.self) }
3232
.asSingle()
3333
} catch {
3434
return Single.error(error)

WSSiOS/WSSiOS/Network/Blocks/BlocksService.swift renamed to WSSiOS/WSSiOS/Network/BlocksService.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Foundation
1010
import RxSwift
1111

1212
protocol BlocksService {
13-
func getBlocksList() -> Single<BlockUserResult>
13+
func getBlocksList() -> Single<BlockUserListResponse>
1414
func deleteBlockUser(blockID: Int) -> Single<Void>
1515
func postBlockUser(blockID: Int) -> Single<Void>
1616
}
@@ -22,7 +22,7 @@ final class DefaultBlocksService: NSObject, Networking {
2222
}
2323

2424
extension DefaultBlocksService: BlocksService {
25-
func getBlocksList() -> Single<BlockUserResult> {
25+
func getBlocksList() -> Single<BlockUserListResponse> {
2626
do {
2727
let request = try makeHTTPRequest(method: .get,
2828
path: URLs.MyPage.Block.blocks,
@@ -33,7 +33,7 @@ extension DefaultBlocksService: BlocksService {
3333

3434
return tokenCheckURLSession.rx.data(request: request)
3535
.map { try self.decode(data: $0,
36-
to: BlockUserResult.self) }
36+
to: BlockUserListResponse.self) }
3737
.asSingle()
3838
} catch {
3939
return Single.error(error)
@@ -59,7 +59,7 @@ extension DefaultBlocksService: BlocksService {
5959
}
6060

6161
func postBlockUser(blockID: Int) -> Single<Void> {
62-
guard let blockUser = try? JSONEncoder().encode(BlockUserId(userId: blockID)) else {
62+
guard let blockUser = try? JSONEncoder().encode(BlockUserRequest(userId: blockID)) else {
6363
return Single.error(NetworkServiceError.invalidRequestError)
6464
}
6565
do {

WSSiOS/WSSiOS/Network/Feed/FeedDetailService.swift renamed to WSSiOS/WSSiOS/Network/FeedDetailService.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import Foundation
1010
import RxSwift
1111

1212
protocol FeedDetailService {
13-
func getFeed(feedId: Int) -> Single<Feed>
14-
func getFeedComments(feedId: Int) -> Single<FeedComments>
13+
func getFeed(feedId: Int) -> Single<FeedResponse>
14+
func getFeedComments(feedId: Int) -> Single<FeedCommentsResponse>
1515
func postFeedLike(feedId: Int) -> Single<Void>
1616
func deleteFeedLike(feedId: Int) -> Single<Void>
1717

@@ -29,7 +29,7 @@ protocol FeedDetailService {
2929
}
3030

3131
final class DefaultFeedDetailService: NSObject, Networking, FeedDetailService {
32-
func getFeed(feedId: Int) -> Single<Feed> {
32+
func getFeed(feedId: Int) -> Single<FeedResponse> {
3333
do {
3434
let request = try makeHTTPRequest(method: .get,
3535
path: URLs.Feed.getSingleFeed(feedId: feedId),
@@ -40,15 +40,15 @@ final class DefaultFeedDetailService: NSObject, Networking, FeedDetailService {
4040

4141
return tokenCheckURLSession.rx.data(request: request)
4242
.map { try self.decode(data: $0,
43-
to: Feed.self) }
43+
to: FeedResponse.self) }
4444
.asSingle()
4545

4646
} catch {
4747
return Single.error(error)
4848
}
4949
}
5050

51-
func getFeedComments(feedId: Int) -> Single<FeedComments> {
51+
func getFeedComments(feedId: Int) -> Single<FeedCommentsResponse> {
5252
do {
5353
let request = try makeHTTPRequest(method: .get,
5454
path: URLs.Feed.getSingleFeedComments(feedId: feedId),
@@ -59,7 +59,7 @@ final class DefaultFeedDetailService: NSObject, Networking, FeedDetailService {
5959

6060
return tokenCheckURLSession.rx.data(request: request)
6161
.map { try self.decode(data: $0,
62-
to: FeedComments.self) }
62+
to: FeedCommentsResponse.self) }
6363
.asSingle()
6464

6565
} catch {
@@ -104,7 +104,7 @@ final class DefaultFeedDetailService: NSObject, Networking, FeedDetailService {
104104
}
105105

106106
func postComment(feedId: Int, commentContent: String) -> Single<Void> {
107-
guard let commentContent = try? JSONEncoder().encode(FeedCommentContent(commentContent: commentContent)) else {
107+
guard let commentContent = try? JSONEncoder().encode(FeedCommentContentRequest(commentContent: commentContent)) else {
108108
return Single.error(NetworkServiceError.invalidRequestError)
109109
}
110110

@@ -126,7 +126,7 @@ final class DefaultFeedDetailService: NSObject, Networking, FeedDetailService {
126126
}
127127

128128
func putComment(feedId: Int, commentId: Int, commentContent: String) -> Single<Void> {
129-
guard let commentContent = try? JSONEncoder().encode(FeedCommentContent(commentContent: commentContent)) else {
129+
guard let commentContent = try? JSONEncoder().encode(FeedCommentContentRequest(commentContent: commentContent)) else {
130130
return Single.error(NetworkServiceError.invalidRequestError)
131131
}
132132

WSSiOS/WSSiOS/Network/Feed/FeedService.swift renamed to WSSiOS/WSSiOS/Network/FeedService.swift

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import Foundation
1010
import RxSwift
1111

1212
protocol FeedService {
13-
func getFeedList(category: String,
14-
lastFeedId: Int,
15-
size: Int) -> Single<TotalFeed>
13+
func getFeedList(category: String, lastFeedId: Int, size: Int) -> Single<TotalFeedListResponse>
1614
func postFeed(relevantCategories: [String], feedContent: String, novelId: Int?, isSpoiler: Bool) -> Single<Void>
1715
func putFeed(feedId: Int, relevantCategories: [String], feedContent: String, novelId: Int?, isSpoiler: Bool) -> Single<Void>
1816
}
@@ -28,7 +26,7 @@ final class DefaultFeedService: NSObject, Networking, FeedService {
2826
]
2927
}
3028

31-
func getFeedList(category: String, lastFeedId: Int, size: Int) -> RxSwift.Single<TotalFeed> {
29+
func getFeedList(category: String, lastFeedId: Int, size: Int) -> Single<TotalFeedListResponse> {
3230
do {
3331
let request = try makeHTTPRequest(method: .get,
3432
path: URLs.Feed.getFeeds,
@@ -42,7 +40,7 @@ final class DefaultFeedService: NSObject, Networking, FeedService {
4240

4341
return tokenCheckURLSession.rx.data(request: request)
4442
.map { try self.decode(data: $0,
45-
to: TotalFeed.self) }
43+
to: TotalFeedListResponse.self) }
4644
.asSingle()
4745

4846
} catch {
@@ -51,7 +49,9 @@ final class DefaultFeedService: NSObject, Networking, FeedService {
5149
}
5250

5351
func postFeed(relevantCategories: [String], feedContent: String, novelId: Int?, isSpoiler: Bool) -> Single<Void> {
54-
guard let feedContentData = try? JSONEncoder().encode(FeedContent(relevantCategories: relevantCategories, feedContent: feedContent, novelId: novelId, isSpoiler: isSpoiler)) else {
52+
guard let feedContentData = try? JSONEncoder().encode(
53+
FeedContentRequest(relevantCategories: relevantCategories, feedContent: feedContent, novelId: novelId, isSpoiler: isSpoiler))
54+
else {
5555
return Single.error(NetworkServiceError.invalidRequestError)
5656
}
5757

@@ -72,7 +72,9 @@ final class DefaultFeedService: NSObject, Networking, FeedService {
7272
}
7373

7474
func putFeed(feedId: Int, relevantCategories: [String], feedContent: String, novelId: Int?, isSpoiler: Bool) -> Single<Void> {
75-
guard let feedContentData = try? JSONEncoder().encode(FeedContent(relevantCategories: relevantCategories, feedContent: feedContent, novelId: novelId, isSpoiler: isSpoiler)) else {
75+
guard let feedContentData = try? JSONEncoder().encode(
76+
FeedContentRequest(relevantCategories: relevantCategories, feedContent: feedContent, novelId: novelId, isSpoiler: isSpoiler))
77+
else {
7678
return Single.error(NetworkServiceError.invalidRequestError)
7779
}
7880

‎WSSiOS/WSSiOS/Network/NovelDetail/NovelDetailService.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import RxSwift
1212
protocol NovelDetailService {
1313
func getNovelDetailHeaderData(novelId: Int) -> Single<NovelDetailHeaderResponse>
1414
func getNovelDetailInfoData(novelId: Int) -> Single<NovelDetailInfoResponse>
15-
func getNovelDetailFeedData(novelId: Int, lastFeedId: Int, size: Int) -> Single<NovelDetailFeedResult>
15+
func getNovelDetailFeedData(novelId: Int, lastFeedId: Int, size: Int) -> Single<NovelDetailFeedResponse>
1616
func postUserInterest(novelId: Int) -> Single<Void>
1717
func deleteUserInterest(novelId: Int) -> Single<Void>
1818
func deleteNovelReview(novelId: Int) -> Single<Void>
@@ -108,7 +108,7 @@ extension DefaultNovelDetailService: NovelDetailService {
108108
}
109109
}
110110

111-
func getNovelDetailFeedData(novelId: Int, lastFeedId: Int, size: Int) -> Single<NovelDetailFeedResult> {
111+
func getNovelDetailFeedData(novelId: Int, lastFeedId: Int, size: Int) -> Single<NovelDetailFeedResponse> {
112112
let novelDetailFeedQueryItems: [URLQueryItem] = [
113113
URLQueryItem(name: "lastFeedId", value: String(describing: lastFeedId)),
114114
URLQueryItem(name: "size", value: String(describing: size))
@@ -124,7 +124,7 @@ extension DefaultNovelDetailService: NovelDetailService {
124124

125125
return tokenCheckURLSession.rx.data(request: request)
126126
.map { try self.decode(data: $0,
127-
to: NovelDetailFeedResult.self) }
127+
to: NovelDetailFeedResponse.self) }
128128
.asSingle()
129129
} catch {
130130
return Single.error(error)

0 commit comments

Comments
 (0)