Merge pull request #11 from brunohbrito/dev

Dev

Author: brunobritodev

appveyor.yml

@@ -1,10 +1,11 @@
-version: 1.0.{build}
+version: 1.2.{build}
 image: Visual Studio 2017
 branches:
   only:
   - master
 pull_requests:
   do_not_increment_build_number: true
+
 init:
   # Good practice, because Windows line endings are different from Unix/Linux ones
   - cmd: git config --global core.autocrlf true
@@ -13,5 +14,9 @@ before_build:
   - cmd: dotnet --version
   # Display minimal restore text
   - cmd: dotnet restore ./src --verbosity m
+
 build_script:
-  - cmd: dotnet build ./src
+  - cmd: dotnet build ./src
+
+test_script:
+  - cmd: dotnet test ./src

azure-pipelines.yml

@@ -12,3 +12,7 @@ variables:
 steps:
 - script: dotnet build ./src --configuration $(buildConfiguration)
   displayName: 'dotnet build $(buildConfiguration)'
+  
+- script: dotnet test ./src
+  displayName: 'Running tests'
+

build/docker-compose.yml

@@ -31,6 +31,9 @@ services:
             CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
             ASPNETCORE_ENVIRONMENT: "Development"
             ASPNETCORE_URLS: http://+:5000
+            DEFAULT_USER: bruno
+            DEFAULT_PASS: Pa$$word123
+            DEFAULT_EMAIL: [email protected]
 
     # #############################
     # # Management API

build/jpproject-docker-windows.zip

@@ -30,10 +30,13 @@ services:
         depends_on:
             - jpdatabase
         environment: 
-            DATABASE_TYPE: "SqlServer"
-            CUSTOMCONNSTR_DATABASE_CONNECTION: "Data Source=tcp:capturadb.database.windows.net,1433;Initial Catalog=homolog_jpproject;User Id=bruno@capturadb.database.windows.net;Password=8BIaspVxw1vOgSIDKdIn;"
+            DATABASE_TYPE: "MySql"
+            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
             ASPNETCORE_ENVIRONMENT: "Development"
             ASPNETCORE_URLS: http://+:5000
+            DEFAULT_USER: bruno
+            DEFAULT_PASS: Pa$$word123
+            DEFAULT_EMAIL: [email protected]
 
     # #############################
     # # Management API
@@ -48,8 +51,8 @@ services:
         depends_on:
             - jpdatabase
         environment: 
-            DATABASE_TYPE: "SqlServer"
-            CUSTOMCONNSTR_DATABASE_CONNECTION: "Data Source=tcp:capturadb.database.windows.net,1433;Initial Catalog=homolog_jpproject;User Id=bruno@capturadb.database.windows.net;Password=8BIaspVxw1vOgSIDKdIn;"
+            DATABASE_TYPE: "MySql"
+            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
             ASPNETCORE_ENVIRONMENT: "Development"
             AUTHORITY: "http://jpproject:5000"
             ASPNETCORE_URLS: http://+

docker-compose.yml

@@ -40,7 +40,7 @@ public ViewModelToDomainMappingProfile()
              */
             CreateMap<UserViewModel, UpdateProfileCommand>().ConstructUsing(c => new UpdateProfileCommand(c.Id, c.Url, c.Bio, c.Company, c.JobTitle, c.Name, c.PhoneNumber));
             CreateMap<UserViewModel, UpdateUserCommand>().ConstructUsing(c => new UpdateUserCommand(c.Email, c.UserName, c.Name, c.PhoneNumber, c.EmailConfirmed, c.PhoneNumberConfirmed, c.TwoFactorEnabled, c.LockoutEnd, c.LockoutEnabled, c.AccessFailedCount));
-            CreateMap<ProfilePictureViewModel, UpdateProfilePictureCommand>().ConstructUsing(c => new UpdateProfilePictureCommand(c.Id));
+            CreateMap<ProfilePictureViewModel, UpdateProfilePictureCommand>().ConstructUsing(c => new UpdateProfilePictureCommand(c.Id, c.Picture));
             CreateMap<ChangePasswordViewModel, ChangePasswordCommand>().ConstructUsing(c => new ChangePasswordCommand(c.Id, c.OldPassword, c.NewPassword, c.ConfirmPassword));
             CreateMap<SetPasswordViewModel, SetPasswordCommand>().ConstructUsing(c => new SetPasswordCommand(c.Id, c.NewPassword, c.ConfirmPassword));
             CreateMap<RemoveAccountViewModel, RemoveAccountCommand>().ConstructUsing(c => new RemoveAccountCommand(c.Id));

