Dev to main #1

Eclipse/Controllers/ContactController.cs

@@ -0,0 +1,72 @@
+using Eclipse.Middlewares;
+using Eclipse.Models;
+using Eclipse.Models.Dto;
+using Eclipse.Repositories.Interfaces;
+using Eclipse.Services.Interfaces;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Eclipse.Controllers;
+
+[Route("api/contact")]
+[ApiController]
+public class ContactController : ControllerBase
+{
+    private readonly IContactService _contactService;
+    private readonly IContactRepository _contactRepository;
+    private readonly string _successMessage = "Success";
+
+    public ContactController(IContactService contactService, IContactRepository contactRepository)
+    {
+        _contactService = contactService;
+        _contactRepository = contactRepository;
+    }
+    [Authorize]
+    [HttpGet]
+    public async Task<ApiResponse<List<ShortContactDto>?>> GetAllContacts([FromQuery] string? sortOrder = null)
+    {
+        var userIdClaim = User.FindFirst("UserId")?.Value;
+        if (userIdClaim == null) throw new UnauthorizedAccessException();
+
+        var userId = Guid.Parse(userIdClaim);
+
+        List<ShortContactDto>? contacts;
+
+        if (!string.IsNullOrWhiteSpace(sortOrder))
+        {
+            contacts = await _contactService.SortContactsByLastOnline(userId, sortOrder);
+        }
+        else
+        {
+            contacts = await _contactService.GetMappedListOfContacts(userId);
+        }
+
+        return new ApiResponse<List<ShortContactDto>?> { Message = "Success", Data = contacts };
+    }
+
+    [Authorize]
+    [HttpPost]
+    [Route("{contactId}/add")]
+    public async Task<ApiResponse<ShortContactDto>> AddContact(Guid contactId)
+    {
+        var userIdClaim = User.FindFirst("UserId");
+        if (userIdClaim is { Value: null }) throw new UnauthorizedAccessException();
+
+        var userId = Guid.Parse(userIdClaim.Value);
+        var newContact = await _contactService.MapResponseOfNewContact(userId, contactId);
+        return new ApiResponse<ShortContactDto>{ Message = _successMessage, Data = newContact };
+    }
+
+    [Authorize]
+    [HttpDelete]
+    [Route("{contactId}/remove")]
+    public async Task<ApiResponse<object>> RemoveContact(Guid contactId)
+    {
+        var userIdClaim = User.FindFirst("UserId");
+        if (userIdClaim is { Value: null }) throw new UnauthorizedAccessException();
+
+        var userId = Guid.Parse(userIdClaim.Value);
+        await _contactRepository.RemoveFromContacts(userId, contactId);
+        return new ApiResponse<object>{ Message = _successMessage, Data = null };
+    }
+}

Eclipse/Controllers/UserController.cs

@@ -51,7 +51,7 @@ public async Task<ApiResponse<UserProfileDto>> GetUserById(Guid userId)
 
     [Authorize]
     [HttpPut]
-    [Route("user/update/{userId:guid}")]
+    [Route("user/update")]
     public async Task<ApiResponse<User>> UpdateUserById(UserProfileDto userProfileDto)
     {
         var userIdClaim = User.FindFirst("UserId");

Eclipse/Data/AutoMapper.cs

@@ -12,5 +12,6 @@ public AutoMapper()
         CreateMap<User, RegisterDto>();
         CreateMap<User, UserInfoDto>();
         CreateMap<User, UserProfileDto>();
+        CreateMap<Contact, ShortContactDto>();
     }
 }

Eclipse/Eclipse.csproj

@@ -38,7 +38,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="Controllers\"/>
         <Folder Include="Migrations\"/>
     </ItemGroup>
 

Eclipse/Middlewares/LastSeenUpdateMiddleware.cs

@@ -0,0 +1,28 @@
+using System.Security.Claims;
+using Eclipse.Repositories.Interfaces;
+
+namespace Eclipse.Middlewares;
+
+public class LastSeenUpdateMiddleware
+{
+    private readonly RequestDelegate _next;
+
+    public LastSeenUpdateMiddleware(RequestDelegate next)
+    {
+        _next = next;
+    }
+
+    public async Task InvokeAsync(HttpContext context, IUserRepository userRepository)
+    {
+        if (context.User.Identity is { IsAuthenticated: true })
+        {
+            var userId = context.User.FindFirst("UserId")?.Value;
+            if (userId != null)
+            {
+                await userRepository.UpdateLastSeen(Guid.Parse(userId));
+            }
+        }
+
+        await _next(context);
+    }
+}

Eclipse/Migrations/20241022110720_Initial.cs → Eclipse/Migrations/20241111043045_Initial.cs

@@ -36,6 +36,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     Username = table.Column<string>(type: "text", nullable: false),
                     Phone = table.Column<string>(type: "text", nullable: false),
                     Pfp = table.Column<string>(type: "text", nullable: true),
+                    LastOnline = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
                     RegisteredAt = table.Column<DateTime>(type: "timestamp with time zone", nullable: false)
                 },
                 constraints: table =>

Eclipse/Migrations/AppDbContextModelSnapshot.cs

@@ -178,6 +178,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("character varying(100)");
 
+                    b.Property<DateTime>("LastOnline")
+                        .HasColumnType("timestamp with time zone");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasMaxLength(100)

Eclipse/Models/Dto/ShortContactDto.cs

