From fe72a360ae44cf2452852ec00684e4ab8d413fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Desc=C3=B4teaux?= <125318411+marcdescotes@users.noreply.github.com> Date: Thu, 21 Sep 2023 08:50:01 -0400 Subject: [PATCH 1/5] Started new branch --- .../Controllers/RobotsController.cs | 35 ++++++++++++++++--- RobotsWantedLeague/Models/Robot.cs | 3 ++ .../Services/CountryConstants.cs | 10 ++++++ RobotsWantedLeague/Views/Robots/Robot.cshtml | 5 ++- 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 RobotsWantedLeague/Services/CountryConstants.cs diff --git a/RobotsWantedLeague/Controllers/RobotsController.cs b/RobotsWantedLeague/Controllers/RobotsController.cs index f9f783f..c408ef9 100644 --- a/RobotsWantedLeague/Controllers/RobotsController.cs +++ b/RobotsWantedLeague/Controllers/RobotsController.cs @@ -8,13 +8,43 @@ namespace RobotsWantedLeague.Controllers; public class RobotRequest { + // [AllowedCountry(ErrorMessage = "Le pays n'est pas autorisé.")] + // public string NewCountry { get; set; } public string Country { get; set; } public string Name { get; set; } public int Height { get; set; } public int Weight { get; set; } +// public static readonly List AllowedCountries = new List +// { +// "Canada", +// "United States of America", +// "Mexico", + +// }; + } +// public class AllowedCountryAttribute : ValidationAttribute +// { +// protected override ValidationResult IsValid(object value, ValidationContext validationContext) +// { +// string country = value as string; +// if (string.IsNullOrEmpty(country)) +// { +// return ValidationResult.Success; +// } + +// if (!CountryConstants.AllowedCountries.Contains(country, StringComparer.OrdinalIgnoreCase)) +// { +// return new ValidationResult(ErrorMessage); +// } + +// return ValidationResult.Success; +// } +// } + + public class RobotsController : Controller { private readonly ILogger _logger; @@ -51,10 +81,7 @@ public class RobotsController : Controller [HttpPost] public IActionResult CreateRobot([FromBody] RobotRequest robot) { - if (!ModelState.IsValid) - { - return View(robot); - } + Robot r = robotsService.CreateRobot(robot.Name, robot.Weight, robot.Height, diff --git a/RobotsWantedLeague/Models/Robot.cs b/RobotsWantedLeague/Models/Robot.cs index b18f2f4..e76a8d6 100644 --- a/RobotsWantedLeague/Models/Robot.cs +++ b/RobotsWantedLeague/Models/Robot.cs @@ -7,7 +7,9 @@ public class Robot public int Weight { get; set; } public int Height { get; set; } public string Country { get; set; } + // public string NewCountry { get; set; } public List VisitedCountries { get; set; } = new List(); + public Robot(int Id, string Name, int Weight, int Height, string Country) { @@ -16,6 +18,7 @@ public class Robot this.Weight = Weight; this.Height = Height; this.Country = Country; + // this.NewCountry = NewCountry; } diff --git a/RobotsWantedLeague/Services/CountryConstants.cs b/RobotsWantedLeague/Services/CountryConstants.cs new file mode 100644 index 0000000..5107611 --- /dev/null +++ b/RobotsWantedLeague/Services/CountryConstants.cs @@ -0,0 +1,10 @@ +// public static class CountryConstants +// { +// public static readonly List AllowedCountries = new List +// { +// "Canada", +// "United States of America", +// "Mexico", +// // Ajoutez les 7 autres pays autorisés ici +// }; +// } \ No newline at end of file diff --git a/RobotsWantedLeague/Views/Robots/Robot.cshtml b/RobotsWantedLeague/Views/Robots/Robot.cshtml index 1e750a6..db84651 100644 --- a/RobotsWantedLeague/Views/Robots/Robot.cshtml +++ b/RobotsWantedLeague/Views/Robots/Robot.cshtml @@ -49,6 +49,7 @@ +@Html.ValidationSummary(true)
From 9052c1119483facd389273b2d27a8137edc1ddef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Desc=C3=B4teaux?= <125318411+marcdescotes@users.noreply.github.com> Date: Thu, 21 Sep 2023 10:04:28 -0400 Subject: [PATCH 2/5] Deleted stuff from validation branch --- .../Controllers/RobotsController.cs | 28 ++----------------- RobotsWantedLeague/Models/Robot.cs | 4 +-- .../Services/CountryConstants.cs | 10 ------- RobotsWantedLeague/Views/Robots/Robot.cshtml | 14 ++++++++-- 4 files changed, 15 insertions(+), 41 deletions(-) delete mode 100644 RobotsWantedLeague/Services/CountryConstants.cs diff --git a/RobotsWantedLeague/Controllers/RobotsController.cs b/RobotsWantedLeague/Controllers/RobotsController.cs index c408ef9..fbb9aa2 100644 --- a/RobotsWantedLeague/Controllers/RobotsController.cs +++ b/RobotsWantedLeague/Controllers/RobotsController.cs @@ -8,41 +8,17 @@ namespace RobotsWantedLeague.Controllers; public class RobotRequest { - // [AllowedCountry(ErrorMessage = "Le pays n'est pas autorisé.")] - // public string NewCountry { get; set; } + public string Country { get; set; } public string Name { get; set; } public int Height { get; set; } public int Weight { get; set; } -// public static readonly List AllowedCountries = new List -// { -// "Canada", -// "United States of America", -// "Mexico", - -// }; + } -// public class AllowedCountryAttribute : ValidationAttribute -// { -// protected override ValidationResult IsValid(object value, ValidationContext validationContext) -// { -// string country = value as string; -// if (string.IsNullOrEmpty(country)) -// { -// return ValidationResult.Success; -// } -// if (!CountryConstants.AllowedCountries.Contains(country, StringComparer.OrdinalIgnoreCase)) -// { -// return new ValidationResult(ErrorMessage); -// } - -// return ValidationResult.Success; -// } -// } public class RobotsController : Controller diff --git a/RobotsWantedLeague/Models/Robot.cs b/RobotsWantedLeague/Models/Robot.cs index e76a8d6..786cb39 100644 --- a/RobotsWantedLeague/Models/Robot.cs +++ b/RobotsWantedLeague/Models/Robot.cs @@ -7,7 +7,8 @@ public class Robot public int Weight { get; set; } public int Height { get; set; } public string Country { get; set; } - // public string NewCountry { get; set; } + + public string NewCountry { get; set; } public List VisitedCountries { get; set; } = new List(); @@ -18,7 +19,6 @@ public class Robot this.Weight = Weight; this.Height = Height; this.Country = Country; - // this.NewCountry = NewCountry; } diff --git a/RobotsWantedLeague/Services/CountryConstants.cs b/RobotsWantedLeague/Services/CountryConstants.cs deleted file mode 100644 index 5107611..0000000 --- a/RobotsWantedLeague/Services/CountryConstants.cs +++ /dev/null @@ -1,10 +0,0 @@ -// public static class CountryConstants -// { -// public static readonly List AllowedCountries = new List -// { -// "Canada", -// "United States of America", -// "Mexico", -// // Ajoutez les 7 autres pays autorisés ici -// }; -// } \ No newline at end of file diff --git a/RobotsWantedLeague/Views/Robots/Robot.cshtml b/RobotsWantedLeague/Views/Robots/Robot.cshtml index db84651..aaee6d1 100644 --- a/RobotsWantedLeague/Views/Robots/Robot.cshtml +++ b/RobotsWantedLeague/Views/Robots/Robot.cshtml @@ -12,6 +12,16 @@
+@*
+
+
+ +
+
+
*@ + + + @@ -66,9 +76,7 @@
- - @* à mettre dans input du haut : data-val="true" - *@ +
From a4f4206f3bf8b766fe07e904e20242e7b50bcfc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Desc=C3=B4teaux?= <125318411+marcdescotes@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:30:36 -0400 Subject: [PATCH 3/5] Added Agent Services to program startup --- RobotsWantedLeague/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/RobotsWantedLeague/Program.cs b/RobotsWantedLeague/Program.cs index 5718be6..9c22748 100644 --- a/RobotsWantedLeague/Program.cs +++ b/RobotsWantedLeague/Program.cs @@ -5,6 +5,7 @@ var builder = WebApplication.CreateBuilder(args); // Add services to the container. builder.Services.AddControllersWithViews(); builder.Services.AddSingleton(); +builder.Services.AddSingleton(); var app = builder.Build(); // Configure the HTTP request pipeline. From 0c0392d0bef8f60c556ade909c4886f1fe32d58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Desc=C3=B4teaux?= <125318411+marcdescotes@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:31:19 -0400 Subject: [PATCH 4/5] Pasted, changed labels for agents instead of robot --- .../Controllers/AgentsController.cs | 61 +++++++++++++++++++ .../Controllers/RobotsController.cs | 6 -- RobotsWantedLeague/Models/Agent.cs | 17 ++++++ RobotsWantedLeague/Models/Robot.cs | 1 - .../Services/Agents/AgentsService.cs | 57 +++++++++++++++++ .../Services/Agents/IAgentsService.cs | 14 +++++ .../Services/Agents/NotEmptyAgentsService.cs | 38 ++++++++++++ .../Services/{ => Robots}/IRobotsService.cs | 0 .../{ => Robots}/NotEmptyRobotsService.cs | 0 .../Services/{ => Robots}/RobotsService.cs | 0 RobotsWantedLeague/Views/Agents/Agent.cshtml | 40 ++++++++++++ RobotsWantedLeague/Views/Agents/Index.cshtml | 17 ++++++ RobotsWantedLeague/Views/Robots/Robot.cshtml | 11 ---- .../Views/Shared/_Layout.cshtml | 5 ++ 14 files changed, 249 insertions(+), 18 deletions(-) create mode 100644 RobotsWantedLeague/Controllers/AgentsController.cs create mode 100644 RobotsWantedLeague/Models/Agent.cs create mode 100644 RobotsWantedLeague/Services/Agents/AgentsService.cs create mode 100644 RobotsWantedLeague/Services/Agents/IAgentsService.cs create mode 100644 RobotsWantedLeague/Services/Agents/NotEmptyAgentsService.cs rename RobotsWantedLeague/Services/{ => Robots}/IRobotsService.cs (100%) rename RobotsWantedLeague/Services/{ => Robots}/NotEmptyRobotsService.cs (100%) rename RobotsWantedLeague/Services/{ => Robots}/RobotsService.cs (100%) create mode 100644 RobotsWantedLeague/Views/Agents/Agent.cshtml create mode 100644 RobotsWantedLeague/Views/Agents/Index.cshtml diff --git a/RobotsWantedLeague/Controllers/AgentsController.cs b/RobotsWantedLeague/Controllers/AgentsController.cs new file mode 100644 index 0000000..ec0199b --- /dev/null +++ b/RobotsWantedLeague/Controllers/AgentsController.cs @@ -0,0 +1,61 @@ +using System.Diagnostics; +using Microsoft.AspNetCore.Mvc; +using RobotsWantedLeague.Models; +using RobotsWantedLeague.Services; +using System.ComponentModel.DataAnnotations; + +namespace RobotsWantedLeague.Controllers; + +public class AgentRequest +{ + public string Name { get; set; } + public string Continent { get; set; } + +} + +public class AgentsController : Controller +{ + private readonly ILogger _logger; + private readonly IAgentsService agentsService; + + public AgentsController(ILogger logger, + IAgentsService agentsService) + { + _logger = logger; + this.agentsService = agentsService; + } + + public IActionResult Index() + { + return View(agentsService.Agents); + } + + public IActionResult Agent(int id) + { + Agent? agent = agentsService.GetAgentById(id); + if (agent == null) + { + return NotFound(); + } + return View(agent); + } + + [HttpGet] + public IActionResult CreateAgent() + { + return View(); + } + + [HttpPost] + public IActionResult CreateAgent([FromBody] AgentRequest agent) + { + + Agent r = agentsService.CreateAgent(agent.Name, + agent.Continent); + string htmxRedirectHeaderName = "HX-Redirect"; + string redirectURL = "/agents/agent?id=" + r.Id; + Response.Headers.Add(htmxRedirectHeaderName, redirectURL); + return Ok(); + } + +} diff --git a/RobotsWantedLeague/Controllers/RobotsController.cs b/RobotsWantedLeague/Controllers/RobotsController.cs index fbb9aa2..9e9be2a 100644 --- a/RobotsWantedLeague/Controllers/RobotsController.cs +++ b/RobotsWantedLeague/Controllers/RobotsController.cs @@ -8,19 +8,13 @@ namespace RobotsWantedLeague.Controllers; public class RobotRequest { - public string Country { get; set; } public string Name { get; set; } public int Height { get; set; } public int Weight { get; set; } - - } - - - public class RobotsController : Controller { private readonly ILogger _logger; diff --git a/RobotsWantedLeague/Models/Agent.cs b/RobotsWantedLeague/Models/Agent.cs new file mode 100644 index 0000000..c8cde01 --- /dev/null +++ b/RobotsWantedLeague/Models/Agent.cs @@ -0,0 +1,17 @@ +namespace RobotsWantedLeague.Models; + +public class Agent +{ + public int Id { get; set; } + public string Name { get; set; } + public string Continent { get; set; } + + + public Agent(int Id, string Name, string Continent) + { + this.Id = Id; + this.Name = Name; + this.Continent = Continent; + } + +} \ No newline at end of file diff --git a/RobotsWantedLeague/Models/Robot.cs b/RobotsWantedLeague/Models/Robot.cs index 786cb39..a4fdf0b 100644 --- a/RobotsWantedLeague/Models/Robot.cs +++ b/RobotsWantedLeague/Models/Robot.cs @@ -7,7 +7,6 @@ public class Robot public int Weight { get; set; } public int Height { get; set; } public string Country { get; set; } - public string NewCountry { get; set; } public List VisitedCountries { get; set; } = new List(); diff --git a/RobotsWantedLeague/Services/Agents/AgentsService.cs b/RobotsWantedLeague/Services/Agents/AgentsService.cs new file mode 100644 index 0000000..83baffc --- /dev/null +++ b/RobotsWantedLeague/Services/Agents/AgentsService.cs @@ -0,0 +1,57 @@ +namespace RobotsWantedLeague.Services; + +using RobotsWantedLeague.Models; + +public class AgentsService: IAgentsService +{ + private readonly List agents; + private int idGenerator = 0; + public List Agents { get => agents; } + + public AgentsService() + { + agents = new List(); + } + + private int generateId(){ + idGenerator = idGenerator + 1; + return idGenerator; + } + + public Agent CreateAgent(string name, + string continent) + { + var agent = new Agent(generateId(), name, continent); + agents.Add(agent); + return agent; + } + + private int getIndexOfAgentById(int id){ + int idx = 0; + foreach (Agent agent in agents){ + if (agent.Id == id){ + return idx; + } + idx ++; + } + return -1; + } + + public Agent? GetAgentById(int id){ + int indexToDelete = getIndexOfAgentById(id); + if(indexToDelete == -1){ + return null; + } + return agents[indexToDelete]; + } + + public bool DeleteAgentById(int id){ + int indexToDelete = getIndexOfAgentById(id); + if(indexToDelete == -1){ + return false; + } + agents.RemoveAt(indexToDelete); + return true; + } + +} \ No newline at end of file diff --git a/RobotsWantedLeague/Services/Agents/IAgentsService.cs b/RobotsWantedLeague/Services/Agents/IAgentsService.cs new file mode 100644 index 0000000..2738824 --- /dev/null +++ b/RobotsWantedLeague/Services/Agents/IAgentsService.cs @@ -0,0 +1,14 @@ +namespace RobotsWantedLeague.Services; +using RobotsWantedLeague.Models; + +public interface IAgentsService +{ + public List Agents { get; } + + public Agent CreateAgent(string name, + string continent); + public Agent? GetAgentById(int id); + public bool DeleteAgentById(int id); + + +} \ No newline at end of file diff --git a/RobotsWantedLeague/Services/Agents/NotEmptyAgentsService.cs b/RobotsWantedLeague/Services/Agents/NotEmptyAgentsService.cs new file mode 100644 index 0000000..4fb7f0e --- /dev/null +++ b/RobotsWantedLeague/Services/Agents/NotEmptyAgentsService.cs @@ -0,0 +1,38 @@ +namespace RobotsWantedLeague.Services; + +using RobotsWantedLeague.Models; + +public class NotEmptyAgentsService : IAgentsService +{ + private readonly IAgentsService underlyingAgentsService; + public List Agents { get => underlyingAgentsService.Agents; } + + public NotEmptyAgentsService() + { + this.underlyingAgentsService = new AgentsService(); + this.underlyingAgentsService.CreateAgent("Mulder", "Amérique du Nord"); + this.underlyingAgentsService.CreateAgent("Scully", "Amérique du Sud"); + this.underlyingAgentsService.CreateAgent("Doggett", "Antarctique"); + this.underlyingAgentsService.CreateAgent("Reyes", "Europe"); + this.underlyingAgentsService.CreateAgent("Skinner", "Asie"); + this.underlyingAgentsService.CreateAgent("Spender", "Afrique"); + this.underlyingAgentsService.CreateAgent("Kersh", "Océanie"); + } + + public Agent CreateAgent(string name, + string continent) + { + return underlyingAgentsService.CreateAgent(name, continent); + } + + public Agent? GetAgentById(int id) + { + return underlyingAgentsService.GetAgentById(id); + } + + public bool DeleteAgentById(int id) + { + return underlyingAgentsService.DeleteAgentById(id); + } + +} \ No newline at end of file diff --git a/RobotsWantedLeague/Services/IRobotsService.cs b/RobotsWantedLeague/Services/Robots/IRobotsService.cs similarity index 100% rename from RobotsWantedLeague/Services/IRobotsService.cs rename to RobotsWantedLeague/Services/Robots/IRobotsService.cs diff --git a/RobotsWantedLeague/Services/NotEmptyRobotsService.cs b/RobotsWantedLeague/Services/Robots/NotEmptyRobotsService.cs similarity index 100% rename from RobotsWantedLeague/Services/NotEmptyRobotsService.cs rename to RobotsWantedLeague/Services/Robots/NotEmptyRobotsService.cs diff --git a/RobotsWantedLeague/Services/RobotsService.cs b/RobotsWantedLeague/Services/Robots/RobotsService.cs similarity index 100% rename from RobotsWantedLeague/Services/RobotsService.cs rename to RobotsWantedLeague/Services/Robots/RobotsService.cs diff --git a/RobotsWantedLeague/Views/Agents/Agent.cshtml b/RobotsWantedLeague/Views/Agents/Agent.cshtml new file mode 100644 index 0000000..365e0eb --- /dev/null +++ b/RobotsWantedLeague/Views/Agents/Agent.cshtml @@ -0,0 +1,40 @@ +@model Agent + +@{ + string imageURL = "https://good-hawk-21.deno.dev/toaster" + Model.Id.ToString(); +} + +
+
+
+ +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
Nom@Model.Name
Id@Model.Id
Continent@Model.Continent
+ + + diff --git a/RobotsWantedLeague/Views/Agents/Index.cshtml b/RobotsWantedLeague/Views/Agents/Index.cshtml new file mode 100644 index 0000000..a205d75 --- /dev/null +++ b/RobotsWantedLeague/Views/Agents/Index.cshtml @@ -0,0 +1,17 @@ +@{ + ViewData["Title"] = "Home Page"; +} +@model List + +

LISTE DES AGENTS

+ +
+
    + @foreach (Agent agent in Model){ +
  • + @agent.Name +
    • + } +
+
+ diff --git a/RobotsWantedLeague/Views/Robots/Robot.cshtml b/RobotsWantedLeague/Views/Robots/Robot.cshtml index aaee6d1..e1d0770 100644 --- a/RobotsWantedLeague/Views/Robots/Robot.cshtml +++ b/RobotsWantedLeague/Views/Robots/Robot.cshtml @@ -12,17 +12,6 @@ -@*
-
-
- -
-
-
*@ - - - - diff --git a/RobotsWantedLeague/Views/Shared/_Layout.cshtml b/RobotsWantedLeague/Views/Shared/_Layout.cshtml index d5b0dbb..c23b51d 100644 --- a/RobotsWantedLeague/Views/Shared/_Layout.cshtml +++ b/RobotsWantedLeague/Views/Shared/_Layout.cshtml @@ -71,6 +71,11 @@
- + + + + + + - - - - - @@ -35,6 +35,3 @@
Id@Model.Id
Nom @Model.Name
Id@Model.Id
Continent @Model.Continent
- - - diff --git a/RobotsWantedLeague/Views/Agents/Index.cshtml b/RobotsWantedLeague/Views/Agents/Index.cshtml index a205d75..b8a001d 100644 --- a/RobotsWantedLeague/Views/Agents/Index.cshtml +++ b/RobotsWantedLeague/Views/Agents/Index.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Home Page"; + ViewData["Title"] = "Agent List"; } @model List diff --git a/RobotsWantedLeague/Views/Robots/Robot.cshtml b/RobotsWantedLeague/Views/Robots/Robot.cshtml index e1d0770..dd8d05c 100644 --- a/RobotsWantedLeague/Views/Robots/Robot.cshtml +++ b/RobotsWantedLeague/Views/Robots/Robot.cshtml @@ -14,7 +14,7 @@ - +
Nom