Merge pull request #452 from MangoInstantMessenger/settings-bugfix

kolosovpetro · web-flow · commit 3c0643586a0d · 2023-03-18T20:31:24.000+01:00
Settings bugfix
diff --git a/MangoAPI.BusinessLogic/ApiCommands/Users/UpdatePersonalInformationCommand.cs b/MangoAPI.BusinessLogic/ApiCommands/Users/UpdatePersonalInformationCommand.cs
@@ -10,4 +10,4 @@ public record UpdatePersonalInformationCommand(
         string LinkedIn,
         string Facebook,
         string Twitter)
-    : IRequest<Result<ResponseBase>>;
+    : IRequest<Result<UpdatePersonalInformationResponse>>;
diff --git a/MangoAPI.BusinessLogic/ApiCommands/Users/UpdatePersonalInformationCommandHandler.cs b/MangoAPI.BusinessLogic/ApiCommands/Users/UpdatePersonalInformationCommandHandler.cs
@@ -1,54 +1,78 @@
-﻿using System.Threading;
+﻿using MangoAPI.Application.Interfaces;
+using MangoAPI.BusinessLogic.Models;
+using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.Responses;
 using MangoAPI.Domain.Constants;
 using MangoAPI.Infrastructure.Database;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
+using System.Globalization;
 
 namespace MangoAPI.BusinessLogic.ApiCommands.Users;
 
 public class UpdatePersonalInformationCommandHandler
-    : IRequestHandler<UpdatePersonalInformationCommand, Result<ResponseBase>>
+    : IRequestHandler<UpdatePersonalInformationCommand, Result<UpdatePersonalInformationResponse>>
 {
     private readonly MangoDbContext dbContext;
-    private readonly ResponseFactory<ResponseBase> responseFactory;
+    private readonly ResponseFactory<UpdatePersonalInformationResponse> responseFactory;
+    private readonly IBlobServiceSettings blobServiceSettings;
 
     public UpdatePersonalInformationCommandHandler(
         MangoDbContext dbContext,
-        ResponseFactory<ResponseBase> responseFactory)
+        ResponseFactory<UpdatePersonalInformationResponse> responseFactory,
+        IBlobServiceSettings blobServiceSettings)
     {
         this.dbContext = dbContext;
         this.responseFactory = responseFactory;
+        this.blobServiceSettings = blobServiceSettings;
     }
 