@@ -0,0 +1,7 @@
+namespace Eclipse.Models.Dto;
+
+public class ShortContactDto
+{
+    public UserInfoDto User { get; set; }
+    public UserInfoDto Contact { get; set; }
+}

Eclipse/Models/User.cs

@@ -21,6 +21,6 @@ public class User
 
     public string Phone { get; set; }
     public string? Pfp { get; set; }
-
+    public DateTime LastOnline { get; set; }
     [DataType(DataType.DateTime)] public DateTime RegisteredAt { get; set; }
 }

Eclipse/Program.cs

@@ -24,6 +24,7 @@ public static void Main(string[] args)
         builder.Services.AddScoped<IUserRepository, UserRepository>();
         builder.Services.AddScoped<IUserService, UserService>();
         builder.Services.AddScoped<IContactRepository, ContactRepository>();
+        builder.Services.AddScoped<IContactService, ContactService>();
         builder.Services.AddControllers();
         builder.Services.AddEndpointsApiExplorer();
         builder.Services.AddSwaggerGen();
@@ -96,6 +97,7 @@ public static void Main(string[] args)
         app.UseAuthorization();
 
         app.UseMiddleware<ErrorHandlingMiddleware>();
+        app.UseMiddleware<LastSeenUpdateMiddleware>();
         app.UseCors("MyPolicy");
         app.MapControllers();
 

Eclipse/Repositories/ContactRepository.cs

@@ -21,6 +21,8 @@ public async Task<List<Contact>> AllContactsOfUser(Guid userId)
     {
         var contacts = await _context.Contacts
             .Where(c => c.UserId == userId)
+            .Include(c => c.User)
+            .Include(c => c.ContactUser)
             .ToListAsync();
         if (contacts.Count == 0)
         {

Eclipse/Repositories/Interfaces/IUserRepository.cs

@@ -10,4 +10,5 @@ public interface IUserRepository
     public Task<List<User>> GetAllUsers();
     public Task<User> UploadAvatar(Guid userId, string fileName);
     public Task<User?> UpdateUser(Guid userId, UserProfileDto userProfileDto);
+    public Task UpdateLastSeen(Guid userId);
 }

Eclipse/Repositories/UserRepository.cs

@@ -52,14 +52,22 @@ public async Task<List<User>> GetAllUsers()
     }
 
     public async Task<User> UploadAvatar(Guid userId, string fileName)
+    {
+        var user = await GetUserById(userId);
+        if (user == null) return null;
+        user.Pfp = fileName;
+        await _context.SaveChangesAsync();
+        return user;
+
+    }
+
+    public async Task UpdateLastSeen(Guid userId)
     {
         var user = await GetUserById(userId);
         if (user != null)
         {
-            user.Pfp = fileName;
-            await _context.SaveChangesAsync();
-            return user;
+            await _context.Users.Where(u=> u.Id == userId)
+                .ExecuteUpdateAsync(s => s.SetProperty(u => u.LastOnline, DateTime.UtcNow));
         }
-        return null;
     }
 }

Eclipse/Services/ContactService.cs

@@ -0,0 +1,45 @@
+using AutoMapper;
+using Eclipse.Models;
+using Eclipse.Models.Dto;
+using Eclipse.Repositories.Interfaces;
+using Eclipse.Services.Interfaces;
+
+namespace Eclipse.Services;
+
+public class ContactService : IContactService
+{
+    private readonly IContactRepository _contactRepository;
+    private readonly IMapper _mapper;
+
+    public ContactService(IContactRepository contactRepository, IMapper mapper)
+    {
+        _contactRepository = contactRepository;
+        _mapper = mapper;
+    }
+
+    public async Task<List<ShortContactDto>?> SortContactsByLastOnline(Guid userId, string sortOrder = "desc")
+    {
+        var contacts = await _contactRepository.AllContactsOfUser(userId);
+        IEnumerable<Contact> sortedContactsQuery = sortOrder
+            .Equals("asc", StringComparison.CurrentCultureIgnoreCase)
+            ? contacts
+                .OrderBy(c => c.User.LastOnline)
+            : contacts
+                .OrderByDescending(c => c.User.LastOnline);
+        var sortedContacts = sortedContactsQuery.ToList();
+        return _mapper.Map<List<ShortContactDto>>(sortedContacts);
+    }
+
+
+    public async Task<List<ShortContactDto>?> GetMappedListOfContacts(Guid userId)
+    {
+        var contacts = await _contactRepository.AllContactsOfUser(userId);
+        return _mapper.Map<List<ShortContactDto>>(contacts);
+    }
+
+    public async Task<ShortContactDto> MapResponseOfNewContact(Guid userId, Guid contactId)
+    {
+        var newContact = await _contactRepository.AddToContacts(userId, contactId);
+        return _mapper.Map<ShortContactDto>(newContact);
+    }
+}

Eclipse/Services/Interfaces/IContactService.cs

@@ -0,0 +1,10 @@
+using Eclipse.Models.Dto;
+
+namespace Eclipse.Services.Interfaces;
+
+public interface IContactService
+{
+    public Task<List<ShortContactDto>?> SortContactsByLastOnline(Guid userId, string sortOrder = "desc");
+    public Task<List<ShortContactDto>?> GetMappedListOfContacts(Guid userId);
+    public Task<ShortContactDto> MapResponseOfNewContact(Guid userId, Guid contactId);
+}