Changeset 0078d84 for Prototype Application/Paw5/src/main/java/finki/paw5/service

Timestamp:

03/10/23 21:43:30 (16 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

104185f

Parents:

b46d1f2 (diff), c3278ac (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:

resolve merge conflicts

Location:

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

Files:

• AdoptionService.java (added)
• PersonalProfileService.java (added)
• PetService.java (added)
• PostService.java (added)
• ShelterService.java (modified) (1 diff)
• implementation/AdoptionServiceImplementation.java (added)
• implementation/AuthServiceImplementation.java (modified) (4 diffs)
• implementation/PersonalProfileServiceImplementation.java (added)
• implementation/PetServiceImplementation.java (added)
• implementation/PostServiceImplementation.java (added)
• implementation/ShelterServiceImplementation.java (modified) (3 diffs)

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

@@ -4 +4 @@
 
 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/AuthServiceImplementation.java

@@ -3 +3 @@
 import finki.paw5.model.entities.Adopter;
 import finki.paw5.model.entities.Employee;
+import finki.paw5.model.entities.Shelter;
 import finki.paw5.model.entities.User;
 import finki.paw5.model.enumerations.FreeTime;
@@ -10 +11 @@
 import finki.paw5.repository.AdopterRepository;
 import finki.paw5.repository.EmployeeRepository;
+import finki.paw5.repository.ShelterRepository;
 import finki.paw5.repository.UserRepository;
 import finki.paw5.service.AuthService;
@@ -22 +24 @@
     private final AdopterRepository adopterRepository;
     private final EmployeeRepository employeeRepository;
+    private final ShelterRepository shelterRepository;
 
-    public AuthServiceImplementation(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository) {
+    public AuthServiceImplementation(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository, ShelterRepository shelterRepository) {
         this.userRepository = userRepository;
         this.adopterRepository = adopterRepository;
         this.employeeRepository = employeeRepository;
+        this.shelterRepository = shelterRepository;
     }
 
@@ -47 +51 @@
     @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);
+        Shelter shelter = this.shelterRepository.findById(shelterId).get();
+        Employee employee = new Employee(LocalDate.now(),name, email,password,telephone,position,shelter,false);
         return employeeRepository.save(employee);
     }

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

@@ -7 +7 @@
 
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class ShelterServiceImplementation implements ShelterService {
+
     private final ShelterRepository shelterRepository;
 
@@ -16 +18 @@
     }
 
+    @Override
+    public Optional<Shelter> findById(Integer id) {
+        return this.shelterRepository.findById(id);
+    }
 
     @Override
@@ -21 +27 @@
         return shelterRepository.findAll();
     }
+
+
 }