🐛 Mobile | Fix camera button not showing on profile (#654)

* Fix camera not showing * Add Image Name to UploadProfilePic * Fix ProfilePics Upload --------- Co-authored-by: Tylah Kapa <[email protected]>
SSWConsulting · Feb 9, 2024 · 92b9070 · 92b9070
1 parent 028a7b1
commit 92b9070
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 24 deletions.
diff --git a/src/ApiClient/Services/IUserService.cs b/src/ApiClient/Services/IUserService.cs
@@ -7,7 +7,8 @@ public interface IUserService
 {
     Task DeleteMyProfile(CancellationToken cancellationToken = default);
 
-    Task<ProfilePicResponseDto> UploadProilePic(Stream file, CancellationToken cancellationToken = default);
+    Task<ProfilePicResponseDto> UploadProfilePic(Stream file, string fileName,
+        CancellationToken cancellationToken = default);
 
     Task<CurrentUserDto> GetCurrentUser(CancellationToken cancellationToken = default);
 
@@ -44,12 +45,12 @@ public async Task DeleteMyProfile(CancellationToken cancellationToken = default)
         throw new Exception($"Failed to delete my profile: {responseContent}");
     }
 
-    public async Task<ProfilePicResponseDto> UploadProilePic(Stream file, CancellationToken cancellationToken = default)
+    public async Task<ProfilePicResponseDto> UploadProfilePic(Stream file, string fileName,
+        CancellationToken cancellationToken = default)
     {
-        var content = new MultipartFormDataContent();
-        content.Add(new StreamContent(file), "file", "file");
+        var content = Helpers.ProcessImageContent(file, fileName);
 
-        var result = await _httpClient.PostAsync($"{_baseRoute}/UploadProfilePic", content, cancellationToken);
+        var result = await _httpClient.PostAsync($"{_baseRoute}UploadProfilePic", content, cancellationToken);
 
         if  (result.IsSuccessStatusCode)
         {
@@ -160,4 +161,23 @@ public async Task<UserRewardsViewModel> GetUserRewards(int userId, CancellationT
 
         throw new Exception($"Failed to get user rewards: {responseContent}");
     }
+
+    // public async Task<NewUsersViewModel> GetNewUsers(LeaderboardFilter filter, bool filterStaff = false, CancellationToken cancellationToken = default)
+    // {
+    //     var result = await _httpClient.GetAsync($"{_baseRoute}/NewUsers?filter={filter}&filterStaff={filterStaff}");
+    //     
+    //     if  (result.IsSuccessStatusCode)
+    //     {
+    //         var response = await result.Content.ReadFromJsonAsync<NewUsersViewModel>(cancellationToken: cancellationToken);
+    //
+    //         if (response is not null)
+    //         {
+    //             return response;
+    //         }
+    //     }
+    //
+    //     var responseContent = await result.Content.ReadAsStringAsync(cancellationToken);
+    //
+    //     throw new Exception($"Failed to get user rewards: {responseContent}");
+    // }
 }
diff --git a/src/Infrastructure/Services/ProfilePicStorageProvider.cs b/src/Infrastructure/Services/ProfilePicStorageProvider.cs
@@ -6,7 +6,7 @@ public class ProfilePicStorageProvider : IProfilePicStorageProvider
 {
     private readonly IStorageProvider _storageProvider;
 
-    private const string CONTAINER_NAME = "ProfilePics";
+    private const string CONTAINER_NAME = "profilepics";
 
     public ProfilePicStorageProvider(IStorageProvider storageProvider)
     {

diff --git a/src/MobileUI/Controls/ProfileStats.xaml b/src/MobileUI/Controls/ProfileStats.xaml
@@ -77,7 +77,7 @@
         TranslationY="-35"
         StrokeShape="Ellipse"
         StrokeThickness="0"
-        IsVisible="{Binding ShowCamera}">
+        IsVisible="{Binding IsMe}">
         <Border.GestureRecognizers>
             <TapGestureRecognizer Command="{Binding CameraCommand}"/>
         </Border.GestureRecognizers>

diff --git a/src/MobileUI/Services/IUserService.cs b/src/MobileUI/Services/IUserService.cs
@@ -26,7 +26,7 @@ public interface IUserService
     Task<IEnumerable<Reward>> GetRewardsAsync();
     Task<IEnumerable<Reward>> GetRewardsAsync(int userId);
     Task<ImageSource> GetAvatarAsync(string url);
-    Task<string> UploadImageAsync(Stream image);
+    Task<string> UploadImageAsync(Stream image, string fileName);
 
 
     Task<bool> DeleteProfileAsync();

diff --git a/src/MobileUI/Services/UserService.cs b/src/MobileUI/Services/UserService.cs
@@ -69,9 +69,9 @@ public string MyProfilePic
 
     public bool IsStaff { get => !string.IsNullOrWhiteSpace(MyQrCode); }
 
-    public async Task<string> UploadImageAsync(Stream image)
+    public async Task<string> UploadImageAsync(Stream image, string fileName)
     {
-        var response = await _userClient.UploadProilePic(image);
+        var response = await _userClient.UploadProfilePic(image, fileName);
 
         Preferences.Set(nameof(MyProfilePic), response.PicUrl);
 

diff --git a/src/MobileUI/ViewModels/CameraPageViewModel.cs b/src/MobileUI/ViewModels/CameraPageViewModel.cs
@@ -139,7 +139,7 @@ public async Task UploadProfilePic()
     {
         IsUploading = true;
         var imageStream = await _imageFile.OpenReadAsync();
-        await _userService.UploadImageAsync(imageStream);
+        await _userService.UploadImageAsync(imageStream, _imageFile.FileName);
         await MopupService.Instance.PopAllAsync();
     }
 }
diff --git a/src/MobileUI/ViewModels/ProfileViewModels/MyProfileViewModel.cs b/src/MobileUI/ViewModels/ProfileViewModels/MyProfileViewModel.cs
@@ -34,7 +34,7 @@ public async Task Initialise()
             });
         }
 
-        _isMe = true;
+        IsMe = true;
 
         var profilePic = _userService.MyProfilePic;
 

diff --git a/src/MobileUI/ViewModels/ProfileViewModels/OthersProfileViewModel.cs b/src/MobileUI/ViewModels/ProfileViewModels/OthersProfileViewModel.cs
@@ -20,7 +20,7 @@ public async Task Initialise()
             });
         }
 
