Skip to content

Commit c6ff538

Browse files
cyj513cyj513
committed
๐Ÿ› ๏ธ :: ๋ฒ„๊ทธ ์ˆ˜์ • ๋ฐ ๋””์ž์ธ ๋ณ€๊ฒฝ
1 parent 8f833e0 commit c6ff538

File tree

10 files changed

+92
-107
lines changed

10 files changed

+92
-107
lines changed

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ struct CompanyInfoDetailResponseDTO: Decodable {
77
let companyProfileURL: String
88
let companyIntroduce: String
99
let mainZipCode, mainAddress, mainAddressDetail: String
10-
// let subZipCode, subAddress, subAddressDetail: String?
1110
let managerName: String
12-
// let subManagerName, subManagerPhoneNo, fax: String?
13-
let email, representativeName, representativePhoneNo, foundedAt: String
11+
let managerPhoneNo: String
12+
let email, representativeName , foundedAt: String
13+
let representativePhoneNo: String?
1414
let workerNumber: Int
1515
let take: Double
1616
let recruitmentID: Int?
1717
let attachments: [String]
1818
let serviceName: String
1919
let businessArea: String
20+
let headquarter: Bool
2021

2122
enum CodingKeys: String, CodingKey {
2223
case businessNumber = "business_number"
@@ -26,13 +27,8 @@ struct CompanyInfoDetailResponseDTO: Decodable {
2627
case mainZipCode = "main_zip_code"
2728
case mainAddress = "main_address"
2829
case mainAddressDetail = "main_address_detail"
29-
// case subZipCode = "sub_zip_code"
30-
// case subAddress = "sub_address"
31-
// case subAddressDetail = "sub_address_detail"
3230
case managerName = "manager_name"
33-
// case managerPhoneNo = "manager_phone_no"
34-
// case subManagerName = "sub_manager_name"
35-
// case subManagerPhoneNo = "sub_manager_phone_no"
31+
case managerPhoneNo = "manager_phone_no"
3632
case email
3733
case representativeName = "representative_name"
3834
case representativePhoneNo = "representative_phone_no"
@@ -43,6 +39,7 @@ struct CompanyInfoDetailResponseDTO: Decodable {
4339
case attachments
4440
case serviceName = "service_name"
4541
case businessArea = "business_area"
42+
case headquarter
4643
}
4744
}
4845

@@ -57,7 +54,7 @@ extension CompanyInfoDetailResponseDTO {
5754
mainAddress: mainAddress,
5855
mainAddressDetail: mainAddressDetail,
5956
managerName: managerName,
60-
// managerPhoneNo: managerPhoneNo,
57+
managerPhoneNo: managerPhoneNo,
6158
email: email,
6259
representativeName: representativeName,
6360
representativePhoneNo: representativePhoneNo,
@@ -67,7 +64,8 @@ extension CompanyInfoDetailResponseDTO {
6764
recruitmentID: recruitmentID,
6865
attachments: attachments,
6966
serviceName: serviceName,
70-
businessArea: businessArea
67+
businessArea: businessArea,
68+
headquarter: headquarter
7169
)
7270
}
7371
}

โ€ŽProjects/Data/Sources/DTO/Recruitments/RecruitmentDetailResponseDTO.swiftโ€Ž

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,47 +7,53 @@ struct RecruitmentDetailResponseDTO: Decodable {
77
let companyProfileURL: String
88
let companyName: String
99
let areas: [AreaResponseDTO]
10-
let requiredGrade: String?
10+
let additionalQualifications: String?
1111
let workingHours: String
1212
let requiredLicenses: [String]?
1313
let hiringProgress: [InterviewType]
14-
let trainPay: Int
14+
let trainPay: Int?
1515
let pay: String?
1616
let benefits: String?
17-
let military: Bool
17+
let military: Bool?
1818
let submitDocument: String
1919
let startDate, endDate: String?
2020
let etc: String?
2121
let isApplicable: Bool
22+
let winterIntern: Bool?
23+
let hireConvertible: Bool?
2224
let bookmarked: Bool
25+
let integrationPlan: Bool?
2326

2427
init(
2528
recruitmentID: Int,
2629
companyID: Int,
2730
companyProfileURL: String,
2831
companyName: String,
2932
areas: [AreaResponseDTO],
30-
requiredGrade: String?,
33+
additionalQualifications: String?,
3134
workingHours: String,
3235
requiredLicenses: [String]?,
3336
hiringProgress: [InterviewType],
3437
trainPay: Int,
3538
pay: String?,
3639
benefits: String?,
37-
military: Bool,
40+
military: Bool?,
3841
submitDocument: String,
3942
startDate: String?,
4043
endDate: String?,
4144
etc: String?,
4245
isApplicable: Bool,
43-
bookmarked: Bool
46+
winterIntern: Bool?,
47+
hireConvertible: Bool?,
48+
bookmarked: Bool,
49+
integrationPlan: Bool?
4450
) {
4551
self.recruitmentID = recruitmentID
4652
self.companyID = companyID
4753
self.companyProfileURL = companyProfileURL
4854
self.companyName = companyName
4955
self.areas = areas
50-
self.requiredGrade = requiredGrade
56+
self.additionalQualifications = additionalQualifications
5157
self.workingHours = workingHours
5258
self.requiredLicenses = requiredLicenses
5359
self.hiringProgress = hiringProgress
@@ -60,7 +66,10 @@ struct RecruitmentDetailResponseDTO: Decodable {
6066
self.endDate = endDate
6167
self.etc = etc
6268
self.isApplicable = isApplicable
69+
self.winterIntern = winterIntern
70+
self.hireConvertible = hireConvertible
6371
self.bookmarked = bookmarked
72+
self.integrationPlan = integrationPlan
6473
}
6574

6675
enum CodingKeys: String, CodingKey {
@@ -69,7 +78,7 @@ struct RecruitmentDetailResponseDTO: Decodable {
6978
case companyProfileURL = "company_profile_url"
7079
case companyName = "company_name"
7180
case areas
72-
case requiredGrade = "additional_qualifications"
81+
case additionalQualifications = "additional_qualifications"
7382
case requiredLicenses = "required_licenses"
7483
case hiringProgress = "hiring_progress"
7584
case trainPay = "train_pay"
@@ -81,16 +90,15 @@ struct RecruitmentDetailResponseDTO: Decodable {
8190
case endDate = "end_date"
8291
case etc
8392
case isApplicable = "is_applicable"
93+
case winterIntern = "winter_intern"
94+
case hireConvertible = "hire_convertible"
8495
case bookmarked
96+
case integrationPlan = "integration_plan"
8597
}
8698
}
8799

88100
extension RecruitmentDetailResponseDTO {
89101
func toDomain() -> RecruitmentDetailEntity {
90-
var unwrappedRequiredGrade: String? {
91-
guard let requiredGrade else { return nil }
92-
return requiredGrade + "% ์ด๋‚ด"
93-
}
94102
var recruitmentPeriod: String {
95103
guard let startDate, let endDate else { return "์ƒ์‹œ ๋ชจ์ง‘" }
96104
return "\(startDate) ~ \(endDate)"
@@ -102,21 +110,24 @@ extension RecruitmentDetailResponseDTO {
102110
companyProfileURL: companyProfileURL,
103111
companyName: companyName,
104112
areas: areas.map { $0.toDomain() },
105-
requiredGrade: unwrappedRequiredGrade,
113+
additionalQualifications: additionalQualifications,
106114
workingHours: workingHours,
107115
requiredLicenses: requiredLicenses?.joined(separator: ", "),
108116
hiringProgress: hiringProgress.enumerated().map { (index, value) in
109117
"\(index + 1). \(value.localizedString())"
110118
}.joined(separator: "\n"),
111-
trainPay: String(trainPay),
119+
trainPay: String(trainPay ?? 0),
112120
pay: pay,
113121
benefits: benefits,
114122
military: military,
115123
submitDocument: submitDocument,
116124
period: recruitmentPeriod,
117125
etc: etc ?? "์—†์Œ",
118126
isApplicable: isApplicable,
119-
bookmarked: bookmarked
127+
winterIntern: winterIntern,
128+
hireConvertible: hireConvertible,
129+
bookmarked: bookmarked,
130+
integrationPlan: integrationPlan
120131
)
121132
}
122133
}

โ€ŽProjects/Data/Sources/DTO/Recruitments/RecruitmentListResponseDTO.swiftโ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ struct RecruitmentResponseDTO: Codable {
88
let recruitID: Int
99
let companyName: String
1010
let companyProfileURL: String
11-
let trainPay: Int
12-
let militarySupport: Bool
11+
let trainPay: Int?
12+
let militarySupport: Bool?
1313
let hiringJobs: String
1414
let bookmarked: Bool
1515

@@ -31,8 +31,8 @@ extension RecruitmentListResponseDTO {
3131
recruitID: $0.recruitID,
3232
companyName: $0.companyName,
3333
companyProfileURL: $0.companyProfileURL,
34-
trainPay: $0.trainPay,
35-
militarySupport: $0.militarySupport,
34+
trainPay: $0.trainPay ?? 0,
35+
militarySupport: $0.militarySupport ?? false,
3636
hiringJobs: $0.hiringJobs,
3737
bookmarked: $0.bookmarked
3838
)

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

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ 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?
109
public let managerName: String
11-
// public let subManagerName, subManagerPhoneNo, fax: String?
12-
public let email, representativeName, representativePhoneNo, foundedAt: String
10+
public let managerPhoneNo: String
11+
public let email, representativeName, foundedAt: String
12+
public let representativePhoneNo: String?
1313
public let workerNumber: String
1414
public let take: String
1515
public let recruitmentID: Int?
1616
public let attachments: [String]
1717
public let serviceName: String
1818
public let businessArea: String
19+
public let headquarter: Bool
1920

2021
public init(
2122
businessNumber: String,
@@ -25,24 +26,19 @@ public struct CompanyInfoDetailEntity: Equatable {
2526
mainZipCode: String,
2627
mainAddress: String,
2728
mainAddressDetail: String,
28-
// subZipCode: String?,
29-
// subAddress: String?,
30-
// subAddressDetail: String?,
3129
managerName: String,
32-
// managerPhoneNo: String,
33-
// subManagerName: String?,
34-
// subManagerPhoneNo: String?,
35-
// fax: String?,
30+
managerPhoneNo: String,
3631
email: String,
3732
representativeName: String,
38-
representativePhoneNo: String,
33+
representativePhoneNo: String?,
3934
foundedAt: String,
4035
workerNumber: String,
4136
take: String,
4237
recruitmentID: Int?,
4338
attachments: [String],
4439
serviceName: String,
45-
businessArea: String
40+
businessArea: String,
41+
headquarter: Bool
4642
) {
4743
self.businessNumber = businessNumber
4844
self.companyName = companyName
@@ -51,14 +47,8 @@ public struct CompanyInfoDetailEntity: Equatable {
5147
self.mainZipCode = mainZipCode
5248
self.mainAddress = mainAddress
5349
self.mainAddressDetail = mainAddressDetail
54-
// self.subZipCode = subZipCode
55-
// self.subAddress = subAddress
56-
// self.subAddressDetail = subAddressDetail
5750
self.managerName = managerName
58-
// self.managerPhoneNo = managerPhoneNo
59-
// self.subManagerName = subManagerName
60-
// self.subManagerPhoneNo = subManagerPhoneNo
61-
// self.fax = fax
51+
self.managerPhoneNo = managerPhoneNo
6252
self.email = email
6353
self.representativeName = representativeName
6454
self.representativePhoneNo = representativePhoneNo
@@ -69,5 +59,6 @@ public struct CompanyInfoDetailEntity: Equatable {
6959
self.attachments = attachments
7060
self.serviceName = serviceName
7161
self.businessArea = businessArea
62+
self.headquarter = headquarter
7263
}
7364
}

โ€ŽProjects/Domain/Sources/Entities/Recruitments/RecruitmentDetailEntity.swiftโ€Ž

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,52 @@ public struct RecruitmentDetailEntity: Equatable {
66
public let companyProfileURL: String
77
public let companyName: String
88
public let areas: [AreaEntity]
9-
public let requiredGrade: String?
9+
public let additionalQualifications: String?
1010
public let workingHours: String
1111
public let requiredLicenses: String?
1212
public let hiringProgress: String
1313
public let trainPay: String
1414
public let pay: String?
1515
public let benefits: String?
16-
public let military: Bool
16+
public let military: Bool?
1717
public let submitDocument: String
1818
public let period: String
1919
public let etc: String
2020
public let isApplicable: Bool
21+
public let winterIntern: Bool?
22+
public let hireConvertible: Bool?
2123
public let bookmarked: Bool
24+
public let integrationPlan: Bool?
2225

2326
public init(
2427
recruitmentID: Int,
2528
companyID: Int,
2629
companyProfileURL: String,
2730
companyName: String,
2831
areas: [AreaEntity],
29-
requiredGrade: String?,
32+
additionalQualifications: String?,
3033
workingHours: String,
3134
requiredLicenses: String?,
3235
hiringProgress: String,
3336
trainPay: String,
3437
pay: String?,
3538
benefits: String?,
36-
military: Bool,
39+
military: Bool?,
3740
submitDocument: String,
3841
period: String,
3942
etc: String,
4043
isApplicable: Bool,
41-
bookmarked: Bool
44+
winterIntern: Bool?,
45+
hireConvertible: Bool?,
46+
bookmarked: Bool,
47+
integrationPlan: Bool?
4248
) {
4349
self.recruitmentID = recruitmentID
4450
self.companyID = companyID
4551
self.companyProfileURL = companyProfileURL
4652
self.companyName = companyName
4753
self.areas = areas
48-
self.requiredGrade = requiredGrade
54+
self.additionalQualifications = additionalQualifications
4955
self.workingHours = workingHours
5056
self.requiredLicenses = requiredLicenses
5157
self.hiringProgress = hiringProgress
@@ -57,6 +63,9 @@ public struct RecruitmentDetailEntity: Equatable {
5763
self.period = period
5864
self.etc = etc
5965
self.isApplicable = isApplicable
66+
self.winterIntern = winterIntern
67+
self.hireConvertible = hireConvertible
6068
self.bookmarked = bookmarked
69+
self.integrationPlan = integrationPlan
6170
}
6271
}

โ€ŽProjects/Domain/Sources/Enums/NotificationType.swiftโ€Ž

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import Foundation
22

33
public enum NotificationType: String, Codable {
4-
case notice = "NEW_NOTICE"
5-
case recruitment = "RECRUITMENT_DONE"
6-
case application = "APPLICATION_STATUS_CHANGED"
7-
case interestRecruitment = "NEW_INTERESTED_RECRUITMENT"
8-
case winterIntern = "WINTER_INTERN_STATUS_CHANGED"
4+
case notice = "NOTICE"
5+
case recruitment = "RECRUITMENT"
6+
case application = "APPLICATION"
7+
case winterIntern = "WINTER_INTERN"
98
}

0 commit comments

Comments
ย (0)