Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AuthServiceImpl.java

    ra762b3a r59a8941  
    11package finki.paw5.service.implementation;
    22
     3import finki.paw5.model.entities.Adopter;
     4import finki.paw5.model.entities.Employee;
    35import finki.paw5.model.entities.User;
    4 import finki.paw5.model.exceptions.NonExistingArgumentsException;
     6import finki.paw5.model.enumerations.FreeTime;
     7import finki.paw5.model.enumerations.Funds;
     8import finki.paw5.model.enumerations.Housing;
     9import finki.paw5.model.enumerations.PhysicalActivity;
     10import finki.paw5.repository.AdopterRepository;
     11import finki.paw5.repository.EmployeeRepository;
    512import finki.paw5.repository.UserRepository;
    613import finki.paw5.service.AuthService;
     
    815
    916import java.time.LocalDate;
    10 import java.util.Objects;
    11 import java.util.Optional;
    1217
    1318@Service
     
    1520
    1621    private final UserRepository userRepository;
     22    private final AdopterRepository adopterRepository;
     23    private final EmployeeRepository employeeRepository;
    1724
    18     public AuthServiceImpl(UserRepository userRepository) {
     25    public AuthServiceImpl(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository) {
    1926        this.userRepository = userRepository;
     27        this.adopterRepository = adopterRepository;
     28        this.employeeRepository = employeeRepository;
    2029    }
    2130
     
    2938    }
    3039
    31     /*
     40
    3241    @Override
    33     public Adopter registerAdopter(String password, String repeatPassword, String name, String email, String telephone) {
    34         if (email == null || email.isEmpty() || password == null || password.isEmpty()) {
    35             //throw new Exception();
    36         }
    37         if (!password.equals(repeatPassword)) {
    38             //throw new Exception();
    39         }
    40         if (this.userRepository.findByEmail(email)!=null) {
    41             //throw new Exception("Username exists:"+email);
    42         }
    43         User user = new User(LocalDate.now(), name, email, password, telephone);
    44         return userRepository.save(user);
     42    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) {
     43        Adopter adopter = new Adopter(LocalDate.now(), name, email, password, telephone,freeTime,funds,hasOtherPets,hasKids,housing,physicalActivity,willFoster,false);
     44        return adopterRepository.save(adopter);
    4545    }
    46     */
     46
     47    @Override
     48    public Employee registerEmployee(String name, String email, String password, String telephone, String position, Integer shelterId) {
     49        Employee employee = new Employee(LocalDate.now(),name, email,password,telephone,position,shelterId,false);
     50        return employeeRepository.save(employee);
     51    }
     52
    4753}
Note: See TracChangeset for help on using the changeset viewer.