First changes with rebase

Author: Karolina Karolak

pom.xml

@@ -59,6 +59,7 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
+			<version>2.2.224</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>

src/main/java/com/capgemini/training/appointment_booking_app/common/datatype/AppointmentStatus.java

@@ -0,0 +1,5 @@
+package com.capgemini.training.appointment_booking_app.common.datatype;
+
+public enum AppointmentStatus {
+SCHEDULED, CANCELLED, COMPLETED;
+}

src/main/java/com/capgemini/training/appointment_booking_app/common/datatype/Specialization.java

@@ -0,0 +1,7 @@
+package com.capgemini.training.appointment_booking_app.common.datatype;
+
+public enum Specialization {
+	
+	DENTIST, CARDIOLOGIST, PEDIATRICIAN, UROLOGIST, NEUROLOGIST, ORTHOPAEDIST;
+
+}

src/main/java/com/capgemini/training/appointment_booking_app/dataaccess/entity/AppointmentEntity.java

@@ -0,0 +1,42 @@
+package com.capgemini.training.appointment_booking_app.dataaccess.entity;
+
+import java.util.Date;
+
+import com.capgemini.training.appointment_booking_app.common.datatype.AppointmentStatus;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name="APPOINTMENT")
+@Getter
+@Setter
+public class AppointmentEntity {
+	
+	@Id
+	private Long id;
+	
+	@Version
+	private int version;
+	
+	@ManyToOne
+	private ClientEntity client;
+	
+	@ManyToOne
+	private TreatmentEntity treatment;
+	
+	@Column(name="DATE_TIME")
+	private Date dateTime;
+	
+	@Enumerated(EnumType.STRING)
+	private AppointmentStatus status;
+	
+}

src/main/java/com/capgemini/training/appointment_booking_app/dataaccess/entity/ClientEntity.java

@@ -0,0 +1,33 @@
+package com.capgemini.training.appointment_booking_app.dataaccess.entity;
+
+import java.util.List;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name="CLIENT")
+@Getter
+@Setter
+public class ClientEntity {
+	
+	@Id
+	private Long id;
+	
+	@Version
+	private int version;
+	
+	@OneToOne(optional = false, orphanRemoval = true, cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE })
+	private UserEntity user;
+	
+	@OneToMany(mappedBy = "client", orphanRemoval=true)
+	private List<AppointmentEntity> appointments;
+	
+}

src/main/java/com/capgemini/training/appointment_booking_app/dataaccess/entity/SpecialistEntity.java

@@ -0,0 +1,38 @@
+package com.capgemini.training.appointment_booking_app.dataaccess.entity;
+
+import java.util.List;
+
+import com.capgemini.training.appointment_booking_app.common.datatype.Specialization;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name="SPECIALIST")
+@Getter
+@Setter
+public class SpecialistEntity {
+
+	@Id
+	private Long id;
+	
+	@Version
+	private int version;
+	
+	@OneToOne(optional = false)
+	private UserEntity user;
+	
+	@Enumerated(EnumType.STRING)
+	private Specialization specialization;
+	
+	@OneToMany(mappedBy = "specialist")
+	private List<TreatmentEntity> treatments;
+}

src/main/java/com/capgemini/training/appointment_booking_app/dataaccess/entity/TreatmentEntity.java

@@ -0,0 +1,34 @@
+package com.capgemini.training.appointment_booking_app.dataaccess.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name="TREATMENT")
+@Getter
+@Setter
+public class TreatmentEntity {
+	
+	@Id
+	private Long id;
+	
+	@Version
+	private int version;
+	
+	private String name;
+	
+	private String description;
+	
+	@Column(name="DURATION_MINUTES")
+	private int durationMinutes;
+	
+	@ManyToOne
+	private SpecialistEntity specialist;
+
+}

src/main/java/com/capgemini/training/appointment_booking_app/dataaccess/entity/UserEntity.java

@@ -0,0 +1,35 @@
+package com.capgemini.training.appointment_booking_app.dataaccess.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.Version;
+import lombok.Getter;
+import lombok.Setter;
+
+@Entity
+@Table(name="USER_TABLE")
+@Getter
+@Setter
+public class UserEntity {
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+	
+	@Version
+	private int version;
+	
+	private String email;
+	
+	@Column(name="PASSWORD_HASH")
+	private String passwordHash;
+	
+	private String firstname;
+	
+	private String lastname;
+
+}

src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=appointment-booking-app
 
 spring.h2.console.enabled=true
 
-spring.datasource.url=jdbc:h2:mem:todoapp
+spring.datasource.url=jdbc:h2:mem:appointment-app
 spring.datasource.username=sa
 spring.datasource.password=password
 

src/main/resources/db/migration/1.0/V0001__Create_schema.sql

@@ -0,0 +1,49 @@
+CREATE TABLE USER_TABLE (
+ID NUMBER(19,0) NOT NULL AUTO_INCREMENT,
+VERSION INTEGER NOT NULL,
+EMAIL VARCHAR(128),
+PASSWORD_HASH VARCHAR(128),
+FIRST_NAME VARCHAR(128),
+LAST_NAME VARCHAR(128),
+PRIMARY KEY (ID)
+);
+
+CREATE TABLE CLIENT (
+ID NUMBER(19,0) NOT NULL AUTO_INCREMENT,
+VERSION INTEGER NOT NULL,
+USER_ID NUMBER(19,0) NOT NULL,
+PRIMARY KEY (ID),
+FOREIGN KEY (USER_ID) REFERENCES USER_TABLE(ID)
+);
+
+CREATE TABLE SPECIALIST (
+ID NUMBER(19,0) NOT NULL AUTO_INCREMENT,
+VERSION INTEGER NOT NULL,
+SPECIALIZATION VARCHAR(128),
+USER_ID NUMBER(19,0) NOT NULL,
+PRIMARY KEY (ID),
+FOREIGN KEY (USER_ID) REFERENCES USER_TABLE(ID)
+);
+
+CREATE TABLE TREATMENT (
+ID NUMBER(19,0) NOT NULL AUTO_INCREMENT,
+VERSION INTEGER NOT NULL,
+NAME VARCHAR(256),
+DESCRIPTION VARCHAR(256),
+DURATION_MINUTES INTEGER,
+SPECIALIST_ID NUMBER(19,0) NOT NULL,
+PRIMARY KEY (ID)
+);
+
+
+CREATE TABLE APPOINTMENT (
+ID NUMBER(19,0) NOT NULL AUTO_INCREMENT,
+VERSION INTEGER NOT NULL,
+DATE_TIME TIMESTAMP,
+STATUS VARCHAR(128) NOT NULL DEFAULT 'SCHEDULED',
+CLIENT_ID NUMBER(19,0) NOT NULL,
+TREATMENT_ID NUMBER(19,0) NOT NULL,
+PRIMARY KEY (ID),
+FOREIGN KEY (CLIENT_ID) REFERENCES CLIENT(ID),
+FOREIGN KEY (TREATMENT_ID) REFERENCES TREATMENT(ID)
+);