diff --git a/src/main/java/com/clova/anifriends/domain/animal/Animal.java b/src/main/java/com/clova/anifriends/domain/animal/Animal.java index 55c2aea38..af490cec1 100644 --- a/src/main/java/com/clova/anifriends/domain/animal/Animal.java +++ b/src/main/java/com/clova/anifriends/domain/animal/Animal.java @@ -1,13 +1,13 @@ package com.clova.anifriends.domain.animal; -import com.clova.anifriends.domain.animal.wrapper.Active; -import com.clova.anifriends.domain.animal.wrapper.Breed; -import com.clova.anifriends.domain.animal.wrapper.Gender; -import com.clova.anifriends.domain.animal.wrapper.Information; -import com.clova.anifriends.domain.animal.wrapper.IsNeutered; -import com.clova.anifriends.domain.animal.wrapper.Name; -import com.clova.anifriends.domain.animal.wrapper.Type; -import com.clova.anifriends.domain.animal.wrapper.Weight; +import com.clova.anifriends.domain.animal.wrapper.AnimalActive; +import com.clova.anifriends.domain.animal.wrapper.AnimalBreed; +import com.clova.anifriends.domain.animal.wrapper.AnimalGender; +import com.clova.anifriends.domain.animal.wrapper.AnimalInformation; +import com.clova.anifriends.domain.animal.wrapper.AnimalName; +import com.clova.anifriends.domain.animal.wrapper.AnimalNeutered; +import com.clova.anifriends.domain.animal.wrapper.AnimalType; +import com.clova.anifriends.domain.animal.wrapper.AnimalWeight; import com.clova.anifriends.domain.common.BaseTimeEntity; import com.clova.anifriends.domain.shelter.Shelter; import jakarta.persistence.Column; @@ -38,33 +38,33 @@ public class Animal extends BaseTimeEntity { private Shelter shelter; @Embedded - private Name name; + private AnimalName name; @Column(name = "birth_date") private LocalDate birthDate; @Enumerated(EnumType.STRING) @Column(name = "type") - private Type type; + private AnimalType type; @Embedded - private Breed breed; + private AnimalBreed breed; @Embedded - private Gender gender; + private AnimalGender gender; @Embedded - private IsNeutered isNeutered; + private AnimalNeutered neutered; @Enumerated(EnumType.STRING) @Column(name = "active") - private Active active; + private AnimalActive active; @Embedded - private Weight weight; + private AnimalWeight weight; @Embedded - private Information information; + private AnimalInformation information; protected Animal() { } @@ -82,14 +82,22 @@ public Animal( String information ) { this.shelter = shelter; - this.name = new Name(name); + this.name = new AnimalName(name); this.birthDate = birthDate; - this.type = Type.valueOf(type); - this.breed = new Breed(breed); - this.gender = Gender.valueOf(gender); - this.isNeutered = new IsNeutered(isNeutered); - this.active = Active.valueOf(active); - this.weight = new Weight(weight); - this.information = new Information(information); + this.type = AnimalType.valueOf(type); + this.breed = new AnimalBreed(breed); + this.gender = AnimalGender.valueOf(gender); + this.neutered = new AnimalNeutered(isNeutered); + this.active = AnimalActive.valueOf(active); + this.weight = new AnimalWeight(weight); + this.information = new AnimalInformation(information); + } + + public String getName() { + return this.name.getName(); + } + + public boolean isNeutered() { + return this.neutered.getIsNeutered(); } } diff --git a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Active.java b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalActive.java similarity index 90% rename from src/main/java/com/clova/anifriends/domain/animal/wrapper/Active.java rename to src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalActive.java index 50941f499..011346b4f 100644 --- a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Active.java +++ b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalActive.java @@ -1,6 +1,6 @@ package com.clova.anifriends.domain.animal.wrapper; -public enum Active { +public enum AnimalActive { QUIET, NORMAL, diff --git a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Breed.java b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalBreed.java similarity index 71% rename from src/main/java/com/clova/anifriends/domain/animal/wrapper/Breed.java rename to src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalBreed.java index e999f9d48..6cbe2b6f3 100644 --- a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Breed.java +++ b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalBreed.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Breed { +public class AnimalBreed { @Column(name = "breed") private String breed; - protected Breed() { + protected AnimalBreed() { } - public Breed(String value) { + public AnimalBreed(String value) { this.breed = value; } diff --git a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Gender.java b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalGender.java similarity index 85% rename from src/main/java/com/clova/anifriends/domain/animal/wrapper/Gender.java rename to src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalGender.java index daad86cba..3a8bdd3ef 100644 --- a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Gender.java +++ b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalGender.java @@ -2,7 +2,7 @@ import com.clova.anifriends.EnumType; -public enum Gender implements EnumType { +public enum AnimalGender implements EnumType { MALE, FEMALE diff --git a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Information.java b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalInformation.java similarity index 69% rename from src/main/java/com/clova/anifriends/domain/animal/wrapper/Information.java rename to src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalInformation.java index d8e6cbcde..6909aae44 100644 --- a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Information.java +++ b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalInformation.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Information { +public class AnimalInformation { @Column(name = "information") private String information; - protected Information() { + protected AnimalInformation() { } - public Information(String value) { + public AnimalInformation(String value) { this.information = value; } } diff --git a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Name.java b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalName.java similarity index 65% rename from src/main/java/com/clova/anifriends/domain/animal/wrapper/Name.java rename to src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalName.java index ad04efc1f..4d44f26ee 100644 --- a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Name.java +++ b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalName.java @@ -2,17 +2,19 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; +import lombok.Getter; +@Getter @Embeddable -public class Name { +public class AnimalName { @Column(name = "name") private String name; - protected Name() { + protected AnimalName() { } - public Name(String value) { + public AnimalName(String value) { this.name = value; } diff --git a/src/main/java/com/clova/anifriends/domain/animal/wrapper/IsNeutered.java b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalNeutered.java similarity index 56% rename from src/main/java/com/clova/anifriends/domain/animal/wrapper/IsNeutered.java rename to src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalNeutered.java index cd458ed46..b240ccf3e 100644 --- a/src/main/java/com/clova/anifriends/domain/animal/wrapper/IsNeutered.java +++ b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalNeutered.java @@ -2,18 +2,19 @@ import jakarta.persistence.Column; import jakarta.persistence.Embeddable; +import lombok.Getter; +@Getter @Embeddable -public class IsNeutered { +public class AnimalNeutered { - @Column(name = "isNeutered") + @Column(name = "is_neutered") private Boolean isNeutered; - protected IsNeutered() { + protected AnimalNeutered() { } - public IsNeutered(boolean value) { + public AnimalNeutered(boolean value) { this.isNeutered = value; } - } diff --git a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Type.java b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalType.java similarity index 89% rename from src/main/java/com/clova/anifriends/domain/animal/wrapper/Type.java rename to src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalType.java index 375705239..d685d72d9 100644 --- a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Type.java +++ b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalType.java @@ -1,6 +1,6 @@ package com.clova.anifriends.domain.animal.wrapper; -public enum Type { +public enum AnimalType { DOG, CAT, diff --git a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Weight.java b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalWeight.java similarity index 71% rename from src/main/java/com/clova/anifriends/domain/animal/wrapper/Weight.java rename to src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalWeight.java index 1f56b3bf1..c6a2ea09c 100644 --- a/src/main/java/com/clova/anifriends/domain/animal/wrapper/Weight.java +++ b/src/main/java/com/clova/anifriends/domain/animal/wrapper/AnimalWeight.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Weight { +public class AnimalWeight { @Column(name = "weight") private Double weight; - protected Weight() { + protected AnimalWeight() { } - public Weight(double value) { + public AnimalWeight(double value) { this.weight = value; } diff --git a/src/main/java/com/clova/anifriends/domain/applicant/Applicant.java b/src/main/java/com/clova/anifriends/domain/applicant/Applicant.java index ae82a4bc8..841d8bbf6 100644 --- a/src/main/java/com/clova/anifriends/domain/applicant/Applicant.java +++ b/src/main/java/com/clova/anifriends/domain/applicant/Applicant.java @@ -1,6 +1,6 @@ package com.clova.anifriends.domain.applicant; -import com.clova.anifriends.domain.applicant.wrapper.Status; +import com.clova.anifriends.domain.applicant.wrapper.ApplicantStatus; import com.clova.anifriends.domain.common.BaseTimeEntity; import com.clova.anifriends.domain.recruitment.Recruitment; import com.clova.anifriends.domain.volunteer.Volunteer; @@ -35,7 +35,7 @@ public class Applicant extends BaseTimeEntity { @Enumerated(EnumType.STRING) @Column(name = "status") - private Status status; + private ApplicantStatus status; protected Applicant() { } @@ -47,6 +47,6 @@ public Applicant( ) { this.recruitment = recruitment; this.volunteer = volunteer; - this.status = Status.valueOf(status); + this.status = ApplicantStatus.valueOf(status); } } diff --git a/src/main/java/com/clova/anifriends/domain/applicant/wrapper/Status.java b/src/main/java/com/clova/anifriends/domain/applicant/wrapper/ApplicantStatus.java similarity index 86% rename from src/main/java/com/clova/anifriends/domain/applicant/wrapper/Status.java rename to src/main/java/com/clova/anifriends/domain/applicant/wrapper/ApplicantStatus.java index d31d942c3..de7d240d6 100644 --- a/src/main/java/com/clova/anifriends/domain/applicant/wrapper/Status.java +++ b/src/main/java/com/clova/anifriends/domain/applicant/wrapper/ApplicantStatus.java @@ -2,7 +2,7 @@ import com.clova.anifriends.EnumType; -public enum Status implements EnumType { +public enum ApplicantStatus implements EnumType { PENDING, REFUSED, diff --git a/src/main/java/com/clova/anifriends/domain/recruitment/Recruitment.java b/src/main/java/com/clova/anifriends/domain/recruitment/Recruitment.java index 68306550f..4443b6535 100644 --- a/src/main/java/com/clova/anifriends/domain/recruitment/Recruitment.java +++ b/src/main/java/com/clova/anifriends/domain/recruitment/Recruitment.java @@ -1,10 +1,10 @@ package com.clova.anifriends.domain.recruitment; import com.clova.anifriends.domain.common.BaseTimeEntity; -import com.clova.anifriends.domain.recruitment.wrapper.Capacity; -import com.clova.anifriends.domain.recruitment.wrapper.Content; -import com.clova.anifriends.domain.recruitment.wrapper.IsClosed; -import com.clova.anifriends.domain.recruitment.wrapper.Title; +import com.clova.anifriends.domain.recruitment.wrapper.RecruitmentContent; +import com.clova.anifriends.domain.recruitment.wrapper.RecruitmentDeadlineInfo; +import com.clova.anifriends.domain.recruitment.wrapper.RecruitmentTime; +import com.clova.anifriends.domain.recruitment.wrapper.RecruitmentTitle; import com.clova.anifriends.domain.shelter.Shelter; import jakarta.persistence.Column; import jakarta.persistence.Embedded; @@ -33,25 +33,16 @@ public class Recruitment extends BaseTimeEntity { private Shelter shelter; @Embedded - private Title title; + private RecruitmentTitle title; @Embedded - private Capacity capacity; + private RecruitmentContent content; @Embedded - private Content content; + private RecruitmentTime time; @Embedded - private IsClosed isClosed; - - @Column(name = "startTime") - private LocalDateTime startTime; - - @Column(name = "endTime") - private LocalDateTime endTime; - - @Column(name = "deadline") - private LocalDateTime deadline; + private RecruitmentDeadlineInfo deadlineInfo; @LastModifiedDate @Column(name = "updated_at") @@ -71,12 +62,9 @@ public Recruitment( LocalDateTime deadline ) { this.shelter = shelter; - this.title = new Title(title); - this.capacity = new Capacity(capacity); - this.content = new Content(content); - this.isClosed = new IsClosed(isClosed); - this.startTime = startTime; - this.endTime = endTime; - this.deadline = deadline; + this.title = new RecruitmentTitle(title); + this.content = new RecruitmentContent(content); + this.time = new RecruitmentTime(startTime, endTime); + this.deadlineInfo = new RecruitmentDeadlineInfo(deadline, isClosed, capacity); } } diff --git a/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/Capacity.java b/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/Capacity.java deleted file mode 100644 index 6e1ba73e0..000000000 --- a/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/Capacity.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.clova.anifriends.domain.recruitment.wrapper; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; - -@Embeddable -public class Capacity { - - @Column(name = "capacity") - private Integer capacity; - - protected Capacity() { - } - - public Capacity(int value) { - this.capacity = value; - } - -} diff --git a/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/IsClosed.java b/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/IsClosed.java deleted file mode 100644 index 3c70ac214..000000000 --- a/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/IsClosed.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.clova.anifriends.domain.recruitment.wrapper; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; - -@Embeddable -public class IsClosed { - - @Column(name = "is_closed") - private Boolean isClosed; - - protected IsClosed() { - } - - public IsClosed(boolean value) { - this.isClosed = value; - } - -} diff --git a/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/Content.java b/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentContent.java similarity index 68% rename from src/main/java/com/clova/anifriends/domain/recruitment/wrapper/Content.java rename to src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentContent.java index 86b1bc901..91c5e66f1 100644 --- a/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/Content.java +++ b/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentContent.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Content { +public class RecruitmentContent { @Column(name = "content") private String content; - protected Content() { + protected RecruitmentContent() { } - public Content(String value) { + public RecruitmentContent(String value) { this.content = value; } diff --git a/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentDeadlineInfo.java b/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentDeadlineInfo.java new file mode 100644 index 000000000..b6b49d9b0 --- /dev/null +++ b/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentDeadlineInfo.java @@ -0,0 +1,27 @@ +package com.clova.anifriends.domain.recruitment.wrapper; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import java.time.LocalDateTime; + +@Embeddable +public class RecruitmentDeadlineInfo { + + @Column(name = "deadline") + private LocalDateTime deadline; + + @Column(name = "is_closed") + private boolean isClosed; + + @Column(name = "capacity") + private int capacity; + + protected RecruitmentDeadlineInfo() { + } + + public RecruitmentDeadlineInfo(LocalDateTime deadline, boolean isClosed, int capacity) { + this.deadline = deadline; + this.isClosed = isClosed; + this.capacity = capacity; + } +} diff --git a/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentTime.java b/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentTime.java new file mode 100644 index 000000000..862398cfc --- /dev/null +++ b/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentTime.java @@ -0,0 +1,23 @@ +package com.clova.anifriends.domain.recruitment.wrapper; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import java.time.LocalDateTime; + +@Embeddable +public class RecruitmentTime { + + @Column(name = "start_time") + private LocalDateTime startTime; + + @Column(name = "end_time") + private LocalDateTime endTime; + + protected RecruitmentTime() { + } + + public RecruitmentTime(LocalDateTime startTime, LocalDateTime endTime) { + this.startTime = startTime; + this.endTime = endTime; + } +} diff --git a/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/Title.java b/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentTitle.java similarity index 68% rename from src/main/java/com/clova/anifriends/domain/recruitment/wrapper/Title.java rename to src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentTitle.java index af722281d..a8fcc99d2 100644 --- a/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/Title.java +++ b/src/main/java/com/clova/anifriends/domain/recruitment/wrapper/RecruitmentTitle.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Title { +public class RecruitmentTitle { @Column(name = "title") private String title; - protected Title() { + protected RecruitmentTitle() { } - public Title(String value) { + public RecruitmentTitle(String value) { this.title = value; } diff --git a/src/main/java/com/clova/anifriends/domain/review/Review.java b/src/main/java/com/clova/anifriends/domain/review/Review.java index 897828d0f..5e7bce41b 100644 --- a/src/main/java/com/clova/anifriends/domain/review/Review.java +++ b/src/main/java/com/clova/anifriends/domain/review/Review.java @@ -2,7 +2,7 @@ import com.clova.anifriends.domain.common.BaseTimeEntity; import com.clova.anifriends.domain.recruitment.Recruitment; -import com.clova.anifriends.domain.review.wrapper.Content; +import com.clova.anifriends.domain.review.wrapper.ReviewContent; import com.clova.anifriends.domain.volunteer.Volunteer; import jakarta.persistence.Column; import jakarta.persistence.Embedded; @@ -33,7 +33,7 @@ public class Review extends BaseTimeEntity { private Volunteer volunteer; @Embedded - private Content content; + private ReviewContent content; protected Review() { } @@ -45,7 +45,7 @@ public Review( ) { this.recruitment = recruitment; this.volunteer = volunteer; - this.content = new Content(content); + this.content = new ReviewContent(content); } } diff --git a/src/main/java/com/clova/anifriends/domain/review/wrapper/Content.java b/src/main/java/com/clova/anifriends/domain/review/wrapper/ReviewContent.java similarity index 70% rename from src/main/java/com/clova/anifriends/domain/review/wrapper/Content.java rename to src/main/java/com/clova/anifriends/domain/review/wrapper/ReviewContent.java index 7f6101ac0..c2da39ea1 100644 --- a/src/main/java/com/clova/anifriends/domain/review/wrapper/Content.java +++ b/src/main/java/com/clova/anifriends/domain/review/wrapper/ReviewContent.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Content { +public class ReviewContent { @Column(name = "content") private String content; - protected Content() { + protected ReviewContent() { } - public Content(String value) { + public ReviewContent(String value) { this.content = value; } diff --git a/src/main/java/com/clova/anifriends/domain/shelter/Shelter.java b/src/main/java/com/clova/anifriends/domain/shelter/Shelter.java index d19bf27c1..e450b42ac 100644 --- a/src/main/java/com/clova/anifriends/domain/shelter/Shelter.java +++ b/src/main/java/com/clova/anifriends/domain/shelter/Shelter.java @@ -1,14 +1,11 @@ package com.clova.anifriends.domain.shelter; import com.clova.anifriends.domain.common.BaseTimeEntity; -import com.clova.anifriends.domain.shelter.wrapper.Address; -import com.clova.anifriends.domain.shelter.wrapper.AddressDetail; -import com.clova.anifriends.domain.shelter.wrapper.Email; -import com.clova.anifriends.domain.shelter.wrapper.IsOpenedAddress; -import com.clova.anifriends.domain.shelter.wrapper.Name; -import com.clova.anifriends.domain.shelter.wrapper.Password; -import com.clova.anifriends.domain.shelter.wrapper.PhoneNumber; -import jakarta.persistence.AttributeOverride; +import com.clova.anifriends.domain.shelter.wrapper.ShelterEmail; +import com.clova.anifriends.domain.shelter.wrapper.ShelterName; +import com.clova.anifriends.domain.shelter.wrapper.ShelterPassword; +import com.clova.anifriends.domain.shelter.wrapper.ShelterAddressInfo; +import com.clova.anifriends.domain.shelter.wrapper.ShelterPhoneNumberInfo; import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; @@ -27,30 +24,19 @@ public class Shelter extends BaseTimeEntity { private Long shelterId; @Embedded - private Email email; + private ShelterEmail email; @Embedded - private Password password; + private ShelterPassword password; @Embedded - private Address address; + private ShelterName name; @Embedded - private AddressDetail addressDetail; + private ShelterPhoneNumberInfo phoneNumberInfo; @Embedded - private Name name; - - @Embedded - @AttributeOverride(name = "phoneNumber", column = @Column(name = "phone_number")) - private PhoneNumber phoneNumber; - - @Embedded - @AttributeOverride(name = "phoneNumber", column = @Column(name = "spare_phone_number")) - private PhoneNumber sparePhoneNumber; - - @Embedded - private IsOpenedAddress isOpenedAddress; + private ShelterAddressInfo addressInfo; protected Shelter() { } @@ -65,13 +51,10 @@ public Shelter( String sparePhoneNumber, boolean isOpenedAddress ) { - this.email = new Email(email); - this.password = new Password(password); - this.address = new Address(address); - this.addressDetail = new AddressDetail(addressDetail); - this.name = new Name(name); - this.phoneNumber = new PhoneNumber(phoneNumber); - this.sparePhoneNumber = new PhoneNumber(sparePhoneNumber); - this.isOpenedAddress = new IsOpenedAddress(isOpenedAddress); + this.email = new ShelterEmail(email); + this.password = new ShelterPassword(password); + this.name = new ShelterName(name); + this.phoneNumberInfo = new ShelterPhoneNumberInfo(phoneNumber, sparePhoneNumber); + this.addressInfo = new ShelterAddressInfo(address, addressDetail, isOpenedAddress); } } diff --git a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/Address.java b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/Address.java deleted file mode 100644 index 4d1a44fa5..000000000 --- a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/Address.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.clova.anifriends.domain.shelter.wrapper; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; - -@Embeddable -public class Address { - - @Column(name = "address") - private String address; - - protected Address() { - } - - public Address(String value) { - this.address = value; - } - -} diff --git a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/AddressDetail.java b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/AddressDetail.java deleted file mode 100644 index 79f82bb4c..000000000 --- a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/AddressDetail.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.clova.anifriends.domain.shelter.wrapper; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; - -@Embeddable -public class AddressDetail { - - @Column(name = "address_detail") - private String addressDetail; - - protected AddressDetail() { - } - - public AddressDetail(String value) { - this.addressDetail = value; - } - -} diff --git a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/IsOpenedAddress.java b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/IsOpenedAddress.java deleted file mode 100644 index 14c90c617..000000000 --- a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/IsOpenedAddress.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.clova.anifriends.domain.shelter.wrapper; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; - -@Embeddable -public class IsOpenedAddress { - - @Column(name = "is_opened_address") - private Boolean isOpenedAddress; - - protected IsOpenedAddress() { - } - - public IsOpenedAddress(boolean value) { - this.isOpenedAddress = value; - } - -} diff --git a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/PhoneNumber.java b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/PhoneNumber.java deleted file mode 100644 index 7bca979ee..000000000 --- a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/PhoneNumber.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.clova.anifriends.domain.shelter.wrapper; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; - -@Embeddable -public class PhoneNumber { - - private String phoneNumber; - - protected PhoneNumber() { - } - - public PhoneNumber(String value) { - this.phoneNumber = value; - } -} diff --git a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterAddressInfo.java b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterAddressInfo.java new file mode 100644 index 000000000..f616d4f79 --- /dev/null +++ b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterAddressInfo.java @@ -0,0 +1,26 @@ +package com.clova.anifriends.domain.shelter.wrapper; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; + +@Embeddable +public class ShelterAddressInfo { + + @Column(name = "address") + private String address; + + @Column(name = "address_detail") + private String addressDetail; + + @Column(name = "is_opened_address") + private boolean isOpenedAddress; + + protected ShelterAddressInfo() { + } + + public ShelterAddressInfo(String address, String addressDetail, boolean isOpenedAddress) { + this.address = address; + this.addressDetail = addressDetail; + this.isOpenedAddress = isOpenedAddress; + } +} diff --git a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/Email.java b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterEmail.java similarity index 70% rename from src/main/java/com/clova/anifriends/domain/shelter/wrapper/Email.java rename to src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterEmail.java index ec718d83c..0f0406712 100644 --- a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/Email.java +++ b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterEmail.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Email { +public class ShelterEmail { @Column(name = "email") private String email; - protected Email() { + protected ShelterEmail() { } - public Email(String value) { + public ShelterEmail(String value) { this.email = value; } diff --git a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/Name.java b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterName.java similarity index 71% rename from src/main/java/com/clova/anifriends/domain/shelter/wrapper/Name.java rename to src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterName.java index 8e828171d..be31fc4bf 100644 --- a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/Name.java +++ b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterName.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Name { +public class ShelterName { @Column(name = "name") private String name; - protected Name() { + protected ShelterName() { } - public Name(String value) { + public ShelterName(String value) { this.name = value; } diff --git a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/Password.java b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterPassword.java similarity index 69% rename from src/main/java/com/clova/anifriends/domain/shelter/wrapper/Password.java rename to src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterPassword.java index 886ae3c9e..183655cdc 100644 --- a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/Password.java +++ b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterPassword.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Password { +public class ShelterPassword { @Column(name = "password") private String password; - protected Password() { + protected ShelterPassword() { } - public Password(String value) { + public ShelterPassword(String value) { this.password = value; } diff --git a/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterPhoneNumberInfo.java b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterPhoneNumberInfo.java new file mode 100644 index 000000000..183e40b4b --- /dev/null +++ b/src/main/java/com/clova/anifriends/domain/shelter/wrapper/ShelterPhoneNumberInfo.java @@ -0,0 +1,22 @@ +package com.clova.anifriends.domain.shelter.wrapper; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; + +@Embeddable +public class ShelterPhoneNumberInfo { + + @Column(name = "phone_number") + private String phoneNumber; + + @Column(name = "spare_phone_number") + private String sparePhoneNumber; + + protected ShelterPhoneNumberInfo() { + } + + public ShelterPhoneNumberInfo(String phoneNumber, String sparePhoneNumber) { + this.phoneNumber = phoneNumber; + this.sparePhoneNumber = sparePhoneNumber; + } +} diff --git a/src/main/java/com/clova/anifriends/domain/volunteer/Volunteer.java b/src/main/java/com/clova/anifriends/domain/volunteer/Volunteer.java index 4c1730f4b..62cd2623d 100644 --- a/src/main/java/com/clova/anifriends/domain/volunteer/Volunteer.java +++ b/src/main/java/com/clova/anifriends/domain/volunteer/Volunteer.java @@ -1,12 +1,12 @@ package com.clova.anifriends.domain.volunteer; import com.clova.anifriends.domain.common.BaseTimeEntity; -import com.clova.anifriends.domain.volunteer.wrapper.Email; -import com.clova.anifriends.domain.volunteer.wrapper.Gender; -import com.clova.anifriends.domain.volunteer.wrapper.Name; -import com.clova.anifriends.domain.volunteer.wrapper.Password; -import com.clova.anifriends.domain.volunteer.wrapper.PhoneNumber; -import com.clova.anifriends.domain.volunteer.wrapper.Temperature; +import com.clova.anifriends.domain.volunteer.wrapper.VolunteerEmail; +import com.clova.anifriends.domain.volunteer.wrapper.VolunteerGender; +import com.clova.anifriends.domain.volunteer.wrapper.VolunteerName; +import com.clova.anifriends.domain.volunteer.wrapper.VolunteerPassword; +import com.clova.anifriends.domain.volunteer.wrapper.VolunteerPhoneNumber; +import com.clova.anifriends.domain.volunteer.wrapper.VolunteerTemperature; import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; @@ -28,26 +28,26 @@ public class Volunteer extends BaseTimeEntity { private Long volunteerId; @Embedded - private Email email; + private VolunteerEmail email; @Embedded - private Password password; + private VolunteerPassword password; @Column(name = "birth_date") private LocalDate birthDate; @Embedded - private PhoneNumber phoneNumber; + private VolunteerPhoneNumber phoneNumber; @Column(name = "gender") @Enumerated(EnumType.STRING) - private Gender gender; + private VolunteerGender gender; @Embedded - private Temperature temperature; + private VolunteerTemperature temperature; @Embedded - private Name name; + private VolunteerName name; protected Volunteer() { } @@ -61,12 +61,12 @@ public Volunteer( int temperature, String name ) { - this.email = new Email(email); - this.password = new Password(password); + this.email = new VolunteerEmail(email); + this.password = new VolunteerPassword(password); this.birthDate = birthDate; - this.phoneNumber = new PhoneNumber(phoneNumber); - this.gender = Gender.valueOf(gender); - this.temperature = new Temperature(temperature); - this.name = new Name(name); + this.phoneNumber = new VolunteerPhoneNumber(phoneNumber); + this.gender = VolunteerGender.valueOf(gender); + this.temperature = new VolunteerTemperature(temperature); + this.name = new VolunteerName(name); } } diff --git a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Email.java b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerEmail.java similarity index 69% rename from src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Email.java rename to src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerEmail.java index 3ba5fd198..ee82b60fe 100644 --- a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Email.java +++ b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerEmail.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Email { +public class VolunteerEmail { @Column(name = "email") private String email; - protected Email() { + protected VolunteerEmail() { } - public Email(String value) { + public VolunteerEmail(String value) { this.email = value; } diff --git a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Gender.java b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerGender.java similarity index 85% rename from src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Gender.java rename to src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerGender.java index bad18743e..9eb70f053 100644 --- a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Gender.java +++ b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerGender.java @@ -2,7 +2,7 @@ import com.clova.anifriends.EnumType; -public enum Gender implements EnumType { +public enum VolunteerGender implements EnumType { MALE, FEMALE diff --git a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Name.java b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerName.java similarity index 70% rename from src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Name.java rename to src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerName.java index b58b6d8ae..ceaaa1637 100644 --- a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Name.java +++ b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerName.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Name { +public class VolunteerName { @Column(name = "name") private String name; - protected Name() { + protected VolunteerName() { } - public Name(String value) { + public VolunteerName(String value) { this.name = value; } diff --git a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Password.java b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerPassword.java similarity index 68% rename from src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Password.java rename to src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerPassword.java index 3812054c2..35c6c4ab5 100644 --- a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Password.java +++ b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerPassword.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Password { +public class VolunteerPassword { @Column(name = "password") private String password; - protected Password() { + protected VolunteerPassword() { } - public Password(String value) { + public VolunteerPassword(String value) { this.password = value; } diff --git a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/PhoneNumber.java b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerPhoneNumber.java similarity index 67% rename from src/main/java/com/clova/anifriends/domain/volunteer/wrapper/PhoneNumber.java rename to src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerPhoneNumber.java index 7ad8d52b3..9afc225e1 100644 --- a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/PhoneNumber.java +++ b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerPhoneNumber.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class PhoneNumber { +public class VolunteerPhoneNumber { @Column(name = "phone_number") private String phoneNumber; - protected PhoneNumber() { + protected VolunteerPhoneNumber() { } - public PhoneNumber(String value) { + public VolunteerPhoneNumber(String value) { this.phoneNumber = value; } } diff --git a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Temperature.java b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerTemperature.java similarity index 68% rename from src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Temperature.java rename to src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerTemperature.java index 66aefb57c..047463e97 100644 --- a/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/Temperature.java +++ b/src/main/java/com/clova/anifriends/domain/volunteer/wrapper/VolunteerTemperature.java @@ -4,15 +4,15 @@ import jakarta.persistence.Embeddable; @Embeddable -public class Temperature { +public class VolunteerTemperature { @Column(name = "temperature") private Integer temperature; - protected Temperature() { + protected VolunteerTemperature() { } - public Temperature(int value) { + public VolunteerTemperature(int value) { this.temperature = value; }