From c947dc3460ad8a18b16011d2e832f928b5db408a Mon Sep 17 00:00:00 2001 From: KKlochko Date: Mon, 6 Nov 2023 21:35:37 +0200 Subject: [PATCH] Migrate the models to the JPA/Hibernate. --- .../models/Department.java | 15 ++++++++++++++- .../models/Indicator.java | 15 ++++++++++++++- .../models/Patient.java | 16 +++++++++++++++- 3 files changed, 43 insertions(+), 3 deletions(-) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/models/Department.java (52%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/models/Indicator.java (55%) rename src/main/java/space/kklochko/{jdbc_hospital_example => jpa_hospital_example}/models/Patient.java (69%) diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/models/Department.java b/src/main/java/space/kklochko/jpa_hospital_example/models/Department.java similarity index 52% rename from src/main/java/space/kklochko/jdbc_hospital_example/models/Department.java rename to src/main/java/space/kklochko/jpa_hospital_example/models/Department.java index 9a1ff63..8bb3069 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/models/Department.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/models/Department.java @@ -1,19 +1,32 @@ -package space.kklochko.jdbc_hospital_example.models; +package space.kklochko.jpa_hospital_example.models; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import java.util.UUID; +@Table(name="departments") +@Entity @AllArgsConstructor @Data public class Department { + @Id + @Column(nullable = true) UUID id; String name; String location; String phone; + public Department(){ + setId(UUID.randomUUID()); + setName(""); + setLocation(""); + setPhone(""); + } + public Department(String name, String location, String phone){ + setId(UUID.randomUUID()); setName(name); setLocation(location); setPhone(phone); diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/models/Indicator.java b/src/main/java/space/kklochko/jpa_hospital_example/models/Indicator.java similarity index 55% rename from src/main/java/space/kklochko/jdbc_hospital_example/models/Indicator.java rename to src/main/java/space/kklochko/jpa_hospital_example/models/Indicator.java index d944f79..29bc8ee 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/models/Indicator.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/models/Indicator.java @@ -1,20 +1,33 @@ -package space.kklochko.jdbc_hospital_example.models; +package space.kklochko.jpa_hospital_example.models; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import java.sql.Timestamp; import java.util.UUID; +@Table(name="indicators") +@Entity @AllArgsConstructor @Data public class Indicator { + @Id + @Column(nullable = true) UUID id; String type; String values; Timestamp timestamp; + public Indicator(){ + setId(UUID.randomUUID()); + setType(""); + setValues(""); + setTimestamp(null); + } + public Indicator(String type, String values, Timestamp timestamp){ + setId(UUID.randomUUID()); setType(type); setValues(values); setTimestamp(timestamp); diff --git a/src/main/java/space/kklochko/jdbc_hospital_example/models/Patient.java b/src/main/java/space/kklochko/jpa_hospital_example/models/Patient.java similarity index 69% rename from src/main/java/space/kklochko/jdbc_hospital_example/models/Patient.java rename to src/main/java/space/kklochko/jpa_hospital_example/models/Patient.java index df0d6c5..aa1d285 100644 --- a/src/main/java/space/kklochko/jdbc_hospital_example/models/Patient.java +++ b/src/main/java/space/kklochko/jpa_hospital_example/models/Patient.java @@ -1,18 +1,30 @@ -package space.kklochko.jdbc_hospital_example.models; +package space.kklochko.jpa_hospital_example.models; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import java.util.ArrayList; import java.util.UUID; +@Table(name="patients") +@Entity @Data public class Patient { + @Id + @Column(nullable = true) UUID id; String name; short age; String phone; + public Patient() { + setId(UUID.randomUUID()); + setName(""); + setAge((short) 0); + setPhone(""); + } + public Patient(UUID id, String name, int age, String phone) { setId(id); setName(name); @@ -28,12 +40,14 @@ public class Patient { } public Patient(String name, int age, String phone) { + setId(UUID.randomUUID()); setName(name); setAge((short) age); setPhone(phone); } public Patient(String name, short age, String phone) { + setId(UUID.randomUUID()); setName(name); setAge(age); setPhone(phone);