Changeset da44aef for Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation

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/service/implementation

Files:

• AuthServiceImpl.java (modified) (4 diffs)
• OrganisationServiceImpl.java (added)
• ShelterServiceImp.java (added)

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