Skip to content

Commit

Permalink
🔗 :: (#790) 컬럼명 통일
Browse files Browse the repository at this point in the history
  • Loading branch information
4mjeo authored Oct 25, 2024
2 parents f69fb53 + 378dbb7 commit 5b47f30
Show file tree
Hide file tree
Showing 21 changed files with 43 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class CompanyMyPageResponse {
private final String businessArea;
private final String bizRegistrationUrl;
private final List<String> attachmentUrls;
private final boolean isHeadquarter;
private final boolean headquarter;

public static CompanyMyPageResponse from(Company company) {
return CompanyMyPageResponse.builder()
Expand All @@ -58,7 +58,7 @@ public static CompanyMyPageResponse from(Company company) {
.businessArea(company.getBusinessArea())
.bizRegistrationUrl(company.getBizRegistrationUrl())
.attachmentUrls(company.getAttachmentUrls())
.isHeadquarter(company.isHeadquarter())
.headquarter(company.isHeadquarter())
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class QueryCompanyDetailsResponse {
private final Long businessAreaCode;
private final String businessArea;
private final String bizRegistrationUrl;
private final boolean isHeadquarter;
private final boolean headquarter;

public static QueryCompanyDetailsResponse from(CompanyDetailsVO vo) {
return QueryCompanyDetailsResponse.builder()
Expand All @@ -60,7 +60,7 @@ public static QueryCompanyDetailsResponse from(CompanyDetailsVO vo) {
.serviceName(vo.getServiceName())
.businessArea(vo.getBusinessArea())
.bizRegistrationUrl(vo.getBizRegistrationUrl())
.isHeadquarter(vo.isHeadquarter())
.headquarter(vo.isHeadquarter())
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class Company {

private final List<String> attachmentUrls;

private final boolean isHeadquarter;
private final boolean headquarter;

public static Company of(Long id, RegisterCompanyRequest request, String businessArea) {
return Company.builder()
Expand Down Expand Up @@ -88,7 +88,7 @@ public static Company of(Long id, RegisterCompanyRequest request, String busines
.representativePhoneNo(request.representativePhoneNo())
.foundedAt(request.foundedAt())
.attachmentUrls(request.attachmentUrls())
.isHeadquarter(request.headquarter())
.headquarter(request.headquarter())
.build();
}

Expand All @@ -115,7 +115,7 @@ public Company update(UpdateCompanyDetailsRequest request) {
.email(request.email())
.serviceName(request.serviceName())
.attachmentUrls(request.attachmentUrls())
.isHeadquarter(request.headquarter())
.headquarter(request.headquarter())
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ public class CompanyDetailsVO {
private final String businessArea;
private final List<String> attachmentUrls;
private final String bizRegistrationUrl;
private final boolean isHeadquarter;
private final boolean headquarter;
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public record ApplyRecruitmentRequest(
LocalDate startDate,
LocalDate endDate,
boolean winterIntern,
Boolean isHireConvertible,
Boolean hireConvertible,
String etc
) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class QueryRecruitmentDetailResponse {
private final String etc;
private final Boolean isApplicable;
private final boolean isBookmarked;
private final Boolean isHireConvertible;
private final Boolean hireConvertible;

public static QueryRecruitmentDetailResponse of(
RecruitmentDetailVO recruitmentDetail, List<RecruitAreaResponse> recruitAreas,
Expand All @@ -63,7 +63,7 @@ public static QueryRecruitmentDetailResponse of(
.etc(recruitmentDetail.getEtc())
.isApplicable(isApplicable)
.isBookmarked(recruitmentDetail.isBookmarked())
.isHireConvertible(recruitmentDetail.getIsHireConvertible())
.hireConvertible(recruitmentDetail.getHireConvertible())
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static class TeacherRecruitmentResponse {

private long companyId;

private Boolean isHireConvertible;
private Boolean hireConvertible;

public static TeacherRecruitmentResponse from(TeacherRecruitmentVO recruitment) {
return TeacherRecruitmentResponse.builder()
Expand All @@ -61,7 +61,7 @@ public static TeacherRecruitmentResponse from(TeacherRecruitmentVO recruitment)
.totalHiringCount(recruitment.getTotalHiringCount())
.hiringJobs(recruitment.getJobCodes())
.companyId(recruitment.getCompanyId())
.isHireConvertible(recruitment.getIsHireConvertible())
.hireConvertible(recruitment.getHireConvertible())
.build();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class Recruitment {

private final boolean winterIntern;

private final Boolean isHireConvertible;
private final Boolean hireConvertible;

private final Long companyId;

Expand All @@ -76,7 +76,7 @@ public static Recruitment of(ApplyRecruitmentRequest request, Long currentCompan
.etc(request.etc())
.hiringProgress(request.hiringProgress())
.winterIntern(request.winterIntern())
.isHireConvertible(request.isHireConvertible())
.hireConvertible(request.hireConvertible())
.build();
}

Expand Down Expand Up @@ -144,7 +144,7 @@ public Recruitment update(UpdateRecruitmentRequest request) {
.militarySupport(request.military())
.submitDocument(request.submitDocument())
.recruitingPeriod(new RecruitingPeriod(request.startDate(), request.endDate()))
.isHireConvertible(request.hireConvertible())
.hireConvertible(request.hireConvertible())
.etc(request.etc())
.build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ public class RecruitmentDetailVO {
private final String companyBizNo;
private final boolean winterIntern;
private final boolean isBookmarked;
private final Boolean isHireConvertible;
private final Boolean hireConvertible;
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ public class TeacherRecruitmentVO {
private final long requestedApplicationCount;
private final long approvedApplicationCount;
private final long companyId;
private final Boolean isHireConvertible;
private final Boolean hireConvertible;

}
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public Optional<CompanyDetailsVO> getCompanyDetails(Long companyId) {
companyEntity.businessArea,
companyEntity.attachmentUrls,
companyEntity.bizRegistrationUrl,
companyEntity.isHeadquarter
companyEntity.headquarter
)
)
.from(companyEntity)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ public class CompanyEntity {

@NotNull
@Column(columnDefinition = "TINYINT(1)")
private boolean isHeadquarter;
private boolean headquarter;

@Builder
public CompanyEntity(Long id, String name, String mainAddress, String mainAddressDetail, String mainZipCode,
List<String> attachmentUrls, String representative, LocalDate foundedAt, double take, int workersCount,
String managerName, String managerPhoneNo, String companyIntroduce, String companyLogoUrl, String email,
String bizNo, String bizRegistrationUrl, String businessArea, String serviceName, CompanyType type,
boolean isMou, String representativePhoneNo, boolean isHeadquarter) {
boolean isMou, String representativePhoneNo, boolean headquarter) {
this.id = id;
this.name = name;
this.isMou = isMou;
Expand All @@ -139,6 +139,6 @@ public CompanyEntity(Long id, String name, String mainAddress, String mainAddres
this.companyIntroduce = companyIntroduce;
this.companyLogoUrl = companyLogoUrl;
this.attachmentUrls = attachmentUrls;
this.isHeadquarter = isHeadquarter;
this.headquarter = headquarter;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public CompanyEntity toEntity(Company domain) {
.isMou(domain.isMou())
.workersCount(domain.getWorkersCount())
.attachmentUrls(domain.getAttachmentUrls())
.isHeadquarter(domain.isHeadquarter())
.headquarter(domain.isHeadquarter())
.build();
}

Expand Down Expand Up @@ -71,7 +71,7 @@ public Company toDomain(CompanyEntity entity) {
.take(entity.getTake())
.workersCount(entity.getWorkersCount())
.attachmentUrls(entity.getAttachmentUrls())
.isHeadquarter(entity.isHeadquarter())
.headquarter(entity.isHeadquarter())
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ public QueryCompanyDetailsVO(String businessNumber, String companyName, String c
String managerName, String managerPhoneNo, String email, String representativeName, String representativePhoneNo,
LocalDate foundedAt, int workerNumber, double take,
Long recruitmentId, String serviceName, Long businessAreaCode,
String businessArea, List<String> attachmentUrls, String bizRegistrationUrl, boolean isHeadquarter) {
String businessArea, List<String> attachmentUrls, String bizRegistrationUrl, boolean headquarter) {
super(businessNumber, companyName, companyProfileUrl, companyIntroduce,
mainZipCode, mainAddress, mainAddressDetail, managerName, managerPhoneNo, email,
representativeName, representativePhoneNo, foundedAt, workerNumber, take, recruitmentId,
serviceName, businessAreaCode, businessArea, attachmentUrls, bizRegistrationUrl, isHeadquarter);
serviceName, businessAreaCode, businessArea, attachmentUrls, bizRegistrationUrl, headquarter);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public List<TeacherRecruitmentVO> getTeacherRecruitmentsBy(RecruitmentFilter fil
requestedApplication.countDistinct(),
approvedApplication.countDistinct(),
companyEntity.id,
recruitmentEntity.isHireConvertible
recruitmentEntity.hireConvertible
)
)
.from(recruitmentEntity)
Expand Down Expand Up @@ -176,7 +176,7 @@ public List<TeacherRecruitmentVO> getTeacherRecruitmentsWithoutPageBy(Recruitmen
requestedApplication.countDistinct(),
approvedApplication.countDistinct(),
companyEntity.id,
recruitmentEntity.isHireConvertible
recruitmentEntity.hireConvertible
)
)
.from(recruitmentEntity)
Expand Down Expand Up @@ -238,7 +238,7 @@ public RecruitmentDetailVO getByIdAndStudentIdOrThrow(Long recruitmentId, Long s
companyEntity.bizNo,
recruitmentEntity.winterIntern,
bookmarkEntity.isNotNull(),
recruitmentEntity.isHireConvertible
recruitmentEntity.hireConvertible
)
)
.from(recruitmentEntity)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public class RecruitmentEntity extends BaseTimeEntity {
private boolean winterIntern;

@Column(columnDefinition = "TINYINT(1)")
private Boolean isHireConvertible;
private Boolean hireConvertible;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "company_id", nullable = false)
Expand All @@ -113,7 +113,7 @@ public RecruitmentEntity(Long id, int recruitYear, RecruitStatus status, String
String submitDocument, LocalDate startDate, LocalDate endDate, CompanyEntity companyEntity,
String benefits, boolean militarySupport, List<String> requiredLicenses, String etc,
List<ProgressType> hiringProgress, Integer requiredGrade, boolean flexibleWorking,
boolean personalContact, boolean winterIntern, Boolean isHireConvertible) {
boolean personalContact, boolean winterIntern, Boolean hireConvertible) {
this.id = id;
this.workingHours = workingHours;
this.flexibleWorking = flexibleWorking;
Expand All @@ -130,7 +130,7 @@ public RecruitmentEntity(Long id, int recruitYear, RecruitStatus status, String
this.requiredLicenses = requiredLicenses;
this.militarySupport = militarySupport;
this.winterIntern = winterIntern;
this.isHireConvertible = isHireConvertible;
this.hireConvertible = hireConvertible;
this.etc = etc;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public RecruitmentEntity toEntity(Recruitment domain) {
.workingHours(domain.getWorkingHours())
.flexibleWorking(domain.isFlexibleWorking())
.winterIntern(domain.isWinterIntern())
.isHireConvertible(domain.getIsHireConvertible())
.hireConvertible(domain.getHireConvertible())
.build();
}

Expand Down Expand Up @@ -73,7 +73,7 @@ public Recruitment toDomain(RecruitmentEntity entity) {
.submitDocument(entity.getSubmitDocument())
.submitDocument(entity.getSubmitDocument())
.winterIntern(entity.isWinterIntern())
.isHireConvertible(entity.getIsHireConvertible())
.hireConvertible(entity.getHireConvertible())
.createdAt(entity.getCreatedAt())
.build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ public QueryRecruitmentDetailVO(Long recruitmentId, Long companyId, String compa
Integer requiredGrade, String workingHours, boolean flexibleWorking, List<String> requiredLicenses,
List<ProgressType> hiringProgress, Integer trainPay, String pay, String benefits,
Boolean military, String submitDocument, LocalDate startDate, LocalDate endDate,
String etc, String companyBizNo, boolean winterIntern, boolean isBookmarked, Boolean isHireConvertible) {
String etc, String companyBizNo, boolean winterIntern, boolean isBookmarked, Boolean hireConvertible) {
super(recruitmentId, companyId, companyProfileUrl, companyName,
requiredGrade, workingHours, flexibleWorking, requiredLicenses,
hiringProgress, trainPay, pay, benefits, military,
submitDocument, startDate, endDate, etc, companyBizNo, winterIntern, isBookmarked, isHireConvertible);
submitDocument, startDate, endDate, etc, companyBizNo, winterIntern, isBookmarked, hireConvertible);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ public QueryTeacherRecruitmentsVO(long recruitmentId, RecruitStatus recruitStatu
LocalDate startDate, LocalDate endDate, String companyName,
CompanyType companyType, String jobCodes, long totalHiring,
long requestedApplicationCount, long approvedApplicationCount,
long companyId, Boolean isHireConvertible) {
long companyId, Boolean hireConvertible) {
super(recruitmentId, recruitStatus, startDate, endDate,
companyName, companyType, jobCodes, totalHiring,
requestedApplicationCount, approvedApplicationCount,
companyId, isHireConvertible);
companyId, hireConvertible);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class ApplyRecruitmentWebRequest {
@NotNull
private Boolean winterIntern;

private Boolean isHireConvertible;
private Boolean hireConvertible;

@Size(max = 350)
private String etc;
Expand All @@ -89,7 +89,7 @@ public ApplyRecruitmentRequest toDomainRequest() {
.startDate(this.startDate)
.endDate(this.endDate)
.winterIntern(this.winterIntern)
.isHireConvertible(this.isHireConvertible)
.hireConvertible(this.hireConvertible)
.etc(this.etc)
.build();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
alter table tbl_company rename column is_headquarter to headquarter;

alter table tbl_recruitment rename column is_hire_convertible to hire_convertible;

0 comments on commit 5b47f30

Please sign in to comment.