Skip to content

Commit 72dd2f2

Browse files
cyj513cyj513
committed
๐Ÿ› ๏ธ :: ๋””์ž์ธ ๋ฐ response ์ˆ˜์ •
1 parent 74d0a58 commit 72dd2f2

File tree

5 files changed

+39
-57
lines changed

5 files changed

+39
-57
lines changed

โ€ŽProjects/Data/Sources/DTO/Companies/CompanyInfoDetailResponseDTO.swiftโ€Ž

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ struct CompanyInfoDetailResponseDTO: Decodable {
77
let companyProfileURL: String
88
let companyIntroduce: String
99
let mainZipCode, mainAddress, mainAddressDetail: String
10-
let subZipCode, subAddress, subAddressDetail: String?
11-
let managerName, managerPhoneNo: String
12-
let subManagerName, subManagerPhoneNo, fax: String?
10+
// let subZipCode, subAddress, subAddressDetail: String?
11+
let managerName: String
12+
// let subManagerName, subManagerPhoneNo, fax: String?
1313
let email, representativeName, representativePhoneNo, foundedAt: String
1414
let workerNumber: Int
1515
let take: Double
@@ -26,14 +26,14 @@ struct CompanyInfoDetailResponseDTO: Decodable {
2626
case mainZipCode = "main_zip_code"
2727
case mainAddress = "main_address"
2828
case mainAddressDetail = "main_address_detail"
29-
case subZipCode = "sub_zip_code"
30-
case subAddress = "sub_address"
31-
case subAddressDetail = "sub_address_detail"
29+
// case subZipCode = "sub_zip_code"
30+
// case subAddress = "sub_address"
31+
// case subAddressDetail = "sub_address_detail"
3232
case managerName = "manager_name"
33-
case managerPhoneNo = "manager_phone_no"
34-
case subManagerName = "sub_manager_name"
35-
case subManagerPhoneNo = "sub_manager_phone_no"
36-
case fax, email
33+
// case managerPhoneNo = "manager_phone_no"
34+
// case subManagerName = "sub_manager_name"
35+
// case subManagerPhoneNo = "sub_manager_phone_no"
36+
case email
3737
case representativeName = "representative_name"
3838
case representativePhoneNo = "representative_phone_no"
3939
case foundedAt = "founded_at"
@@ -56,14 +56,8 @@ extension CompanyInfoDetailResponseDTO {
5656
mainZipCode: mainZipCode,
5757
mainAddress: mainAddress,
5858
mainAddressDetail: mainAddressDetail,
59-
subZipCode: subZipCode ?? "์—†์Œ",
60-
subAddress: subAddress ?? "์—†์Œ",
61-
subAddressDetail: subAddressDetail ?? "์—†์Œ",
6259
managerName: managerName,
63-
managerPhoneNo: managerPhoneNo,
64-
subManagerName: subManagerName ?? "์—†์Œ",
65-
subManagerPhoneNo: subManagerPhoneNo ?? "์—†์Œ",
66-
fax: fax ?? "์—†์Œ",
60+
// managerPhoneNo: managerPhoneNo,
6761
email: email,
6862
representativeName: representativeName,
6963
representativePhoneNo: representativePhoneNo,

โ€ŽProjects/Domain/Sources/Entities/Companies/CompanyInfoDetailEntity.swiftโ€Ž

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ public struct CompanyInfoDetailEntity: Equatable {
66
public let companyProfileURL: String
77
public let companyIntroduce: String
88
public let mainZipCode, mainAddress, mainAddressDetail: String
9-
public let subZipCode, subAddress, subAddressDetail: String?
10-
public let managerName, managerPhoneNo: String
11-
public let subManagerName, subManagerPhoneNo, fax: String?
9+
// public let subZipCode, subAddress, subAddressDetail: String?
10+
public let managerName: String
11+
// public let subManagerName, subManagerPhoneNo, fax: String?
1212
public let email, representativeName, representativePhoneNo, foundedAt: String
1313
public let workerNumber: String
1414
public let take: String
@@ -25,14 +25,14 @@ public struct CompanyInfoDetailEntity: Equatable {
2525
mainZipCode: String,
2626
mainAddress: String,
2727
mainAddressDetail: String,
28-
subZipCode: String?,
29-
subAddress: String?,
30-
subAddressDetail: String?,
28+
// subZipCode: String?,
29+
// subAddress: String?,
30+
// subAddressDetail: String?,
3131
managerName: String,
32-
managerPhoneNo: String,
33-
subManagerName: String?,
34-
subManagerPhoneNo: String?,
35-
fax: String?,
32+
// managerPhoneNo: String,
33+
// subManagerName: String?,
34+
// subManagerPhoneNo: String?,
35+
// fax: String?,
3636
email: String,
3737
representativeName: String,
3838
representativePhoneNo: String,
@@ -51,14 +51,14 @@ public struct CompanyInfoDetailEntity: Equatable {
5151
self.mainZipCode = mainZipCode
5252
self.mainAddress = mainAddress
5353
self.mainAddressDetail = mainAddressDetail
54-
self.subZipCode = subZipCode
55-
self.subAddress = subAddress
56-
self.subAddressDetail = subAddressDetail
54+
// self.subZipCode = subZipCode
55+
// self.subAddress = subAddress
56+
// self.subAddressDetail = subAddressDetail
5757
self.managerName = managerName
58-
self.managerPhoneNo = managerPhoneNo
59-
self.subManagerName = subManagerName
60-
self.subManagerPhoneNo = subManagerPhoneNo
61-
self.fax = fax
58+
// self.managerPhoneNo = managerPhoneNo
59+
// self.subManagerName = subManagerName
60+
// self.subManagerPhoneNo = subManagerPhoneNo
61+
// self.fax = fax
6262
self.email = email
6363
self.representativeName = representativeName
6464
self.representativePhoneNo = representativePhoneNo

โ€ŽProjects/Presentation/Sources/CompanyDetail/CompanyDetailViewController.swiftโ€Ž

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,10 @@ public class CompanyDetailViewController: BaseViewController<CompanyDetailViewMo
2222
private let startedDayLabel = CompanyDetailLabel(menuText: "์„ค๋ฆฝ์ผ")
2323
private let workersNumbersLabel = CompanyDetailLabel(menuText: "๊ทผ๋กœ์ž ์ˆ˜")
2424
private let annualSalesLabel = CompanyDetailLabel(menuText: "์—ฐ๋งค์ถœ")
25-
private let headAddressLabel = CompanyDetailLabel(menuText: "์ฃผ์†Œ(๋ณธ์‚ฌ)")
26-
private let chainAddressLabel = CompanyDetailLabel(menuText: "์ฃผ์†Œ(์ง€์ )")
27-
private let firstManagerLabel = CompanyDetailLabel(menuText: "๋‹ด๋‹น์ž1")
28-
private let firstPhoneNumberLabel = CompanyDetailLabel(menuText: "์ „ํ™”๋ฒˆํ˜ธ1")
29-
private let secondManagerLabel = CompanyDetailLabel(menuText: "๋‹ด๋‹น์ž2")
30-
private let secondPhoneNumberLabel = CompanyDetailLabel(menuText: "์ „ํ™”๋ฒˆํ˜ธ2")
25+
private let headAddressLabel = CompanyDetailLabel(menuText: "์ฃผ์†Œ")
26+
private let firstManagerLabel = CompanyDetailLabel(menuText: "๋‹ด๋‹น์ž")
27+
private let firstPhoneNumberLabel = CompanyDetailLabel(menuText: "๋Œ€ํ‘œ ๋ฒˆํ˜ธ")
3128
private let emailLabel = CompanyDetailLabel(menuText: "์ด๋ฉ”์ผ")
32-
private let faxLabel = CompanyDetailLabel(menuText: "ํŒฉ์Šค")
3329
private let interviewReviewMenuLabel = JobisMenuLabel(text: "๋ฉด์ ‘ ํ›„๊ธฐ")
3430
private let interviewReviewTableView = UITableView().then {
3531
$0.register(
@@ -60,13 +56,9 @@ public class CompanyDetailViewController: BaseViewController<CompanyDetailViewMo
6056
workersNumbersLabel,
6157
annualSalesLabel,
6258
headAddressLabel,
63-
chainAddressLabel,
6459
firstManagerLabel,
6560
firstPhoneNumberLabel,
66-
secondManagerLabel,
67-
secondPhoneNumberLabel,
68-
emailLabel,
69-
faxLabel
61+
emailLabel
7062
].forEach(mainStackView.addArrangedSubview(_:))
7163

7264
[
@@ -143,13 +135,9 @@ public class CompanyDetailViewController: BaseViewController<CompanyDetailViewMo
143135
self?.workersNumbersLabel.setContent(contentText: $0.workerNumber)
144136
self?.annualSalesLabel.setContent(contentText: $0.take)
145137
self?.headAddressLabel.setContent(contentText: $0.mainAddress)
146-
self?.chainAddressLabel.setContent(contentText: $0.subAddress ?? "-")
147138
self?.firstManagerLabel.setContent(contentText: $0.managerName)
148-
self?.firstPhoneNumberLabel.setContent(contentText: $0.managerPhoneNo)
149-
self?.secondManagerLabel.setContent(contentText: $0.subManagerName ?? "-")
150-
self?.secondPhoneNumberLabel.setContent(contentText: $0.subManagerPhoneNo ?? "-")
139+
self?.firstPhoneNumberLabel.setContent(contentText: $0.representativePhoneNo)
151140
self?.emailLabel.setContent(contentText: $0.email)
152-
self?.faxLabel.setContent(contentText: $0.fax ?? "-")
153141
self?.viewModel.recruitmentID = $0.recruitmentID
154142
self?.recruitmentButton.isHidden = $0.recruitmentID == nil
155143
})

โ€ŽProjects/Presentation/Sources/RecruitmentDetail/RecruitmentDetailViewController.swiftโ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public class RecruitmentDetailViewController: BaseViewController<RecruitmentDeta
3030
$0.axis = .vertical
3131
}
3232
private let recruitmentPeriodLabel = RecruitmentDetailLabel(title: "๋ชจ์ง‘๊ธฐ๊ฐ„")
33-
private let militaryServiceLabel = RecruitmentDetailLabel(title: "๋ณ‘์—ญํŠน๋ก€ ์—ฌ๋ถ€")
33+
private let militaryServiceLabel = RecruitmentDetailLabel(title: "์‚ฐ์—… ๊ธฐ๋Šฅ ์š”์› ๊ทผ๋ฌด ๊ฐ€๋Šฅ ์—ฌ๋ถ€")
3434
private let fieldTypeDetailStackView = FieldTypeDetailStackView()
3535
private let certificateLabel = RecruitmentDetailLabel(title: "์ž๊ฒฉ์ฆ")
36-
private let recruitmentProcessLabel = RecruitmentDetailLabel(title: "์ฑ„์šฉ์ ˆ์ฐจ")
37-
private let requiredGradeLabel = RecruitmentDetailLabel(title: "ํ•„์ˆ˜ ์„ฑ์ ")
36+
private let recruitmentProcessLabel = RecruitmentDetailLabel(title: "์„ ๋ฐœ ์ ˆ์ฐจ")
37+
private let requiredGradeLabel = RecruitmentDetailLabel(title: "๊ธฐํƒ€ ์ž๊ฒฉ ์š”๊ฑด")
3838
private let workingHoursLabel = RecruitmentDetailLabel(title: "๊ทผ๋ฌด์‹œ๊ฐ„")
3939
// private let awardedMoneyLabel = RecruitmentDetailLabel(title: "์‹ค์Šต ์ˆ˜๋‹น")
4040
// private let permanentEmployeeLabel = RecruitmentDetailLabel(title: "์ •๊ทœ์ง ์ „ํ™˜ ์‹œ")

โ€ŽProjects/Presentation/Sources/WinterInternDetail/WinterInternDetailViewController.swiftโ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public class WinterInternDetailViewController: BaseViewController<WinterInternDe
3030
$0.axis = .vertical
3131
}
3232
private let recruitmentPeriodLabel = RecruitmentDetailLabel(title: "๋ชจ์ง‘๊ธฐ๊ฐ„")
33-
private let militaryServiceLabel = RecruitmentDetailLabel(title: "๋ณ‘์—ญํŠน๋ก€ ์—ฌ๋ถ€")
33+
private let militaryServiceLabel = RecruitmentDetailLabel(title: "์‚ฐ์—… ๊ธฐ๋Šฅ ์š”์› ๊ทผ๋ฌด ๊ฐ€๋Šฅ ์—ฌ๋ถ€")
3434
private let fieldTypeDetailStackView = FieldTypeDetailStackView()
3535
private let certificateLabel = RecruitmentDetailLabel(title: "์ž๊ฒฉ์ฆ")
36-
private let recruitmentProcessLabel = RecruitmentDetailLabel(title: "์ฑ„์šฉ์ ˆ์ฐจ")
37-
private let requiredGradeLabel = RecruitmentDetailLabel(title: "ํ•„์ˆ˜ ์„ฑ์ ")
36+
private let recruitmentProcessLabel = RecruitmentDetailLabel(title: "์„ ๋ฐœ ์ ˆ์ฐจ")
37+
private let requiredGradeLabel = RecruitmentDetailLabel(title: "๊ธฐํƒ€ ์ž๊ฒฉ ์š”๊ฑด")
3838
private let workingHoursLabel = RecruitmentDetailLabel(title: "๊ทผ๋ฌด์‹œ๊ฐ„")
3939
// private let awardedMoneyLabel = RecruitmentDetailLabel(title: "์‹ค์Šต ์ˆ˜๋‹น")
4040
// private let permanentEmployeeLabel = RecruitmentDetailLabel(title: "์ •๊ทœ์ง ์ „ํ™˜ ์‹œ")

0 commit comments

Comments
ย (0)