AH-16 API image upload

API/Controllers/AccountController.cs

@@ -18,7 +18,7 @@ public class AccountController(UserManager<User> userManager, TokenService token
     [HttpPost("login")]
     public async Task<ActionResult<AuthUserDto>> Login(LoginDto loginDto)
     {
-        var user = await userManager.FindByEmailAsync(loginDto.Email);
+        var user = await userManager.Users.Include(p => p.Photos).FirstOrDefaultAsync(u => u.Email == loginDto.Email);
 
         if (user == null) return Unauthorized();
 
@@ -65,7 +65,7 @@ public async Task<ActionResult<AuthUserDto>> Register(RegisterDto registerDto)
     [HttpGet]
     public async Task<ActionResult<AuthUserDto>> GetCurrentUser()
     {
-        var user = await userManager.FindByEmailAsync(User.FindFirstValue(ClaimTypes.Email));
+        var user = await userManager.Users.Include(p => p.Photos).FirstOrDefaultAsync(u => u.Email == User.FindFirstValue(ClaimTypes.Email));
 
         return CreateUserObject(user);
     }
@@ -75,7 +75,7 @@ private AuthUserDto CreateUserObject(User user)
         return new AuthUserDto
         {
             DisplayName = user.DisplayName,
-            Image = null,
+            Image = user.Photos.FirstOrDefault(x => x.IsMain)?.Url,
             Token = tokenService.CreateToken(user),
             Username = user.UserName
         };

API/Controllers/PhotosController.cs

@@ -0,0 +1,27 @@
+using Application.Features.Photos.Commands.AddPhoto;
+using Application.Features.Photos.Commands.DeletePhoto;
+using Application.Features.Photos.Commands.SetMainPhoto;
+using Microsoft.AspNetCore.Mvc;
+
+namespace API.Controllers;
+
+public class PhotosController : BaseApiController
+{
+    [HttpPost]
+    public async Task<IActionResult> Add([FromForm] AddPhotoCommand command)
+    {
+        return HandleResult(await Mediator.Send(command));
+    }
+
+    [HttpDelete("{id}")]
+    public async Task<IActionResult> Delete(string id)
+    {
+        return HandleResult(await Mediator.Send(new DeletePhotoCommand { Id = id }));
+    }
+
+    [HttpPost("{id}/setMain")]
+    public async Task<IActionResult> SetMain(string id)
+    {
+        return HandleResult(await Mediator.Send(new SetMainPhotoCommand { Id = id }));
+    }
+}

API/Controllers/ProfilesController.cs

@@ -0,0 +1,13 @@
+using Application.Features.Profiles.Queries.GetProfile;
+using Microsoft.AspNetCore.Mvc;
+
+namespace API.Controllers;
+
+public class ProfilesController : BaseApiController
+{
+    [HttpGet("{username}")]
+    public async Task<IActionResult> GetProfile(string username)
+    {
+        return HandleResult(await Mediator.Send(new GetProfileQuery { Username = username }));
+    }
+}

API/Extensions/ApplicationServiceExtensions.cs

@@ -4,6 +4,7 @@
 using Application.Interfaces;
 using FluentValidation;
 using FluentValidation.AspNetCore;
+using Infrastructure.Photos;
 using Infrastructure.Security;
 using Microsoft.EntityFrameworkCore;
 using Persistence;
@@ -26,6 +27,8 @@ public static IServiceCollection AddApplicationServices(this IServiceCollection
         services.AddValidatorsFromAssemblyContaining<CreateActivityValidator>();
         services.AddHttpContextAccessor();
         services.AddScoped<IUserAccessor, UserAccessor>();
+        services.AddScoped<IPhotoAccessor, PhotoAccessor>();
+        services.Configure<CloudinarySettings>(config.GetSection("Cloudinary"));
 
         return services;
     }

Application/Application.csproj

@@ -13,6 +13,9 @@
 
     <ItemGroup>
         <Folder Include="Features\Attendance\Queries\"/>
+        <Folder Include="Features\Photos\Queries\"/>
+        <Folder Include="Features\Profiles\Commands\"/>
+        <Folder Include="Photos\"/>
     </ItemGroup>
 
     <PropertyGroup>

Application/Core/MappingProfiles.cs

@@ -1,4 +1,5 @@
 using Application.Features.Activities.Contracts;
+using Application.Features.Attendance.Contracts;
 using AutoMapper;
 using Domain.Entities;
 
@@ -14,9 +15,13 @@ public MappingProfiles()
             .ForMember(d => d.HostUsername, o => o.MapFrom(s => s.Attendees
                 .FirstOrDefault(x => x.IsHost).User.UserName));
 
-        CreateMap<ActivityAttendee, Profiles.Profile>()
+        CreateMap<ActivityAttendee, AttendeeDto>()
             .ForMember(d => d.DisplayName, o => o.MapFrom(s => s.User.DisplayName))
             .ForMember(d => d.Username, o => o.MapFrom(s => s.User.UserName))
-            .ForMember(d => d.Bio, o => o.MapFrom(s => s.User.Bio));
+            .ForMember(d => d.Bio, o => o.MapFrom(s => s.User.Bio))
+            .ForMember(d => d.Image, o => o.MapFrom(s => s.User.Photos.FirstOrDefault(x => x.IsMain).Url));
+
+        CreateMap<User, Features.Profiles.Contracts.Profile>()
+            .ForMember(d => d.Image, s => s.MapFrom(o => o.Photos.FirstOrDefault(x => x.IsMain).Url));
     }
 }

