diff --git a/src/main/java/workplate/workplateserver/restaurant/domain/entity/Restaurant.java b/src/main/java/workplate/workplateserver/restaurant/domain/entity/Restaurant.java index 4f8839d..60f3241 100644 --- a/src/main/java/workplate/workplateserver/restaurant/domain/entity/Restaurant.java +++ b/src/main/java/workplate/workplateserver/restaurant/domain/entity/Restaurant.java @@ -30,7 +30,6 @@ public class Restaurant extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "restaurant_id") private Long id; @Column(name = "restaurant_name") private String name; diff --git a/src/main/java/workplate/workplateserver/work/domain/dto/WorkResponse.java b/src/main/java/workplate/workplateserver/work/domain/dto/WorkResponse.java index 5f16c63..6832423 100644 --- a/src/main/java/workplate/workplateserver/work/domain/dto/WorkResponse.java +++ b/src/main/java/workplate/workplateserver/work/domain/dto/WorkResponse.java @@ -4,6 +4,7 @@ import lombok.Builder; import lombok.Getter; import workplate.workplateserver.auth.domain.MainExperience; +import workplate.workplateserver.auth.domain.PhysicalStatus; import workplate.workplateserver.auth.domain.SubExperience; import workplate.workplateserver.work.domain.entity.Work; @@ -21,16 +22,20 @@ public class WorkResponse { private String workName; private String workDetail; private Long workCredit; + private String location; private MainExperience mainCategory; private SubExperience subCategory; + private PhysicalStatus physicalStatus; public static WorkResponse toDto(Work work) { return WorkResponse.builder() .workName(work.getWorkName()) .workDetail(work.getWorkDetail()) .workCredit(work.getWorkCredit()) + .location(work.getLocation()) .mainCategory(work.getMainCategory()) .subCategory(work.getSubCategory()) + .physicalStatus(work.getPhysicalStatus()) .build(); } } diff --git a/src/main/java/workplate/workplateserver/work/domain/entity/Work.java b/src/main/java/workplate/workplateserver/work/domain/entity/Work.java index 11f0e6e..016d29f 100644 --- a/src/main/java/workplate/workplateserver/work/domain/entity/Work.java +++ b/src/main/java/workplate/workplateserver/work/domain/entity/Work.java @@ -13,6 +13,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import workplate.workplateserver.auth.domain.MainExperience; +import workplate.workplateserver.auth.domain.PhysicalStatus; import workplate.workplateserver.auth.domain.SubExperience; import workplate.workplateserver.common.BaseEntity; @@ -39,21 +40,27 @@ public class Work extends BaseEntity { private String workDetail; @Column(name = "work_credit") private Long workCredit; - @Column(name = "work_main_category") + private String location; + @Column(name = "main_category") @Enumerated(EnumType.STRING) private MainExperience mainCategory; - @Column(name = "work_sub_category") + @Column(name = "sub_category") @Enumerated(EnumType.STRING) private SubExperience subCategory; + @Column(name = "physical_status") + @Enumerated(EnumType.STRING) + private PhysicalStatus physicalStatus; - public static Work toEntity(String workName, String workDetail, Long workCredit, MainExperience mainCategory, - SubExperience subCategory) { + public static Work toEntity(String workName, String workDetail, Long workCredit, String location, + MainExperience mainCategory, SubExperience subCategory, PhysicalStatus physicalStatus) { return Work.builder() .workName(workName) .workDetail(workDetail) .workCredit(workCredit) + .location(location) .mainCategory(mainCategory) .subCategory(subCategory) + .physicalStatus(physicalStatus) .build(); } }