Changeset 9ee306b for Prototype Application/Paw5/src/main/java

Timestamp:

02/16/23 15:22:04 (17 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

6941fac

Parents:

04e4f54 (diff), eef07ff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'main' into create-post

Location:

Prototype Application/Paw5/src/main/java/finki/paw5

Files:

• model/entities/Adopter.java (modified) (3 diffs)
• model/entities/Employee.java (modified) (2 diffs)
• model/entities/Shelter.java (modified) (2 diffs)
• repository/AdopterRepository.java (modified) (1 diff)
• repository/EmployeeRepository.java (modified) (1 diff)
• repository/ShelterRepository.java (modified) (1 diff)
• service/AuthService.java (modified) (1 diff)
• service/OrganisationService.java (added)
• service/ShelterService.java (added)
• service/implementation/AuthServiceImpl.java (deleted)
• service/implementation/AuthServiceImplementation.java (added)
• service/implementation/OrganisationServiceImplementation.java (added)
• service/implementation/ShelterServiceImplementation.java (added)
• web/controllers/RegisterController.java (added)

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adopter.java

@@ -23 +23 @@
 
     @Column(name = "has_other_pets")
-    private boolean hasOtherPets;
+    private Boolean hasOtherPets;
 
     @Column(name = "has_kids")
-    private boolean hasKids;
+    private Boolean hasKids;
 
     @Column(name = "housing")
@@ -35 +35 @@
 
     @Column(name = "will_foster")
-    private boolean willFoster;
+    private Boolean willFoster;
 
     @Column(name = "is_verified", nullable = false)
-    private boolean verified;
+    private Boolean verified;
 
     @Column(name = "verified_by_employee")
-    private int verifiedByEmployeeId;
+    private Integer verifiedByEmployeeId;
 
     public Adopter(LocalDate dateCreated, String name, String email, String password, String telephone,
                    FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing,
-                   PhysicalActivity physicalActivity, boolean willFoster, boolean verified, int verifiedByEmployeeId) {
+                   PhysicalActivity physicalActivity, boolean willFoster, boolean verified) {
         super(dateCreated, name, email, password, telephone);
         this.freeTime = freeTime;
@@ -55 +55 @@
         this.willFoster = willFoster;
         this.verified = verified;
-        this.verifiedByEmployeeId = verifiedByEmployeeId;
     }
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Employee.java

@@ -16 +16 @@
 
     @Column(name = "id_shelter", nullable = false)
-    private int shelterId;
+    private Integer shelterId;
 
     @Column(name = "is_verified", nullable = false)
@@ -22 +22 @@
 
     @Column(name = "verified_by_admin")
-    private int verifiedByAdminId;
+    private Integer verifiedByAdminId;
 
     public Employee(LocalDate dateCreated, String name, String email, String password, String telephone,
-                    String position, int shelterId, boolean verified, int verifiedByAdminId) {
+                    String position, int shelterId, boolean verified) {
         super(dateCreated, name, email, password, telephone);
         this.position = position;
         this.shelterId = shelterId;
         this.verified = verified;
-        this.verifiedByAdminId = verifiedByAdminId;
     }
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Shelter.java

@@ -21 +21 @@
 
     @Column(name = "id_organisation")
-    private int organisationId;
+    private Integer organisationId;
 
     @Column(name = "name_shelter", nullable = false, length = 100)
@@ -29 +29 @@
     private String email;
 
-    public Shelter(String address, String telephone, int organisationId, String name, String email) {
+    public Shelter(String address, String telephone, Integer organisationId, String name, String email) {
         this.address = address;
         this.telephone = telephone;

Prototype Application/Paw5/src/main/java/finki/paw5/repository/AdopterRepository.java

@@ -5 +5 @@
 import org.springframework.stereotype.Repository;
 
+
 @Repository
 public interface AdopterRepository extends JpaRepository<Adopter, Integer> {

Prototype Application/Paw5/src/main/java/finki/paw5/repository/EmployeeRepository.java

@@ -2 +2 @@
 
 import finki.paw5.model.entities.Employee;
+import finki.paw5.model.entities.Shelter;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 @Repository

Prototype Application/Paw5/src/main/java/finki/paw5/repository/ShelterRepository.java

@@ -5 +5 @@
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ShelterRepository extends JpaRepository<Shelter, Integer> {

Prototype Application/Paw5/src/main/java/finki/paw5/service/AuthService.java

@@ -4 +4 @@
 import finki.paw5.model.entities.Employee;
 import finki.paw5.model.entities.User;
-
-import java.util.Optional;
+import finki.paw5.model.enumerations.FreeTime;
+import finki.paw5.model.enumerations.Funds;
+import finki.paw5.model.enumerations.Housing;
+import finki.paw5.model.enumerations.PhysicalActivity;
 
 public interface AuthService {
     User login (String email, String password);
-//    Adopter registerAdopter(String password, String repeatPassword, String name, String email, String telephone);
-//    Employee registerEmployee(String password, String repeatPassword, String name, String email, String telephone);
+    Adopter registerAdopter(String name, String email, String password, String telephone, FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing, PhysicalActivity physicalActivity, boolean willFoster);
+    Employee registerEmployee(String name, String email, String password, String telephone, String position, Integer shelterId);
 
 }