Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Koin/Apps/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ extension SceneDelegate {
fetchShopCategoryListUseCase: fetchShopCategoryUseCase,
dateProvider: dateProvider,
checkVersionUseCase: DefaultCheckVersionUseCase(coreRepository: DefaultCoreRepository(service: DefaultCoreService())),
assignAbTestUseCase: DefaultAssignAbTestUseCase(abTestRepository: DefaultAbTestRepository(service: DefaultAbTestService())),
fetchKeywordNoticePhraseUseCase: DefaultFetchKeywordNoticePhraseUseCase(),
checkLoginUseCase: checkLoginUseCase,
fetchLostItemStatsUseCase: fetchLostItemStatsUseCase
Expand Down
38 changes: 8 additions & 30 deletions Koin/Presentation/Home/Home/HomeViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,6 @@ final class HomeViewController: UIViewController {
cornerSegmentControl.addTarget(self, action: #selector(segmentDidChange), for: .valueChanged)
checkAndShowTooltip()
checkAndShowBanner()
inputSubject.send(.logEvent(EventParameter.EventLabel.AbTest.businessBenefit, .abTestBenefit, "혜택X", nil, nil, nil, nil))
inputSubject.send(.getAbTestResult("c_main_dining_v1"))
inputSubject.send(.getClubAbTest("a_main_club_ui"))
scrollView.delegate = self
}

Expand Down Expand Up @@ -213,12 +210,10 @@ final class HomeViewController: UIViewController {
self?.updateHotArticles(articles: hotNoticeArticlesInfo, phrases: keywordNoticePhrases)
case let .showForceUpdate(version):
self?.navigateToForceUpdate(version: version)
case let .setAbTestResult(abTestResult):
self?.setAbTestResult(result: abTestResult)
case .showForceModal:
self?.navigationController?.setViewControllers([ForceModifyUserViewController()], animated: true)
case .updateBanner(let banner, let abTestResult):
self?.showBanner(banner: banner, abTestResult: abTestResult)
case .updateBanner(let banner):
self?.showBanner(banner: banner)
case .setHotClub(let hotClub):
self?.clubView.setupHotClub(club: hotClub)
case .setClubCategories(let response):
Expand Down Expand Up @@ -437,20 +432,12 @@ extension HomeViewController {
return false
}

private func showBanner(banner: BannerDto, abTestResult: AssignAbTestResponse) {
private func showBanner(banner: BannerDto) {
if banner.count == 0 { return }
let viewController: UIViewController
if abTestResult.variableName == .bottomBanner {
bannerViewControllerA.setBanners(banners: banner.banners)
viewController = BottomSheetViewController(contentViewController: bannerViewControllerA, defaultHeight: 389)
inputSubject.send(.logEventDirect(name: "AB_TEST", label: "CAMPUS_modal_1", value: "design_A", category: "a/b test 로깅(메인 모달)"))
inputSubject.send(.logEventDirect(name: "CAMPUS", label: "main_modal_entry", value: banner.banners.first?.title ?? "", category: "entry"))
} else {
bannerViewControllerB.setBanners(banners: banner.banners)
viewController = bannerViewControllerB
inputSubject.send(.logEventDirect(name: "AB_TEST", label: "CAMPUS_modal_1", value: "design_B", category: "a/b test 로깅(메인 모달)"))
inputSubject.send(.logEventDirect(name: "CAMPUS", label: "main_modal_entry", value: banner.banners.first?.title ?? "", category: "entry"))
}

bannerViewControllerA.setBanners(banners: banner.banners)
let viewController = BottomSheetViewController(contentViewController: bannerViewControllerA, defaultHeight: 389)
inputSubject.send(.logEventDirect(name: "CAMPUS", label: "main_modal_entry", value: banner.banners.first?.title ?? "", category: "entry"))
viewController.modalPresentationStyle = .overFullScreen
viewController.modalTransitionStyle = .crossDissolve
self.present(viewController, animated: true)
Expand All @@ -463,7 +450,7 @@ extension HomeViewController {
return
}
}
inputSubject.send(.getBannerAbTest("a_main_banner_ui"))
inputSubject.send(.fetchBanner)
}

@objc private func tapBusQrCode() {
Expand Down Expand Up @@ -577,15 +564,6 @@ extension HomeViewController {
categoryCollectionView.updateCategories(data.shopCategories)
}

private func setAbTestResult(result: AssignAbTestResponse) {
if result.variableName == .mainDiningOriginal {
goDiningPageButton.isHidden = true
}
else if result.variableName == .mainDiningNew {
goDiningPageButton.isHidden = false
}
}

private func didTapCell(at id: Int) {
let shopService = DefaultShopService()
let shopRepository = DefaultShopRepository(service: shopService)
Expand Down
70 changes: 7 additions & 63 deletions Koin/Presentation/Home/Home/HomeViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ final class HomeViewModel: ViewModelProtocol {
case logEventDirect(name: String, label: String, value: String, category: String)
case getUserScreenAction(Date, ScreenActionType, EventParameter.EventLabelNeededDuration? = nil)
case getNoticeBanner(Date?)
case getAbTestResult(String)
case getBannerAbTest(String)
case getClubAbTest(String)
case fetchBanner
case logSessionEvent(EventLabelType, EventParameter.EventCategory, Any, String)
}

Expand All @@ -34,9 +32,8 @@ final class HomeViewModel: ViewModelProtocol {
case updateNoticeBanners([NoticeArticleDto], ((String, String), Int)?)
case putImage(ShopCategoryDto)
case showForceUpdate(String)
case setAbTestResult(AssignAbTestResponse)
case showForceModal
case updateBanner(BannerDto, AssignAbTestResponse)
case updateBanner(BannerDto)
case setHotClub(HotClubDto)
case setClubCategories(ClubCategoriesDto)
case updateLostItem(LostItemStats)
Expand All @@ -52,7 +49,6 @@ final class HomeViewModel: ViewModelProtocol {
private let checkVersionUseCase: CheckVersionUseCase
private let getUserScreenTimeUseCase: GetUserScreenTimeUseCase
private let fetchHotNoticeArticlesUseCase: FetchHotNoticeArticlesUseCase
private let assignAbTestUseCase: AssignAbTestUseCase
private let fetchKeywordNoticePhraseUseCase: FetchKeywordNoticePhraseUseCase
private let fetchLostItemStatsUseCase: FetchLostItemStatsUseCase
private let fetchUserDataUseCase = DefaultFetchUserDataUseCase(userRepository: DefaultUserRepository(service: DefaultUserService()))
Expand All @@ -73,7 +69,6 @@ final class HomeViewModel: ViewModelProtocol {
fetchShopCategoryListUseCase: FetchShopCategoryListUseCase,
dateProvider: DateProvider,
checkVersionUseCase: CheckVersionUseCase,
assignAbTestUseCase: AssignAbTestUseCase,
fetchKeywordNoticePhraseUseCase: FetchKeywordNoticePhraseUseCase,
checkLoginUseCase: CheckLoginUseCase,
fetchLostItemStatsUseCase: FetchLostItemStatsUseCase
Expand All @@ -85,7 +80,6 @@ final class HomeViewModel: ViewModelProtocol {
self.fetchShopCategoryListUseCase = fetchShopCategoryListUseCase
self.dateProvider = dateProvider
self.checkVersionUseCase = checkVersionUseCase
self.assignAbTestUseCase = assignAbTestUseCase
self.fetchKeywordNoticePhraseUseCase = fetchKeywordNoticePhraseUseCase
self.checkLoginUseCase = checkLoginUseCase
self.fetchLostItemStatsUseCase = fetchLostItemStatsUseCase
Expand All @@ -99,6 +93,7 @@ final class HomeViewModel: ViewModelProtocol {
self?.getShopCategory()
self?.checkVersion()
self?.fetchUserData()
self?.fetchHotClub()
case let .categorySelected(place):
self?.getDiningInformation(diningPlace: place)
case .getDiningInfo:
Expand All @@ -111,15 +106,10 @@ final class HomeViewModel: ViewModelProtocol {
self?.getScreenAction(time: time, screenActionType: screenActionType, eventLabelNeededDuration: eventLabelNeededDuration)
case let .getNoticeBanner(date):
self?.getNoticeBanners(date: date)
case let .getAbTestResult(abTestTitle):
break
// self?.getAbTestResult(abTestTitle: abTestTitle)
case .getBannerAbTest(let request):
self?.getBannerAbTest(request: request)
case .fetchBanner:
self?.fetchBanner()
case let .logEventDirect(name, label, value, category):
self?.logAnalyticsEventUseCase.logEvent(name: name, label: label, value: value, category: category)
case .getClubAbTest(let request):
self?.getClubAbTest(request: request)
case let .logSessionEvent(label, category, value, sessionId):
self?.makeLogAnalyticsSessionEvent(label: label, category: category, value: value, sessionId: sessionId)
}
Expand All @@ -131,13 +121,13 @@ final class HomeViewModel: ViewModelProtocol {

extension HomeViewModel {

private func fetchBanner(abTestResult: AssignAbTestResponse) {
private func fetchBanner() {
fetchBannerUseCase.execute().sink { completion in
if case let .failure(error) = completion {
Log.make().error("\(error)")
}
} receiveValue: { [weak self] response in
self?.outputSubject.send(.updateBanner(response, abTestResult))
self?.outputSubject.send(.updateBanner(response))
}.store(in: &subscriptions)
}
private func fetchHotClub() {
Expand All @@ -159,32 +149,6 @@ extension HomeViewModel {
self?.outputSubject.send(.setClubCategories(categories))
}).store(in: &subscriptions)
}
private func getClubAbTest(request: String) {
assignAbTestUseCase.execute(requestModel: AssignAbTestRequest(title: request))
.sink(receiveCompletion: { completion in
if case let .failure(error) = completion {
Log.make().error("\(error)")
}
}, receiveValue: { [weak self] abTestResult in
print(abTestResult)
if abTestResult.variableName == .hot {
self?.fetchHotClub()
self?.logAnalyticsEventUseCase.logEvent(name: "AB_TEST", label: "CAMPUS_club_1", value: "design_B", category: "a/b test 로깅(메인화면 동아리 진입)")
} else {
self?.fetchClubCategories()
self?.logAnalyticsEventUseCase.logEvent(name: "AB_TEST", label: "CAMPUS_club_1", value: "design_A", category: "a/b test 로깅(메인화면 동아리 진입)") }
}).store(in: &subscriptions)
}
private func getBannerAbTest(request: String) {
assignAbTestUseCase.execute(requestModel: AssignAbTestRequest(title: request))
.sink(receiveCompletion: { completion in
if case let .failure(error) = completion {
Log.make().error("\(error)")
}
}, receiveValue: { [weak self] abTestResult in
self?.fetchBanner(abTestResult: abTestResult)
}).store(in: &subscriptions)
}

private func fetchUserData() {
fetchUserDataUseCase.execute().sink { completion in
Expand Down Expand Up @@ -302,26 +266,6 @@ extension HomeViewModel {
}
}.store(in: &subscriptions)
}


private func getAbTestResult(abTestTitle: String) {
assignAbTestUseCase.execute(requestModel: AssignAbTestRequest(title: abTestTitle))
.throttle(for: .milliseconds(500), scheduler: RunLoop.main, latest: true)
.sink(receiveCompletion: { [weak self] completion in
if case let .failure(error) = completion {
Log.make().error("\(error)")
if abTestTitle == "c_keyword_ banner_v1" {
self?.getNoticeBanners(date: nil)
}
}
}, receiveValue: { [weak self] abTestResult in
print(abTestResult)
self?.outputSubject.send(.setAbTestResult(abTestResult))
if abTestTitle == "c_main_dining_v1" {
self?.getAbTestResult(abTestTitle: "c_keyword_ banner_v1")
}
}).store(in: &subscriptions)
}

private func makeLogAnalyticsSessionEvent(label: EventLabelType, category: EventParameter.EventCategory, value: Any, sessionId: String) {
logAnalyticsEventUseCase.executeWithSessionId(label: label, category: category, value: value, sessionId: sessionId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ extension ForceModifyUserViewController {
fetchShopCategoryListUseCase: fetchShopCategoryUseCase,
dateProvider: dateProvider,
checkVersionUseCase: DefaultCheckVersionUseCase(coreRepository: DefaultCoreRepository(service: DefaultCoreService())),
assignAbTestUseCase: DefaultAssignAbTestUseCase(abTestRepository: DefaultAbTestRepository(service: DefaultAbTestService())),
fetchKeywordNoticePhraseUseCase: DefaultFetchKeywordNoticePhraseUseCase(),
checkLoginUseCase: checkLoginUseCase,
fetchLostItemStatsUseCase: fetchLostItemStatsUseCase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ extension FoundIdViewController {
fetchShopCategoryListUseCase: fetchShopCategoryUseCase,
dateProvider: dateProvider,
checkVersionUseCase: DefaultCheckVersionUseCase(coreRepository: DefaultCoreRepository(service: DefaultCoreService())),
assignAbTestUseCase: DefaultAssignAbTestUseCase(abTestRepository: DefaultAbTestRepository(service: DefaultAbTestService())),
fetchKeywordNoticePhraseUseCase: DefaultFetchKeywordNoticePhraseUseCase(),
checkLoginUseCase: checkLoginUseCase,
fetchLostItemStatsUseCase: fetchLostItemStatsUseCase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ extension ChangePasswordSuccessViewController {
fetchShopCategoryListUseCase: fetchShopCategoryUseCase,
dateProvider: dateProvider,
checkVersionUseCase: DefaultCheckVersionUseCase(coreRepository: DefaultCoreRepository(service: DefaultCoreService())),
assignAbTestUseCase: DefaultAssignAbTestUseCase(abTestRepository: DefaultAbTestRepository(service: DefaultAbTestService())),
fetchKeywordNoticePhraseUseCase: DefaultFetchKeywordNoticePhraseUseCase(),
checkLoginUseCase: checkLoginUseCase,
fetchLostItemStatsUseCase: fetchLostItemStatsUseCase
Expand Down
1 change: 0 additions & 1 deletion Koin/Presentation/Login/Login/LoginViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ final class LoginViewController: UIViewController {
fetchShopCategoryListUseCase: fetchShopCategoryUseCase,
dateProvider: dateProvider,
checkVersionUseCase: DefaultCheckVersionUseCase(coreRepository: DefaultCoreRepository(service: DefaultCoreService())),
assignAbTestUseCase: DefaultAssignAbTestUseCase(abTestRepository: DefaultAbTestRepository(service: DefaultAbTestService())),
fetchKeywordNoticePhraseUseCase: DefaultFetchKeywordNoticePhraseUseCase(),
checkLoginUseCase: checkLoginUseCase,
fetchLostItemStatsUseCase: fetchLostItemStatsUseCase
Expand Down