src/Backend/Jp.Application/AutoMapper/ViewModelToDomainMappingProfile.cs

@@ -52,8 +52,8 @@ public Task UpdateProfile(UserViewModel model)
 
         public async Task UpdateProfilePicture(ProfilePictureViewModel model)
         {
+            model.Picture = await _imageStorage.SaveAsync(model);
             var updateCommand = _mapper.Map<UpdateProfilePictureCommand>(model);
-            updateCommand.Picture = await _imageStorage.SaveAsync(model);
             await Bus.SendCommand(updateCommand);
         }
 

src/Backend/Jp.Application/Services/UserManagerAppService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using Newtonsoft.Json;
 
 namespace Jp.Application.ViewModels
 {
@@ -13,5 +14,7 @@ public class ProfilePictureViewModel
         public string Value { get; set; }
 
         public Guid? Id { get; set; }
+        [JsonIgnore]
+        public string Picture { get; set; }
     }
 }

src/Backend/Jp.Application/ViewModels/FileUpload.cs

@@ -39,15 +39,14 @@ public async Task<bool> Handle(RegisterNewUserCommand request, CancellationToken
                 return false;
             }
 
-            var user = new User()
-            {
-                Email = request.Email,
-                Name = request.Name,
-                UserName = request.Username,
-                PhoneNumber = request.PhoneNumber,
-                Picture = request.Picture
-            };
-
+            var user = new User(
+                id: Guid.NewGuid(),
+                email: request.Email,
+                name: request.Name,
+                userName: request.Username,
+                phoneNumber: request.PhoneNumber,
+                picture: request.Picture
+            );
             var id = await _userService.CreateUserWithPass(user, request.Password);
             if (id.HasValue)
             {
@@ -65,16 +64,14 @@ public async Task<bool> Handle(RegisterNewUserWithoutPassCommand request, Cancel
                 return false; ;
             }
 
-            var user = new User()
-            {
-                Id = Guid.NewGuid(),
-                Email = request.Email,
-                Name = request.Name,
-                UserName = request.Username,
-                PhoneNumber = request.PhoneNumber,
-                Picture = request.Picture
-            };
-
+            var user = new User(
+                id: Guid.NewGuid(),
+                email: request.Email,
+                name: request.Name,
+                userName: request.Username,
+                phoneNumber: request.PhoneNumber,
+                picture: request.Picture
+            );
             var id = await _userService.CreateUserWithProvider(user, request.Provider, request.ProviderId);
             if (id.HasValue)
             {
@@ -92,14 +89,14 @@ public async Task<bool> Handle(RegisterNewUserWithProviderCommand request, Cance
                 return false; ;
             }
 
-            var user = new User()
-            {
-                Email = request.Email,
-                Name = request.Name,
-                UserName = request.Username,
-                PhoneNumber = request.PhoneNumber,
-                Picture = request.Picture
-            };
+            var user = new User(
+                id: Guid.NewGuid(),
+                email: request.Email,
+                name: request.Name,
+                userName: request.Username,
+                phoneNumber: request.PhoneNumber,
+                picture: request.Picture);
+
             var id = await _userService.CreateUserWithProviderAndPass(user, request.Password, request.Provider, request.ProviderId);
             if (id.HasValue)
             {

src/Backend/Jp.Domain/CommandHandlers/UserCommandHandler.cs

@@ -140,15 +140,7 @@ public async Task<bool> Handle(UpdateUserCommand request, CancellationToken canc
                 await Bus.RaiseEvent(new DomainNotification("1", "User not found"));
                 return false;
             }
-            user.Email = request.Email;
-            user.EmailConfirmed = request.EmailConfirmed;
-            user.AccessFailedCount = request.AccessFailedCount;
-            user.LockoutEnabled = request.LockoutEnabled;
-            user.LockoutEnd = request.LockoutEnd;
-            user.Name = request.Name;
-            user.TwoFactorEnabled = request.TwoFactorEnabled;
-            user.PhoneNumber = request.PhoneNumber;
-            user.PhoneNumberConfirmed = request.PhoneNumberConfirmed;
+            user.UpdateInfo(request);
             await _userService.UpdateUserAsync(user);
 
             return true;