Skip to content

Commit

Permalink
✨#296: 지역 필터링한 좋아요, 드랍 API 파라미터 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
@joseph704
joseph704 committed Dec 26, 2024
1 parent 9f68cf3 commit d80ccee
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 24 deletions.
32 changes: 26 additions & 6 deletions StreetDrop/StreetDrop.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@
C44A549A2BBC097E00354F8F /* FetchingPopUpInfomationUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44A54992BBC097E00354F8F /* FetchingPopUpInfomationUseCase.swift */; };
C44A549C2BBC099E00354F8F /* DefaultFetchingPopUpInfomationUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44A549B2BBC099E00354F8F /* DefaultFetchingPopUpInfomationUseCase.swift */; };
C44A549E2BBC0DC500354F8F /* TipPopUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44A549D2BBC0DC500354F8F /* TipPopUpViewController.swift */; };
C44B6BA92D153E47007F2C8C /* GuTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44B6BA82D153E47007F2C8C /* GuTableViewCell.swift */; };
C44B6BAA2D153E47007F2C8C /* GuTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44B6BA82D153E47007F2C8C /* GuTableViewCell.swift */; };
C44B6BAD2D154258007F2C8C /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44B6BAC2D154258007F2C8C /* Order.swift */; };
C44B6BAE2D154258007F2C8C /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44B6BAC2D154258007F2C8C /* Order.swift */; };
C45A4CB02A3710AC00EE9C36 /* ImageCacheError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45A4CAF2A3710AC00EE9C36 /* ImageCacheError.swift */; };
C45BF3972A1D0ADF00CEDE74 /* UserDefaultKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45BF3962A1D0ADF00CEDE74 /* UserDefaultKey.swift */; };
C45BF39E2A1D113200CEDE74 /* UserDefaultsRecentMusicSearches.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45BF39D2A1D113200CEDE74 /* UserDefaultsRecentMusicSearches.swift */; };
Expand Down Expand Up @@ -296,8 +300,8 @@
C4F5D3F02C5B4830008AF976 /* FetchingCityAndDistrictsUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F5D3EE2C5B4830008AF976 /* FetchingCityAndDistrictsUseCase.swift */; };
C4F5D3F22C5B4850008AF976 /* DefaultFetchingCityAndDistrictsUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F5D3F12C5B4850008AF976 /* DefaultFetchingCityAndDistrictsUseCase.swift */; };
C4F5D3F32C5B4850008AF976 /* DefaultFetchingCityAndDistrictsUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4F5D3F12C5B4850008AF976 /* DefaultFetchingCityAndDistrictsUseCase.swift */; };
C4FDF55D2C60982800551A16 /* RegionCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FDF55C2C60982800551A16 /* RegionCollectionViewCell.swift */; };
C4FDF55E2C60982800551A16 /* RegionCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FDF55C2C60982800551A16 /* RegionCollectionViewCell.swift */; };
C4FDF55D2C60982800551A16 /* CityTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FDF55C2C60982800551A16 /* CityTableViewCell.swift */; };
C4FDF55E2C60982800551A16 /* CityTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4FDF55C2C60982800551A16 /* CityTableViewCell.swift */; };
C4FDF5612C60C4D700551A16 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = C4FDF5602C60C4D700551A16 /* OrderedCollections */; };
C51230A18096B11C82137084 /* libPods-StreetDrop.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 642A4AE13B198B9F5F5F76E4 /* libPods-StreetDrop.a */; };
F48DF73A2C1DD8F500F6DEA1 /* SettingPushNotificationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F48DF7392C1DD8F500F6DEA1 /* SettingPushNotificationCell.swift */; };
Expand Down Expand Up @@ -520,6 +524,8 @@
C44A54992BBC097E00354F8F /* FetchingPopUpInfomationUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchingPopUpInfomationUseCase.swift; sourceTree = "<group>"; };
C44A549B2BBC099E00354F8F /* DefaultFetchingPopUpInfomationUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultFetchingPopUpInfomationUseCase.swift; sourceTree = "<group>"; };
C44A549D2BBC0DC500354F8F /* TipPopUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TipPopUpViewController.swift; sourceTree = "<group>"; };
C44B6BA82D153E47007F2C8C /* GuTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuTableViewCell.swift; sourceTree = "<group>"; };
C44B6BAC2D154258007F2C8C /* Order.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
C45A4CAF2A3710AC00EE9C36 /* ImageCacheError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageCacheError.swift; sourceTree = "<group>"; };
C45BF3962A1D0ADF00CEDE74 /* UserDefaultKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultKey.swift; sourceTree = "<group>"; };
C45BF39D2A1D113200CEDE74 /* UserDefaultsRecentMusicSearches.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsRecentMusicSearches.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -581,7 +587,7 @@
C4F5D3EA2C5B43BB008AF976 /* JSONLoadError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONLoadError.swift; sourceTree = "<group>"; };
C4F5D3EE2C5B4830008AF976 /* FetchingCityAndDistrictsUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchingCityAndDistrictsUseCase.swift; sourceTree = "<group>"; };
C4F5D3F12C5B4850008AF976 /* DefaultFetchingCityAndDistrictsUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultFetchingCityAndDistrictsUseCase.swift; sourceTree = "<group>"; };
C4FDF55C2C60982800551A16 /* RegionCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegionCollectionViewCell.swift; sourceTree = "<group>"; };
C4FDF55C2C60982800551A16 /* CityTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CityTableViewCell.swift; sourceTree = "<group>"; };
F48DF7392C1DD8F500F6DEA1 /* SettingPushNotificationCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingPushNotificationCell.swift; sourceTree = "<group>"; };
F48DF73B2C1DD91C00F6DEA1 /* SettingMusicSelectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingMusicSelectCell.swift; sourceTree = "<group>"; };
F4AA84D82C1F030F00CADB1A /* NoticeListResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeListResponseDTO.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -788,6 +794,7 @@
04FB1F222A0214A20064B3C8 /* Util */ = {
isa = PBXGroup;
children = (
C44B6BAB2D154231007F2C8C /* NameSpace */,
C4AA82692C5911EA004B8934 /* Modal */,
4143452C2A373520003FEE2A /* Service */,
C4D16FCA2A1B985F008B076F /* Extensions */,
Expand Down Expand Up @@ -1566,6 +1573,14 @@
path = PopUp;
sourceTree = "<group>";
};
C44B6BAB2D154231007F2C8C /* NameSpace */ = {
isa = PBXGroup;
children = (
C44B6BAC2D154258007F2C8C /* Order.swift */,
);
path = NameSpace;
sourceTree = "<group>";
};
C45BF3982A1D0AE200CEDE74 /* Constant */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1740,7 +1755,8 @@
isa = PBXGroup;
children = (
C4AA825F2C590A2A004B8934 /* RegionFilteringModalViewController.swift */,
C4FDF55C2C60982800551A16 /* RegionCollectionViewCell.swift */,
C4FDF55C2C60982800551A16 /* CityTableViewCell.swift */,
C44B6BA82D153E47007F2C8C /* GuTableViewCell.swift */,
);
path = FilterModal;
sourceTree = "<group>";
Expand Down Expand Up @@ -2192,6 +2208,7 @@
C4F5D3EB2C5B43BB008AF976 /* JSONLoadError.swift in Sources */,
C41972462ABDC45000211222 /* DefaultClaimingCommentUseCase.swift in Sources */,
C45A4CB02A3710AC00EE9C36 /* ImageCacheError.swift in Sources */,
C44B6BA92D153E47007F2C8C /* GuTableViewCell.swift in Sources */,
08F5745D2C46992500635B54 /* DefaultFetchingMyLevelUseCase.swift in Sources */,
C41972532ABED14200211222 /* DefaultMyInfoRepository.swift in Sources */,
6A7D73D92BB11A0E009340E3 /* LevelUpGuideView.swift in Sources */,
Expand Down Expand Up @@ -2228,6 +2245,7 @@
C449807E2BC3B09F0001E6C3 /* DefaultPostingPopUpUserReadingUseCase.swift in Sources */,
C41972302ABDAB0200211222 /* DefaultMyInfoUseCase.swift in Sources */,
41396D8F2A4EFBE800B69341 /* DefaultDeleteMusicRepository.swift in Sources */,
C44B6BAD2D154258007F2C8C /* Order.swift in Sources */,
41396D822A4EF65B00B69341 /* EditCommentRequestDTO.swift in Sources */,
C434A4D32A17983A00C63526 /* SearchingMusicRepository.swift in Sources */,
41A3DDF82A5AD222004CFA2F /* DefaultBlockUserRepository.swift in Sources */,
Expand Down Expand Up @@ -2269,7 +2287,7 @@
6A51EC692C48F53400DEF6F3 /* MusicListFilterView.swift in Sources */,
C46293C92C6495DD00FF4A7A /* RegionFilteredLikeCountResponseDTO.swift in Sources */,
41396D8B2A4EFB2500B69341 /* EditCommentRepository.swift in Sources */,
C4FDF55D2C60982800551A16 /* RegionCollectionViewCell.swift in Sources */,
C4FDF55D2C60982800551A16 /* CityTableViewCell.swift in Sources */,
F4AA84E12C1F732800CADB1A /* DateManager.swift in Sources */,
1816ED3F2A68064E005009FC /* MyPageViewModel.swift in Sources */,
C49EDACE2BBD7EFE0025DB55 /* GradientLabel.swift in Sources */,
Expand Down Expand Up @@ -2408,7 +2426,7 @@
C4F5D3F32C5B4850008AF976 /* DefaultFetchingCityAndDistrictsUseCase.swift in Sources */,
C4AA826C2C5911FB004B8934 /* ModalPresentable.swift in Sources */,
C434A4D12A17981C00C63526 /* DefaultSearchingMusicRepository.swift in Sources */,
C4FDF55E2C60982800551A16 /* RegionCollectionViewCell.swift in Sources */,
C4FDF55E2C60982800551A16 /* CityTableViewCell.swift in Sources */,
18AAF8422A13CC54002EF441 /* MusicWithinAreaResponseDTO.swift in Sources */,
C4AA82612C590A2A004B8934 /* RegionFilteringModalViewController.swift in Sources */,
C4F5D3E52C5B22D9008AF976 /* CityAndDistrictsDTO.swift in Sources */,
Expand All @@ -2423,10 +2441,12 @@
C4F5D3F02C5B4830008AF976 /* FetchingCityAndDistrictsUseCase.swift in Sources */,
C4A4E3BD2C6447AF00283C37 /* FetchingRegionFilteredDropCountUseCase.swift in Sources */,
18AAF83F2A137435002EF441 /* CommunityResponseDTO.swift in Sources */,
C44B6BAA2D153E47007F2C8C /* GuTableViewCell.swift in Sources */,
C4A4E3B92C64451400283C37 /* RegionFilteredDropCountResponseDTO.swift in Sources */,
C41BD2ED2A3848880090EF2B /* UIImage+loadURLImage.swift in Sources */,
41FF58FC2A06B38800ABB871 /* NetworkManagerTest.swift in Sources */,
C434A4D42A17983A00C63526 /* SearchingMusicRepository.swift in Sources */,
C44B6BAE2D154258007F2C8C /* Order.swift in Sources */,
1824F1382A34A30F00A10320 /* ViewModel.swift in Sources */,
C49BA7832A1BE71700A83E95 /* SearchingMusicViewModel.swift in Sources */,
C4F5D3EC2C5B43BB008AF976 /* JSONLoadError.swift in Sources */,
Expand Down
8 changes: 4 additions & 4 deletions StreetDrop/StreetDrop/Data/Repositories/MyPage/DefaultMyPageRepository.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ extension DefaultMyPageRepository: MyPageRepository {
}
}

