feat: new endpoint for messages for artist requests.

src/comissions.app.api/ApplicationDbContext.cs

@@ -48,5 +48,6 @@ public class ApplicationDbContext:DbContext
     public DbSet<Request> Requests { get; set; }= null!;
     public DbSet<RequestReference> RequestReferences { get; set; }= null!;
     public DbSet<RequestAsset> RequestAssets { get; set; }= null!;
+    public DbSet<ArtistRequestMessage> ArtistRequestMessages { get; set; }= null!;
     #endregion
 }

src/comissions.app.api/Controllers/ArtistAccessRequestController.cs

@@ -0,0 +1,128 @@
+using comissions.app.api.Extensions;
+using comissions.app.api.Models.PortfolioModel;
+using comissions.app.api.Models.Artist;
+using comissions.app.api.Models.ArtistRequest;
+using comissions.app.api.Services.Payment;
+using comissions.app.api.Services.Storage;
+using comissions.app.database;
+using comissions.app.database.Entities;
+using comissions.app.database.Models;
+using comissions.app.database.Models.Request;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using Novu;
+using Novu.DTO.Events;
+
+namespace comissions.app.api.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+public class ArtistAccessRequestController : Controller
+{
+    private readonly ApplicationDbContext _dbContext;
+    private readonly IStorageService _storageService;
+    private readonly IPaymentService _paymentService;
+    private readonly NovuClient _client;
+
+    public ArtistAccessRequestController(ApplicationDbContext dbContext, IPaymentService paymentService, IStorageService storageService, NovuClient client)
+    {
+        _client = client;
+        _paymentService = paymentService;
+        _storageService = storageService;
+        _dbContext = dbContext;
+    }
+    
+    [HttpPost]
+    [Authorize("write:artist")]
+    public async Task<IActionResult> RequestArtist([FromBody] string message)
+    {
+        var userId = User.GetUserId();
+        
+        var existingArtist = await _dbContext.UserArtists.FirstOrDefaultAsync(Artist=>Artist.UserId==userId);
+        if (existingArtist != null)
+        {
+            return Unauthorized();
+        }
+        
+        var artistRequest = await _dbContext.ArtistRequests.FirstOrDefaultAsync(request=>request.UserId==userId);
+        if (artistRequest != null)
+            return Ok(artistRequest.ToModel());
+        
+        artistRequest = new ArtistRequest()
+        {
+            Accepted = false,
+            Message = message,
+            RequestDate = DateTime.UtcNow,
+            UserId = userId
+        };
+                
+        _dbContext.ArtistRequests.Add(artistRequest);
+        await _dbContext.SaveChangesAsync();
+        return Ok(artistRequest.ToModel());
+    }   
+    
+    [HttpGet]
+    [Authorize("read:artist")]
+    public async Task<IActionResult> GetRequest()
+    {
+        var userId = User.GetUserId();
+        var existingArtist = await _dbContext.UserArtists.FirstOrDefaultAsync(Artist=>Artist.UserId==userId);
+        if (existingArtist != null)
+        {
+            return Unauthorized();
+        }
+        
+        var artistRequest = await _dbContext.ArtistRequests.FirstOrDefaultAsync(request=>request.UserId==userId);
+        if (artistRequest == null)
+            return NotFound();
+        
+        return Ok(artistRequest.ToModel());
+    }
+    
+    [HttpPost]
+    [Authorize("write:artist")]
+    [Route("Messages")]
+    public async Task<IActionResult> AddMessage([FromBody] string message)
+    {
+        var userId = User.GetUserId();
+        var existingArtist = await _dbContext.UserArtists.FirstOrDefaultAsync(Artist=>Artist.UserId==userId);
+        if (existingArtist != null)
+        {
+            return Unauthorized();
+        }
+        
+        var artistRequest = await _dbContext.ArtistRequests.FirstOrDefaultAsync(request=>request.UserId==userId);
+        if (artistRequest == null)
+            return NotFound();
+
+        var newMessage = new ArtistRequestMessage()
+        {
+            UserId = userId,
+            Message = message,
+            SentDate = DateTime.UtcNow
+        };
+        artistRequest.ArtistRequestMessages.Add(newMessage);
+        await _dbContext.SaveChangesAsync();
+        return Ok(artistRequest.ToModel());
+    }
+    
+    [HttpGet]
+    [Authorize("read:artist")]
+    [Route("Messages")]
+    public async Task<IActionResult> GetMessages()
+    {
+        var userId = User.GetUserId();
+        var existingArtist = await _dbContext.UserArtists.FirstOrDefaultAsync(Artist=>Artist.UserId==userId);
+        if (existingArtist != null)
+        {
+            return Unauthorized();
+        }
+        var artistRequest = await _dbContext.ArtistRequests.FirstOrDefaultAsync(request=>request.UserId==userId);
+        if (artistRequest == null)
+            return NotFound();
+        var result = artistRequest.ArtistRequestMessages.Select(x => x.ToModel()).ToList();
+        return Ok(result);
+    }
+}

