Tilføjede Catalog API controllers og Swagger setup

Author: Deblight

Directory.Packages.props

@@ -50,7 +50,7 @@
     <PackageVersion Include="System.Security.Claims" Version="4.3.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.3" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.6" />
     <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.2" />
@@ -71,4 +71,4 @@
     <PackageVersion Include="MSTest.TestFramework" Version="3.2.2" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
-</Project>
+</Project>

src/Microservices/CatalogMicroservice/CatalogMicroservice.API/CatalogMicroservice.API.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>

src/Microservices/CatalogMicroservice/CatalogMicroservice.API/Controllers/CatalogAPI.cs

@@ -1,12 +1,68 @@
 using Microsoft.AspNetCore.Mvc;
+using Microservice.Catalog.Infrastructure.Interfaces;
+using Microservice.Catalog.Common.Models;
 
-namespace CatalogMicroservice.API.Controllers
+namespace CatalogMicroservice.API.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+public class ItemsController : ControllerBase
 {
-    public class CatalogAPI : Controller
+    private readonly ICatalogItemRepository _repo;
+
+    public ItemsController(ICatalogItemRepository repo) => _repo = repo;
+
+    [HttpGet]
+    public async Task<ActionResult<IEnumerable<CatalogItem>>> GetPage(
+        // en ide til at lave pagination og filtrering, her fra starten, skal nok ændres ERH
+        [FromQuery] int pageNo = 1,
+        [FromQuery] int pageSize = 20,
+        [FromQuery] int? brandId = null,
+        [FromQuery] int? typeId = null,
+        CancellationToken ct = default)
+    {
+        if (pageNo < 1 || pageSize < 1) return BadRequest("pageNo og pageSize skal være >= 1.");
+
+        var items = await _repo.GetItemPageAsync(pageNo, pageSize, brandId, typeId, ct);
+        return Ok(items);
+    }
+
+    [HttpGet("{id:int}")]
+    public async Task<ActionResult<CatalogItem>> GetById(int id, CancellationToken ct)
+    {
+        var item = await _repo.GetItemAsync(id, ct);
+        return item is null ? NotFound() : Ok(item);
+    }
+
+    [HttpPost]
+    public async Task<ActionResult<CatalogItem>> Create([FromBody] CreateCatalogItem dto, CancellationToken ct)
     {
-        public IActionResult Index()
-        {
-            return View();
-        }
+        if (dto is null) return BadRequest("Body mangler.");
+
+        var created = await _repo.CreateItemAsync(dto, ct);
+        return CreatedAtAction(nameof(GetById), new { id = created.Id }, created);
+    }
+
+    [HttpPut("{id:int}")]
+    public async Task<IActionResult> Update(int id, [FromBody] CatalogItem model, CancellationToken ct)
+    {
+        if (model is null || model.Id != id)
+            return BadRequest("Id i route og body skal matche.");
+
+        var existing = await _repo.GetItemAsync(id, ct);
+        if (existing is null) return NotFound();
+
+        await _repo.UpdateItemAsync(model, ct);
+        return NoContent();
+    }
+
+    [HttpDelete("{id:int}")]
+    public async Task<IActionResult> Delete(int id, CancellationToken ct)
+    {
+        var existing = await _repo.GetItemAsync(id, ct);
+        if (existing is null) return NotFound();
+
+        await _repo.DeleteItemAsync(id, ct);
+        return NoContent();
     }
 }

src/Microservices/CatalogMicroservice/CatalogMicroservice.API/Controllers/CatalogBrandAPI.cs