func fetchRegionFilteredDropList(state: String, city: String) -> Single<TotalMyMusics> {
func fetchRegionFilteredDropList(state: String, city: String, order: Order) -> Single<TotalMyMusics> {
return networkManager.request(
target: .init(
NetworkService.getRegionFilteredDropList(state: state, city: city)
NetworkService.getRegionFilteredDropList(state: state, city: city, order: order)
),
responseType: MyDropListResponseDTO.self
)
Expand All @@ -135,10 +135,10 @@ extension DefaultMyPageRepository: MyPageRepository {
}
}

func fetchRegionFilteredLikeList(state: String, city: String) -> Single<TotalMyMusics> {
func fetchRegionFilteredLikeList(state: String, city: String, order: Order) -> Single<TotalMyMusics> {
return networkManager.request(
target: .init(
NetworkService.getRegionFilteredLikeList(state: state, city: city)
NetworkService.getRegionFilteredLikeList(state: state, city: city, order: order)
),
responseType: MyDropListResponseDTO.self
)
Expand Down
4 changes: 2 additions & 2 deletions StreetDrop/StreetDrop/Data/Repositories/Protocol/MyPage/MyPageRepository.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ protocol MyPageRepository {
func fetchMyDropMusic(itemID: Int) -> Single<Musics>
func fetchCityAndDistricts() throws -> OrderedDictionary<String, [String]>
func fetchRegionFilteredDropCount(state: String, city: String) -> Single<Int>
func fetchRegionFilteredDropList(state: String, city: String) -> Single<TotalMyMusics>
func fetchRegionFilteredDropList(state: String, city: String, order: Order) -> Single<TotalMyMusics>
func fetchRegionFilteredLikeCount(state: String, city: String) -> Single<Int>
func fetchRegionFilteredLikeList(state: String, city: String) -> Single<TotalMyMusics>
func fetchRegionFilteredLikeList(state: String, city: String, order: Order) -> Single<TotalMyMusics>
}
6 changes: 3 additions & 3 deletions ...rop/Domain/UseCase/FetchingRegionFilteredDropList/FetchingRegionFilteredDropUseCase.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import RxSwift

protocol FetchingRegionFilteredDropUseCase {
func execute(state: String, city: String) -> Single<TotalMyMusics>
func execute(state: String, city: String, order: Order) -> Single<TotalMyMusics>
}

final class DefaultFetchingRegionFilteredDropUseCase: FetchingRegionFilteredDropUseCase {
Expand All @@ -20,7 +20,7 @@ final class DefaultFetchingRegionFilteredDropUseCase: FetchingRegionFilteredDrop
self.myPageRepository = myPageRepository
}

func execute(state: String, city: String) -> Single<TotalMyMusics> {
return myPageRepository.fetchRegionFilteredDropList(state: state, city: city)
func execute(state: String, city: String, order: Order) -> Single<TotalMyMusics> {
return myPageRepository.fetchRegionFilteredDropList(state: state, city: city, order: order)
}
}
6 changes: 3 additions & 3 deletions ...rop/Domain/UseCase/FetchingRegionFilteredLikeList/FetchingRegionFilteredLikeUseCase.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import RxSwift

protocol FetchingRegionFilteredLikeUseCase {
func execute(state: String, city: String) -> Single<TotalMyMusics>
func execute(state: String, city: String, order: Order) -> Single<TotalMyMusics>
}

final class DefaultFetchingRegionFilteredLikeUseCase: FetchingRegionFilteredLikeUseCase {
Expand All @@ -20,7 +20,7 @@ final class DefaultFetchingRegionFilteredLikeUseCase: FetchingRegionFilteredLike
self.myPageRepository = myPageRepository
}

func execute(state: String, city: String) -> Single<TotalMyMusics> {
return myPageRepository.fetchRegionFilteredLikeList(state: state, city: city)
func execute(state: String, city: String, order: Order) -> Single<TotalMyMusics> {
return myPageRepository.fetchRegionFilteredLikeList(state: state, city: city, order: order)
}
}
14 changes: 8 additions & 6 deletions StreetDrop/StreetDrop/Network/NetworkService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ enum NetworkService {
case getNoticeDetail(id: Int)
case checkNewNotice(lastNoticeId: Int?)
case getRegionFilteredDropCount(state: String, city: String)
case getRegionFilteredDropList(state: String, city: String)
case getRegionFilteredDropList(state: String, city: String, order: Order)
case getRegionFilteredLikeCount(state: String, city: String)
case getRegionFilteredLikeList(state: String, city: String)
case getRegionFilteredLikeList(state: String, city: String, order: Order)
}

extension NetworkService: TargetType {
Expand Down Expand Up @@ -283,11 +283,12 @@ extension NetworkService: TargetType {
],
encoding: URLEncoding.queryString
)
case let .getRegionFilteredDropList(state, city):
case let .getRegionFilteredDropList(state, city, order):
return .requestParameters(
parameters: [
"state": state,
"city": city
"city": city,
"order": order.rawValue
],
encoding: URLEncoding.queryString
)
Expand All @@ -299,11 +300,12 @@ extension NetworkService: TargetType {
],
encoding: URLEncoding.queryString
)
case let .getRegionFilteredLikeList(state, city):
case let .getRegionFilteredLikeList(state, city, order):
return .requestParameters(
parameters: [
"state": state,
"city": city
"city": city,
"order": order.rawValue
],
encoding: URLEncoding.queryString
)
Expand Down

0 comments on commit d80ccee

Please sign in to comment.