Skip to content

Commit b46f76d

Browse files
authored
Refactor/mappers and dtos (#33)
2 parents b35f0ee + 35e5d39 commit b46f76d

16 files changed

Lines changed: 64 additions & 40 deletions

File tree

src/main/java/com/historialplus/historialplus/internal/allergycatalog/entities/AllergyCatalogEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@
1212
import jakarta.persistence.UniqueConstraint;
1313
import lombok.AllArgsConstructor;
1414
import lombok.Builder;
15-
import lombok.Data;
15+
import lombok.Getter;
1616
import lombok.NoArgsConstructor;
17+
import lombok.Setter;
1718
import org.hibernate.annotations.CreationTimestamp;
1819
import org.hibernate.annotations.UpdateTimestamp;
1920

2021
import java.time.LocalDateTime;
2122
import java.util.UUID;
2223

23-
@Data
24+
@Getter
25+
@Setter
2426
@NoArgsConstructor
2527
@AllArgsConstructor
2628
@Builder

src/main/java/com/historialplus/historialplus/internal/documenttype/entities/DocumentTypeEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@
99
import jakarta.persistence.Table;
1010
import lombok.AllArgsConstructor;
1111
import lombok.Builder;
12-
import lombok.Data;
12+
import lombok.Getter;
1313
import lombok.NoArgsConstructor;
14+
import lombok.Setter;
1415
import org.hibernate.annotations.CreationTimestamp;
1516
import org.hibernate.annotations.UpdateTimestamp;
1617

1718
import java.sql.Timestamp;
1819

1920
@Entity
2021
@Table(name = "document_type")
21-
@Data
22+
@Getter
23+
@Setter
2224
@NoArgsConstructor
2325
@AllArgsConstructor
2426
@Builder

src/main/java/com/historialplus/historialplus/internal/file/entites/FileEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
import jakarta.persistence.Table;
1212
import jakarta.persistence.Temporal;
1313
import jakarta.persistence.TemporalType;
14-
import lombok.Data;
14+
import lombok.Getter;
15+
import lombok.Setter;
1516
import org.hibernate.annotations.CreationTimestamp;
1617
import org.hibernate.annotations.UpdateTimestamp;
1718

@@ -20,7 +21,8 @@
2021

2122
@Entity
2223
@Table(name = "files")
23-
@Data
24+
@Getter
25+
@Setter
2426
public class FileEntity {
2527
@Id
2628
@GeneratedValue(generator = "UUID")

src/main/java/com/historialplus/historialplus/internal/filetype/entities/FileTypeEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@
1111
import jakarta.persistence.Table;
1212
import jakarta.persistence.Temporal;
1313
import jakarta.persistence.TemporalType;
14-
import lombok.Data;
14+
import lombok.Getter;
15+
import lombok.Setter;
1516
import org.hibernate.annotations.CreationTimestamp;
1617
import org.hibernate.annotations.UpdateTimestamp;
1718

1819
import java.util.Date;
1920

2021
@Entity
2122
@Table(name = "file_type")
22-
@Data
23+
@Getter
24+
@Setter
2325
public class FileTypeEntity {
2426
@Id
2527
@GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/historialplus/historialplus/internal/hospital/entities/HospitalEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
import jakarta.persistence.Table;
1717
import lombok.AllArgsConstructor;
1818
import lombok.Builder;
19-
import lombok.Data;
19+
import lombok.Getter;
2020
import lombok.NoArgsConstructor;
21+
import lombok.Setter;
2122
import org.hibernate.annotations.CreationTimestamp;
2223
import org.hibernate.annotations.UpdateTimestamp;
2324

@@ -26,7 +27,8 @@
2627

2728
@Entity
2829
@Table(name = "hospital")
29-
@Data
30+
@Getter
31+
@Setter
3032
@NoArgsConstructor
3133
@AllArgsConstructor
3234
@Builder

src/main/java/com/historialplus/historialplus/internal/patientallergy/entities/PatientAllergyEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,18 @@
1616
import jakarta.persistence.Table;
1717
import lombok.AllArgsConstructor;
1818
import lombok.Builder;
19-
import lombok.Data;
19+
import lombok.Getter;
2020
import lombok.NoArgsConstructor;
21+
import lombok.Setter;
2122
import org.hibernate.annotations.CreationTimestamp;
2223
import org.hibernate.annotations.UpdateTimestamp;
2324

2425
import java.time.LocalDate;
2526
import java.time.LocalDateTime;
2627
import java.util.UUID;
2728

28-
@Data
29+
@Getter
30+
@Setter
2931
@NoArgsConstructor
3032
@AllArgsConstructor
3133
@Builder

src/main/java/com/historialplus/historialplus/internal/people/entities/PeopleEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
import jakarta.persistence.Table;
1919
import lombok.AllArgsConstructor;
2020
import lombok.Builder;
21-
import lombok.Data;
21+
import lombok.Getter;
2222
import lombok.NoArgsConstructor;
23+
import lombok.Setter;
2324
import org.hibernate.annotations.CreationTimestamp;
2425
import org.hibernate.annotations.UpdateTimestamp;
2526

@@ -31,7 +32,8 @@
3132

3233
@Entity
3334
@Table(name = "people")
34-
@Data
35+
@Getter
36+
@Setter
3537
@NoArgsConstructor
3638
@AllArgsConstructor
3739
@Builder

src/main/java/com/historialplus/historialplus/internal/record/entites/RecordEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
import jakarta.persistence.OneToMany;
1414
import jakarta.persistence.OneToOne;
1515
import jakarta.persistence.Table;
16-
import lombok.Data;
16+
import lombok.Getter;
17+
import lombok.Setter;
1718
import org.hibernate.annotations.CreationTimestamp;
1819
import org.hibernate.annotations.UpdateTimestamp;
1920

@@ -22,7 +23,8 @@
2223
import java.util.Set;
2324
import java.util.UUID;
2425

25-
@Data
26+
@Getter
27+
@Setter
2628
@Entity
2729
@Table(name = "medical_record")
2830
public class RecordEntity {
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
package com.historialplus.historialplus.internal.recorddetail.dto.response;
22

3+
import lombok.Builder;
34
import lombok.Getter;
45
import lombok.Setter;
56

67
import java.util.UUID;
78

89
@Getter
910
@Setter
11+
@Builder
1012
public class RecordDetailResponseDto {
1113
private UUID id;
1214
private String description;
1315
private UUID recordId;
1416
private Integer stateId;
1517

16-
public RecordDetailResponseDto(UUID id, String description, UUID recordId, Integer stateId) {
17-
this.id = id;
18-
this.description = description;
19-
this.recordId = recordId;
20-
this.stateId = stateId;
21-
}
2218
}

src/main/java/com/historialplus/historialplus/internal/recorddetail/entites/RecordDetailEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
import jakarta.persistence.ManyToOne;
1818
import jakarta.persistence.OneToMany;
1919
import jakarta.persistence.Table;
20-
import lombok.Data;
20+
import lombok.Getter;
21+
import lombok.Setter;
2122
import org.hibernate.annotations.CreationTimestamp;
2223
import org.hibernate.annotations.UpdateTimestamp;
2324

@@ -26,7 +27,8 @@
2627
import java.util.Set;
2728
import java.util.UUID;
2829

29-
@Data
30+
@Getter
31+
@Setter
3032
@Entity
3133
@Table(name = "record_detail")
3234
public class RecordDetailEntity {

0 commit comments

Comments
 (0)