-    public async Task<Result<ResponseBase>> Handle(
+    public async Task<Result<UpdatePersonalInformationResponse>> Handle(
         UpdatePersonalInformationCommand request,
         CancellationToken cancellationToken)
     {
-        var personalInformation = await dbContext.PersonalInformation
-            .FirstOrDefaultAsync(
-                entity => entity.UserId == request.UserId,
-                cancellationToken);
+        var user = await dbContext.Users.AsNoTracking()
+            .Include(x => x.PersonalInformation)
+            .FirstOrDefaultAsync(x => x.Id == request.UserId, cancellationToken);
 
-        if (personalInformation == null)
+        if (user == null)
         {
             const string errorMessage = ResponseMessageCodes.UserNotFound;
             var details = ResponseMessageCodes.ErrorDictionary[errorMessage];
 
             return responseFactory.ConflictResponse(errorMessage, details);
         }
 
-        personalInformation.UpdateSocialInformation(
+        user.PersonalInformation.UpdateSocialInformation(
             request.Facebook,
             request.Twitter,
             request.Instagram,
             request.LinkedIn);
 
-        dbContext.PersonalInformation.Update(personalInformation);
+        dbContext.PersonalInformation.Update(user.PersonalInformation);
 
         await dbContext.SaveChangesAsync(cancellationToken);
 
-        return responseFactory.SuccessResponse(ResponseBase.SuccessResponse);
+        var userDto = new User
+        {
+            UserId = user.Id,
+            DisplayName = user.DisplayName,
+            DisplayNameColour = user.DisplayNameColour,
+            Address = user.Address,
+            Birthday = user.Birthday?.ToString("yyyy-MM-dd", CultureInfo.CurrentCulture),
+            Website = user.Website,
+            Facebook = user.PersonalInformation.Facebook,
+            Twitter = user.PersonalInformation.Twitter,
+            Instagram = user.PersonalInformation.Instagram,
+            LinkedIn = user.PersonalInformation.LinkedIn,
+            Username = user.Username,
+            Bio = user.Bio,
+            PictureUrl = $"{blobServiceSettings.MangoBlobAccess}/{user.ImageFileName}",
+        };
+
+        var response = UpdatePersonalInformationResponse.FromSuccess(userDto);
+
+        return responseFactory.SuccessResponse(response);
     }
 }
diff --git a/MangoAPI.BusinessLogic/ApiCommands/Users/UpdatePersonalInformationResponse.cs b/MangoAPI.BusinessLogic/ApiCommands/Users/UpdatePersonalInformationResponse.cs
@@ -0,0 +1,20 @@
+﻿using MangoAPI.BusinessLogic.Models;
+using MangoAPI.BusinessLogic.Responses;
+using MangoAPI.Domain.Constants;
+
+namespace MangoAPI.BusinessLogic.ApiCommands.Users;
+
+public record UpdatePersonalInformationResponse : ResponseBase
+{
+    public User User { get; init; }
+
+    public static UpdatePersonalInformationResponse FromSuccess(User user)
+    {
+        var response = new UpdatePersonalInformationResponse
+        {
+            Message = ResponseMessageCodes.Success, Success = true, User = user,
+        };
+
+        return response;
+    }
+}
diff --git a/MangoAPI.BusinessLogic/ApiCommands/Users/UpdateUserAccountInfoCommand.cs b/MangoAPI.BusinessLogic/ApiCommands/Users/UpdateUserAccountInfoCommand.cs
@@ -12,4 +12,4 @@ public record UpdateUserAccountInfoCommand(
         string Bio,
         string Address,
         DateTime? Birthday)
-    : IRequest<Result<ResponseBase>>;
+    : IRequest<Result<UpdateUserAccountInfoResponse>>;
diff --git a/MangoAPI.BusinessLogic/ApiCommands/Users/UpdateUserAccountInfoCommandHandler.cs b/MangoAPI.BusinessLogic/ApiCommands/Users/UpdateUserAccountInfoCommandHandler.cs
@@ -1,4 +1,6 @@
-﻿using System.Linq;
+﻿using MangoAPI.Application.Interfaces;
+using MangoAPI.BusinessLogic.Models;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MangoAPI.BusinessLogic.Responses;
@@ -7,28 +9,34 @@
 using MangoAPI.Infrastructure.Database;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
+using System.Globalization;
 
 namespace MangoAPI.BusinessLogic.ApiCommands.Users;
 
 public class
-    UpdateUserAccountInfoCommandHandler : IRequestHandler<UpdateUserAccountInfoCommand, Result<ResponseBase>>
+    UpdateUserAccountInfoCommandHandler : IRequestHandler<UpdateUserAccountInfoCommand,
+        Result<UpdateUserAccountInfoResponse>>
 {
     private readonly MangoDbContext dbContext;
-    private readonly ResponseFactory<ResponseBase> responseFactory;
+    private readonly ResponseFactory<UpdateUserAccountInfoResponse> responseFactory;
+    private readonly IBlobServiceSettings blobServiceSettings;
 
     public UpdateUserAccountInfoCommandHandler(
         MangoDbContext dbContext,
-        ResponseFactory<ResponseBase> responseFactory)
+        ResponseFactory<UpdateUserAccountInfoResponse> responseFactory,
+        IBlobServiceSettings blobServiceSettings)
     {
         this.dbContext = dbContext;
         this.responseFactory = responseFactory;
+        this.blobServiceSettings = blobServiceSettings;
     }
 
-    public async Task<Result<ResponseBase>> Handle(
+    public async Task<Result<UpdateUserAccountInfoResponse>> Handle(
         UpdateUserAccountInfoCommand request,
         CancellationToken cancellationToken)
     {
         var user = await dbContext.Users
+            .Include(x => x.PersonalInformation)
             .FirstOrDefaultAsync(x => x.Id == request.UserId, cancellationToken);
 
         if (user is null)
@@ -71,6 +79,26 @@ public async Task<Result<ResponseBase>> Handle(
 
         await dbContext.SaveChangesAsync(cancellationToken);
 
-        return responseFactory.SuccessResponse(ResponseBase.SuccessResponse);
+        var userDto = new User
+        {
+            UserId = user.Id,
+            DisplayName = user.DisplayName,
+            DisplayNameColour = user.DisplayNameColour,
+            Address = user.Address,
+            Birthday = user.Birthday?.ToString("yyyy-MM-dd", CultureInfo.CurrentCulture),
+            Website = user.Website,
+            Facebook = user.PersonalInformation?.Facebook,
+            Twitter = user.PersonalInformation?.Twitter,
+            Instagram = user.PersonalInformation?.Instagram,
+            LinkedIn = user.PersonalInformation?.LinkedIn,
+            Username = user.Username,
+            Bio = user.Bio,
+            PictureUrl = $"{blobServiceSettings.MangoBlobAccess}/{user.ImageFileName}",
+        };
+
+        var response = UpdateUserAccountInfoResponse.FromSuccess(userDto);
+        var result = responseFactory.SuccessResponse(response);
+
+        return result;
     }
 }
diff --git a/MangoAPI.BusinessLogic/ApiCommands/Users/UpdateUserAccountInfoResponse.cs b/MangoAPI.BusinessLogic/ApiCommands/Users/UpdateUserAccountInfoResponse.cs
@@ -0,0 +1,20 @@
+﻿using MangoAPI.BusinessLogic.Models;
+using MangoAPI.BusinessLogic.Responses;
+using MangoAPI.Domain.Constants;
+
+namespace MangoAPI.BusinessLogic.ApiCommands.Users;
+
+public record UpdateUserAccountInfoResponse : ResponseBase
+{
+    public User User { get; init; }
+
+    public static UpdateUserAccountInfoResponse FromSuccess(User user)
+    {
+        var response = new UpdateUserAccountInfoResponse
+        {
+            Message = ResponseMessageCodes.Success, Success = true, User = user,
+        };
+
+        return response;
+    }
+}
diff --git a/MangoAPI.Client/src/app/components/settings/settings.component.html b/MangoAPI.Client/src/app/components/settings/settings.component.html
@@ -312,7 +312,7 @@ <h5 class="mb-2">Avatar</h5>
         </div>
         <div class="profile-form-footer gap-fix">
           <button class="button-dark" (click)="clearProfilePictureFile()">Reset</button>
-          <button class="button-orange" (click)="onSaveChangesUpdateProfilePictureClick()">
+          <button class="button-orange" (click)="onSaveProfilePictureClick()">
             Save Changes
           </button>
         </div>
diff --git a/MangoAPI.Client/src/app/components/settings/settings.component.ts b/MangoAPI.Client/src/app/components/settings/settings.component.ts
@@ -19,6 +19,8 @@ import { GetUserResponse } from '../../types/responses/GetUserResponse';
 import { GetAppInfoResponse } from '../../types/responses/GetAppInfoResponse';
 import { BaseResponse } from '../../types/responses/BaseResponse';
 import { SettingsHelper } from './settings.helper';
+import { UpdatePersonalInformationResponse } from '../../types/responses/UpdatePersonalInformationResponse';
+import { UpdateUserAccountInfoResponse } from '../../types/responses/UpdateUserAccountInfoResponse';
 
 @Component({
   selector: 'app-settings',
@@ -63,8 +65,6 @@ export class SettingsComponent implements OnInit {
 
     const getUserInfoResponse = await firstValueFrom<GetUserResponse>(getUserInfoSub$);
 
-    // console.log(JSON.stringify(getUserInfoResponse.user));
-
     this.currentUser = getUserInfoResponse.user;
 
     this.currentUserForUpdating = { ...getUserInfoResponse.user };
@@ -106,14 +106,31 @@ export class SettingsComponent implements OnInit {
 
     const updateUserInfoSub$ = this._usersService.updateUserAccountInformation(command);
 
-    const response = await firstValueFrom<BaseResponse>(updateUserInfoSub$);
+    const response = await firstValueFrom<UpdateUserAccountInfoResponse>(updateUserInfoSub$);
+
+    this.currentUser = response.user;
+
+    alert(response.message);
+  }
+
+  async onSavePersonalInformationClick() {
+    const command: UpdatePersonalInformationCommand = {
+      facebook: this.currentUserForUpdating.facebook,
+      twitter: this.currentUserForUpdating.twitter,
+      instagram: this.currentUserForUpdating.instagram,
+      linkedIn: this.currentUserForUpdating.linkedIn
+    };
+
+    const saveSocialsSub$ = this._usersService.updateUserSocials(command);
+
+    const response = await firstValueFrom<UpdatePersonalInformationResponse>(saveSocialsSub$);
 
-    this.currentUser = { ...this.currentUserForUpdating };
+    this.currentUser = response.user;
 
     alert(response.message);
   }
 
-  async onSaveChangesUpdateProfilePictureClick() {
+  async onSaveProfilePictureClick() {
     const tokens = this._tokensService.getTokens();
 
     if (!tokens) {
@@ -131,19 +148,24 @@ export class SettingsComponent implements OnInit {
     const file = this.file as File;
     formData.append('pictureFile', file);
 
-    const updateProfileImage$ = this._usersService.updateProfilePicture(formData);
+    try {
+      const updateProfileImage$ = this._usersService.updateProfilePicture(formData);
 
-    const result = await firstValueFrom<UpdateProfilePictureResponse>(updateProfileImage$);
+      const result = await firstValueFrom<UpdateProfilePictureResponse>(updateProfileImage$);
 
-    alert(result.message);
+      alert(result.message);
 
-    this.currentUser.pictureUrl = result.newUserPictureUrl;
+      this.currentUser.pictureUrl = result.newUserPictureUrl;
 
-    tokens.userProfilePictureUrl = result.newUserPictureUrl;
+      tokens.userProfilePictureUrl = result.newUserPictureUrl;
 
-    this._tokensService.setTokens(tokens);
+      this._tokensService.setTokens(tokens);
 
-    this.clearProfilePictureFile();
+      this.clearProfilePictureFile();
+    } catch (e) {
+      this._errorNotificationService.notifyOnError(e);
+      this.clearProfilePictureFile();
+    }
   }
 
   async onSaveChangesChangePasswordClick() {
@@ -174,21 +196,6 @@ export class SettingsComponent implements OnInit {
     alert(response.message);
   }
 
-  async onSavePersonalInformationClick() {
-    const command: UpdatePersonalInformationCommand = {
-      facebook: this.currentUserForUpdating.facebook,
-      twitter: this.currentUserForUpdating.twitter,
-      instagram: this.currentUserForUpdating.instagram,
-      linkedIn: this.currentUserForUpdating.linkedIn
-    };
-
-    const saveSocialsSub$ = this._usersService.updateUserSocials(command);
-
-    const response = await firstValueFrom<BaseResponse>(saveSocialsSub$);
-
-    alert(response.message);
-  }
-
   onUpdateProfilePictureChange(event: any): void {
     const file: File = event.currentTarget.files[0];
 
diff --git a/MangoAPI.Client/src/app/services/api/users.service.ts b/MangoAPI.Client/src/app/services/api/users.service.ts
@@ -11,6 +11,8 @@ import { ChangePasswordCommand } from '../../types/requests/ChangePasswordComman
 import { UpdateProfilePictureResponse } from '../../types/responses/UpdateProfilePictureResponse';
 import { TokensResponse } from 'src/app/types/responses/TokensResponse';
 import ApiBaseService from './api-base.service';
+import { UpdatePersonalInformationResponse } from '../../types/responses/UpdatePersonalInformationResponse';
+import { UpdateUserAccountInfoResponse } from '../../types/responses/UpdateUserAccountInfoResponse';
 
 @Injectable({
   providedIn: 'root'
@@ -25,8 +27,13 @@ export class UsersService extends ApiBaseService {
   }
 
   // PUT /api/users/socials
-  updateUserSocials(request: UpdatePersonalInformationCommand): Observable<BaseResponse> {
-    return this.httpClient.put<BaseResponse>(this.baseUrl + this.usersRoute + 'socials/', request);
+  updateUserSocials(
+    request: UpdatePersonalInformationCommand
+  ): Observable<UpdatePersonalInformationResponse> {
+    return this.httpClient.put<UpdatePersonalInformationResponse>(
+      this.baseUrl + this.usersRoute + 'socials/',
+      request
+    );
   }
 
   // GET /api/users/{userId}
@@ -40,8 +47,10 @@ export class UsersService extends ApiBaseService {
   }
 
   // PUT /api/users/account
-  updateUserAccountInformation(request: UpdateAccountInformationCommand): Observable<BaseResponse> {
-    return this.httpClient.put<SearchContactsResponse>(
+  updateUserAccountInformation(
+    request: UpdateAccountInformationCommand
+  ): Observable<UpdateUserAccountInfoResponse> {
+    return this.httpClient.put<UpdateUserAccountInfoResponse>(
       this.baseUrl + this.usersRoute + 'account/',
       request
     );
diff --git a/MangoAPI.Client/src/app/types/responses/UpdatePersonalInformationResponse.ts b/MangoAPI.Client/src/app/types/responses/UpdatePersonalInformationResponse.ts
@@ -0,0 +1,6 @@
+import { BaseResponse } from './BaseResponse';
+import { User } from '../models/User';
+
+export interface UpdatePersonalInformationResponse extends BaseResponse {
+  user: User;
+}
diff --git a/MangoAPI.Client/src/app/types/responses/UpdateUserAccountInfoResponse.ts b/MangoAPI.Client/src/app/types/responses/UpdateUserAccountInfoResponse.ts
@@ -0,0 +1,6 @@
+import { BaseResponse } from './BaseResponse';
+import { User } from '../models/User';
+
+export interface UpdateUserAccountInfoResponse extends BaseResponse {
+  user: User;
+}
diff --git a/MangoAPI.IntegrationTests/ApiCommandsTests/UpdateUserAccountInfoCommandHandlerTests/UpdateUserAccountInfoTestShouldThrowUserNotFound.cs b/MangoAPI.IntegrationTests/ApiCommandsTests/UpdateUserAccountInfoCommandHandlerTests/UpdateUserAccountInfoTestShouldThrowUserNotFound.cs
diff --git a/MangoAPI.IntegrationTests/ApiCommandsTests/UpdateUserAccountInfoCommandHandlerTests/UpdateUserAccountInfoTestSuccess.cs b/MangoAPI.IntegrationTests/ApiCommandsTests/UpdateUserAccountInfoCommandHandlerTests/UpdateUserAccountInfoTestSuccess.cs
diff --git a/MangoAPI.IntegrationTests/ApiCommandsTests/UpdateUserSocialsInformationCommandHandlerTests/UpdatePersonalInformationTestShouldThrowUserNotFound.cs b/MangoAPI.IntegrationTests/ApiCommandsTests/UpdateUserSocialsInformationCommandHandlerTests/UpdatePersonalInformationTestShouldThrowUserNotFound.cs
diff --git a/MangoAPI.IntegrationTests/ApiCommandsTests/UpdateUserSocialsInformationCommandHandlerTests/UpdatePersonalInformationTestSuccess.cs b/MangoAPI.IntegrationTests/ApiCommandsTests/UpdateUserSocialsInformationCommandHandlerTests/UpdatePersonalInformationTestSuccess.cs
diff --git a/MangoAPI.sln.DotSettings b/MangoAPI.sln.DotSettings
