feat: added ability to search consultants and admins by id

Onlineberatung · Aug 15, 2023 · a7ca0f5 · a7ca0f5
1 parent dbf0de8
commit a7ca0f5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/api/useradminservice.yaml b/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:

diff --git a/api/userservice.yaml b/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:

diff --git a/src/main/java/de/caritas/cob/userservice/api/port/out/AdminRepository.java b/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.adminId) = 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), '%')"

diff --git a/src/main/java/de/caritas/cob/userservice/api/port/out/ConsultantRepository.java b/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.consulantId) = 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.consulantId) = 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), '%')"
               + "  )"