Merge pull request #24 from Team-Kaleidoscope/feature/profile_picture_implementation

- Removed InsertProfilePicture from Service layer (unneeded)
- ReadProfilePicture endpoint implemented

4 files changed, 57 insertions, 25 deletions

diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
index a0d0979..20b66e1 100644
--- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
+++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureDependencyInjection.cs
@@ -17,20 +17,22 @@ namespace DevHive.Web.Configurations.Extensions
 			services.AddTransient<ILanguageRepository, LanguageRepository>();
 			services.AddTransient<IRoleRepository, RoleRepository>();
 			services.AddTransient<ITechnologyRepository, TechnologyRepository>();
-			services.AddTransient<IUserRepository, UserRepository>();
 			services.AddTransient<IPostRepository, PostRepository>();
 			services.AddTransient<ICommentRepository, CommentRepository>();
 			services.AddTransient<IFeedRepository, FeedRepository>();
 			services.AddTransient<IRatingRepository, RatingRepository>();
+			services.AddTransient<IProfilePictureRepository, ProfilePictureRepository>();
+			services.AddTransient<IUserRepository, UserRepository>();
 
 			services.AddTransient<ILanguageService, LanguageService>();
 			services.AddTransient<IRoleService, RoleService>();
 			services.AddTransient<ITechnologyService, TechnologyService>();
-			services.AddTransient<IUserService, UserService>();
 			services.AddTransient<IPostService, PostService>();
 			services.AddTransient<ICommentService, CommentService>();
 			services.AddTransient<IFeedService, FeedService>();
 			services.AddTransient<IRatingService, RatingService>();
+			services.AddTransient<IProfilePictureService, ProfilePictureService>();
+			services.AddTransient<IUserService, UserService>();
 
 			services.AddTransient<ICloudService, CloudinaryService>(options =>
 				new CloudinaryService(
@@ -43,7 +45,6 @@ namespace DevHive.Web.Configurations.Extensions
 					signingKey: Encoding.ASCII.GetBytes(configuration.GetSection("Jwt").GetSection("signingKey").Value),
 					validationIssuer: configuration.GetSection("Jwt").GetSection("validationIssuer").Value,
 					audience: configuration.GetSection("Jwt").GetSection("audience").Value));
-			services.AddTransient<IRatingService, RatingService>();
 		}
 	}
 }
diff --git a/src/Web/DevHive.Web/Configurations/Mapping/ProfilePictureMappings.cs b/src/Web/DevHive.Web/Configurations/Mapping/ProfilePictureMappings.cs
new file mode 100644
index 0000000..8c12a20
--- /dev/null
+++ b/src/Web/DevHive.Web/Configurations/Mapping/ProfilePictureMappings.cs
@@ -0,0 +1,16 @@
+using System;
+using AutoMapper;
+using DevHive.Web.Models.ProfilePicture;
+using DevHive.Services.Models.ProfilePicture;
+
+namespace DevHive.Web.Configurations.Mapping
+{
+	public class ProfilePictureMappings : Profile
+	{
+		public ProfilePictureMappings()
+		{
+			CreateMap<ProfilePictureWebModel, ProfilePictureServiceModel>()
+				.ForMember(dest => dest.ProfilePictureFormFile, src => src.MapFrom(p => p.Picture));
+		}
+	}
+}
diff --git a/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs
index 14aaa3a..dabec93 100644
--- a/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs
+++ b/src/Web/DevHive.Web/Configurations/Mapping/UserMappings.cs
@@ -23,9 +23,6 @@ namespace DevHive.Web.Configurations.Mapping
 			CreateMap<UsernameWebModel, FriendServiceModel>();
 			CreateMap<UsernameWebModel, UpdateFriendServiceModel>();
 
-			CreateMap<UpdateProfilePictureWebModel, UpdateProfilePictureServiceModel>();
-			CreateMap<ProfilePictureServiceModel, ProfilePictureWebModel>();
-
 			CreateMap<UpdateUserServiceModel, UpdateUserWebModel>();
 			CreateMap<FriendServiceModel, UsernameWebModel>();
 		}
