Skip to content

Commit

Permalink
relations fixed.
Browse files Browse the repository at this point in the history
  • Loading branch information
FruTooTi committed Dec 9, 2023
1 parent 45e6693 commit 3529c04
Show file tree
Hide file tree
Showing 10 changed files with 86 additions and 32 deletions.
1 change: 1 addition & 0 deletions src/main/java/Entities/Appointment.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class Appointment {
@ManyToOne
@JoinColumn(name = "VetID", referencedColumnName = "VetID")
private Veterinarian VetID;
@Column(nullable = false)
private DateTimeLiteralExpression.DateTime AppointmentDate;
@ManyToOne
@JoinColumn(name = "PetID", referencedColumnName = "PetID")
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/Entities/MedType.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,28 @@
public class MedType{
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
int MedTypeID;
String MedType;
@OneToMany(mappedBy = "Medication",cascade = CascadeType.REMOVE)
List<Medication> medications;
private int MedTypeID;
@Column(nullable = false)
private String MedType;
@OneToMany(mappedBy = "Medication")
private List<Medication> medications;

public int getMedTypeID() {
return MedTypeID;
}

public void setMedTypeID(int medTypeID) {
MedTypeID = medTypeID;
}

public String getMedType() {
return MedType;
}

public void setMedType(String medType) {
MedType = medType;
}



public List<Medication> getMedications() {
return medications;
}
public void setMedications(List<Medication> medications) {
this.medications = medications;
}
}
9 changes: 4 additions & 5 deletions src/main/java/Entities/Medication.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ public class Medication {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int medicationID;
@Column(nullable = false)
private String medicationName;
@ManyToOne
@JoinColumn(name="MedTypeID",referencedColumnName = "MedTypeID")
@JoinColumn(name="MedTypeID", referencedColumnName = "MedTypeID")
private MedType MedTypeID;

@ManyToOne
@JoinColumn(name="ScheduleID",referencedColumnName = "ScheduleID")
@JoinColumn(name="ScheduleID", referencedColumnName = "ScheduleID")
private Schedule ScheduleID;

@ManyToOne
@JoinColumn(name="PetID",referencedColumnName = "PetID")
@JoinColumn(name="PetID", referencedColumnName = "PetID")
private Pet PetID;

public Pet getPetID() {
Expand Down
13 changes: 12 additions & 1 deletion src/main/java/Entities/Pet.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class Pet {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int PetID;
@Column(nullable = false)
private String PetName;
private int Age;
@ManyToOne
Expand All @@ -19,8 +20,10 @@ public class Pet {
@ManyToOne
@JoinColumn(name = "PetOwnerID", referencedColumnName = "PetOwnerID")
private PetOwner PetOwnerID;
@OneToMany(mappedBy = "Appointments")
@OneToMany(mappedBy = "Appointment")
private List<Appointment> Appointments;
@OneToMany(mappedBy = "Medication")
private List<Medication> Medications;

public int getPetID() {
return PetID;
Expand Down Expand Up @@ -64,4 +67,12 @@ public List<Appointment> getAppointments() {
public void setAppointments(List<Appointment> appointments) {
Appointments = appointments;
}

public List<Medication> getMedications() {
return Medications;
}

public void setMedications(List<Medication> medications) {
Medications = medications;
}
}
31 changes: 31 additions & 0 deletions src/main/java/Entities/PetOwner.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,35 @@ public class PetOwner{
private Veterinarian Vet;
@OneToMany(mappedBy = "Appointment")
private List<Appointment> Appointments;

public int getPetOwnerID() {
return PetOwnerID;
}
public void setPetOwnerID(int petOwnerID) {
PetOwnerID = petOwnerID;
}
public Entities.User getUser() {
return User;
}
public void setUser(Entities.User user) {
User = user;
}
public List<Pet> getPets() {
return Pets;
}
public void setPets(List<Pet> pets) {
Pets = pets;
}
public Veterinarian getVet() {
return Vet;
}
public void setVet(Veterinarian vet) {
Vet = vet;
}
public List<Appointment> getAppointments() {
return Appointments;
}
public void setAppointments(List<Appointment> appointments) {
Appointments = appointments;
}
}
8 changes: 6 additions & 2 deletions src/main/java/Entities/PetType.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ public class PetType {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int PetTypeID;
private String Type;


@OneToMany(mappedBy = "Pet")
private List<Pet> pets;

Expand All @@ -28,4 +26,10 @@ public String getType() {
public void setType(String type) {
Type = type;
}
public List<Pet> getPets() {
return pets;
}
public void setPets(List<Pet> pets) {
this.pets = pets;
}
}
19 changes: 9 additions & 10 deletions src/main/java/Entities/Schedule.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,41 @@
public class Schedule {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
int ScheduleID;
@OneToMany(mappedBy = "Medication",cascade = CascadeType.REMOVE)
List<Medication> medicationList;
private int ScheduleID;
@OneToMany(mappedBy = "Medication")
private List<Medication> medications;
private DateTimeLiteralExpression.DateTime beginningDate;
private int doseFrequency;
private int doseCount;

public int getScheduleID() {
return ScheduleID;
}

public void setScheduleID(int scheduleID) {
ScheduleID = scheduleID;
}

public DateTimeLiteralExpression.DateTime getBeginningDate() {
return beginningDate;
}

public void setBeginningDate(DateTimeLiteralExpression.DateTime beginningDate) {
this.beginningDate = beginningDate;
}

public int getDoseFrequency() {
return doseFrequency;
}

public void setDoseFrequency(int doseFrequency) {
this.doseFrequency = doseFrequency;
}

public int getDoseCount() {
return doseCount;
}

public void setDoseCount(int doseCount) {
this.doseCount = doseCount;
}
public List<Medication> getMedications() {
return medications;
}
public void setMedications(List<Medication> medications) {
this.medications = medications;
}
}
2 changes: 1 addition & 1 deletion src/main/java/Entities/UserType.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class UserType {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int UserTypeID;
private String Type;
@OneToMany(mappedBy = "UserType")
@OneToMany(mappedBy = "User")
private List<User> Users;

public int getUserTypeID() {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/Entities/Veterinarian.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ public class Veterinarian{
@OneToMany(mappedBy = "PetOwner")
private List<PetOwner> PetOwners;
private String Clinic;
@OneToOne(cascade = CascadeType.ALL)
@JoinColumn(name = "UserID", referencedColumnName = "UserID")
private User User;
@OneToMany(mappedBy = "Appointment")
private List<Appointment> Appointments;

Expand Down
11 changes: 8 additions & 3 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
spring.datasource.url=localhost
spring.datasource.username=****
spring.datasource.password=****
#spring.datasource.url=localhost
#spring.datasource.username=****
#spring.datasource.password=****
#spring.datasource.driver-class-name=org.postgresql.Driver

spring.datasource.url=jdbc:postgresql://ehayvan-instance-1.cec0hgebpm1w.eu-north-1.rds.amazonaws.com/postgres
spring.datasource.username=postgres
spring.datasource.password=12345678
spring.datasource.driver-class-name=org.postgresql.Driver

0 comments on commit 3529c04

Please sign in to comment.