From 4382fe0ce380cee88a867d63af2136e61dced2d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kerem=20G=C3=B6rkem=20G=C3=B6rg=C3=BCl=C3=BC?= Date: Sat, 9 Dec 2023 23:21:45 +0300 Subject: [PATCH] Some more bug fixes. --- .../ehayvanbackendapi/EhayvanBackendApiApplication.java | 3 +-- .../ehayvanbackendapi}/Entities/Appointment.java | 2 +- .../production/ehayvanbackendapi}/Entities/MedType.java | 4 ++-- .../ehayvanbackendapi}/Entities/Medication.java | 3 +-- .../production/ehayvanbackendapi}/Entities/Pet.java | 9 +++++++-- .../production/ehayvanbackendapi}/Entities/PetOwner.java | 6 +++--- .../production/ehayvanbackendapi}/Entities/PetType.java | 2 +- .../production/ehayvanbackendapi}/Entities/Schedule.java | 2 +- .../production/ehayvanbackendapi}/Entities/User.java | 6 +++--- .../production/ehayvanbackendapi}/Entities/UserType.java | 2 +- .../ehayvanbackendapi}/Entities/Veterinarian.java | 6 +++--- src/main/resources/application.properties | 6 ++++-- 12 files changed, 28 insertions(+), 23 deletions(-) rename src/main/java/{ => com/production/ehayvanbackendapi}/Entities/Appointment.java (96%) rename src/main/java/{ => com/production/ehayvanbackendapi}/Entities/MedType.java (89%) rename src/main/java/{ => com/production/ehayvanbackendapi}/Entities/Medication.java (96%) rename src/main/java/{ => com/production/ehayvanbackendapi}/Entities/Pet.java (79%) rename src/main/java/{ => com/production/ehayvanbackendapi}/Entities/PetOwner.java (86%) rename src/main/java/{ => com/production/ehayvanbackendapi}/Entities/PetType.java (93%) rename src/main/java/{ => com/production/ehayvanbackendapi}/Entities/Schedule.java (96%) rename src/main/java/{ => com/production/ehayvanbackendapi}/Entities/User.java (91%) rename src/main/java/{ => com/production/ehayvanbackendapi}/Entities/UserType.java (92%) rename src/main/java/{ => com/production/ehayvanbackendapi}/Entities/Veterinarian.java (91%) diff --git a/src/main/java/com/production/ehayvanbackendapi/EhayvanBackendApiApplication.java b/src/main/java/com/production/ehayvanbackendapi/EhayvanBackendApiApplication.java index 3eba681..dc342ad 100644 --- a/src/main/java/com/production/ehayvanbackendapi/EhayvanBackendApiApplication.java +++ b/src/main/java/com/production/ehayvanbackendapi/EhayvanBackendApiApplication.java @@ -4,12 +4,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.ComponentScan; @SpringBootApplication public class EhayvanBackendApiApplication { - public static void main(String[] args) { SpringApplication.run(EhayvanBackendApiApplication.class, args); } - } diff --git a/src/main/java/Entities/Appointment.java b/src/main/java/com/production/ehayvanbackendapi/Entities/Appointment.java similarity index 96% rename from src/main/java/Entities/Appointment.java rename to src/main/java/com/production/ehayvanbackendapi/Entities/Appointment.java index 44dae46..5e0ef61 100644 --- a/src/main/java/Entities/Appointment.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/Appointment.java @@ -1,4 +1,4 @@ -package Entities; +package com.production.ehayvanbackendapi.Entities; import jakarta.persistence.*; import net.sf.jsqlparser.expression.DateTimeLiteralExpression; diff --git a/src/main/java/Entities/MedType.java b/src/main/java/com/production/ehayvanbackendapi/Entities/MedType.java similarity index 89% rename from src/main/java/Entities/MedType.java rename to src/main/java/com/production/ehayvanbackendapi/Entities/MedType.java index a8749e7..e1a714e 100644 --- a/src/main/java/Entities/MedType.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/MedType.java @@ -1,4 +1,4 @@ -package Entities; +package com.production.ehayvanbackendapi.Entities; import jakarta.persistence.*; @@ -12,7 +12,7 @@ public class MedType{ private int MedTypeID; @Column(nullable = false) private String MedType; - @OneToMany(mappedBy = "Medication") + @OneToMany(mappedBy = "MedTypeID") private List medications; public int getMedTypeID() { diff --git a/src/main/java/Entities/Medication.java b/src/main/java/com/production/ehayvanbackendapi/Entities/Medication.java similarity index 96% rename from src/main/java/Entities/Medication.java rename to src/main/java/com/production/ehayvanbackendapi/Entities/Medication.java index 97c3791..751c555 100644 --- a/src/main/java/Entities/Medication.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/Medication.java @@ -1,10 +1,9 @@ -package Entities; +package com.production.ehayvanbackendapi.Entities; import jakarta.persistence.*; @Entity @Table(name="Medication") - public class Medication { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/Entities/Pet.java b/src/main/java/com/production/ehayvanbackendapi/Entities/Pet.java similarity index 79% rename from src/main/java/Entities/Pet.java rename to src/main/java/com/production/ehayvanbackendapi/Entities/Pet.java index 49a8e39..b07b718 100644 --- a/src/main/java/Entities/Pet.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/Pet.java @@ -1,4 +1,4 @@ -package Entities; +package com.production.ehayvanbackendapi.Entities; import jakarta.persistence.*; @@ -16,8 +16,13 @@ public class Pet { @JoinColumn(name = "PetTypeID", referencedColumnName = "PetTypeID") private PetType PetTypeID; private String Description; - @OneToMany(mappedBy = "Appointments") + @ManyToOne + @JoinColumn(name = "PetOwnerID", referencedColumnName = "PetOwnerID") + private PetOwner PetOwnerID; + @OneToMany(mappedBy = "PetID") private List Appointments; + @OneToMany(mappedBy = "PetID") + private List Medications; public int getPetID() { return PetID; diff --git a/src/main/java/Entities/PetOwner.java b/src/main/java/com/production/ehayvanbackendapi/Entities/PetOwner.java similarity index 86% rename from src/main/java/Entities/PetOwner.java rename to src/main/java/com/production/ehayvanbackendapi/Entities/PetOwner.java index 1721687..b95cc74 100644 --- a/src/main/java/Entities/PetOwner.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/PetOwner.java @@ -1,4 +1,4 @@ -package Entities; +package com.production.ehayvanbackendapi.Entities; import jakarta.persistence.*; @@ -27,10 +27,10 @@ public int getPetOwnerID() { public void setPetOwnerID(int petOwnerID) { PetOwnerID = petOwnerID; } - public Entities.User getUser() { + public com.production.ehayvanbackendapi.Entities.User getUser() { return User; } - public void setUser(Entities.User user) { + public void setUser(com.production.ehayvanbackendapi.Entities.User user) { User = user; } public List getPets() { diff --git a/src/main/java/Entities/PetType.java b/src/main/java/com/production/ehayvanbackendapi/Entities/PetType.java similarity index 93% rename from src/main/java/Entities/PetType.java rename to src/main/java/com/production/ehayvanbackendapi/Entities/PetType.java index 8c07d94..fc640ea 100644 --- a/src/main/java/Entities/PetType.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/PetType.java @@ -1,4 +1,4 @@ -package Entities; +package com.production.ehayvanbackendapi.Entities; import jakarta.persistence.*; diff --git a/src/main/java/Entities/Schedule.java b/src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java similarity index 96% rename from src/main/java/Entities/Schedule.java rename to src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java index 608bf25..ebb9685 100644 --- a/src/main/java/Entities/Schedule.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/Schedule.java @@ -1,4 +1,4 @@ -package Entities; +package com.production.ehayvanbackendapi.Entities; import jakarta.persistence.*; import net.sf.jsqlparser.expression.DateTimeLiteralExpression; diff --git a/src/main/java/Entities/User.java b/src/main/java/com/production/ehayvanbackendapi/Entities/User.java similarity index 91% rename from src/main/java/Entities/User.java rename to src/main/java/com/production/ehayvanbackendapi/Entities/User.java index 162ff11..fb408f0 100644 --- a/src/main/java/Entities/User.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/User.java @@ -1,4 +1,4 @@ -package Entities; +package com.production.ehayvanbackendapi.Entities; import jakarta.persistence.*; @@ -19,9 +19,9 @@ public class User { @ManyToOne @JoinColumn(name = "UserTypeID", referencedColumnName = "UserTypeID") private UserType UserTypeID; - @OneToOne(mappedBy = "Veterinarian") + @OneToOne(mappedBy = "User") private Veterinarian Vet; - @OneToOne(mappedBy = "PetOwner") + @OneToOne(mappedBy = "User") private PetOwner Owner; public int getUserID() { diff --git a/src/main/java/Entities/UserType.java b/src/main/java/com/production/ehayvanbackendapi/Entities/UserType.java similarity index 92% rename from src/main/java/Entities/UserType.java rename to src/main/java/com/production/ehayvanbackendapi/Entities/UserType.java index 68a7e91..d2bb947 100644 --- a/src/main/java/Entities/UserType.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/UserType.java @@ -1,4 +1,4 @@ -package Entities; +package com.production.ehayvanbackendapi.Entities; import jakarta.persistence.*; diff --git a/src/main/java/Entities/Veterinarian.java b/src/main/java/com/production/ehayvanbackendapi/Entities/Veterinarian.java similarity index 91% rename from src/main/java/Entities/Veterinarian.java rename to src/main/java/com/production/ehayvanbackendapi/Entities/Veterinarian.java index 3de2347..ede6a8e 100644 --- a/src/main/java/Entities/Veterinarian.java +++ b/src/main/java/com/production/ehayvanbackendapi/Entities/Veterinarian.java @@ -1,4 +1,4 @@ -package Entities; +package com.production.ehayvanbackendapi.Entities; import jakarta.persistence.*; @@ -10,14 +10,14 @@ public class Veterinarian{ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private int VetID; - @OneToMany(mappedBy = "VetID") + @OneToMany(mappedBy = "Vet") private List PetOwners; @Column(nullable = false) private String Clinic; @OneToOne(cascade = CascadeType.ALL) @JoinColumn(name = "UserID", referencedColumnName = "UserID") private User User; - @OneToMany(mappedBy = "Veterinarian") + @OneToMany(mappedBy = "VetID") private List Appointments; public String getClinic() { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index eec9a36..eaddddd 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -7,6 +7,8 @@ spring.datasource.url=jdbc:postgresql://ehayvan-instance-1.cec0hgebpm1w.eu-north spring.datasource.username=postgres spring.datasource.password=12345678 spring.datasource.driver-class-name=org.postgresql.Driver -spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect spring.jpa.generate-ddl=true -spring.jpa.hibernate.ddl-auto = create +spring.jpa.hibernate.ddl-auto=update +spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true +spring.jpa.properties.hibernate.dialect= org.hibernate.dialect.PostgreSQLDialect +