src/comissions.app.api/Controllers/ArtistController.cs

@@ -118,35 +118,4 @@ public class ArtistController : Controller
         var result = ArtistRequest.ToModel();
         return Ok(result);
     }
-    
-    
-    [HttpPost]
-    [Authorize("write:artist")]
-    public async Task<IActionResult> RequestArtist([FromBody] string message)
-    {
-        var userId = User.GetUserId();
-        
-        var existingArtist = await _dbContext.UserArtists.FirstOrDefaultAsync(Artist=>Artist.UserId==userId);
-        if (existingArtist != null)
-        {
-            return Unauthorized();
-        }
-        
-        var ArtistRequest = await _dbContext.ArtistRequests.FirstOrDefaultAsync(request=>request.UserId==userId);
-        if (ArtistRequest != null)
-            return Ok(ArtistRequest.ToModel());
-        
-        ArtistRequest = new ArtistRequest()
-        {
-            Accepted = false,
-            Message = message,
-            RequestDate = DateTime.UtcNow,
-            UserId = userId
-        };
-                
-        _dbContext.ArtistRequests.Add(ArtistRequest);
-        await _dbContext.SaveChangesAsync();
-        return Ok();
-    }   
-    
 }

src/comissions.app.api/Entities/ArtistRequest.cs

@@ -8,9 +8,7 @@ public class ArtistRequest
     public DateTime RequestDate { get; set; }
     public DateTime? AcceptedDate { get; set; }
     public bool Accepted { get; set; }
-    public bool Reviewed { get; set; }
-    public string? Review { get; set; }
-    public double? ReviewRating { get; set; }
     
     public virtual User User { get; set; } = null!;
+    public virtual ICollection<ArtistRequestMessage> ArtistRequestMessages { get; set; } = null!;
 }

src/comissions.app.api/Entities/ArtistRequestMessage.cs

@@ -0,0 +1,10 @@
+namespace comissions.app.database.Entities;
+
+public class ArtistRequestMessage
+{
+    public int Id { get; set; }
+    public string Message { get; set; }
+    public DateTime SentDate { get; set; }
+    public string UserId { get; set; }
+    public virtual User User { get; set; }
+}

src/comissions.app.api/Migrations/20240310021457_fix.Designer.cs

