Merge branch 'master' of git.ozg-sh.de:mgm/goofy

goofy-client/libs/user-profile-shared/src/lib/user-profile.util.spec.ts

@@ -7,20 +7,20 @@ describe('UserProfileUtil', () => {
 
 	describe('existsName', () => {
 
-		it('should return true if only firstName exists', () => {
-			const exists: boolean = existsName({ ...createUserProfileResource(), lastName: null });
+		it.each([null, EMPTY_STRING])('should return true if only firstName exists and lastName has value %s', (value: null | string) => {
+			const exists: boolean = existsName({ ...createUserProfileResource(), lastName: value });
 
 			expect(exists).toBeTruthy();
 		})
 
-		it('should return true if only lastName exists', () => {
-			const exists: boolean = existsName({ ...createUserProfileResource(), firstName: null });
+		it.each([null, EMPTY_STRING])('should return true if only lastName exists and firstName has value %s', (value: null | string) => {
+			const exists: boolean = existsName({ ...createUserProfileResource(), firstName: value });
 
 			expect(exists).toBeTruthy();
 		})
 
-		it('should return false if either firstName nor lastName exists', () => {
-			const exists: boolean = existsName({ ...createUserProfileResource(), firstName: null, lastName: null });
+		it.each([null, EMPTY_STRING])('should return false if either firstName nor lastName exists', (value: null | string) => {
+			const exists: boolean = existsName({ ...createUserProfileResource(), firstName: value, lastName: value });
 
 			expect(exists).toBeFalsy();
 		})

goofy-client/libs/user-profile-shared/src/lib/user-profile.util.ts

-import { EMPTY_STRING, getFirstLetter, getStringValue, isNotNull } from '@goofy-client/tech-shared';
+import { EMPTY_STRING, getFirstLetter, getStringValue, isNotEmpty, isNotNull } from '@goofy-client/tech-shared';
 import { isNull } from 'lodash-es';
 import { UserProfileResource } from './user-profile.model';
 
@@ -6,7 +6,7 @@ export const NO_NAME_MESSAGE: string = 'Benutzer ohne hinterlegtem Namen';
 export const UNKNOWN_USER: string = 'Unbekannter Benutzer';
 
 export function existsName(userProfile: UserProfileResource): boolean {
-	return isNotNull(userProfile.firstName) || isNotNull(userProfile.lastName);
+	return (isNotEmpty(userProfile.firstName) && isNotNull(userProfile.firstName)) || (isNotEmpty(userProfile.lastName) && isNotNull(userProfile.lastName));
 }
 
 export function getUserName(userProfile: UserProfileResource): string {