diff --git a/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs b/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs
index 2eec99e..9a76e2c 100644
--- a/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs
+++ b/src/Web/DevHive.Web/Controllers/ProfilePictureController.cs
@@ -1,8 +1,12 @@
 using System;
 using System.Threading.Tasks;
-using DevHive.Web.Models.User;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using DevHive.Services.Interfaces;
+using DevHive.Services.Models.ProfilePicture;
+using DevHive.Common.Jwt.Interfaces;
+using AutoMapper;
+using DevHive.Web.Models.ProfilePicture;
 
 namespace DevHive.Web.Controllers
 {
@@ -13,36 +17,50 @@ namespace DevHive.Web.Controllers
 	[Route("api/[controller]")]
 	public class ProfilePictureController
 	{
-		// private readonly ProfilePictureService _profilePictureService;
+		private readonly IProfilePictureService _profilePictureService;
+		private readonly IJwtService _jwtService;
+		private readonly IMapper _profilePictureMapper;
 
-		// public ProfilePictureController(ProfilePictureService profilePictureService)
-		// {
-		// 	this._profilePictureService = profilePictureService;
-		// }
+		public ProfilePictureController(IProfilePictureService profilePictureService, IJwtService jwtService, IMapper profilePictureMapper)
+		{
+			this._profilePictureService = profilePictureService;
+			this._jwtService = jwtService;
+			this._profilePictureMapper = profilePictureMapper;
+		}
+
+		/// <summary>
+		/// Get the URL of user's profile picture
+		/// </summary>
+		/// <param name="profilePictureId">The profile picture's Id</param>
+		/// <param name="authorization">JWT Bearer Token</param>
+		/// <returns>The URL of the profile picture</returns>
+		[HttpGet]
+		[AllowAnonymous]
+		public async Task<IActionResult> ReadProfilePicture(Guid profilePictureId, [FromHeader] string authorization)
+		{
+			string profilePicURL = await this._profilePictureService.GetProfilePictureById(profilePictureId);
+			return new OkObjectResult(new { ProfilePictureURL = profilePicURL} );
+		}
 
 		/// <summary>
 		/// Alter the profile picture of a user
 		/// </summary>
 		/// <param name="userId">The user's Id</param>
-		/// <param name="updateProfilePictureWebModel">The new profile picture</param>
+		/// <param name="profilePictureWebModel">The new profile picture</param>
 		/// <param name="authorization">JWT Bearer Token</param>
-		/// <returns>???</returns>
+		/// <returns>The URL of the new profile picture</returns>
 		[HttpPut]
-		[Route("ProfilePicture")]
 		[Authorize(Roles = "User,Admin")]
-		public async Task<IActionResult> UpdateProfilePicture(Guid userId, [FromForm] UpdateProfilePictureWebModel updateProfilePictureWebModel, [FromHeader] string authorization)
+		public async Task<IActionResult> UpdateProfilePicture(Guid userId, [FromForm] ProfilePictureWebModel profilePictureWebModel, [FromHeader] string authorization)
 		{
-			throw new NotImplementedException();
-			// if (!await this._userService.ValidJWT(userId, authorization))
-			// 	return new UnauthorizedResult();
-
-			// UpdateProfilePictureServiceModel updateProfilePictureServiceModel = this._userMapper.Map<UpdateProfilePictureServiceModel>(updateProfilePictureWebModel);
-			// updateProfilePictureServiceModel.UserId = userId;
+			if (!this._jwtService.ValidateToken(userId, authorization))
+				return new UnauthorizedResult();
 
-			// ProfilePictureServiceModel profilePictureServiceModel = await this._userService.UpdateProfilePicture(updateProfilePictureServiceModel);
-			// ProfilePictureWebModel profilePictureWebModel = this._userMapper.Map<ProfilePictureWebModel>(profilePictureServiceModel);
+			ProfilePictureServiceModel profilePictureServiceModel = this._profilePictureMapper.Map<ProfilePictureServiceModel>(profilePictureWebModel);
+			profilePictureServiceModel.UserId = userId;
 
-			// return new AcceptedResult("UpdateProfilePicture", profilePictureWebModel);
+			string url = await this._profilePictureService.UpdateProfilePicture(profilePictureServiceModel);
+			return new OkObjectResult(new { URL = url });
 		}
 	}
 }