From dcca20068ec87f65237138c4dc7fc80397e76c46 Mon Sep 17 00:00:00 2001
From: Damien Ostler <damien.ostler@data443.com>
Date: Sat, 24 Feb 2024 20:45:32 -0500
Subject: [PATCH] fix: changed endpoints back and added endpoint to get the
 user by their name

---
 .../Controllers/DiscoveryController.cs        | 65 ++-----------------
 .../Controllers/RequestsController.cs         |  4 +-
 .../Models/Request/RequestCreateModel.cs      |  2 +-
 3 files changed, 10 insertions(+), 61 deletions(-)

diff --git a/src/comissions.app.api/Controllers/DiscoveryController.cs b/src/comissions.app.api/Controllers/DiscoveryController.cs
index c00a12d..ec3e029 100644
--- a/src/comissions.app.api/Controllers/DiscoveryController.cs
+++ b/src/comissions.app.api/Controllers/DiscoveryController.cs
@@ -48,67 +48,16 @@ public class DiscoveryController : Controller
     
     
     [HttpGet]
-    [Route("Artists/{sellerName}/Page")]
-    public async Task<IActionResult> GetArtistPage(string sellerName)
+    [Route("Artists/{sellerName}")]
+    public async Task<IActionResult> GetArtistByName(string sellerName)
     {
-        var seller = await _dbContext.UserArtists
-            .Include(x=>x.ArtistPageSettings)
-            .FirstOrDefaultAsync(x=>x.Name==sellerName.Replace('-', ' '));
+        
+        var seller = await _dbContext.UserArtists.Include(x=>x.User)
+            .FirstOrDefaultAsync(x=>x.User.DisplayName==sellerName);
         if(seller==null)
             return NotFound();
-
-        if (seller.ArtistPageSettings == null)
-        {
-            var newSettings = new ArtistPageSettings()
-            {
-                ArtistId = seller.Id,
-                BackgroundColor = "rgb(126, 115, 115)",
-                HeaderColor = "rgb(194, 187, 187)",
-                HeaderTextSize = 5,
-                HeaderUseImage = false,
-                HeaderImageUrl = "",
-                DescriptionHeaderText = "",
-                DescriptionHeaderColor = "rgb(194, 187, 187)",
-                DescriptionHeaderSize = 3,
-                DescriptionHeaderUseImage = false,
-                DescriptionHeaderImageUrl = "",
-                DescriptionBackgroundColor = "rgb(103, 97, 97)",
-                DescriptionTextColor = "rgb(186, 186, 186)",
-                DescriptionTextSize = 1,
-                PortfolionHeaderText = "",
-                PortfolionHeaderColor = "rgb(194, 187, 187)",
-                PortfolionHeaderSize = 3,
-                PortfolionHeaderUseImage = false,
-                PortfolionHeaderImageUrl = "",
-                PortfolioBackgroundColor = "rgb(78, 73, 73)",
-                PortfolioMasonry = true,
-                PortfolioColumns = 3,
-                PortfolioEnabledScrolling = true,
-                PortfolioMaximumSize = 50,
-                RequestHeaderText = "",
-                RequestHeaderColor = "rgb(194, 187, 187)",
-                RequestHeaderSize = 3,
-                RequestHeaderUseImage = false,
-                RequestHeaderImageUrl = "",
-                RequestBackgroundColor = "rgb(103, 97, 97)",
-                RequestTermsColor = "rgb(194, 187, 187)",
-                RequestButtonBGColor = "rgb(101, 97, 97)",
-                RequestButtonTextColor = "rgb(194, 187, 187)",
-                RequestButtonHoverBGColor = "rgb(98, 98, 98)"
-            };
-            var dbSettings = _dbContext.ArtistPageSettings.Add(newSettings).Entity;
-            await _dbContext.SaveChangesAsync();
-            var result = dbSettings.ToModel();
-            result.Artist = seller.ToModel();   
-            return Ok(result);
-        }
-        else
-        {
-            var result = seller.ArtistPageSettings.ToModel();
-            result.Artist = seller.ToModel();   
-            return Ok(result);
-        }
-        
+        var result = seller.ToModel();
+        return Ok(result);
     }
     
     [HttpGet]
diff --git a/src/comissions.app.api/Controllers/RequestsController.cs b/src/comissions.app.api/Controllers/RequestsController.cs
index 6911c86..9c0b537 100644
--- a/src/comissions.app.api/Controllers/RequestsController.cs
+++ b/src/comissions.app.api/Controllers/RequestsController.cs
@@ -919,7 +919,7 @@ public class RequestsController : Controller
             .Where(x=>x.UserId==User.GetUserId())
             .CountAsync();
         
-        var artist = await _dbContext.UserArtists.Include(x=>x.User).FirstOrDefaultAsync(x=>x.User.DisplayName==model.ArtistDisplayName);
+        var artist = await _dbContext.UserArtists.FirstOrDefaultAsync(x=>x.Id==model.ArtistId);
         if(artist==null)
             return NotFound("Artist not found.");
         
@@ -932,7 +932,7 @@ public class RequestsController : Controller
             Message = model.Message,
             RequestDate = DateTime.UtcNow,
             UserId = userId,
-            ArtistId = artist.Id,
+            ArtistId = model.ArtistId,
             Accepted = false,
             AcceptedDate = null,
             Declined = false,
diff --git a/src/comissions.app.api/Models/Request/RequestCreateModel.cs b/src/comissions.app.api/Models/Request/RequestCreateModel.cs
index 75607ac..1918385 100644
--- a/src/comissions.app.api/Models/Request/RequestCreateModel.cs
+++ b/src/comissions.app.api/Models/Request/RequestCreateModel.cs
@@ -2,7 +2,7 @@ namespace comissions.app.database.Models.Request;
 
 public class RequestCreateModel
 {
-    public string ArtistDisplayName { get; set; }
+    public int ArtistId { get; set; }
     public string Message { get; set; }
     public decimal Amount { get; set; }
 }
\ No newline at end of file