Skip to content

[MERGE]: QA및 일부 버그 수정 #71

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
zzangzzangguy merged 5 commits into from
Mar 9, 2025
Merged

[MERGE]: QA및 일부 버그 수정 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4375dbb
[FEAT]: QA 일부반영
zzangzzangguy Mar 2, 2025
3ba1fcc
[FIX]: 약관 QA 적용
dongglehada Mar 4, 2025
ca31fa3
[FIX] QA 반영 (레이아웃 수정)
zzangzzangguy Mar 6, 2025
53ddcbf
[FIX] 리스트뷰 제스쳐 수정
zzangzzangguy Mar 7, 2025
ef3725d
[FIX]: 시간오류 수정
zzangzzangguy Mar 9, 2025
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
12 changes: 10 additions & 2 deletions Poppool/Poppool.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,8 @@
08DE8A3F2D54DCC40049BCAC /* MyCommentedPopUpGridSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08DE8A3E2D54DCC40049BCAC /* MyCommentedPopUpGridSection.swift */; };
08DE8A412D54DCCA0049BCAC /* MyCommentedPopUpGridSectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08DE8A402D54DCCA0049BCAC /* MyCommentedPopUpGridSectionCell.swift */; };
4E5825672D1951DF00EE83EF /* FloatingPanel in Frameworks */ = {isa = PBXBuildFile; productRef = 4E5825662D1951DF00EE83EF /* FloatingPanel */; };
4E643FC12D738D7F0046AF29 /* PopUpStoreRegisterReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E643FC02D738D7F0046AF29 /* PopUpStoreRegisterReactor.swift */; };
4E643FC32D738D930046AF29 /* PopUpStoreRegisterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E643FC22D738D930046AF29 /* PopUpStoreRegisterView.swift */; };
4E685ECE2D12CEB6001EF91C /* BalloonBackgroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E685EAA2D12CEB6001EF91C /* BalloonBackgroundView.swift */; };
4E685ECF2D12CEB6001EF91C /* BalloonChipCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E685EAB2D12CEB6001EF91C /* BalloonChipCell.swift */; };
4E685ED12D12CEB6001EF91C /* FilterBottomSheetReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E685EAD2D12CEB6001EF91C /* FilterBottomSheetReactor.swift */; };
Expand Down Expand Up @@ -862,6 +864,8 @@
08DE8A1C2D5261E70049BCAC /* MyPageTermsReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageTermsReactor.swift; sourceTree = "<group>"; };
08DE8A3E2D54DCC40049BCAC /* MyCommentedPopUpGridSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyCommentedPopUpGridSection.swift; sourceTree = "<group>"; };
08DE8A402D54DCCA0049BCAC /* MyCommentedPopUpGridSectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyCommentedPopUpGridSectionCell.swift; sourceTree = "<group>"; };
4E643FC02D738D7F0046AF29 /* PopUpStoreRegisterReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopUpStoreRegisterReactor.swift; sourceTree = "<group>"; };
4E643FC22D738D930046AF29 /* PopUpStoreRegisterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopUpStoreRegisterView.swift; sourceTree = "<group>"; };
4E685EAA2D12CEB6001EF91C /* BalloonBackgroundView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BalloonBackgroundView.swift; sourceTree = "<group>"; };
4E685EAB2D12CEB6001EF91C /* BalloonChipCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BalloonChipCell.swift; sourceTree = "<group>"; };
4E685EAD2D12CEB6001EF91C /* FilterBottomSheetReactor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterBottomSheetReactor.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2783,6 +2787,8 @@
isa = PBXGroup;
children = (
4E9C12802D2BE0A6006744D6 /* PopUpStoreRegisterViewController.swift */,
4E643FC02D738D7F0046AF29 /* PopUpStoreRegisterReactor.swift */,
4E643FC22D738D930046AF29 /* PopUpStoreRegisterView.swift */,
);
path = AdminRegister;
sourceTree = "<group>";
Expand Down Expand Up @@ -3445,6 +3451,7 @@
08DC61F52CF765B5002A2F44 /* UserDefaultService.swift in Sources */,
08A2E46C2D15BC5000102313 /* CommentLikeRequestDTO.swift in Sources */,
086F8A072D23CB3800CA4FC9 /* MyPageProfileSectionCell.swift in Sources */,
4E643FC12D738D7F0046AF29 /* PopUpStoreRegisterReactor.swift in Sources */,
08B191AE2CF5BFA60057BC04 /* AgeSelectedView.swift in Sources */,
4E685EE72D12CEB6001EF91C /* MapSearchInput.swift in Sources */,
08A2E4912D1BF6EA00102313 /* CommentListController.swift in Sources */,
Expand Down Expand Up @@ -3553,6 +3560,7 @@
0818992D2D3506240067BF01 /* FAQDropdownSectionCell.swift in Sources */,
08B191742CF43DF40057BC04 /* SignUpCheckBoxButton.swift in Sources */,
086DD8D32CFDFF1500B97D3B /* HomePopUpType.swift in Sources */,
4E643FC32D738D930046AF29 /* PopUpStoreRegisterView.swift in Sources */,
081898CC2D30D5BF0067BF01 /* InfoEditModalController.swift in Sources */,
08DE8A0D2D5236840049BCAC /* PutCommentRequestDTO.swift in Sources */,
4E685EE92D12CEB6001EF91C /* MapView.swift in Sources */,
Expand Down Expand Up @@ -3864,7 +3872,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.17;
MARKETING_VERSION = 1.0.20;
PRODUCT_BUNDLE_IDENTIFIER = com.poppoolIOS.poppool;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down Expand Up @@ -3902,7 +3910,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.17;
MARKETING_VERSION = 1.0.20;
PRODUCT_BUNDLE_IDENTIFIER = com.poppoolIOS.poppool;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down
2 changes: 1 addition & 1 deletion Poppool/Poppool/Data/Network/PopUpAPI/ResponseDTO/GetPopUpDetailResponseDTO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extension GetPopUpDetailResponseDTO {
startDate: startDate.toDate().toPPDateString(),
endDate: endDate.toDate().toPPDateString(),
startTime: startDate.toDate().toPPTimeeString(),
endTime: startDate.toDate().toPPTimeeString(),
endTime: endDate.toDate().toPPTimeeString(),
address: address,
commentCount: commentCount,
bookmarkYn: bookmarkYn,
Expand Down
111 changes: 111 additions & 0 deletions Poppool/Poppool/Presentation/Admin/AdminRegister/PopUpStoreRegisterReactor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
import ReactorKit
import RxSwift
import RxCocoa


final class PopUpStoreRegisterReactor: Reactor {

// MARK: - Action
enum Action {
case updateName(String)
case updateAddress(String)
case updateLat(String)
case updateLon(String)
case updateDescription(String)
case selectCategory(String)
case addImage(ExtendedImage)
case removeImage(Int)
case tapSave
}

// MARK: - Mutation
enum Mutation {
case setName(String)
case setAddress(String)
case setLat(String)
case setLon(String)
case setDescription(String)
case setCategory(String)
case addImage(ExtendedImage)
case removeImage(Int)
case setSaveEnabled(Bool)
}

// MARK: - State
struct State {
var name: String = ""
var address: String = ""
var lat: String = ""
var lon: String = ""
var description: String = ""
var category: String = ""
var images: [ExtendedImage] = []
var isSaveEnabled: Bool = false
}

let initialState = State()

// MARK: - Mutate
func mutate(action: Action) -> Observable<Mutation> {
switch action {
case let .updateName(name):
return .just(.setName(name))
case let .updateAddress(address):
return .just(.setAddress(address))
case let .updateLat(lat):
return .just(.setLat(lat))
case let .updateLon(lon):
return .just(.setLon(lon))
case let .updateDescription(desc):
return .just(.setDescription(desc))
case let .selectCategory(category):
return .just(.setCategory(category))
case let .addImage(image):
return .just(.addImage(image))
case let .removeImage(index):
return .just(.removeImage(index))
case .tapSave:
// API 호출 등 저장 로직은 여기서 처리하거나 별도 Service로 위임합니다.
// 이 예제에서는 저장 전 폼 유효성 검증만 진행합니다.
return .empty()
}
}

// MARK: - Reduce
func reduce(state: State, mutation: Mutation) -> State {
var newState = state
switch mutation {
case let .setName(name):
newState.name = name
case let .setAddress(address):
newState.address = address
case let .setLat(lat):
newState.lat = lat
case let .setLon(lon):
newState.lon = lon
case let .setDescription(desc):
newState.description = desc
case let .setCategory(category):
newState.category = category
case let .addImage(image):
newState.images.append(image)
case let .removeImage(index):
if index < newState.images.count {
newState.images.remove(at: index)
}
case .setSaveEnabled(let enabled):
newState.isSaveEnabled = enabled
}

let isValid = !newState.name.isEmpty &&
!newState.address.isEmpty &&
!newState.lat.isEmpty &&
!newState.lon.isEmpty &&
!newState.description.isEmpty &&
!newState.category.isEmpty &&
!newState.images.isEmpty
newState.isSaveEnabled = isValid

return newState
}
}
Loading