feat: added ability to search consultants and admins by id

api/useradminservice.yaml

@@ -568,7 +568,7 @@ paths:
       parameters:
         - name: query
           in: query
-          description: URL-encoded infix to search for in first name, last name, or email.
+          description: URL-encoded infix to search for in id first name, last name, or email.
             A non-encoded star symbol searches for all.
           required: true
           schema:

api/userservice.yaml

@@ -1002,7 +1002,7 @@ paths:
       parameters:
         - name: query
           in: query
-          description: URL-encoded infix to search for in first name, last name, or email.
+          description: URL-encoded infix to search for in id, first name, last name, or email.
             A non-encoded star symbol searches for all.
           required: true
           schema:

src/main/java/de/caritas/cob/userservice/api/adapters/web/controller/interceptor/ApiResponseEntityExceptionHandler.java

@@ -27,6 +27,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.lang.Nullable;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -43,18 +44,21 @@
 @Order(Ordered.HIGHEST_PRECEDENCE)
 public class ApiResponseEntityExceptionHandler extends ResponseEntityExceptionHandler {
 
+  private static final String BAD_REQUEST = "Bad Request: ";
+  private static final String USER_SERVICE_API_LOG_PLACEHOLDER = "UserService API: {}: {}";
+
   @ExceptionHandler({DataIntegrityViolationException.class})
   public ResponseEntity<Object> handleJPAConstraintViolationException(
       final org.hibernate.exception.ConstraintViolationException ex, final WebRequest request) {
-    log.error("Bad Request: ", ex);
+    log.error(BAD_REQUEST, ex);
 
     return handleExceptionInternal(ex, null, new HttpHeaders(), HttpStatus.CONFLICT, request);
   }
 
   @ExceptionHandler({CreateEnquiryMessageException.class})
   public ResponseEntity<Object> handleCreateEnquiryMessageException(
       final CreateEnquiryMessageException ex, final WebRequest request) {
-    log.error("Bad Request: ", ex);
+    log.error(BAD_REQUEST, ex);
 
     return handleExceptionInternal(ex, null, new HttpHeaders(), HttpStatus.BAD_REQUEST, request);
   }
@@ -68,7 +72,7 @@ public ResponseEntity<Object> handleCreateEnquiryMessageException(
   @ExceptionHandler({BadRequestException.class})
   public ResponseEntity<Object> handleCustomBadRequest(
       final BadRequestException ex, final WebRequest request) {
-    log.warn("Bad Request: ", ex);
+    log.warn(BAD_REQUEST, ex);
 
     return handleExceptionInternal(ex, null, new HttpHeaders(), HttpStatus.BAD_REQUEST, request);
   }
@@ -113,7 +117,7 @@ protected ResponseEntity<Object> handleHttpMessageNotReadable(
       final HttpHeaders headers,
       final HttpStatus status,
       final WebRequest request) {
-    log.warn("UserService API: {}: {}", status.getReasonPhrase(), ex.getStackTrace());
+    log.warn(USER_SERVICE_API_LOG_PLACEHOLDER, status.getReasonPhrase(), ex.getStackTrace());
 
     return handleExceptionInternal(null, null, headers, status, request);
   }
@@ -130,7 +134,7 @@ protected ResponseEntity<Object> handleMethodArgumentNotValid(
       final HttpHeaders headers,
       final HttpStatus status,
       final WebRequest request) {
-    log.warn("UserService API: {}: {}", status.getReasonPhrase(), ex.getStackTrace());
+    log.warn(USER_SERVICE_API_LOG_PLACEHOLDER, status.getReasonPhrase(), ex);
 
     return handleExceptionInternal(null, null, headers, status, request);
   }
@@ -159,7 +163,7 @@ public ResponseEntity<Object> handleUnauthorized(
   @ExceptionHandler({InvalidDataAccessApiUsageException.class})
   protected ResponseEntity<Object> handleConflict(
       final RuntimeException ex, final WebRequest request) {
-    log.warn("UserService API: {}: {}", HttpStatus.CONFLICT, ex.getStackTrace());
+    log.warn(USER_SERVICE_API_LOG_PLACEHOLDER, HttpStatus.CONFLICT, ex.getStackTrace());
 
     return handleExceptionInternal(null, null, new HttpHeaders(), HttpStatus.CONFLICT, request);
   }
@@ -256,4 +260,18 @@ public ResponseEntity<Object> handleInternal(
       final NoContentException ex, final WebRequest request) {
     return handleExceptionInternal(null, null, new HttpHeaders(), HttpStatus.NO_CONTENT, request);
   }
+
+  @Override
+  protected ResponseEntity<Object> handleExceptionInternal(
+      @Nullable Exception ex,
+      @Nullable Object body,
+      HttpHeaders headers,
+      HttpStatus status,
+      WebRequest request) {
+    if (HttpStatus.INTERNAL_SERVER_ERROR.equals(status)) {
+      request.setAttribute("javax.servlet.error.exception", ex, 0);
+    }
+
+    return new ResponseEntity<>(body, headers, status);
+  }
 }

src/main/java/de/caritas/cob/userservice/api/port/out/AdminRepository.java

@@ -21,7 +21,8 @@ public interface AdminRepository extends CrudRepository<Admin, String> {
               + "AND ("
               + "  ?1 = '*' "
               + "  OR ("
-              + "    UPPER(a.firstName) LIKE CONCAT('%', UPPER(?1), '%')"
+              + "    UPPER(a.id) = UPPER(?1)"
+              + "    OR UPPER(a.firstName) LIKE CONCAT('%', UPPER(?1), '%')"
               + "    OR UPPER(a.lastName) LIKE CONCAT('%', UPPER(?1), '%')"
               + "    OR UPPER(a.email) LIKE CONCAT('%', UPPER(?1), '%')"
               + "    OR CONVERT(a.tenantId,char) LIKE CONCAT('%', UPPER(?1), '%')"

src/main/java/de/caritas/cob/userservice/api/port/out/ConsultantRepository.java

@@ -36,7 +36,8 @@ public interface ConsultantRepository extends CrudRepository<Consultant, String>
               + "WHERE"
               + "  ?1 = '*' "
               + "  OR ("
-              + "    UPPER(c.firstName) LIKE CONCAT('%', UPPER(?1), '%')"
+              + "    UPPER(c.id) = UPPER(?1)"
+              + "    OR UPPER(c.firstName) LIKE CONCAT('%', UPPER(?1), '%')"
               + "    OR UPPER(c.lastName) LIKE CONCAT('%', UPPER(?1), '%')"
               + "    OR UPPER(c.email) LIKE CONCAT('%', UPPER(?1), '%')"
               + "  )")
@@ -52,7 +53,8 @@ public interface ConsultantRepository extends CrudRepository<Consultant, String>
               + " AND ("
               + "  ?1 = '*' "
               + "  OR ("
-              + "    UPPER(c.firstName) LIKE CONCAT('%', UPPER(?1), '%')"
+              + "    UPPER(c.id) = UPPER(?1)"
+              + "    OR UPPER(c.firstName) LIKE CONCAT('%', UPPER(?1), '%')"
               + "    OR UPPER(c.lastName) LIKE CONCAT('%', UPPER(?1), '%')"
               + "    OR UPPER(c.email) LIKE CONCAT('%', UPPER(?1), '%')"
               + "  )"