Revert "Front-end perms and back-end content for exceptions of owners" (

#600)

Reverts #597

api-gateway/src/main/java/com/petclinic/bffapigateway/config/GlobalExceptionHandler.java

@@ -4,7 +4,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -17,8 +16,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-
 
 /**
  * Created by IntelliJ IDEA.
@@ -132,13 +129,4 @@ public ResponseEntity<HttpErrorInfo> handleForbiddenAccessException(ForbiddenAcc
                 .body(new HttpErrorInfo(HttpStatus.FORBIDDEN.value(),ex.getMessage()));
     }
 
-    //I have no idea why but this method kills docker and specifically
-    //the api gateway as a service crashes on docker if you have this uncommented
-//    @ExceptionHandler(value = NotFoundException.class)
-//    public ResponseEntity<HttpErrorInfo>  handleNotFoundException(NotFoundException ex) {
-//        return ResponseEntity.status(NOT_FOUND)
-//                .body(new HttpErrorInfo(NOT_FOUND.value(),ex.getMessage()));
-//
-//    }
-
 }

api-gateway/src/main/java/com/petclinic/bffapigateway/config/GlobalServletExceptionHandler.java

@@ -48,11 +48,7 @@ else if(exClass.equals(NullPointerException.class)){
             }
             else if(exClass.equals(ForbiddenAccessException.class)){
                 status = HttpStatus.FORBIDDEN;
-
-            }
-            else if(exClass.equals(NotFoundException.class)){
-                status = HttpStatus.NOT_FOUND;
-            }// Handle any other exception types here
+            } // Handle any other exception types here
             else {
                 log.error("Exception not handled: {}", exClass.getSimpleName());
                 status = HttpStatus.UNPROCESSABLE_ENTITY;

api-gateway/src/main/java/com/petclinic/bffapigateway/domainclientlayer/CustomersServiceClient.java

@@ -4,11 +4,8 @@
 import com.petclinic.bffapigateway.dtos.CustomerDTOs.OwnerResponseDTO;
 import com.petclinic.bffapigateway.dtos.Pets.*;
 import com.petclinic.bffapigateway.dtos.Vets.PhotoDetails;
-import com.petclinic.bffapigateway.exceptions.NotFoundException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -44,16 +41,6 @@ public Mono<OwnerResponseDTO> getOwner(final String ownerId) {
         return webClientBuilder.build().get()
                 .uri(customersServiceUrl + "/owners/" + ownerId)
                 .retrieve()
-                .onStatus(HttpStatusCode::is4xxClientError, error->{
-                    HttpStatusCode statusCode = error.statusCode();
-
-                    if (statusCode.equals(HttpStatus.NOT_FOUND))
-                        return Mono.error(new NotFoundException("Course id not found:" + ownerId));
-                    return Mono.error(new IllegalArgumentException("Something went wrong(owner Client)"));
-                })
-                .onStatus(HttpStatusCode::is5xxServerError, error-> {
-                    return Mono.error(new IllegalArgumentException("Something went wrong(owner Client"));
-                })
                 .bodyToMono(OwnerResponseDTO.class);
     }
 

api-gateway/src/main/java/com/petclinic/bffapigateway/presentationlayer/BFFApiGatewayController.java

@@ -754,6 +754,12 @@ public Mono<ResponseEntity<OwnerResponseDTO>> updateOwner(
     }
 
 
+
+
+
+
+
+
     @SecuredEndpoint(allowedRoles = {Roles.ADMIN})
     @DeleteMapping(value = "owners/{ownerId}")
     public Mono<ResponseEntity<OwnerResponseDTO>> deleteOwner(@PathVariable String ownerId){

api-gateway/src/main/resources/static/scripts/fragments/nav.html

@@ -1,16 +1,4 @@
 <script>
-
-    function purgeUser() {
-        localStorage.removeItem("username")
-        localStorage.removeItem("email")
-        localStorage.removeItem("UUID")
-        localStorage.removeItem("roles")
-    }
-
-    //access the roles title and make sure it exists
-    const userRoles = localStorage.getItem('roles')
-    console.log(userRoles);
-
     function logoutUser() {
         logoutUser.$inject = ['$http'];
         var $http = angular.injector(['ng']).get('$http');
@@ -32,7 +20,6 @@
             localStorage.removeItem("roles")
             window.location.href = '/#!/login';
         });    }
-
 </script>
 
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
@@ -55,22 +42,16 @@
                     </a>
                     <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                         <a class="nav-link" ui-sref="owners">Owners</a>
-
-                        <a class="nav-link" ui-sref="ownerDetails({ ownerId: UUID })" ng-if = "roles == 'OWNER'" >Edit Account</a>
-
                         <a class="nav-link" ui-sref="ownerDetails({ ownerId: UUID })">Edit Account</a>
                         <a class="nav-link" ui-sref="petTypes">Pet Types</a>
-
                     </div>
                 </li>
-                <li class="nav-item" ng-if = "roles !== 'OWNER'">
+                <li class="nav-item">
                         <a class="nav-link" ui-sref="bills">Bills</a>
                 </li>
-
-                <li class="nav-item" ng-if = "roles !== 'OWNER'">
+                <li class="nav-item">
                     <a class="nav-link" ui-sref="visitList">Visits</a>
                 </li>
-
                 <li class="nav-item">
                     <a class="nav-link" ui-sref="inventories">Inventory</a>
                 </li>
@@ -94,5 +75,7 @@
                 <a class="nav-link" ui-sref="login">Login</a>
             </li>
         </ul>
+
+
     </div>
 </nav>

api-gateway/src/main/resources/static/scripts/owner-details/owner-details.js

@@ -15,6 +15,7 @@ angular.module('ownerDetails', ['ui.router'])
             //     params: {ownerId: null, petId: null},
             //     template: '<owner-details></owner-details>'
             // }
+
     }]);
 
 

api-gateway/src/main/resources/static/scripts/vet-list/vet-list.controller.js

@@ -52,15 +52,15 @@ angular.module('vetList')
             $http.get('api/gateway/vets/' + vet.vetId + "/ratings/average").then(function (resp) {
                 console.log(resp.data);
                 vet.showRating = true;
-                vet.rating = parseFloat(resp.data).toFixed(1);
+                vet.rating = parseFloat(resp.data.toFixed(1));
             });
         }
 
         function getTopThreeVetsWithHighestRating(vet){
             $http.get('api/gateway/vets/topVets').then(function (resp) {
                 console.log(resp.data);
                 vet.showRating=true;
-                vet.rating = parseFloat(resp.data).toFixed(1);
+                vet.rating = parseFloat(resp.data.toFixed(1));
 
             });
 

api-gateway/src/main/resources/static/scripts/vet-list/vet-list.template.html

@@ -20,10 +20,6 @@ <h2>Veterinarians</h2>
 </form>
 
 
-<a ng-if = "roles !== 'OWNER'"  ui-sref="vetsNew" style="float: right;margin-bottom: 1%">
-    <button ng-if = "roles !== 'OWNER'"  class="add-vet-button btn btn-success">Add Vet</button>
-</a>
-
 
 <div style="margin-bottom: 1%; margin-top: 1%">
     <label for="filterOption">Filter</label>
@@ -45,7 +41,7 @@ <h2>Veterinarians</h2>
         <th class="vet_speciality">Specialties</th>
         <th class="getAverageRating">Average Rating</th>
         <th class="getCountOfRatings">Number of Ratings</th>
-        <th ng-if = "roles !== 'OWNER'" >Delete</th>
+        <th>Delete</th>
     </tr>
     </thead>
 
@@ -60,9 +56,14 @@ <h2>Veterinarians</h2>
         <td class="vet_speciality"><span ng-repeat="specialty in vet.specialties">{{specialty.name + ' '}}</span></td>
         <td class="vet-rating v{{vet.vetId}} centered-count"><span>{{vet.rating}}</span></td>
         <td class="vet-rating v{{vet.vetId}} centered-count"><span>{{vet.count}}</span></td>
-        <td ng-if = "roles !== 'OWNER'" ><a class="btn btn-danger" href="javascript:void(0)" ng-click="deleteVet(vet.vetId)" >Delete Vet</a></td>
+        <td><a class="btn btn-danger" href="javascript:void(0)" ng-click="deleteVet(vet.vetId)">Delete Vet</a></td>
     </tr>
 
+
+
+
+
+
     <div class="modal m{{vet.vetId}} modalOff" ng-repeat="vet in $ctrl.vetList" >
             <span class="modal_image"><img ng-if="vet.image != null" src="data:image/png;base64,{{vet.image}}"/><img
                     ng-if="vet.image == null" src="images/vet_default.jpg"/></span>