@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Mvc;
+using Microservice.Catalog.Infrastructure.Interfaces;
+using Microservice.Catalog.Common.Models;
+
+namespace CatalogMicroservice.API.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+public class BrandsController : ControllerBase
+{
+    private readonly ICatalogBrandRepository _repo;
+
+    public BrandsController(ICatalogBrandRepository repo) => _repo = repo;
+
+    [HttpGet]
+    public async Task<ActionResult<IEnumerable<CatalogBrand>>> GetAll(CancellationToken ct)
+    {
+        var brands = await _repo.GetBrandsAsync(ct);
+        return Ok(brands);
+    }
+
+    [HttpGet("{id:int}")]
+    public async Task<ActionResult<CatalogBrand>> GetById(int id, CancellationToken ct)
+    {
+        var brand = await _repo.GetBrandByIdAsync(id, ct);
+        return brand is null ? NotFound() : Ok(brand);
+    }
+}

src/Microservices/CatalogMicroservice/CatalogMicroservice.API/Controllers/CatalogTypeAPI.cs

@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Mvc;
+using Microservice.Catalog.Infrastructure.Interfaces;
+using Microservice.Catalog.Common.Models;
+
+namespace CatalogMicroservice.API.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+public class TypesController : ControllerBase
+{
+    private readonly ICatalogTypeRepository _repo;
+
+    public TypesController(ICatalogTypeRepository repo) => _repo = repo;
+
+    [HttpGet]
+    public async Task<ActionResult<IEnumerable<CatalogType>>> GetAll(CancellationToken ct)
+    {
+        var types = await _repo.GetCatalogTypesAsync(ct);
+        return Ok(types);
+    }
+
+    [HttpGet("{id:int}")]
+    public async Task<ActionResult<CatalogType>> GetById(int id, CancellationToken ct)
+    {
+        var type = await _repo.GetCatalogTypeAsync(id, ct);
+        return type is null ? NotFound() : Ok(type);
+    }
+}

src/Microservices/CatalogMicroservice/CatalogMicroservice.API/Program.cs

@@ -1,14 +1,31 @@
-using Microservice.Catalog.Infrastructure.DependencyInjection;
+using System.Reflection;
+using Microsoft.OpenApi.Models;
+using Microservice.Catalog.Infrastructure.DependencyInjection;
 
 var builder = WebApplication.CreateBuilder(args);
 
-// Add services to the container.
-
 builder.Services.AddControllers();
-// Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
-builder.Services.AddOpenApi();
 
-var connectionString = Environment.GetEnvironmentVariable("SQL_CONNECTION_STRING", EnvironmentVariableTarget.Process) ?? "";
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen(c =>
+{
+    c.SwaggerDoc("v1", new OpenApiInfo
+    {
+        Title = "Catalog API",
+        Version = "v1",
+        Description = "eShopOnWeb – Catalog microservice"
+    });
+
+    var xmlName = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlName);
+    if (File.Exists(xmlPath))
+        c.IncludeXmlComments(xmlPath, includeControllerXmlComments: true);
+});
+
+var connectionString = Environment.GetEnvironmentVariable(
+    "SQL_CONNECTION_STRING",
+    EnvironmentVariableTarget.Process
+) ?? "";
 
 builder.Services.AddCatalogBrandRepository(connectionString);
 builder.Services.AddCatalogItemRepository(connectionString);
@@ -18,19 +35,22 @@
 
 var app = builder.Build();
 
-// Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
-    app.MapOpenApi();
+    app.UseSwagger();
+    app.UseSwaggerUI(c =>
+    {
+        c.SwaggerEndpoint("/swagger/v1/swagger.json", "Catalog API v1");
+    });
 }
 
-using var scope = app.Services.CreateScope();
-scope.SetupCatalogDatabase();
+using (var scope = app.Services.CreateScope())
+{
+    scope.SetupCatalogDatabase();
+}
 
 app.UseHttpsRedirection();
-
 app.UseAuthorization();
-
 app.MapControllers();
 
 app.Run();

src/Microservices/CatalogMicroservice/CatalogMicroservice.Infrastructure/DependencyInjection/CatalogItemDependencyInjection.cs

@@ -1,4 +1,4 @@
-using Microservice.Catalog.Infrastructure.Interfaces;
+using Microservice.Catalog.Infrastructure.Interfaces;
 using Microservice.Catalog.Infrastructure.Repositories;
 using Microsoft.Extensions.DependencyInjection;