Changeset 50f2c2a

Timestamp:

02/16/23 14:45:18 (17 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

9a180fd

Parents:

59a8941 (diff), eef07ff (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 changes from main & resolve conflicts

Location:

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

Files:

• model/entities/Adopter.java (modified) (2 diffs)
• service/implementation/AuthServiceImplementation.java (moved) (moved from Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/AuthServiceImpl.java ) (2 diffs)
• service/implementation/OrganisationServiceImplementation.java (moved) (moved from Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/OrganisationServiceImpl.java ) (1 diff)
• web/controllers/RegisterController.java (modified) (2 diffs)

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adopter.java

@@ -23 +23 @@
 
     @Column(name = "has_other_pets")
-    private boolean hasOtherPets;
+    private Boolean hasOtherPets;
 
     @Column(name = "has_kids")
-    private boolean hasKids;
+    private Boolean hasKids;
 
     @Column(name = "housing")
@@ -35 +35 @@
 
     @Column(name = "will_foster")
-    private boolean willFoster;
+    private Boolean willFoster;
 
     @Column(name = "is_verified", nullable = false)
-    private boolean verified;
+    private Boolean verified;
 
     @Column(name = "verified_by_employee")

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

@@ -17 +17 @@
 
 @Service
-public class AuthServiceImpl implements AuthService {
+public class AuthServiceImplementation implements AuthService {
 
     private final UserRepository userRepository;
@@ -23 +23 @@
     private final EmployeeRepository employeeRepository;
 
-    public AuthServiceImpl(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository) {
+    public AuthServiceImplementation(UserRepository userRepository, AdopterRepository adopterRepository, EmployeeRepository employeeRepository) {
         this.userRepository = userRepository;
         this.adopterRepository = adopterRepository;

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

@@ -8 +8 @@
 import java.util.List;
 @Service
-public class OrganisationServiceImpl implements OrganisationService {
+public class OrganisationServiceImplementation implements OrganisationService {
     private final OrganisationRepository organisationRepository;
 
-    public OrganisationServiceImpl(OrganisationRepository organisationRepository) {
+    public OrganisationServiceImplementation(OrganisationRepository organisationRepository) {
         this.organisationRepository = organisationRepository;
     }

Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/RegisterController.java

@@ -42 +42 @@
                                @RequestParam String password, @RequestParam String repeatPassword,
                                @RequestParam String telephone,@RequestParam String role,
-                               HttpServletRequest request) {
+                               @RequestParam (required = false) String freeTime,  @RequestParam (required = false) String funds,
+                               @RequestParam (required = false) boolean hasOtherPets, @RequestParam (required = false) boolean hasKids,
+                               @RequestParam (required = false) String housing, @RequestParam (required = false) String physicalActivity,
+                               @RequestParam (required = false) boolean willFoster, @RequestParam (required = false) Integer shelter,
+                               @RequestParam (required = false)  String position, HttpServletRequest request) {
 
         if(role.equals("adopter") & password.equals(repeatPassword)){
-            String freeTime = request.getParameter("freeTime");
-            String funds = request.getParameter("funds");
-            boolean hasOtherPets = Boolean.parseBoolean(request.getParameter("hasOtherPets"));
-            boolean hasKids = Boolean.parseBoolean(request.getParameter("hasKids"));
-            String housing = request.getParameter("housing");
-            String physicalActivity = request.getParameter("physicalActivity");
-            boolean willFoster = Boolean.parseBoolean(request.getParameter("willFoster"));
 
             FreeTime ft = FreeTime.valueOf(freeTime);
@@ -64 +61 @@
         }
         else if(role.equals("employee") & password.equals(repeatPassword)){
-            Integer shelter = Integer.valueOf(request.getParameter("shelter"));
-            String position = request.getParameter("position");
 
             Employee employeeUser = authService.registerEmployee(name, email, password, telephone,position,shelter);