ECS: Add wrapper to ilObjUser::_lookupId to handle null and empty parameter

Author: Akumatic

components/ILIAS/WebServices/ECS/classes/Course/class.ilECSCmsCourseMemberCommandQueueHandler.php

@@ -301,7 +301,7 @@ protected function refreshAssignmentStatus(object $course_member, int $obj_id, ?
 
                     $this->log->debug('Local user assignment: ' . $usr_id . ' <-> ' . $login);
 
-                    if ($il_usr_id = ilObjUser::_lookupId($login)) {
+                    if ($il_usr_id = self::lookupUserIdByLogin($login)) {
                         // this removes also admin, tutor roles
                         $part->delete($il_usr_id);
                         $this->log->info('Deassigning user ' . $usr_id . ' ' . 'from course ' . ilObject::_lookupTitle($obj_id));
@@ -329,7 +329,7 @@ protected function refreshAssignmentStatus(object $course_member, int $obj_id, ?
             $this->log->info('Handling user ' . $person_id);
 
             if (in_array($person_id, $usr_ids, true)) {
-                if ($il_usr_id = ilObjUser::_lookupId($login)) {
+                if ($il_usr_id = self::lookupUserIdByLogin($login)) {
                     $this->log->info('Update user assignment for: ' . $person_id);
                     $part->updateRoleAssignments($il_usr_id, array($part->getAutoGeneratedRoleId($role)));
                 } elseif ($role_info['create']) {
@@ -339,13 +339,13 @@ protected function refreshAssignmentStatus(object $course_member, int $obj_id, ?
                         $this->mapping->getAuthMode(),
                         (string) $person_id
                     );
-                    if ($role && $il_usr_id = ilObjUser::_lookupId($login)) {
+                    if ($role && $il_usr_id = self::lookupUserIdByLogin($login)) {
                         $part->add($il_usr_id, $role);
                         $part->sendNotification(ilCourseMembershipMailNotification::TYPE_ADMISSION_MEMBER, $il_usr_id);
                     }
                 }
             } else {
-                if ($il_usr_id = ilObjUser::_lookupId($login)) {
+                if ($il_usr_id = self::lookupUserIdByLogin($login)) {
                     // user exists => assign to course/group
                     if ($role) {
                         // Assign user
@@ -364,7 +364,7 @@ protected function refreshAssignmentStatus(object $course_member, int $obj_id, ?
                         );
                     }
                     // Assign to role
-                    if ($role && $il_usr_id = ilObjUser::_lookupId($login)) {
+                    if ($role && $il_usr_id = self::lookupUserIdByLogin($login)) {
                         $this->log->info('Assigning new role to existing user ' . $person_id . ' ' . 'to ' . ilObject::_lookupTitle($obj_id) . ' using role: ' . $role);
                         $part->add($il_usr_id, $role);
                         $part->sendNotification(ilCourseMembershipMailNotification::TYPE_ADMISSION_MEMBER, $il_usr_id);
@@ -485,4 +485,20 @@ private function readCourse($course_member)
         }
         return (new ilECSCourseConnector($this->getServer()))->getCourse($ecs_id);
     }
+
+    /**
+     * Wrapper method to Lookup an user id by a login string.
+     *
+     * Returns null if $login is null, empty or no user can be found with the given name.
+     *
+     * @param string|null $login
+     * @return int|null
+     */
+    private function lookupUserIdByLogin(?string $login): ?int
+    {
+        if ($login === null || $login === '') {
+            return null;
+        }
+        return ilObjUser::_lookupId($login);
+    }
 }