Changeset 59a8941 for Prototype Application/Paw5/src/main/java/finki/paw5/service

Timestamp:

02/16/23 13:45:55 (17 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

50f2c2a

Parents:

a762b3a (diff), da44aef (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 login and register into branch

Location:

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

Files:

• AuthService.java (modified) (1 diff)
• OrganisationService.java (added)
• ShelterService.java (modified) (1 diff)
• implementation/AuthServiceImpl.java (modified) (4 diffs)
• implementation/OrganisationServiceImpl.java (added)
• implementation/ShelterServiceImplementation.java (modified) (2 diffs)

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/ShelterService.java

@@ -3 +3 @@
 import finki.paw5.model.entities.Shelter;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface ShelterService {
     Optional<Shelter> findById(Integer id);
+    List<Shelter> listShelters();
 }

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

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

@@ -6 +6 @@
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Optional;
 
@@ -21 +22 @@
         return this.shelterRepository.findById(id);
     }
+
+    @Override
+    public List<Shelter> listShelters() {
+        return shelterRepository.findAll();
+    }
+
+
 }