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.

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

fix: 명함 그룹 관련 수정된 API 반영 #464 #465

Merged
merged 17 commits into from
May 2, 2023

Conversation

dlwns33
Copy link
Member

@dlwns33 dlwns33 commented May 2, 2023

🌴 PR 요약

🌱 작업한 브랜치

🌱 작업한 내용

  • 명함 그룹 관련 수정된 API를 반영했습니다. 반영된 API는 다음과 같습니다.

  • 그룹 삭제

  • 그룹 안에 명함 삭제

  • 명함 그룹 생성

  • 명함 그룹에 카드 연결

  • 명함 그룹 이름 수정

  • 명함에 속한 카드 리스트 조회

  • 내가 가진 명함 리스트 조회

  • 이제 카드를 추가하고 명함 그룹을 조회할 수 있습니다.

  • 명함 그룹 변경이 가능합니다.

  • 이슈 List

  • 미분류 그룹은 조회가 되지 않습니다. -> 이슈 새로파서 진행하겠습니다 서버 선생님들께도 전달했습니다.

  • 그룹 삭제 API 가 살짝 이상해서 서버 선생님들께 전달했습니다.

  • 그룹 안 명함 카드 레이아웃 수정중입니다. 계속 진행하겠습니다.

📮 관련 이슈

@dlwns33 dlwns33 added Yijoon 🐨 이준 대치동강사 작업 Fix 코드 수정 및 버그, 오류 해결 labels May 2, 2023
@dlwns33 dlwns33 requested a review from hyun99999 May 2, 2023 04:02
@dlwns33 dlwns33 self-assigned this May 2, 2023
Copy link
Member

@hyun99999 hyun99999 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

api 논의하시공 프린트문이랑 주석 정리해서 계속 작업해주시면 될거 같습니당! 많이 하셨네요 ㅜ 고생하셨습니당

@@ -81,6 +96,24 @@ extension CompanyFrontCardCell {

linkURLStackView.alignment = .center
}
func setConstraints() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이제 그룹 안 명함이랑 같이 쓰고자하는거죵? 좋은 것 같습니다..!!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넹 맞습니다! 비율만 조절하려구 합니당!

Comment on lines +22 to +45
let cardID: Int
let cardUUID, cardType, cardName, departmentName: String
let userName, birth, mbti, instagram: String
let twitter, mailAddress: String?
let phoneNumber: String
let urls: [String]
let cardTastes: [CardTaste]
let tmi: String?
let cardImage: String
let isRepresentative: Bool

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

// MARK: - CardTaste
struct CardTaste: Codable {
let cardTasteName: String
let sortOrder: Int
let isChoose: Bool
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Card 그룹 안에 있는 Card 데이터 모델 그대로 사용하면될거 같아요!
CardTaste 도 CardTasteInfo 데이터 모델로 만들어뒀습니당!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

서버썜들한테 부탁드려서 최대한 같은 데이터 모델 사용하고자 했습니당!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

앗 넴넴 참고하겠습니당 감사합니다!!!

Comment on lines 18 to 19
func cardDeleteInGroup(cardUuid: String, cardGroupName: String, completion: @escaping (NetworkResult<Any>) -> Void) {
groupProvider.request(.cardDeleteInGroup(cardUuid: cardUuid, cardGroupName: cardGroupName)) { (result) in
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

매개변수라서 약어는 UUID 이렇게 작성해도 좋을듯합니당

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵 반영했습니당!

Comment on lines 92 to 93
// groupEditWithAPI(groupRequest: GroupEditRequest(groupId: nowGroup?.cardGroupId ?? 0, groupName: addGroupTextField.text ?? ""))
groupEditWithAPI(groupRequest: GroupEditRequest(groupName: nowGroup ?? "", modifyGroupName: addGroupTextField.text ?? ""))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요기 주석되어 있습니당!

Comment on lines +137 to +139
cardsCollectionView.register(FrontCardCell.nib(), forCellWithReuseIdentifier: FrontCardCell.className)
cardsCollectionView.register(FanFrontCardCell.nib(), forCellWithReuseIdentifier: FanFrontCardCell.className)
cardsCollectionView.register(CompanyFrontCardCell.nib(), forCellWithReuseIdentifier: CompanyFrontCardCell.className)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아하.. 이렇게 연결해야하군요

@@ -293,7 +293,7 @@ extension HomeViewController {
}
}
private func cardAddInGroupWithAPI(cardUUID: String, completion: @escaping () -> Void) {
GroupAPI.shared.cardAddInGroup(cardRequest: CardAddInGroupRequest(cardUUID: cardUUID, cardGroupID: 1)) { response in
GroupAPI.shared.cardAddInGroup(cardRequest: CardAddInGroupRequest(cardGroupName: nil, cardUUID: cardUUID)) { response in
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

수정 감사합니다 🙇🏻‍♂️

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아유 별말씀을~

@dlwns33 dlwns33 merged commit 744b026 into TeamNADA:develop May 2, 2023
@dlwns33 dlwns33 deleted the feature/#464 branch May 2, 2023 04:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix 코드 수정 및 버그, 오류 해결 Yijoon 🐨 이준 대치동강사 작업
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fix: 명함 그룹 관련 수정된 API 반영
2 participants