Application/Features/Activities/Contracts/ActivityDto.cs

@@ -1,4 +1,6 @@
-using Application.Profiles;
+using Application.Features.Attendance.Contracts;
+using Application.Features.Profiles;
+using Application.Features.Profiles.Contracts;
 
 namespace Application.Features.Activities.Contracts;
 
@@ -13,5 +15,5 @@ public class ActivityDto
     public string Venue { get; set; }
     public string HostUsername { get; set; }
     public bool IsCancelled { get; set; }
-    public ICollection<Profile> Attendees { get; set; }
+    public ICollection<AttendeeDto> Attendees { get; set; }
 }

Application/Profiles/Profile.cs → Application/Features/Attendance/Contracts/AttendeeDto.cs

@@ -1,6 +1,6 @@
-namespace Application.Profiles;
+namespace Application.Features.Attendance.Contracts;
 
-public class Profile
+public class AttendeeDto
 {
     public string Username { get; set; }
     public string DisplayName { get; set; }

Application/Features/Photos/Commands/AddPhoto/AddPhotoCommand.cs

@@ -0,0 +1,11 @@
+using Application.Core;
+using Domain.Entities;
+using MediatR;
+using Microsoft.AspNetCore.Http;
+
+namespace Application.Features.Photos.Commands.AddPhoto;
+
+public class AddPhotoCommand : IRequest<Result<Photo>>
+{
+    public IFormFile File { get; set; }
+}

Application/Features/Photos/Commands/AddPhoto/AddPhotoHandler.cs

@@ -0,0 +1,36 @@
+using Application.Core;
+using Application.Interfaces;
+using Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Persistence;
+
+namespace Application.Features.Photos.Commands.AddPhoto;
+
+public class AddPhotoHandler(DataContext context, IPhotoAccessor photoAccessor, IUserAccessor userAccessor)
+    : IRequestHandler<AddPhotoCommand, Result<Photo>>
+{
+    public async Task<Result<Photo>> Handle(AddPhotoCommand request, CancellationToken cancellationToken)
+    {
+        var user = await context.Users.Include(p => p.Photos)
+            .FirstOrDefaultAsync(x => x.UserName == userAccessor.GetUsername());
+
+        if (user == null) return null;
+
+        var photoUploadResult = await photoAccessor.AddPhoto(request.File);
+
+        var photo = new Photo
+        {
+            Url = photoUploadResult.Url,
+            Id = photoUploadResult.PublicId
+        };
+
+        if (!user.Photos.Any(x => x.IsMain)) photo.IsMain = true;
+
+        user.Photos.Add(photo);
+
+        var result = await context.SaveChangesAsync() > 0;
+
+        return result ? Result<Photo>.Success(photo) : Result<Photo>.Failure("Problem adding photo");
+    }
+}

Application/Features/Photos/Commands/AddPhoto/PhotoUploadResult.cs

@@ -0,0 +1,7 @@
+namespace Application.Features.Photos.Commands.AddPhoto;
+
+public class PhotoUploadResult
+{
+    public string PublicId { get; set; }
+    public string Url { get; set; }
+}

Application/Features/Photos/Commands/DeletePhoto/DeletePhotoCommand.cs

@@ -0,0 +1,9 @@
+using Application.Core;
+using MediatR;
+
+namespace Application.Features.Photos.Commands.DeletePhoto;
+
+public class DeletePhotoCommand : IRequest<Result<Unit>>
+{
+    public string Id { get; set; }
+}

Application/Features/Photos/Commands/DeletePhoto/DeletePhotoHandler.cs

@@ -0,0 +1,35 @@
+using Application.Core;
+using Application.Features.Photos.Commands.AddPhoto;
+using Application.Interfaces;
+using Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Persistence;
+
+namespace Application.Features.Photos.Commands.DeletePhoto;
+
+public class DeletePhotoHandler(DataContext context, IPhotoAccessor photoAccessor, IUserAccessor userAccessor)
+    : IRequestHandler<DeletePhotoCommand, Result<Unit>>
+{
+    public async Task<Result<Unit>> Handle(DeletePhotoCommand request, CancellationToken cancellationToken)
+    {
+        var user = await context.Users.Include(p => p.Photos)
+            .FirstOrDefaultAsync(x => x.UserName == userAccessor.GetUsername());
+
+        var photo = user.Photos.FirstOrDefault(x => x.Id == request.Id);
+
+        if (photo == null) return null;
+
+        if (photo.IsMain) return Result<Unit>.Failure("You cannot delete your main photo");
+
+        var result = await photoAccessor.DeletePhoto(photo.Id);
+
+        if (result == null) return Result<Unit>.Failure("Problem deleting photo");
+
+        user.Photos.Remove(photo);
+
+        var success = await context.SaveChangesAsync() > 0;
+
+        return success ? Result<Unit>.Success(Unit.Value) : Result<Unit>.Failure("Problem deleting photo");
+    }
+}

Application/Features/Photos/Commands/SetMainPhoto/SetMainPhotoCommand.cs

@@ -0,0 +1,9 @@
+using Application.Core;
+using MediatR;
+
+namespace Application.Features.Photos.Commands.SetMainPhoto;
+
+public class SetMainPhotoCommand : IRequest<Result<Unit>>
+{
+    public string Id { get; set; }
+}

Application/Features/Photos/Commands/SetMainPhoto/SetMainPhotoHandler.cs

@@ -0,0 +1,31 @@
+using Application.Core;
+using Application.Interfaces;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Persistence;
+
+namespace Application.Features.Photos.Commands.SetMainPhoto;
+
+public class SetMainPhotoHandler(DataContext context, IUserAccessor userAccessor)
+    : IRequestHandler<SetMainPhotoCommand, Result<Unit>>
+{
+    public async Task<Result<Unit>> Handle(SetMainPhotoCommand request, CancellationToken cancellationToken)
+    {
+        var user = await context.Users
+            .Include(p => p.Photos)
+            .FirstOrDefaultAsync(x => x.UserName == userAccessor.GetUsername());
+
+        var photo = user.Photos.FirstOrDefault(x => x.Id == request.Id);
+
+        if (photo == null) return null;
+
+        var currentMain = user.Photos.FirstOrDefault(x => x.IsMain);
+
+        if (currentMain != null) currentMain.IsMain = false;
+
+        photo.IsMain = true;
+        var success = await context.SaveChangesAsync() > 0;
+
+        return success ? Result<Unit>.Success(Unit.Value) : Result<Unit>.Failure("Problem setting main photo");
+    }
+}

Application/Features/Profiles/Contracts/Profile.cs

@@ -0,0 +1,12 @@
+using Domain.Entities;
+
+namespace Application.Features.Profiles.Contracts;
+
+public class Profile
+{
+    public string Username { get; set; }
+    public string DisplayName { get; set; }
+    public string Bio { get; set; }
+    public string Image { get; set; }
+    public ICollection<Photo> Photos { get; set; }
+}

Application/Features/Profiles/Queries/GetProfile/GetProfileHandler.cs

@@ -0,0 +1,21 @@
+using Application.Core;
+using AutoMapper;
+using AutoMapper.QueryableExtensions;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Persistence;
+using Profile = Application.Features.Profiles.Contracts.Profile;
+
+namespace Application.Features.Profiles.Queries.GetProfile;
+
+public class GetProfileHandler(DataContext context, IMapper mapper) : IRequestHandler<GetProfileQuery, Result<Profile>>
+{
+    public async Task<Result<Profile>> Handle(GetProfileQuery request, CancellationToken cancellationToken)
+    {
+        var user = await context.Users
+            .ProjectTo<Profile>(mapper.ConfigurationProvider)
+            .SingleOrDefaultAsync(x => x.Username == request.Username);
+
+        return Result<Profile>.Success(user);
+    }
+}

Application/Features/Profiles/Queries/GetProfile/GetProfileQuery.cs

@@ -0,0 +1,10 @@
+using Application.Core;
+using Application.Features.Profiles.Contracts;
+using MediatR;
+
+namespace Application.Features.Profiles.Queries.GetProfile;
+
+public class GetProfileQuery : IRequest<Result<Profile>>
+{
+    public string Username { get; set; }
+}

Application/Interfaces/IPhotoAccessor.cs

@@ -0,0 +1,10 @@
+using Application.Features.Photos.Commands.AddPhoto;
+using Microsoft.AspNetCore.Http;
+
+namespace Application.Interfaces;
+
+public interface IPhotoAccessor
+{
+    Task<PhotoUploadResult> AddPhoto(IFormFile file);
+    Task<string> DeletePhoto(string publicId);
+}

Domain/Entities/Photo.cs

@@ -0,0 +1,8 @@
+namespace Domain.Entities;
+
+public class Photo
+{
+    public string Id { get; set; }
+    public string Url { get; set; }
+    public bool IsMain { get; set; }
+}

Domain/Entities/User.cs

@@ -7,4 +7,5 @@ public class User : IdentityUser
     public string DisplayName { get; set; }
     public string Bio { get; set; }
     public ICollection<ActivityAttendee> Activities { get; set; }
+    public ICollection<Photo> Photos { get; set; }
 }

Infrastructure/Infrastructure.csproj

@@ -4,6 +4,10 @@
         <ProjectReference Include="..\Application\Application.csproj"/>
     </ItemGroup>
 
+    <ItemGroup>
+        <PackageReference Include="CloudinaryDotNet" Version="1.26.2"/>
+    </ItemGroup>
+
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>

Infrastructure/Photos/CloudinarySettings.cs

@@ -0,0 +1,8 @@
+namespace Infrastructure.Photos;
+
+public class CloudinarySettings
+{
+    public string CloudName { get; set; }
+    public string ApiKey { get; set; }
+    public string ApiSecret { get; set; }
+}