Changeset da44aef for Prototype Application/Paw5/src/main/java/finki

Timestamp:

02/15/23 17:58:59 (17 months ago)

Author:

trajchevaM <118018439+trajchevaM@…>

Branches:

main

Children:

59a8941, dad5bcd

Parents:

f0232fb

Message:

register functionality

1. Changed css of login.html
2. Changed css and html of register
3. Foreign keys in Adopter and Employee changed from int to Integer
4. AuthorisationService updated with methods for employee and adopter registration
5. RegisterController works only for employee and adopter
6. Added services for Organisation and Shelter for dropdown list on registration form

Location:

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

Files:

• model/entities/Adopter.java (modified) (2 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 (modified) (4 diffs)
• service/implementation/OrganisationServiceImpl.java (added)
• service/implementation/ShelterServiceImp.java (added)
• web/controllers/RegisterController.java (added)

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

@@ -41 +41 @@
 
     @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);
 
 }

Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AuthServiceImpl.java

@@ -1 +1 @@
 package finki.paw5.service.implementation;
 
+import finki.paw5.model.entities.Adopter;
+import finki.paw5.model.entities.Employee;
 import finki.paw5.model.entities.User;
-import finki.paw5.model.exceptions.NonExistingArgumentsException;
+import finki.paw5.model.enumerations.FreeTime;
+import finki.paw5.model.enumerations.Funds;
+import finki.paw5.model.enumerations.Housing;
+import finki.paw5.model.enumerations.PhysicalActivity;
+import finki.paw5.repository.AdopterRepository;
+import finki.paw5.repository.EmployeeRepository;
 import finki.paw5.repository.UserRepository;
 import finki.paw5.service.AuthService;
@@ -8 +15 @@
 
 import java.time.LocalDate;
-import java.util.Objects;
-import java.util.Optional;
 
 @Service
@@ -15 +20 @@
 
     private final UserRepository userRepository;
+    private final AdopterRepository adopterRepository;
+    private final EmployeeRepository employeeRepository;
 
-    public AuthServiceImpl(UserRepository userRepository) {
+    public AuthServiceImpl(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository) {
         this.userRepository = userRepository;
+        this.adopterRepository = adopterRepository;
+        this.employeeRepository = employeeRepository;
     }
 
@@ -29 +38 @@
     }
 
-    /*
+
     @Override
-    public Adopter registerAdopter(String password, String repeatPassword, String name, String email, String telephone) {
-        if (email == null || email.isEmpty() || password == null || password.isEmpty()) {
-            //throw new Exception();
-        }
-        if (!password.equals(repeatPassword)) {
-            //throw new Exception();
-        }
-        if (this.userRepository.findByEmail(email)!=null) {
-            //throw new Exception("Username exists:"+email);
-        }
-        User user = new User(LocalDate.now(), name, email, password, telephone);
-        return userRepository.save(user);
+    public Adopter registerAdopter(String name, String email, String password, String telephone, FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing, PhysicalActivity physicalActivity, boolean willFoster) {
+        Adopter adopter = new Adopter(LocalDate.now(), name, email, password, telephone,freeTime,funds,hasOtherPets,hasKids,housing,physicalActivity,willFoster,false);
+        return adopterRepository.save(adopter);
     }
-    */
+
+    @Override
+    public Employee registerEmployee(String name, String email, String password, String telephone, String position, Integer shelterId) {
+        Employee employee = new Employee(LocalDate.now(),name, email,password,telephone,position,shelterId,false);
+        return employeeRepository.save(employee);
+    }
+
 }