Fix UploadAvatarPortraitAsync: try username then email then id

Author: dellams

OASIS Architecture/NextGenSoftware.OASIS.API.Core/Managers/AvatarManager/AvatarManager-Portrait.cs

@@ -116,15 +116,15 @@ public async Task<OASISResult<bool>> UploadAvatarPortraitAsync(Guid avatarId, st
                     return result;
                 }
 
-                if (avatarId != Guid.Empty)
-                    avatarDetailResult = await LoadAvatarDetailAsync(avatarId);
-
-                if ((avatarDetailResult == null || avatarDetailResult.IsError || avatarDetailResult.Result == null) && !string.IsNullOrEmpty(username))
+                if (!string.IsNullOrEmpty(username))
                     avatarDetailResult = await LoadAvatarDetailByUsernameAsync(username);
 
                 if ((avatarDetailResult == null || avatarDetailResult.IsError || avatarDetailResult.Result == null) && !string.IsNullOrEmpty(email))
                     avatarDetailResult = await LoadAvatarDetailByEmailAsync(email);
 
+                if ((avatarDetailResult == null || avatarDetailResult.IsError || avatarDetailResult.Result == null) && avatarId != Guid.Empty)
+                    avatarDetailResult = await LoadAvatarDetailAsync(avatarId);
+
                 if (avatarDetailResult != null && !avatarDetailResult.IsError && avatarDetailResult.Result != null)
                 {
                     avatarDetailResult.Result.Portrait = imageBase64;