Skip to content

Commit b751dcd

Browse files
authored
Merge pull request #43 from Orange-Co/feat/#42
QA 반영 및 심사 대응
2 parents 42fca19 + 7875704 commit b751dcd

31 files changed

+881
-134
lines changed

DDANZI_iOS/DDANZI_iOS.xcodeproj/project.pbxproj

+44-3
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@
7272
363F1A102C9B10BA007527E2 /* LogoutDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A0F2C9B10BA007527E2 /* LogoutDTO.swift */; };
7373
363F1A122C9B1638007527E2 /* UserAccountDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A112C9B1638007527E2 /* UserAccountDTO.swift */; };
7474
363F1A182C9CA04F007527E2 /* Amplitude in Frameworks */ = {isa = PBXBuildFile; productRef = 363F1A172C9CA04F007527E2 /* Amplitude */; };
75+
363F1A1A2C9EE9EB007527E2 /* AccountAddViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A192C9EE9EB007527E2 /* AccountAddViewController.swift */; };
76+
363F1A1C2C9EF029007527E2 /* AccountAddCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A1B2C9EF029007527E2 /* AccountAddCell.swift */; };
77+
363F1A1E2C9F072F007527E2 /* UserAccountRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A1D2C9F072F007527E2 /* UserAccountRequestDTO.swift */; };
78+
363F1A232C9F15EB007527E2 /* RxGesture in Frameworks */ = {isa = PBXBuildFile; productRef = 363F1A222C9F15EB007527E2 /* RxGesture */; };
79+
363F1A252C9F1BE2007527E2 /* BankList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A242C9F1BE2007527E2 /* BankList.swift */; };
80+
363F1A272C9F57D4007527E2 /* CustomAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A262C9F57D4007527E2 /* CustomAlertView.swift */; };
81+
363F1A292CA067C7007527E2 /* RefreshTokenRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A282CA067C7007527E2 /* RefreshTokenRequestDTO.swift */; };
7582
3648954E2C6281BB00AAA8E2 /* HomeItemsResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3648954D2C6281BB00AAA8E2 /* HomeItemsResponseDTO.swift */; };
7683
364895502C62822200AAA8E2 /* ProductDetailResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3648954F2C62822200AAA8E2 /* ProductDetailResponseDTO.swift */; };
7784
364895522C62826200AAA8E2 /* SearchItemsResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 364895512C62826200AAA8E2 /* SearchItemsResponseDTO.swift */; };
@@ -306,6 +313,12 @@
306313
363F1A0D2C9B10AF007527E2 /* WithDrawDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WithDrawDTO.swift; sourceTree = "<group>"; };
307314
363F1A0F2C9B10BA007527E2 /* LogoutDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoutDTO.swift; sourceTree = "<group>"; };
308315
363F1A112C9B1638007527E2 /* UserAccountDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAccountDTO.swift; sourceTree = "<group>"; };
316+
363F1A192C9EE9EB007527E2 /* AccountAddViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountAddViewController.swift; sourceTree = "<group>"; };
317+
363F1A1B2C9EF029007527E2 /* AccountAddCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountAddCell.swift; sourceTree = "<group>"; };
318+
363F1A1D2C9F072F007527E2 /* UserAccountRequestDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAccountRequestDTO.swift; sourceTree = "<group>"; };
319+
363F1A242C9F1BE2007527E2 /* BankList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BankList.swift; sourceTree = "<group>"; };
320+
363F1A262C9F57D4007527E2 /* CustomAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAlertView.swift; sourceTree = "<group>"; };
321+
363F1A282CA067C7007527E2 /* RefreshTokenRequestDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshTokenRequestDTO.swift; sourceTree = "<group>"; };
309322
3648954D2C6281BB00AAA8E2 /* HomeItemsResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeItemsResponseDTO.swift; sourceTree = "<group>"; };
310323
3648954F2C62822200AAA8E2 /* ProductDetailResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductDetailResponseDTO.swift; sourceTree = "<group>"; };
311324
364895512C62826200AAA8E2 /* SearchItemsResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchItemsResponseDTO.swift; sourceTree = "<group>"; };
@@ -464,6 +477,7 @@
464477
36B744F92C6C50D3002892C4 /* RxKakaoSDKCommon in Frameworks */,
465478
36B744F22C6C4CD2002892C4 /* KakaoSDKCommon in Frameworks */,
466479
3664CFDA2C6E2179007FB5DF /* Lottie in Frameworks */,
480+
363F1A232C9F15EB007527E2 /* RxGesture in Frameworks */,
467481
368E36A82C4A3BBE003FA911 /* RxDataSources in Frameworks */,
468482
368E36992C4A3B55003FA911 /* Moya in Frameworks */,
469483
363C243C2C6619950097FCB7 /* Kingfisher in Frameworks */,
@@ -528,6 +542,7 @@
528542
363152802C35EAF400DF689E /* DdanziButton.swift */,
529543
363C24282C6520DD0097FCB7 /* DdanziChipButton.swift */,
530544
36A5947D2C87F90C0097DE70 /* DdanziLoadingView.swift */,
545+
363F1A262C9F57D4007527E2 /* CustomAlertView.swift */,
531546
);
532547
path = ReusableView;
533548
sourceTree = "<group>";
@@ -538,6 +553,7 @@
538553
3631528A2C3D120400DF689E /* PurchaseSectionModel.swift */,
539554
363C24202C6512E60097FCB7 /* UserInfoModel.swift */,
540555
363C242C2C6529500097FCB7 /* UserAddressModel.swift */,
556+
363F1A242C9F1BE2007527E2 /* BankList.swift */,
541557
);
542558
path = Model;
543559
sourceTree = "<group>";
@@ -653,6 +669,7 @@
653669
3648955D2C6284D000AAA8E2 /* UserSaleResponseDTO.swift */,
654670
3648955F2C62850200AAA8E2 /* UserInterestResponesDTO.swift */,
655671
363F1A112C9B1638007527E2 /* UserAccountDTO.swift */,
672+
363F1A1D2C9F072F007527E2 /* UserAccountRequestDTO.swift */,
656673
);
657674
path = Mypage;
658675
sourceTree = "<group>";
@@ -764,6 +781,8 @@
764781
36542E802C308ED000D5BFEB /* BankAccountViewController.swift */,
765782
363152F22C44F8BE00DF689E /* AddressSettingViewController.swift */,
766783
36BE65B02C4510FE00CD4511 /* AccountViewController.swift */,
784+
363F1A192C9EE9EB007527E2 /* AccountAddViewController.swift */,
785+
363F1A1B2C9EF029007527E2 /* AccountAddCell.swift */,
767786
363C242E2C6537840097FCB7 /* KakaoPostCodeViewController.swift */,
768787
);
769788
path = Info;
@@ -1179,6 +1198,7 @@
11791198
363F1A0B2C9ADD22007527E2 /* RefreshTokenDTO.swift */,
11801199
363F1A0D2C9B10AF007527E2 /* WithDrawDTO.swift */,
11811200
363F1A0F2C9B10BA007527E2 /* LogoutDTO.swift */,
1201+
363F1A282CA067C7007527E2 /* RefreshTokenRequestDTO.swift */,
11821202
);
11831203
path = Auth;
11841204
sourceTree = "<group>";
@@ -1368,6 +1388,7 @@
13681388
3664CFD92C6E2179007FB5DF /* Lottie */,
13691389
36130D032C92B0F90028CF3A /* FirebaseMessaging */,
13701390
363F1A172C9CA04F007527E2 /* Amplitude */,
1391+
363F1A222C9F15EB007527E2 /* RxGesture */,
13711392
);
13721393
productName = DDANZI_iOS;
13731394
productReference = 369C63872C1A7A240021E2E0 /* DDANZI_iOS.app */;
@@ -1455,6 +1476,7 @@
14551476
3664CFD82C6E2179007FB5DF /* XCRemoteSwiftPackageReference "lottie-ios" */,
14561477
36130D022C92B0F90028CF3A /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
14571478
363F1A162C9CA04F007527E2 /* XCRemoteSwiftPackageReference "Amplitude-iOS" */,
1479+
363F1A212C9F15EB007527E2 /* XCRemoteSwiftPackageReference "RxGesture" */,
14581480
);
14591481
productRefGroup = 369C63882C1A7A240021E2E0 /* Products */;
14601482
projectDirPath = "";
@@ -1543,6 +1565,7 @@
15431565
368E36842C4936AB003FA911 /* APIConstants.swift in Sources */,
15441566
363C24332C6607080097FCB7 /* HomeRepository.swift in Sources */,
15451567
369C63E52C1A95280021E2E0 /* UIButton+.swift in Sources */,
1568+
363F1A1C2C9EF029007527E2 /* AccountAddCell.swift in Sources */,
15461569
3648954E2C6281BB00AAA8E2 /* HomeItemsResponseDTO.swift in Sources */,
15471570
36BE65C62C4591F500CD4511 /* PurchaseHeaderView.swift in Sources */,
15481571
362864D72C8EBEAB00029452 /* ItemEndpoint.swift in Sources */,
@@ -1554,6 +1577,7 @@
15541577
363152F12C44F80900DF689E /* SalesDetailViewController.swift in Sources */,
15551578
363C242F2C6537840097FCB7 /* KakaoPostCodeViewController.swift in Sources */,
15561579
363C242D2C6529500097FCB7 /* UserAddressModel.swift in Sources */,
1580+
363F1A1E2C9F072F007527E2 /* UserAccountRequestDTO.swift in Sources */,
15571581
36BE65C22C458FA600CD4511 /* TermsTableViewCell.swift in Sources */,
15581582
363152AB2C3DC57800DF689E /* PurchaseModel.swift in Sources */,
15591583
36B745052C6C5AC2002892C4 /* UserDefaltManager.swift in Sources */,
@@ -1592,6 +1616,7 @@
15921616
364895542C62829200AAA8E2 /* SearchResultResponseDTO.swift in Sources */,
15931617
363C24252C651E620097FCB7 /* AddressFormViewController.swift in Sources */,
15941618
364895662C6285C900AAA8E2 /* UserAddressRequestDTO.swift in Sources */,
1619+
363F1A272C9F57D4007527E2 /* CustomAlertView.swift in Sources */,
15951620
3648DB802C93E134003EA6BE /* PushViewController.swift in Sources */,
15961621
36B833EC2C5CDCE4009C2C3E /* AuthEndpoint.swift in Sources */,
15971622
362864CE2C8EBC2C00029452 /* PickerManager.swift in Sources */,
@@ -1643,15 +1668,18 @@
16431668
36EB5FA82C1ED6B600FAF995 /* ProductModel.swift in Sources */,
16441669
363152A52C3DBE9500DF689E /* TotalPriceFooterView.swift in Sources */,
16451670
368833AA2C20A9B7000F3A45 /* String.swift in Sources */,
1671+
363F1A252C9F1BE2007527E2 /* BankList.swift in Sources */,
16461672
363152902C3DB37000DF689E /* PurchaseDetailViewController.swift in Sources */,
16471673
36774A682C466E4000F32637 /* CompleteCollectionViewCell.swift in Sources */,
16481674
36B833EE2C5CDCFB009C2C3E /* HomeEndpoint.swift in Sources */,
16491675
36542E732C2E88F500D5BFEB /* SellListViewController.swift in Sources */,
16501676
362864E72C8EDF0000029452 /* SellDetailDTO.swift in Sources */,
16511677
362864CC2C8EA7B700029452 /* CheckItemViewController.swift in Sources */,
1678+
363F1A292CA067C7007527E2 /* RefreshTokenRequestDTO.swift in Sources */,
16521679
36EB5FA52C1ECDED00FAF995 /* String+.swift in Sources */,
16531680
362864CA2C8E985400029452 /* LandingViewController.swift in Sources */,
16541681
36542E792C2E892500D5BFEB /* CsCenterViewController.swift in Sources */,
1682+
363F1A1A2C9EE9EB007527E2 /* AccountAddViewController.swift in Sources */,
16551683
363152A12C3DBA0B00DF689E /* InfoCollectionViewCell.swift in Sources */,
16561684
363C24292C6520DD0097FCB7 /* DdanziChipButton.swift in Sources */,
16571685
362864E52C8EDE6700029452 /* RegisteItemDTO.swift in Sources */,
@@ -1850,7 +1878,7 @@
18501878
369C63B22C1A7A270021E2E0 /* Debug */ = {
18511879
isa = XCBuildConfiguration;
18521880
buildSettings = {
1853-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1881+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_dev;
18541882
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
18551883
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
18561884
CODE_SIGN_ENTITLEMENTS = DDANZI_iOS/DDANZI_iOS.entitlements;
@@ -1859,7 +1887,7 @@
18591887
DEVELOPMENT_TEAM = 65NSM7Z327;
18601888
GENERATE_INFOPLIST_FILE = YES;
18611889
INFOPLIST_FILE = DDANZI_iOS/Application/Info.plist;
1862-
INFOPLIST_KEY_CFBundleDisplayName = "딴지";
1890+
INFOPLIST_KEY_CFBundleDisplayName = "딴지(DEV)";
18631891
INFOPLIST_KEY_LSApplicationCategoryType = "";
18641892
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "상품 캡처본을 위해 접근이 필요합니다. ";
18651893
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -1872,7 +1900,7 @@
18721900
"@executable_path/Frameworks",
18731901
);
18741902
MARKETING_VERSION = 1.0;
1875-
PRODUCT_BUNDLE_IDENTIFIER = "com.orangeCo.DDANZI-iOS";
1903+
PRODUCT_BUNDLE_IDENTIFIER = "com.orangeCo.DDANZI-iOS.dev";
18761904
PRODUCT_NAME = "$(TARGET_NAME)";
18771905
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
18781906
SUPPORTS_MACCATALYST = NO;
@@ -2063,6 +2091,14 @@
20632091
kind = branch;
20642092
};
20652093
};
2094+
363F1A212C9F15EB007527E2 /* XCRemoteSwiftPackageReference "RxGesture" */ = {
2095+
isa = XCRemoteSwiftPackageReference;
2096+
repositoryURL = "https://github.com/RxSwiftCommunity/RxGesture";
2097+
requirement = {
2098+
kind = upToNextMajorVersion;
2099+
minimumVersion = 4.0.4;
2100+
};
2101+
};
20662102
3664CFD82C6E2179007FB5DF /* XCRemoteSwiftPackageReference "lottie-ios" */ = {
20672103
isa = XCRemoteSwiftPackageReference;
20682104
repositoryURL = "https://github.com/airbnb/lottie-ios";
@@ -2161,6 +2197,11 @@
21612197
package = 363F1A162C9CA04F007527E2 /* XCRemoteSwiftPackageReference "Amplitude-iOS" */;
21622198
productName = Amplitude;
21632199
};
2200+
363F1A222C9F15EB007527E2 /* RxGesture */ = {
2201+
isa = XCSwiftPackageProductDependency;
2202+
package = 363F1A212C9F15EB007527E2 /* XCRemoteSwiftPackageReference "RxGesture" */;
2203+
productName = RxGesture;
2204+
};
21642205
3664CFD92C6E2179007FB5DF /* Lottie */ = {
21652206
isa = XCSwiftPackageProductDependency;
21662207
package = 3664CFD82C6E2179007FB5DF /* XCRemoteSwiftPackageReference "lottie-ios" */;

DDANZI_iOS/DDANZI_iOS/Common/LocalStorage/Keychainwrapper.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public final class KeychainWrapper {
131131
return status == errSecSuccess
132132
}
133133

134-
private func deleteAccessToken() -> Bool {
134+
func deleteAccessToken() -> Bool {
135135
let query: [CFString: Any] = [
136136
kSecClass: kSecClassGenericPassword,
137137
kSecAttrService: userKey
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "appicon.png",
5+
"idiom" : "universal",
6+
"platform" : "ios",
7+
"size" : "1024x1024"
8+
}
9+
],
10+
"info" : {
11+
"author" : "xcode",
12+
"version" : 1
13+
}
14+
}
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//
2+
// RefreshTokenRequestDTO.swift
3+
// DDANZI_iOS
4+
//
5+
// Created by 이지희 on 9/22/24.
6+
//
7+
8+
import Foundation
9+
10+
struct RefreshTokenRequestDTO: Codable {
11+
let refreshtoken : String
12+
}

DDANZI_iOS/DDANZI_iOS/Data/DTO/Item/itemConfirmedDTO.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct itemConformedDTO: Codable {
1111
let productID, productName: String
1212
let imgURL: String
1313
let originPrice, salePrice: Int
14-
let isAccountExist: Bool
14+
var isAccountExist: Bool
1515

1616
enum CodingKeys: String, CodingKey {
1717
case productID = "productId"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//
2+
// UserAccountRequestDTO.swift
3+
// DDANZI_iOS
4+
//
5+
// Created by 이지희 on 9/21/24.
6+
//
7+
8+
import Foundation
9+
10+
struct UserAccountRequestDTO: Codable {
11+
let accountName: String
12+
let bank: String
13+
let accountNumber: String
14+
}

DDANZI_iOS/DDANZI_iOS/Data/DTO/Setting/UserAddressResponseDTO.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import Foundation
1111
struct UserAddressResponseDTO: Codable {
1212
let addressID: Int?
1313
let recipient: String?
14-
let zipCode: String
15-
let type: AddressType
16-
let address, detailAddress, recipientPhone: String
14+
let zipCode: String?
15+
let type: AddressType?
16+
let address, detailAddress, recipientPhone: String?
1717

1818
enum CodingKeys: String, CodingKey {
1919
case addressID = "addressId"

DDANZI_iOS/DDANZI_iOS/Data/Endpoint/AuthEndpoint.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ enum AuthEndpoint {
1414
case certification(VerificationRequestDTO)
1515
case revoke
1616
case logout
17-
case refreshToken
17+
case refreshToken(RefreshTokenRequestDTO)
1818
}
1919

2020
extension AuthEndpoint: BaseTargetType {
@@ -73,8 +73,8 @@ extension AuthEndpoint: BaseTargetType {
7373
return .requestPlain
7474
case .logout:
7575
return .requestPlain
76-
case .refreshToken:
77-
return .requestPlain
76+
case let .refreshToken(dto):
77+
return .requestJSONEncodable(dto)
7878
}
7979
}
8080

DDANZI_iOS/DDANZI_iOS/Data/Endpoint/MypageEndpoint.swift

+19-5
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ enum MypageEndpoint {
2020
/// 주소 관련 API
2121
case fetchUserAddress
2222
case addUserAddress(UserAddressRequestDTO)
23-
case editUserAddress(Int)
23+
case editUserAddress(Int,UserAddressRequestDTO)
2424
case deleteUserAddress(Int)
2525

2626
/// 계좌 관련 API
2727
case fetchUserAccount
28-
case addUserAccount
28+
case addUserAccount(UserAccountRequestDTO)
29+
case editUserAccount(Int,UserAccountRequestDTO)
30+
case deleteUserAccount(Int)
2931

3032
case settingUserNoti
3133
}
@@ -51,7 +53,7 @@ extension MypageEndpoint: BaseTargetType {
5153
return "/api/v1/mypage/setting/address"
5254
case .addUserAddress:
5355
return "/api/v1/mypage/setting/address"
54-
case let .editUserAddress(id):
56+
case let .editUserAddress(id, _):
5557
return "/api/v1/mypage/setting/address/\(id)"
5658
case let .deleteUserAddress(id):
5759
return "/api/v1/mypage/setting/address/\(id)"
@@ -61,6 +63,10 @@ extension MypageEndpoint: BaseTargetType {
6163
return "/api/v1/mypage/setting/account"
6264
case .addUserAccount:
6365
return "/api/v1/mypage/setting/account"
66+
case let .editUserAccount(id, _):
67+
return "/api/v1/mypage/setting/account/\(id)"
68+
case let .deleteUserAccount(id):
69+
return "/api/v1/mypage/setting/account/\(id)"
6470
}
6571
}
6672

@@ -90,6 +96,10 @@ extension MypageEndpoint: BaseTargetType {
9096
return .get
9197
case .addUserAccount:
9298
return .post
99+
case .editUserAccount:
100+
return .put
101+
case .deleteUserAccount:
102+
return .delete
93103
}
94104
}
95105

@@ -109,15 +119,19 @@ extension MypageEndpoint: BaseTargetType {
109119
return .requestPlain
110120
case let .addUserAddress(body):
111121
return .requestJSONEncodable(body)
112-
case .editUserAddress:
122+
case let .editUserAddress(_, body):
113123
return .requestPlain
114124
case .deleteUserAddress:
115125
return .requestPlain
116126
case .settingUserNoti:
117127
return .requestPlain
118128
case .fetchUserAccount:
119129
return .requestPlain
120-
case .addUserAccount:
130+
case .addUserAccount(let body):
131+
return .requestJSONEncodable(body)
132+
case let .editUserAccount(_, body):
133+
return .requestJSONEncodable(body)
134+
case .deleteUserAccount(_):
121135
return .requestPlain
122136
}
123137
}

0 commit comments

Comments
 (0)