Changeset 59a8941 for Prototype Application/Paw5/src/main/java/finki
- Timestamp:
- 02/16/23 13:45:55 (17 months ago)
- 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. - Location:
- Prototype Application/Paw5/src/main/java/finki/paw5
- Files:
-
- 3 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adopter.java
ra762b3a r59a8941 41 41 42 42 @Column(name = "verified_by_employee") 43 private intverifiedByEmployeeId;43 private Integer verifiedByEmployeeId; 44 44 45 45 public Adopter(LocalDate dateCreated, String name, String email, String password, String telephone, 46 46 FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing, 47 PhysicalActivity physicalActivity, boolean willFoster, boolean verified , int verifiedByEmployeeId) {47 PhysicalActivity physicalActivity, boolean willFoster, boolean verified) { 48 48 super(dateCreated, name, email, password, telephone); 49 49 this.freeTime = freeTime; … … 55 55 this.willFoster = willFoster; 56 56 this.verified = verified; 57 this.verifiedByEmployeeId = verifiedByEmployeeId;58 57 } 59 58 -
Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Employee.java
ra762b3a r59a8941 16 16 17 17 @Column(name = "id_shelter", nullable = false) 18 private intshelterId;18 private Integer shelterId; 19 19 20 20 @Column(name = "is_verified", nullable = false) … … 22 22 23 23 @Column(name = "verified_by_admin") 24 private intverifiedByAdminId;24 private Integer verifiedByAdminId; 25 25 26 26 public Employee(LocalDate dateCreated, String name, String email, String password, String telephone, 27 String position, int shelterId, boolean verified , int verifiedByAdminId) {27 String position, int shelterId, boolean verified) { 28 28 super(dateCreated, name, email, password, telephone); 29 29 this.position = position; 30 30 this.shelterId = shelterId; 31 31 this.verified = verified; 32 this.verifiedByAdminId = verifiedByAdminId;33 32 } 34 33 -
Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Shelter.java
ra762b3a r59a8941 21 21 22 22 @Column(name = "id_organisation") 23 private intorganisationId;23 private Integer organisationId; 24 24 25 25 @Column(name = "name_shelter", nullable = false, length = 100) … … 29 29 private String email; 30 30 31 public Shelter(String address, String telephone, intorganisationId, String name, String email) {31 public Shelter(String address, String telephone, Integer organisationId, String name, String email) { 32 32 this.address = address; 33 33 this.telephone = telephone; -
Prototype Application/Paw5/src/main/java/finki/paw5/repository/AdopterRepository.java
ra762b3a r59a8941 5 5 import org.springframework.stereotype.Repository; 6 6 7 7 8 @Repository 8 9 public interface AdopterRepository extends JpaRepository<Adopter, Integer> { -
Prototype Application/Paw5/src/main/java/finki/paw5/repository/EmployeeRepository.java
ra762b3a r59a8941 2 2 3 3 import finki.paw5.model.entities.Employee; 4 import finki.paw5.model.entities.Shelter; 4 5 import org.springframework.data.jpa.repository.JpaRepository; 5 6 import org.springframework.stereotype.Repository; 7 8 import java.util.List; 6 9 7 10 @Repository -
Prototype Application/Paw5/src/main/java/finki/paw5/repository/ShelterRepository.java
ra762b3a r59a8941 5 5 import org.springframework.stereotype.Repository; 6 6 7 import java.util.List; 8 7 9 @Repository 8 10 public interface ShelterRepository extends JpaRepository<Shelter, Integer> { -
Prototype Application/Paw5/src/main/java/finki/paw5/service/AuthService.java
ra762b3a r59a8941 4 4 import finki.paw5.model.entities.Employee; 5 5 import finki.paw5.model.entities.User; 6 7 import java.util.Optional; 6 import finki.paw5.model.enumerations.FreeTime; 7 import finki.paw5.model.enumerations.Funds; 8 import finki.paw5.model.enumerations.Housing; 9 import finki.paw5.model.enumerations.PhysicalActivity; 8 10 9 11 public interface AuthService { 10 12 User login (String email, String password); 11 // Adopter registerAdopter(String password, String repeatPassword, String name, String email, String telephone);12 // Employee registerEmployee(String password, String repeatPassword, String name, String email, String telephone);13 Adopter registerAdopter(String name, String email, String password, String telephone, FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing, PhysicalActivity physicalActivity, boolean willFoster); 14 Employee registerEmployee(String name, String email, String password, String telephone, String position, Integer shelterId); 13 15 14 16 } -
Prototype Application/Paw5/src/main/java/finki/paw5/service/ShelterService.java
ra762b3a r59a8941 3 3 import finki.paw5.model.entities.Shelter; 4 4 5 import java.util.List; 5 6 import java.util.Optional; 6 7 7 8 public interface ShelterService { 8 9 Optional<Shelter> findById(Integer id); 10 List<Shelter> listShelters(); 9 11 } -
Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AuthServiceImpl.java
ra762b3a r59a8941 1 1 package finki.paw5.service.implementation; 2 2 3 import finki.paw5.model.entities.Adopter; 4 import finki.paw5.model.entities.Employee; 3 5 import finki.paw5.model.entities.User; 4 import finki.paw5.model.exceptions.NonExistingArgumentsException; 6 import finki.paw5.model.enumerations.FreeTime; 7 import finki.paw5.model.enumerations.Funds; 8 import finki.paw5.model.enumerations.Housing; 9 import finki.paw5.model.enumerations.PhysicalActivity; 10 import finki.paw5.repository.AdopterRepository; 11 import finki.paw5.repository.EmployeeRepository; 5 12 import finki.paw5.repository.UserRepository; 6 13 import finki.paw5.service.AuthService; … … 8 15 9 16 import java.time.LocalDate; 10 import java.util.Objects;11 import java.util.Optional;12 17 13 18 @Service … … 15 20 16 21 private final UserRepository userRepository; 22 private final AdopterRepository adopterRepository; 23 private final EmployeeRepository employeeRepository; 17 24 18 public AuthServiceImpl(UserRepository userRepository ) {25 public AuthServiceImpl(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository) { 19 26 this.userRepository = userRepository; 27 this.adopterRepository = adopterRepository; 28 this.employeeRepository = employeeRepository; 20 29 } 21 30 … … 29 38 } 30 39 31 /* 40 32 41 @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); 45 45 } 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 47 53 } -
Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/ShelterServiceImplementation.java
ra762b3a r59a8941 6 6 import org.springframework.stereotype.Service; 7 7 8 import java.util.List; 8 9 import java.util.Optional; 9 10 … … 21 22 return this.shelterRepository.findById(id); 22 23 } 24 25 @Override 26 public List<Shelter> listShelters() { 27 return shelterRepository.findAll(); 28 } 29 30 23 31 }
Note:
See TracChangeset
for help on using the changeset viewer.