Changes in / [50f2c2a:59a8941]

Location:

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

Files:

• model/entities/Adopter.java (modified) (2 diffs)
• service/implementation/AuthServiceImpl.java (added)
• service/implementation/AuthServiceImplementation.java (deleted)
• service/implementation/OrganisationServiceImpl.java (added)
• service/implementation/OrganisationServiceImplementation.java (deleted)
• 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/web/controllers/RegisterController.java

@@ -42 +42 @@
                                @RequestParam String password, @RequestParam String repeatPassword,
                                @RequestParam String telephone,@RequestParam String role,
-                               @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) {
+                               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);
@@ -61 +64 @@
         }
         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);