Skip to content

[MERGE] SIgnUp UserID 삭제 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dongglehada merged 1 commit into from
Dec 7, 2024
Merged

[MERGE] SIgnUp UserID 삭제 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 4 additions & 12 deletions Poppool/Poppool.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,7 @@
BD91036D2CF6149D00BBCCAE /* SignUpAPIEndpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD91035D2CF6149D00BBCCAE /* SignUpAPIEndpoint.swift */; };
BD91036E2CF6149D00BBCCAE /* SignUpRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD91035E2CF6149D00BBCCAE /* SignUpRequestDTO.swift */; };
BD9103812CF614A900BBCCAE /* HomeUseCaseImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9103702CF614A900BBCCAE /* HomeUseCaseImpl.swift */; };
BD9103822CF614A900BBCCAE /* SignUpUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9103712CF614A900BBCCAE /* SignUpUseCase.swift */; };
BD9103832CF614A900BBCCAE /* SignUpUseCaseImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9103722CF614A900BBCCAE /* SignUpUseCaseImpl.swift */; };
BD9103832CF614A900BBCCAE /* SignUpAPIUseCaseImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9103722CF614A900BBCCAE /* SignUpAPIUseCaseImpl.swift */; };
BD9103842CF614A900BBCCAE /* TryLoginUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9103732CF614A900BBCCAE /* TryLoginUseCase.swift */; };
BD9103852CF614A900BBCCAE /* TryLoginUseCaseImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9103742CF614A900BBCCAE /* TryLoginUseCaseImpl.swift */; };
BD9103862CF614A900BBCCAE /* BannerPopUpStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9103762CF614A900BBCCAE /* BannerPopUpStore.swift */; };
Expand All @@ -198,7 +197,6 @@
BD9103892CF614A900BBCCAE /* PopUpStoreResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9103792CF614A900BBCCAE /* PopUpStoreResponse.swift */; };
BD91038A2CF614A900BBCCAE /* LoginResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD91037A2CF614A900BBCCAE /* LoginResponse.swift */; };
BD91038B2CF614A900BBCCAE /* AuthRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD91037C2CF614A900BBCCAE /* AuthRepository.swift */; };
BD91038D2CF614A900BBCCAE /* SignUpRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD91037E2CF614A900BBCCAE /* SignUpRepository.swift */; };
BD9103922CF6166800BBCCAE /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD91038E2CF6166800BBCCAE /* SplashView.swift */; };
BD9103932CF6166800BBCCAE /* SplashController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD9103902CF6166800BBCCAE /* SplashController.swift */; };
BDCA41C12CF35AC0005EECF6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDCA41C02CF35AC0005EECF6 /* AppDelegate.swift */; };
Expand Down Expand Up @@ -416,8 +414,7 @@
BD91035D2CF6149D00BBCCAE /* SignUpAPIEndpoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignUpAPIEndpoint.swift; sourceTree = "<group>"; };
BD91035E2CF6149D00BBCCAE /* SignUpRequestDTO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignUpRequestDTO.swift; sourceTree = "<group>"; };
BD9103702CF614A900BBCCAE /* HomeUseCaseImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeUseCaseImpl.swift; sourceTree = "<group>"; };
BD9103712CF614A900BBCCAE /* SignUpUseCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignUpUseCase.swift; sourceTree = "<group>"; };
BD9103722CF614A900BBCCAE /* SignUpUseCaseImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignUpUseCaseImpl.swift; sourceTree = "<group>"; };
BD9103722CF614A900BBCCAE /* SignUpAPIUseCaseImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignUpAPIUseCaseImpl.swift; sourceTree = "<group>"; };
BD9103732CF614A900BBCCAE /* TryLoginUseCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TryLoginUseCase.swift; sourceTree = "<group>"; };
BD9103742CF614A900BBCCAE /* TryLoginUseCaseImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TryLoginUseCaseImpl.swift; sourceTree = "<group>"; };
BD9103762CF614A900BBCCAE /* BannerPopUpStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BannerPopUpStore.swift; sourceTree = "<group>"; };
Expand All @@ -426,7 +423,6 @@
BD9103792CF614A900BBCCAE /* PopUpStoreResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopUpStoreResponse.swift; sourceTree = "<group>"; };
BD91037A2CF614A900BBCCAE /* LoginResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginResponse.swift; sourceTree = "<group>"; };
BD91037C2CF614A900BBCCAE /* AuthRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthRepository.swift; sourceTree = "<group>"; };
BD91037E2CF614A900BBCCAE /* SignUpRepository.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignUpRepository.swift; sourceTree = "<group>"; };
BD91038E2CF6166800BBCCAE /* SplashView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = "<group>"; };
BD9103902CF6166800BBCCAE /* SplashController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SplashController.swift; sourceTree = "<group>"; };
BDCA41BD2CF35AC0005EECF6 /* Poppool.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Poppool.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -1264,8 +1260,7 @@
isa = PBXGroup;
children = (
BD9103702CF614A900BBCCAE /* HomeUseCaseImpl.swift */,
BD9103712CF614A900BBCCAE /* SignUpUseCase.swift */,
BD9103722CF614A900BBCCAE /* SignUpUseCaseImpl.swift */,
BD9103722CF614A900BBCCAE /* SignUpAPIUseCaseImpl.swift */,
BD9103732CF614A900BBCCAE /* TryLoginUseCase.swift */,
BD9103742CF614A900BBCCAE /* TryLoginUseCaseImpl.swift */,
086DD8DD2CFF19C400B97D3B /* UserAPIUseCaseImpl.swift */,
Expand All @@ -1291,7 +1286,6 @@
isa = PBXGroup;
children = (
BD91037C2CF614A900BBCCAE /* AuthRepository.swift */,
BD91037E2CF614A900BBCCAE /* SignUpRepository.swift */,
);
path = Repository;
sourceTree = "<group>";
Expand Down Expand Up @@ -1585,7 +1579,6 @@
0841BAB82CFAC41300049E31 /* SectionBackGroundDecorationView.swift in Sources */,
089952682D046CD80022AEF9 /* SearchResultReactor.swift in Sources */,
BDCA41C52CF35AC0005EECF6 /* TestViewController.swift in Sources */,
BD9103822CF614A900BBCCAE /* SignUpUseCase.swift in Sources */,
086DD9402D01EEEB00B97D3B /* SearchCountTitleSection.swift in Sources */,
086DD8CE2CFDFEB000B97D3B /* HomeListView.swift in Sources */,
08B191C22CF615CA0057BC04 /* Secrets.swift in Sources */,
Expand All @@ -1602,7 +1595,7 @@
BD91038A2CF614A900BBCCAE /* LoginResponse.swift in Sources */,
083A25BF2CF362770099B58E /* Logger.swift in Sources */,
08DC61FC2CF76862002A2F44 /* SignUpCompleteReactor.swift in Sources */,
BD9103832CF614A900BBCCAE /* SignUpUseCaseImpl.swift in Sources */,
BD9103832CF614A900BBCCAE /* SignUpAPIUseCaseImpl.swift in Sources */,
08DC62072CF8AC14002A2F44 /* HomeReactor.swift in Sources */,
083A259A2CF362090099B58E /* SectionDecorationItem.swift in Sources */,
BD9103892CF614A900BBCCAE /* PopUpStoreResponse.swift in Sources */,
Expand Down Expand Up @@ -1636,7 +1629,6 @@
086DD8E32CFF356300B97D3B /* HomeCardGridSection.swift in Sources */,
0841BABE2CFB5AA600049E31 /* Date?+.swift in Sources */,
083A258D2CF361F90099B58E /* ConventionCollectionViewCell.swift in Sources */,
BD91038D2CF614A900BBCCAE /* SignUpRepository.swift in Sources */,
08DC620D2CF8AE16002A2F44 /* ImageBannerSectionCell.swift in Sources */,
08B1915B2CF41E690057BC04 /* SignUpMainReactor.swift in Sources */,
08B191882CF48FAE0057BC04 /* NickNameState.swift in Sources */,
Expand Down
1 change: 0 additions & 1 deletion Poppool/Poppool/Data/Network/SignUpAPI/SignUpRequestDTO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import Foundation

