Skip to content
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

Jump to bottom

fix: 명함 생성 API 기능 구현 확인 (#419) #421

Merged
merged 4 commits into from
Apr 15, 2023
Merged

fix: 명함 생성 API 기능 구현 확인 (#419) #421

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62e7c7d
fix: sns 대신 instagram, twitter 로 수정 (#419)
hyun99999 Apr 15, 2023
35a69d9
fix: 데이터 모델 변경으로 수정 (#419)
hyun99999 Apr 15, 2023
797409a
fix: 명함 생성 request parmeter 오타 수정 (#419)
hyun99999 Apr 15, 2023
6079ab1
Merge branch 'develop' of https://github.com/TeamNADA/NADA-iOS-ForRel…
hyun99999 Apr 15, 2023
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
4 changes: 2 additions & 2 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ extension FrontCardCell {
userNameLabel.text = cardData.userName
birthLabel.text = cardData.birth
mbtiLabel.text = cardData.mbti
instagramIDLabel.text = cardData.sns
instagramIDLabel.text = cardData.instagram
phoneNumberLabel.text = cardData.phoneNumber
if let urls = cardData.urls {
linkURLLabel.text = urls[0]
}

if cardData.sns == nil {
if cardData.instagram == nil {
instagramStackView.isHidden = true
}
if cardData.phoneNumber == nil {
Expand Down
3 changes: 2 additions & 1 deletion NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ extension FrontCardCreationCollectionViewCell {
mailAddress: nil,
mbti: mbtiLabel.text,
phoneNumber: phoneNumberTextField.text,
sns: instagramIDTextField.text,
instagram: instagramIDTextField.text,
twitter: nil,
urls: linkURLTextField.text == nil ? nil : [linkURLTextField.text ?? ""],
defaultImageIndex: defaultImageIndex))
}
Expand Down
11 changes: 6 additions & 5 deletions NADA-iOS-forRelease/Sources/NetworkModel/Card/Card.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,22 @@ struct Card: Codable {
let mailAddress: String?
let mbti: String?
let phoneNumber: String?
let sns: String?
let instagram: String?
let twitter: String?
let tmi: String?
let urls: [String]?
let userName: String

enum CodingKeys: String, CodingKey {
case birth, cardImage, cardName, cardTastes, cardType, departmentName, isRepresentative, mailAddress, mbti, phoneNumber, sns, tmi, urls, userName
case birth, cardImage, cardName, cardTastes, cardType, departmentName, isRepresentative, mailAddress, mbti, phoneNumber, instagram, twitter, tmi, urls, userName
case cardID = "cardId"
case cardUUID = "cardUuid"
}

static let mockData = [
Card(birth: "", cardID: 0, cardUUID: "id1", cardImage: "imgCardBg01", cardName: "첫 번째 카드", cardTastes: [CardTasteInfo(cardTasteName: "", isChoose: false, sortOrder: 0)], cardType: "", departmentName: "", isRepresentative: false, mailAddress: "", mbti: "", phoneNumber: "", sns: "", tmi: "", urls: [], userName: "1현규"),
Card(birth: "", cardID: 1, cardUUID: "id2", cardImage: "imgCardBg02", cardName: "두 번째 카드", cardTastes: [CardTasteInfo(cardTasteName: "", isChoose: false, sortOrder: 0)], cardType: "", departmentName: "", isRepresentative: false, mailAddress: "", mbti: "", phoneNumber: "", sns: "", tmi: "", urls: [], userName: "2현규"),
Card(birth: "", cardID: 2, cardUUID: "id3", cardImage: "imgCardBg03", cardName: "세 번째 카드", cardTastes: [CardTasteInfo(cardTasteName: "", isChoose: false, sortOrder: 0)], cardType: "", departmentName: "", isRepresentative: false, mailAddress: "", mbti: "", phoneNumber: "", sns: "", tmi: "", urls: [], userName: "3현규")
Card(birth: "", cardID: 0, cardUUID: "id1", cardImage: "imgCardBg01", cardName: "첫 번째 카드", cardTastes: [CardTasteInfo(cardTasteName: "", isChoose: false, sortOrder: 0)], cardType: "", departmentName: "", isRepresentative: false, mailAddress: "", mbti: "", phoneNumber: "", instagram: "", twitter: "", tmi: "", urls: [], userName: "1현규"),
Card(birth: "", cardID: 1, cardUUID: "id2", cardImage: "imgCardBg02", cardName: "두 번째 카드", cardTastes: [CardTasteInfo(cardTasteName: "", isChoose: false, sortOrder: 0)], cardType: "", departmentName: "", isRepresentative: false, mailAddress: "", mbti: "", phoneNumber: "", instagram: "", twitter: "", tmi: "", urls: [], userName: "2현규"),
Card(birth: "", cardID: 2, cardUUID: "id3", cardImage: "imgCardBg03", cardName: "세 번째 카드", cardTastes: [CardTasteInfo(cardTasteName: "", isChoose: false, sortOrder: 0)], cardType: "", departmentName: "", isRepresentative: false, mailAddress: "", mbti: "", phoneNumber: "", instagram: "", twitter: "", tmi: "", urls: [], userName: "3현규")
]
}

Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/NetworkModel/Card/CardCreationRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct CardCreationRequest: Codable {
struct FrontCardDataModel: Codable {
let birth, cardName, userName: String

let departmentName, mailAddress, mbti, phoneNumber, sns: String?
let departmentName, mailAddress, mbti, phoneNumber, instagram, twitter: String?
let urls: [String]?
let defaultImageIndex: Int
}
Expand Down
10 changes: 7 additions & 3 deletions NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ extension CardService: TargetType {
case .cardDetailFetch, .cardDelete, .tasteFetch, .cardListFetch:
return .requestPlain
case .cardCreation(let request):
var parameters: [String: Any] = ["brith": request.frontCard.birth,
var parameters: [String: Any] = ["birth": request.frontCard.birth,
"cardImage": request.cardImageURL,
"cardName": request.frontCard.cardName,
"cardTastes": request.backCard.tastes,
Expand All @@ -89,8 +89,12 @@ extension CardService: TargetType {
parameters["phoneNumber"] = phoneNumber
}

if let sns = request.frontCard.sns {
parameters["sns"] = sns
if let instagram = request.frontCard.instagram {
parameters["instagram"] = instagram
}

if let twitter = request.frontCard.twitter {
parameters["twitter"] = twitter
}

if let tmi = request.backCard.tmi {
Expand Down
4 changes: 2 additions & 2 deletions ...-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ class CardResultBottomSheetViewController: CommonBottomSheetViewController {
cardView.userNameLabel.text = cardDataModel.userName
cardView.birthLabel.text = cardDataModel.birth
cardView.mbtiLabel.text = cardDataModel.mbti ?? ""
cardView.instagramIDLabel.text = cardDataModel.sns ?? ""
cardView.instagramIDLabel.text = cardDataModel.instagram ?? ""
if let urls = cardDataModel.urls {
cardView.lineURLLabel.text = urls[0]
}

if cardDataModel.sns == nil {
if cardDataModel.instagram == nil {
cardView.instagramIcon.isHidden = true
}
if cardDataModel.urls == nil {
Expand Down
4 changes: 2 additions & 2 deletions ...orRelease/Sources/ViewControllers/CardCreation/VC/CardCreationPreviewViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ extension CardCreationPreviewViewController {
frontCardDataModel.userName,
frontCardDataModel.birth,
frontCardDataModel.mbti ?? "",
frontCardDataModel.sns ?? "",
frontCardDataModel.instagram ?? "",
frontCardDataModel.phoneNumber ?? "",
frontCardDataModel.urls?[0] ?? "",
isShareable: isShareable)
Expand Down Expand Up @@ -202,7 +202,7 @@ extension CardCreationPreviewViewController {
frontCardDataModel.userName,
frontCardDataModel.birth,
frontCardDataModel.mbti ?? "",
frontCardDataModel.sns ?? "",
frontCardDataModel.instagram ?? "",
frontCardDataModel.phoneNumber ?? "",
frontCardDataModel.urls?[0] ?? "",
isShareable: isShareable)
Expand Down
18 changes: 12 additions & 6 deletions NADA-iOS-forRelease/Sources/ViewControllers/TeamNADA/TeamNADAViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ class TeamNADAViewController: UIViewController {
mailAddress: nil,
mbti: nil,
phoneNumber: nil,
sns: nil,
instagram: "",
twitter: "",
tmi: nil,
urls: nil,
userName: ""),
Expand All @@ -39,7 +40,8 @@ class TeamNADAViewController: UIViewController {
mailAddress: nil,
mbti: nil,
phoneNumber: nil,
sns: nil,
instagram: "",
twitter: "",
tmi: nil,
urls: nil,
userName: ""),
Expand All @@ -55,7 +57,8 @@ class TeamNADAViewController: UIViewController {
mailAddress: nil,
mbti: nil,
phoneNumber: nil,
sns: nil,
instagram: "",
twitter: "",
tmi: nil,
urls: nil,
userName: ""),
Expand All @@ -71,7 +74,8 @@ class TeamNADAViewController: UIViewController {
mailAddress: nil,
mbti: nil,
phoneNumber: nil,
sns: nil,
instagram: "",
twitter: "",
tmi: nil,
urls: nil,
userName: ""),
Expand All @@ -87,7 +91,8 @@ class TeamNADAViewController: UIViewController {
mailAddress: nil,
mbti: nil,
phoneNumber: nil,
sns: nil,
instagram: "",
twitter: "",
tmi: nil,
urls: nil,
userName: ""),
Expand All @@ -103,7 +108,8 @@ class TeamNADAViewController: UIViewController {
mailAddress: nil,
mbti: nil,
phoneNumber: nil,
sns: nil,
instagram: "",
twitter: "",
tmi: nil,
urls: nil,
userName: "")]
Expand Down