-        _isMe = false;
+        IsMe = false;
 
         await _initialise();
     }

diff --git a/src/MobileUI/ViewModels/ProfileViewModels/ProfileViewModelBase.cs b/src/MobileUI/ViewModels/ProfileViewModels/ProfileViewModelBase.cs
@@ -38,7 +38,8 @@ public partial class ProfileViewModelBase : BaseViewModel, IRecipient<Achievemen
     [ObservableProperty]
     private bool _isLoading;
 
-    public bool ShowCamera => _isMe && !IsLoading;
+    [ObservableProperty]
+    private bool _isMe;
 
     public ObservableCollection<ProfileCarouselViewModel> ProfileSections { get; set; } = new ObservableCollection<ProfileCarouselViewModel>();
 
@@ -50,8 +51,6 @@ public partial class ProfileViewModelBase : BaseViewModel, IRecipient<Achievemen
 
     public bool ShowPopButton { get; set; } = false;
 
-    protected bool _isMe;
-
     protected double _topRewardCost;
 
     private readonly SemaphoreSlim _loadingProfileSectionsSemaphore = new(1,1);
@@ -129,15 +128,15 @@ protected async Task _initialise()
 
     private void ProcessAchievement(ProfileAchievement achievement)
     {
-        if (achievement.IsMe == _isMe)
+        if (achievement.IsMe == IsMe)
         {
             if (achievement.Complete)
             {
                 ShowAchievementSnackbar(achievement);
             }
             else
             {
-                if (achievement.Type == AchievementType.Linked && _isMe)
+                if (achievement.Type == AchievementType.Linked && IsMe)
                 {
                     var popup = new LinkSocial(achievement);
                     MopupService.Instance.PushAsync(popup);
@@ -152,6 +151,9 @@ private void ProcessAchievement(ProfileAchievement achievement)
 
     private async Task ShowCameraPageAsync()
     {
+        if (IsLoading)
+            return;
+
         var popup = new CameraPage(new CameraPageViewModel(_userService));
         //App.Current.MainPage.ShowPopup(popup);
         await MopupService.Instance.PushAsync(popup);
@@ -188,7 +190,7 @@ protected async Task LoadProfileSections()
 
         foreach (var achievement in profileAchievements)
         {
-            achivementsSection.Achievements.Add(achievement.ToProfileAchievement(_isMe));
+            achivementsSection.Achievements.Add(achievement.ToProfileAchievement(IsMe));
         }
 
         ProfileSections.Add(achivementsSection);
@@ -197,7 +199,7 @@ protected async Task LoadProfileSections()
 
         var activitySection = new ProfileCarouselViewModel();
         activitySection.Type = CarouselType.RecentActivity;
-        activitySection.IsMe = _isMe;
+        activitySection.IsMe = IsMe;
         activitySection.ProfileName = Name;
 
         var activityList = new List<Activity>();
@@ -234,7 +236,7 @@ protected async Task LoadProfileSections()
 
         // ===== Notifications =====
 
-        if (_isMe)
+        if (IsMe)
         {
             var notificationsSection = new ProfileCarouselViewModel();
             notificationsSection.Type = CarouselType.Notifications;
@@ -287,7 +289,7 @@ private async void ShowAchievementSnackbar(ProfileAchievement achievement)
 
     public string GetMessage(Achievement achievement, bool IsActivity = false)
     {
-        string prefix = _isMe ? "You have" : $"{Name} has";
+        string prefix = IsMe ? "You have" : $"{Name} has";
 
         if (!achievement.Complete)
         {

diff --git a/src/WebAPI/Controllers/UserController.cs b/src/WebAPI/Controllers/UserController.cs
@@ -47,9 +47,15 @@ public async Task<ActionResult<UserAchievementsViewModel>> ProfileAchievements([
     }
 
     [HttpPost]
-    public async Task<ActionResult<ProfilePicResponseDto>> UploadProfilePic(Stream file)
+    public async Task<ActionResult<ProfilePicResponseDto>> UploadProfilePic()
     {
-        return Ok(await Mediator.Send(new UploadProfilePicCommand { File = file }));
+        var file = HttpContext.Request.Form.Files["file"];
+        if (file == null || file.Length == 0)
+        {
+            return BadRequest("No file received");
+        }
+
+        return Ok(await Mediator.Send(new UploadProfilePicCommand { File = file.OpenReadStream() }));
     }
 
     [HttpGet]
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ public async Task Initialise() @@
                 });
             }
-            _isMe = true;
+            IsMe = true;
             var profilePic = _userService.MyProfilePic;
@@ Expand Down @@