struct SignUpRequestDTO: Encodable {
var userId: String
var nickname: String
var gender: String
var age: Int32
Expand Down
4 changes: 1 addition & 3 deletions Poppool/Poppool/Data/Repository/SignUpRepositoryImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation
import RxSwift

final class SignUpRepositoryImpl: SignUpRepository {
final class SignUpRepositoryImpl {

var provider: Provider

Expand All @@ -29,7 +29,6 @@ final class SignUpRepositoryImpl: SignUpRepository {
}

func trySignUp(
userId: String,
nickName: String,
gender: String,
age: Int32,
Expand All @@ -38,7 +37,6 @@ final class SignUpRepositoryImpl: SignUpRepository {
interests: [Int64]
) -> Completable {
let endPoint = SignUpAPIEndpoint.signUp_trySignUp(with: .init(
userId: userId,
nickname: nickName,
gender: gender,
age: age,
Expand Down
46 changes: 0 additions & 46 deletions Poppool/Poppool/Domain/Repository/SignUpRepository.swift
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions ...ol/Domain/UseCase/SignUpUseCaseImpl.swift → ...Domain/UseCase/SignUpAPIUseCaseImpl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// SignUpUseCaseImpl.swift
// SignUpAPIUseCaseImpl.swift
// Poppool
//
// Created by Porori on 11/25/24.
Expand All @@ -8,14 +8,13 @@
import Foundation
import RxSwift

final class SignUpUseCaseImpl: SignUpUseCase {
var repository: SignUpRepository
final class SignUpAPIUseCaseImpl {
var repository: SignUpRepositoryImpl

init(repository: SignUpRepository) {
init(repository: SignUpRepositoryImpl) {
self.repository = repository
}
func trySignUp(
userId: String,
nickName: String,
gender: String,
age: Int32,
Expand All @@ -24,7 +23,6 @@ final class SignUpUseCaseImpl: SignUpUseCase {
interests: [Int64]
) -> Completable {
return repository.trySignUp(
userId: userId,
nickName: nickName,
gender: gender,
age: age,
Expand Down
46 changes: 0 additions & 46 deletions Poppool/Poppool/Domain/UseCase/SignUpUseCase.swift
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Poppool/Poppool/Presentation/Secne/Search/CategoryController/SearchCategoryReactor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ final class SearchCategoryReactor: Reactor {
var initialState: State
var disposeBag = DisposeBag()
var originCategoryList: [Int64]
private let signUpAPIUseCase = SignUpUseCaseImpl(repository: SignUpRepositoryImpl(provider: ProviderImpl()))
private let signUpAPIUseCase = SignUpAPIUseCaseImpl(repository: SignUpRepositoryImpl(provider: ProviderImpl()))
private var tagSection = TagSection(inputDataList: [])
lazy var compositionalLayout: UICollectionViewCompositionalLayout = {
UICollectionViewCompositionalLayout { [weak self] section, env in
Expand Down
6 changes: 2 additions & 4 deletions Poppool/Poppool/Presentation/Secne/SignUp/Main/SignUpMainReactor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ final class SignUpMainReactor: Reactor {

var initialState: State
var disposeBag = DisposeBag()
private let signUpAPIUseCase = SignUpUseCaseImpl(repository: SignUpRepositoryImpl(provider: ProviderImpl()))
private let signUpAPIUseCase = SignUpAPIUseCaseImpl(repository: SignUpRepositoryImpl(provider: ProviderImpl()))
private let userDefaultService = UserDefaultService()

// MARK: - init
Expand Down Expand Up @@ -112,12 +112,10 @@ final class SignUpMainReactor: Reactor {
newState.currentIndex = currentIndex - 1
controller.scrollToPage(.at(index: currentIndex - 1), animated: false)
case .moveToCompleteScene(let controller):
guard let userId = userDefaultService.fetch(key: "userID"),
let socialType = userDefaultService.fetch(key: "socialType"),
guard let socialType = userDefaultService.fetch(key: "socialType"),
let nickName = newState.nickName,
let gender = newState.gender else { return newState }
signUpAPIUseCase.trySignUp(
userId: userId,
nickName: nickName,
gender: gender,
age: Int32(newState.age ?? 30),
Expand Down
2 changes: 1 addition & 1 deletion Poppool/Poppool/Presentation/Secne/SignUp/Step2/SignUpStep2Reactor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ final class SignUpStep2Reactor: Reactor {

var initialState: State
var disposeBag = DisposeBag()
private let signUpAPIUseCase = SignUpUseCaseImpl(repository: SignUpRepositoryImpl(provider: ProviderImpl()))
private let signUpAPIUseCase = SignUpAPIUseCaseImpl(repository: SignUpRepositoryImpl(provider: ProviderImpl()))
private var nickName: String?

// MARK: - init
Expand Down
2 changes: 1 addition & 1 deletion Poppool/Poppool/Presentation/Secne/SignUp/Step3/SignUpStep3Reactor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ final class SignUpStep3Reactor: Reactor {

var initialState: State
var disposeBag = DisposeBag()
private let signUpAPIUseCase = SignUpUseCaseImpl(repository: SignUpRepositoryImpl(provider: ProviderImpl()))
private let signUpAPIUseCase = SignUpAPIUseCaseImpl(repository: SignUpRepositoryImpl(provider: ProviderImpl()))
private var cetegoryIDList: [Int64] = []

lazy var compositionalLayout: UICollectionViewCompositionalLayout = {
Expand Down