@@ -0,0 +1,631 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using comissions.app.database;
+
+#nullable disable
+
+namespace comissions.app.api.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20240310021457_fix")]
+    partial class fix
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.1")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistPageSettings", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ArtistId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("BackgroundColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DescriptionBackgroundColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DescriptionHeaderColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DescriptionHeaderImageUrl")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("DescriptionHeaderSize")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("DescriptionHeaderText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("DescriptionHeaderUseImage")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("DescriptionTextColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("DescriptionTextSize")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("HeaderColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("HeaderImageUrl")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("HeaderTextSize")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("HeaderUseImage")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("PortfolioBackgroundColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PortfolioColumns")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("PortfolioEnabledScrolling")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("PortfolioMasonry")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("PortfolioMaximumSize")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PortfolionHeaderColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PortfolionHeaderImageUrl")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PortfolionHeaderSize")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PortfolionHeaderText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PortfolionHeaderUseImage")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("RequestBackgroundColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequestButtonBGColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequestButtonHoverBGColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequestButtonHoverTextColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequestButtonTextColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequestHeaderColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequestHeaderImageUrl")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RequestHeaderSize")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("RequestHeaderText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("RequestHeaderUseImage")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("RequestTermsColor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ArtistId")
+                        .IsUnique();
+
+                    b.ToTable("ArtistPageSettings");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistPortfolioPiece", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ArtistId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FileReference")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ArtistId");
+
+                    b.ToTable("ArtistPortfolioPieces");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistRequest", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("Accepted")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("AcceptedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("RequestDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ArtistRequests");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistRequestMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SentDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ArtistRequestMessages");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.Request", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("Accepted")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("AcceptedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<int>("ArtistId")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("ArtistRequestId")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("Completed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("CompletedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("Declined")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("DeclinedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Paid")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("PaidDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("PaymentUrl")
+                        .HasColumnType("text");
+
+                    b.Property<double?>("Rating")
+                        .HasColumnType("double precision");
+
+                    b.Property<DateTime>("RequestDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("ReviewDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ReviewMessage")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Reviewed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ArtistId");
+
+                    b.HasIndex("ArtistRequestId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Requests");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.RequestAsset", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FileReference")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestId");
+
+                    b.ToTable("RequestAssets");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.RequestReference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("FileReference")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RequestId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestId");
+
+                    b.ToTable("RequestReferences");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.User", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BanAdminId")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Banned")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("BannedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("BannedReason")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Biography")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SuspendAdminId")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Suspended")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("SuspendedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("SuspendedReason")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("UnbanDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("UnsuspendDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int?>("UserArtistId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.UserArtist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AgeRestricted")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("ArtistPageSettingsId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PrepaymentRequired")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("RequestGuidelines")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SocialMediaLink1")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SocialMediaLink2")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SocialMediaLink3")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SocialMediaLink4")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("StripeAccountId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SuspendAdminId")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Suspended")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("SuspendedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("SuspendedReason")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("UnsuspendDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("UserArtists");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistPageSettings", b =>
+                {
+                    b.HasOne("comissions.app.database.Entities.UserArtist", "Artist")
+                        .WithOne("ArtistPageSettings")
+                        .HasForeignKey("comissions.app.database.Entities.ArtistPageSettings", "ArtistId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Artist");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistPortfolioPiece", b =>
+                {
+                    b.HasOne("comissions.app.database.Entities.UserArtist", "Artist")
+                        .WithMany("PortfolioPieces")
+                        .HasForeignKey("ArtistId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Artist");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistRequest", b =>
+                {
+                    b.HasOne("comissions.app.database.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistRequestMessage", b =>
+                {
+                    b.HasOne("comissions.app.database.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.Request", b =>
+                {
+                    b.HasOne("comissions.app.database.Entities.UserArtist", "Artist")
+                        .WithMany("Requests")
+                        .HasForeignKey("ArtistId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("comissions.app.database.Entities.ArtistRequest", null)
+                        .WithMany("Requests")
+                        .HasForeignKey("ArtistRequestId");
+
+                    b.HasOne("comissions.app.database.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Artist");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.RequestAsset", b =>
+                {
+                    b.HasOne("comissions.app.database.Entities.Request", "Request")
+                        .WithMany("RequestAssets")
+                        .HasForeignKey("RequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Request");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.RequestReference", b =>
+                {
+                    b.HasOne("comissions.app.database.Entities.Request", "Request")
+                        .WithMany("RequestReferences")
+                        .HasForeignKey("RequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Request");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.UserArtist", b =>
+                {
+                    b.HasOne("comissions.app.database.Entities.User", "User")
+                        .WithOne("UserArtist")
+                        .HasForeignKey("comissions.app.database.Entities.UserArtist", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistRequest", b =>
+                {
+                    b.Navigation("Requests");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.Request", b =>
+                {
+                    b.Navigation("RequestAssets");
+
+                    b.Navigation("RequestReferences");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.User", b =>
+                {
+                    b.Navigation("UserArtist");
+                });
+
+            modelBuilder.Entity("comissions.app.database.Entities.UserArtist", b =>
+                {
+                    b.Navigation("ArtistPageSettings")
+                        .IsRequired();
+
+                    b.Navigation("PortfolioPieces");
+
+                    b.Navigation("Requests");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/comissions.app.api/Migrations/20240310021457_fix.cs

@@ -0,0 +1,110 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace comissions.app.api.Migrations
+{
+    /// <inheritdoc />
+    public partial class fix : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Review",
+                table: "ArtistRequests");
+
+            migrationBuilder.DropColumn(
+                name: "ReviewRating",
+                table: "ArtistRequests");
+
+            migrationBuilder.DropColumn(
+                name: "Reviewed",
+                table: "ArtistRequests");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ArtistRequestId",
+                table: "Requests",
+                type: "integer",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "ArtistRequestMessages",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    Message = table.Column<string>(type: "text", nullable: false),
+                    SentDate = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    UserId = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ArtistRequestMessages", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ArtistRequestMessages_Users_UserId",
+                        column: x => x.UserId,
+                        principalTable: "Users",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Requests_ArtistRequestId",
+                table: "Requests",
+                column: "ArtistRequestId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ArtistRequestMessages_UserId",
+                table: "ArtistRequestMessages",
+                column: "UserId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Requests_ArtistRequests_ArtistRequestId",
+                table: "Requests",
+                column: "ArtistRequestId",
+                principalTable: "ArtistRequests",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Requests_ArtistRequests_ArtistRequestId",
+                table: "Requests");
+
+            migrationBuilder.DropTable(
+                name: "ArtistRequestMessages");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Requests_ArtistRequestId",
+                table: "Requests");
+
+            migrationBuilder.DropColumn(
+                name: "ArtistRequestId",
+                table: "Requests");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Review",
+                table: "ArtistRequests",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<double>(
+                name: "ReviewRating",
+                table: "ArtistRequests",
+                type: "double precision",
+                nullable: true);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Reviewed",
+                table: "ArtistRequests",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+        }
+    }
+}

src/comissions.app.api/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -207,15 +207,6 @@ namespace comissions.app.api.Migrations
                     b.Property<DateTime>("RequestDate")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<string>("Review")
-                        .HasColumnType("text");
-
-                    b.Property<double?>("ReviewRating")
-                        .HasColumnType("double precision");
-
-                    b.Property<bool>("Reviewed")
-                        .HasColumnType("boolean");
-
                     b.Property<string>("UserId")
                         .IsRequired()
                         .HasColumnType("text");
@@ -227,6 +218,32 @@ namespace comissions.app.api.Migrations
                     b.ToTable("ArtistRequests");
                 });
 
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistRequestMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SentDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ArtistRequestMessages");
+                });
+
             modelBuilder.Entity("comissions.app.database.Entities.Request", b =>
                 {
                     b.Property<int>("Id")
@@ -247,6 +264,9 @@ namespace comissions.app.api.Migrations
                     b.Property<int>("ArtistId")
                         .HasColumnType("integer");
 
+                    b.Property<int?>("ArtistRequestId")
+                        .HasColumnType("integer");
+
                     b.Property<bool>("Completed")
                         .HasColumnType("boolean");
 
@@ -295,6 +315,8 @@ namespace comissions.app.api.Migrations
 
                     b.HasIndex("ArtistId");
 
+                    b.HasIndex("ArtistRequestId");
+
                     b.HasIndex("UserId");
 
                     b.ToTable("Requests");
@@ -507,6 +529,17 @@ namespace comissions.app.api.Migrations
                     b.Navigation("User");
                 });
 
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistRequestMessage", b =>
+                {
+                    b.HasOne("comissions.app.database.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
             modelBuilder.Entity("comissions.app.database.Entities.Request", b =>
                 {
                     b.HasOne("comissions.app.database.Entities.UserArtist", "Artist")
@@ -515,6 +548,10 @@ namespace comissions.app.api.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("comissions.app.database.Entities.ArtistRequest", null)
+                        .WithMany("Requests")
+                        .HasForeignKey("ArtistRequestId");
+
                     b.HasOne("comissions.app.database.Entities.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
@@ -559,6 +596,11 @@ namespace comissions.app.api.Migrations
                     b.Navigation("User");
                 });
 
+            modelBuilder.Entity("comissions.app.database.Entities.ArtistRequest", b =>
+                {
+                    b.Navigation("Requests");
+                });
+
             modelBuilder.Entity("comissions.app.database.Entities.Request", b =>
                 {
                     b.Navigation("RequestAssets");

src/comissions.app.api/Models/ArtistAccessRequestMessage.cs

@@ -0,0 +1,22 @@
+using comissions.app.database.Entities;
+
+namespace comissions.app.database.Models;
+
+public class ArtistAccessRequestMessage
+{
+    public string SenderId { get; set; }
+    public string Message { get; set; }
+    public DateTime SentDate { get; set; }
+}
+public static class ArtistAccessRequestMessageExtensions
+{
+    public static ArtistAccessRequestMessage ToModel(this ArtistRequestMessage message)
+    {
+        return new ArtistAccessRequestMessage()
+        {
+            SenderId = message.UserId,
+            Message = message.Message,
+            SentDate = message.SentDate
+        };
+    }
+}

src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("comissions.app.database.migrator")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0587ebd942b3c18ddca3d939fcc3ae7c12df39d6")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+381bc5e8844469bf214194d596b636911956a7d5")]
 [assembly: System.Reflection.AssemblyProductAttribute("comissions.app.database.migrator")]
 [assembly: System.Reflection.AssemblyTitleAttribute("comissions.app.database.migrator")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

src/comissions.app.database.migrator/obj/Debug/net8.0/comissions.app.database.migrator.AssemblyInfoInputs.cache

@@ -1 +1 @@
-947b6aba969a37d22fe07007044e3210a1a2697c7448f25d3c0d3a0cb66506ca
+69ac50d95c8c1fb669484852338a4006ee3bdd9ffe4fe2b5d2b8c182c02d4f17