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

♻️ refactor : request dto 및 엔티티에 null 허용 #149

Merged
merged 2 commits into from
Feb 9, 2024
Merged
Changes from all commits
Commits
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
11 changes: 2 additions & 9 deletions http/test.http
Original file line number Diff line number Diff line change
@@ -6,18 +6,11 @@ Content-Type: application/json

{
"name": "팀 스포너스",
"email": "sponus@gmail.com",
"email": "sponus_student@gmail.com",
"password": "password1234",
"location": "none",
"organizationType": "STUDENT",
"suborganizationType": "STUDENT_COUNCIL",
"managerName": "이가은",
"managerPosition": "Project Manager",
"managerEmail": "test@gmail.com",
"managerPhone": "01012345678",
"managerAvailableDay": "월-금",
"managerAvailableHour": "15:00-18:00",
"managerContactPreference": "EMAIL"
"suborganizationType": "STUDENT_COUNCIL"
}

### 로그인
Original file line number Diff line number Diff line change
@@ -22,53 +22,19 @@ public record OrganizationJoinRequest(
@Size(min = 10, message = "[ERROR] 비밀번호는 최소 10자리 이이어야 합니다.")
String password,

@NotBlank(message = "[ERROR] 위치 입력은 필수 입니다.")
String location,

@NotNull(message = "[ERROR] 단체 유형 입력은 필수입니다.")
OrganizationType organizationType,

@NotNull(message = "[ERROR] 단체 서브 유형 입력은 필수입니다.")
SuborganizationType suborganizationType,

@NotBlank(message = "[ERROR] 담당자 이름 입력은 필수입니다.")
String managerName,

@NotBlank(message = "[ERROR] 담당자 직책 입력은 필수입니다.")
String managerPosition,

@NotBlank(message = "[ERROR] 담당자 이메일 입력은 필수입니다.")
@Pattern(regexp = "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+.[A-Za-z]{2,6}$", message = "[ERROR] 이메일 형식에 맞지 않습니다.")
String managerEmail,

@NotBlank(message = "[ERROR] 담당자 전화번호 입력은 필수입니다.")
String managerPhone,

@NotBlank(message = "[ERROR] 담당자 연락 가능 요일 입력은 필수입니다.")
String managerAvailableDay,

@NotBlank(message = "[ERROR] 담당자 연락 가능 시간 입력은 필수입니다.")
String managerAvailableHour,

@NotBlank(message = "[ERROR] 담당자 연락 선호 방법 입력은 필수입니다.")
String managerContactPreference
SuborganizationType suborganizationType
) {

public Organization toEntity(String encodedPassword) {
return Organization.builder()
.name(name)
.email(email)
.password(encodedPassword)
.location(location)
.organizationType(organizationType)
.suborganizationType(suborganizationType)
.managerName(managerName)
.managerPosition(managerPosition)
.managerEmail(managerEmail)
.managerPhone(managerPhone)
.managerAvailableDay(managerAvailableDay)
.managerAvailableHour(managerAvailableHour)
.managerContactPreference(managerContactPreference)
.organizationStatus(OrganizationStatus.ACTIVE)
.build();
}
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ public class Organization extends BaseEntity {
@Column(name = "organization_password", nullable = false)
private String password;

@Column(name = "organization_location", nullable = false)
@Column(name = "organization_location")
private String location;

@Column(name = "organization_description")
@@ -62,29 +62,29 @@ public class Organization extends BaseEntity {
@Enumerated(EnumType.STRING)
private OrganizationType organizationType;

@Column(name = "suborganization_type", nullable = false)
@Column(name = "suborganization_type")
@Enumerated(EnumType.STRING)
private SuborganizationType suborganizationType;

@Column(name = "manager_name", nullable = false)
@Column(name = "manager_name")
private String managerName;

@Column(name = "manager_position", nullable = false)
@Column(name = "manager_position")
private String managerPosition;

@Column(name = "manager_email", nullable = false)
@Column(name = "manager_email")
private String managerEmail;

@Column(name = "manager_phone", nullable = false)
@Column(name = "manager_phone")
private String managerPhone;

@Column(name = "manager_available_day", nullable = false)
@Column(name = "manager_available_day")
private String managerAvailableDay;

@Column(name = "manager_available_hour", nullable = false)
@Column(name = "manager_available_hour")
private String managerAvailableHour;

@Column(name = "manager_contact_preference", nullable = false)
@Column(name = "manager_contact_preference")
private String managerContactPreference;

// TODO 알림 허용 여부