diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java index d9f7d01..f162762 100644 --- a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java +++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Address.java @@ -3,6 +3,7 @@ package com.mirna.hospitalmanagementapi.domain.entities; import com.mirna.hospitalmanagementapi.domain.dtos.AddressDTO; import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO; +import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; @@ -35,23 +36,30 @@ public class Address { } @NotBlank(message="street cannot be blank") + @Column(name="street") private String street; @NotBlank(message="neighborhood cannot be blank") + @Column(name="neighborhood") private String neighborhood; @NotBlank(message="zipCode cannot be blank") @Pattern(regexp="\\d{8}", message="invalid format for zipCode") + @Column(name="zip_code") private String zipCode; @NotBlank(message="city cannot be blank") + @Column(name="city") private String city; @NotBlank(message="state cannot be blank") + @Column(name="state") private String state; + @Column(name="additional_details") private String additionalDetails; + @Column(name="house_number") private String houseNumber; /** diff --git a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java index 8bb09a6..307e7c4 100644 --- a/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java +++ b/src/main/java/com/mirna/hospitalmanagementapi/domain/entities/Doctor.java @@ -3,6 +3,7 @@ package com.mirna.hospitalmanagementapi.domain.entities; import com.mirna.hospitalmanagementapi.domain.dtos.DoctorDTO; import com.mirna.hospitalmanagementapi.domain.enums.Specialty; +import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -43,15 +44,19 @@ public class Doctor { private Long id; @NotBlank(message="name cannot be blank") + @Column(name="name") private String name; @NotBlank(message="email cannot be blank") + @Column(name="email") private String email; @NotBlank(message="crm cannot be blank") + @Column(name="crm", length = 6) private String crm; @NotBlank(message="telephone cannot be blank") + @Column(name="telephone") private String telephone; @NotNull(message="specialty cannot be null") diff --git a/src/main/resources/db/migration/V1__create-table-doctors.sql b/src/main/resources/db/migration/V1__create-table-doctors.sql index 7be6fad..0c517ba 100644 --- a/src/main/resources/db/migration/V1__create-table-doctors.sql +++ b/src/main/resources/db/migration/V1__create-table-doctors.sql @@ -8,9 +8,9 @@ create table doctors ( telephone varchar(20) not null, street varchar(100) not null, neighborhood varchar(100) not null, - zipCode varchar(9) not null, - additionalDetails varchar(100), - houseNumber varchar(20), + zip_code varchar(9) not null, + additional_details varchar(100), + house_number varchar(20), state varchar(2) not null, city varchar(100) not null,