Added Card Lists

SDG-Backend-Barracuda/Models/CardListModel.cs

@@ -0,0 +1,177 @@
+using Dapper;
+using Npgsql;
+
+namespace SDG_Backend_Barracuda.Models;
+
+public record CardList
+{
+    public int Id { get; init; }
+    public IEnumerable<Card>? Cards { get; init; }
+    public IEnumerable<CardList>? SubLists { get; init; }
+
+    public CardList() { }
+
+    public CardList(int id, IEnumerable<Card>? cards = null, IEnumerable<CardList>? subLists = null)
+    {
+        Id = id;
+        Cards = cards;
+        SubLists = subLists;
+    }
+}
+
+public record CardListInformation(IEnumerable<int>? CardIds = null, IEnumerable<int>? SubListIds = null);
+
+public interface ICardListModel : IDatabaseModel<CardList, CardListInformation>
+{}
+
+public class CardListModel(NpgsqlDataSource dataSource) : ICardListModel, IEndpointRouteHandler
+{
+    public static void MapEndpoints(IEndpointRouteBuilder router)
+    {
+        var listEndpoint = router.MapGroup("/cardlist");
+
+        // Create
+        listEndpoint.MapPost("/", async (CardListInformation input, ICardListModel model) =>
+        {
+            var newList = await model.Create(input);
+            return Results.Created($"/cardlist/{newList.Id}", newList);
+        });
+
+        // Get all
+        listEndpoint.MapGet("/", async (ICardListModel model) =>
+            Results.Ok(await model.GetAll()));
+
+        // Get one
+        listEndpoint.MapGet("/{id}", async (int id, ICardListModel model) =>
+            await model.GetById(id) is { } l ? Results.Ok(l) : Results.NotFound());
+
+        // Update
+        listEndpoint.MapPut("/{id}", async (int id, CardListInformation input, ICardListModel model) =>
+            await model.Update(id, input) is { } l ? Results.Ok(l) : Results.NotFound());
+
+        // Delete
+        listEndpoint.MapDelete("/{id}", async (int id, ICardListModel model) =>
+            await model.Delete(id) ? Results.NoContent() : Results.NotFound());
+    }
+
+    public async Task<IEnumerable<CardList>> GetAll()
+    {
+        await using var connection = await dataSource.OpenConnectionAsync();
+        var sql = """SELECT * FROM "CardList";""";
+        var cardListIds = await connection.QueryAsync<CardList>(sql);
+        
+        var result = new List<CardList>();
+        foreach (var cardListId in cardListIds)
+        {
+            result.Add(await GetById(cardListId.Id) ?? cardListId);
+        }
+        return result;
+    }
+
+    public async Task<CardList?> GetById(int id)
+    {
+        // Check if it exists
+        await using var connection = await dataSource.OpenConnectionAsync();
+        var listSql = """SELECT * FROM "CardList" WHERE "Id" = @Id;""";
+        var cardListId = await connection.QueryFirstOrDefaultAsync<CardList>(listSql, new { Id = id });
+        if (cardListId == null) return null;
+
+        // Get all associated cards
+        var cardsSql = """
+            SELECT c."Id", c."Value" 
+            FROM "Card" c
+            JOIN "CardListCard" clc ON c."Id" = clc."CardId"
+            WHERE clc."CardListId" = @Id;
+            """;
+        var cards = await connection.QueryAsync<Card>(cardsSql, new { Id = id });
+
+        // Get all child CardLists
+        var subListsSql = """
+            SELECT sl."Id"
+            FROM "CardList" sl
+            JOIN "CardListSubList" clsl ON sl."Id" = clsl."SubCardListId"
+            WHERE clsl."CardListId" = @Id;
+            """;
+        var subLists = await connection.QueryAsync<CardList>(subListsSql, new { Id = id });
+        
+        return cardListId with { Cards = cards, SubLists = subLists };
+    }
+
+    public async Task<CardList> CreateEmpty()
+    {
+        await using var connection = await dataSource.OpenConnectionAsync();
+        var sql = """INSERT INTO "CardList" DEFAULT VALUES RETURNING "Id";""";
+        return await connection.QuerySingleAsync<CardList>(sql);
+    }
+
+    public async Task<CardList> Create(CardListInformation input)
+    {
+        await using var connection = await dataSource.OpenConnectionAsync();
+        var newList = await CreateEmpty();
+
+        if (input.CardIds != null)
+        {
+            foreach (var cardId in input.CardIds)
+            {
+                await connection.ExecuteAsync(
+                    """INSERT INTO "CardListCard" ("CardListId", "CardId") VALUES (@ListId, @CardId)""",
+                    new { ListId = newList.Id, CardId = cardId });
+            }
+        }
+
+        if (input.SubListIds != null)
+        {
+            foreach (var subListId in input.SubListIds)
+            {
+                await connection.ExecuteAsync(
+                    """INSERT INTO "CardListSubList" ("CardListId", "SubCardListId") VALUES (@ListId, @SubListId)""",
+                    new { ListId = newList.Id, SubListId = subListId });
+            }
+        }
+
+        return (await GetById(newList.Id))!;
+    }
+
+    public async Task<CardList?> Update(int id, CardListInformation input)
+    {
+        await using var connection = await dataSource.OpenConnectionAsync();
+        
+        // Verify list exists
+        var exists = await connection.ExecuteScalarAsync<bool>("""SELECT EXISTS(SELECT 1 FROM "CardList" WHERE "Id" = @Id)""", new { Id = id });
+        if (!exists) return null;
+
+        // Sync Cards - Maybe think through a better way to do this that isn't "wipe it, then start over"
+        await connection.ExecuteAsync("""DELETE FROM "CardListCard" WHERE "CardListId" = @Id""", new { Id = id });
+        if (input.CardIds != null)
+        {
+            foreach (var cardId in input.CardIds)
+            {
+                await connection.ExecuteAsync(
+                    """INSERT INTO "CardListCard" ("CardListId", "CardId") VALUES (@Id, @CardId)""",
+                    new { Id = id, CardId = cardId });
+            }
+        }
+
+        // Sync SubLists - Maybe think through a better way to do this that isn't "wipe it, then start over"
+        await connection.ExecuteAsync("""DELETE FROM "CardListSubList" WHERE "CardListId" = @Id""", new { Id = id });
+        if (input.SubListIds != null)
+        {
+            foreach (var subListId in input.SubListIds)
+            {
+                await connection.ExecuteAsync(
+                    """INSERT INTO "CardListSubList" ("CardListId", "SubCardListId") VALUES (@Id, @SubListId)""",
+                    new { Id = id, SubListId = subListId });
+            }
+        }
+
+        return await GetById(id);
+    }
+
+    public async Task<bool> Delete(int id)
+    {
+        await using var connection = await dataSource.OpenConnectionAsync();
+        var sql = """DELETE FROM "CardList" WHERE "Id" = @Id;""";
+        var rowsAffected = await connection.ExecuteAsync(sql, new { Id = id });
+        return rowsAffected > 0;
+    }
+}

SDG-Backend-Barracuda/Models/CardModel.cs

@@ -4,43 +4,66 @@ using Npgsql;
 namespace SDG_Backend_Barracuda.Models;
 
 public record Card(int Id, string Value);
-public record CardInput(string Value);
+public record CardInformation(string Value);
 
-public interface ICardModel : IDatabaseModel<Card, CardInput>
+public interface ICardModel : IDatabaseModel<Card, CardInformation>
 {
 }
 
-public class CardModel(NpgsqlDataSource dataSource) : ICardModel
+public class CardModel(NpgsqlDataSource dataSource) : ICardModel, IEndpointRouteHandler
 {
-    public async Task<IEnumerable<Card>> GetAllAsync()
+    public static void MapEndpoints(IEndpointRouteBuilder router)
+    {
+        var cardEndpoint = router.MapGroup("/card");
+
+        cardEndpoint.MapPost("/", async (CardInformation input, ICardModel model) =>
+        {
+            var newCard = await model.Create(input);
+            return Results.Created($"/card/{newCard.Id}", newCard);
+        });
+
+        cardEndpoint.MapGet("/", async (ICardModel model) =>
+            Results.Ok(await model.GetAll()));
+
+        cardEndpoint.MapGet("/{id}", async (int id, ICardModel model) =>
+            await model.GetById(id) is { } c ? Results.Ok(c) : Results.NotFound());
+
+        cardEndpoint.MapPut("/{id}", async (int id, CardInformation input, ICardModel model) =>
+            await model.Update(id, input) is { } c ? Results.Ok(c) : Results.NotFound());
+
+        cardEndpoint.MapDelete("/{id}", async (int id, ICardModel model) =>
+            await model.Delete(id) ? Results.NoContent() : Results.NotFound());
+    }
+    
+    public async Task<IEnumerable<Card>> GetAll()
     {
         await using var connection = await dataSource.OpenConnectionAsync();
         var sql = """SELECT "Id", "Value" FROM "Card";""";
         return await connection.QueryAsync<Card>(sql);
     }
 
-    public async Task<Card?> GetByIdAsync(int id)
+    public async Task<Card?> GetById(int id)
     {
         await using var connection = await dataSource.OpenConnectionAsync();
         var sql = """SELECT "Id", "Value" FROM "Card" WHERE "Id" = @Id;""";
         return await connection.QueryFirstOrDefaultAsync<Card>(sql, new { Id = id });
     }
 
-    public async Task<Card> CreateAsync(CardInput input)
+    public async Task<Card> Create(CardInformation input)
     {
         await using var connection = await dataSource.OpenConnectionAsync();
         var sql = """INSERT INTO "Card" ("Value") VALUES (@Value) RETURNING "Id", "Value";""";
         return await connection.QuerySingleAsync<Card>(sql, input);
     }
 
-    public async Task<Card?> UpdateAsync(int id, CardInput input)
+    public async Task<Card?> Update(int id, CardInformation input)
     {
         await using var connection = await dataSource.OpenConnectionAsync();
         var sql = """UPDATE "Card" SET "Value" = @Value WHERE "Id" = @Id RETURNING "Id", "Value";""";
-        return await connection.QueryFirstOrDefaultAsync<Card>(sql, new { Id = id, Value = input.Value });
+        return await connection.QueryFirstOrDefaultAsync<Card>(sql, new { Id = id, input.Value });
     }
 
-    public async Task<bool> DeleteAsync(int id)
+    public async Task<bool> Delete(int id)
     {
         await using var connection = await dataSource.OpenConnectionAsync();
         var sql = """DELETE FROM "Card" WHERE "Id" = @Id;""";

SDG-Backend-Barracuda/Models/IDatabaseModel.cs

@@ -2,9 +2,9 @@
 
 public interface IDatabaseModel<T, in TInput>
 {
-    Task<IEnumerable<T>> GetAllAsync();
+    Task<IEnumerable<T>> GetAll();
-    Task<T?> GetByIdAsync(int id);
+    Task<T?> GetById(int id);
-    Task<T> CreateAsync(TInput input);
+    Task<T> Create(TInput input);
-    Task<T?> UpdateAsync(int id, TInput input);
+    Task<T?> Update(int id, TInput input);
-    Task<bool> DeleteAsync(int id);
+    Task<bool> Delete(int id);
 }

SDG-Backend-Barracuda/Models/IEndpointRouteHandler.cs

@@ -0,0 +1,6 @@
+namespace SDG_Backend_Barracuda.Models;
+
+public interface IEndpointRouteHandler
+{
+    static abstract void MapEndpoints(IEndpointRouteBuilder routes);
+}

SDG-Backend-Barracuda/Program.cs

@@ -14,6 +14,7 @@ builder.Services.AddNpgsqlDataSource(connectionString!);
 
 // Register Data Tables
 builder.Services.AddScoped<ICardModel, CardModel>();
+builder.Services.AddScoped<ICardListModel, CardListModel>();
 
 var app = builder.Build();
 
@@ -26,6 +27,19 @@ using (var scope = app.Services.CreateScope())
         CREATE TABLE IF NOT EXISTS ""Card"" (
             ""Id"" SERIAL PRIMARY KEY,
             ""Value"" TEXT NOT NULL
+        );
+        CREATE TABLE IF NOT EXISTS ""CardList"" (
+            ""Id"" SERIAL PRIMARY KEY
+        );
+        CREATE TABLE IF NOT EXISTS ""CardListCard"" (
+            ""CardListId"" INTEGER NOT NULL REFERENCES ""CardList""(""Id"") ON DELETE CASCADE,
+            ""CardId"" INTEGER NOT NULL REFERENCES ""Card""(""Id"") ON DELETE CASCADE,
+            PRIMARY KEY (""CardListId"", ""CardId"")
+        );
+        CREATE TABLE IF NOT EXISTS ""CardListSubList"" (
+            ""CardListId"" INTEGER NOT NULL REFERENCES ""CardList""(""Id"") ON DELETE CASCADE,
+            ""SubCardListId"" INTEGER NOT NULL REFERENCES ""CardList""(""Id"") ON DELETE CASCADE,
+            PRIMARY KEY (""CardListId"", ""SubCardListId"")
         );");
 }
 
@@ -37,34 +51,7 @@ if (app.Environment.IsDevelopment())
 
 app.UseHttpsRedirection();
 
-app.MapPost("/card", async (CardInput input, ICardModel card) =>
+CardModel.MapEndpoints(app);
-{
+CardListModel.MapEndpoints(app);
-    var newCard = await card.CreateAsync(input);
-    return Results.Created($"/card/{newCard.Id}", newCard);
-});
-
-app.MapGet("/card", async (ICardModel card) =>
-{
-    var result = await card.GetAllAsync();
-    return Results.Ok(result);
-});
-
-app.MapGet("/card/{id}", async (int id, ICardModel card) =>
-{
-    var newCard = await card.GetByIdAsync(id);
-    return newCard is not null ? Results.Ok(newCard) : Results.NotFound();
-});
-
-app.MapPut("/card/{id}", async (int id, CardInput input, ICardModel card) =>
-{
-    var newCard = await card.UpdateAsync(id, input);
-    return newCard is not null ? Results.Ok(newCard) : Results.NotFound();
-});
-
-app.MapDelete("/card/{id}", async (int id, ICardModel card) =>
-{
-    var success = await card.DeleteAsync(id);
-    return success ? Results.NoContent() : Results.NotFound();
-});
 
 app.Run();

SDG-Backend-Barracuda/SDG-Backend-Barracuda.http

@@ -26,3 +26,37 @@ Content-Type: application/json
 
 ### Delete a card
 DELETE {{SDG_Backend_Barracuda_HostAddress}}/card/1
+
+
+### Create a new empty card list
+POST {{SDG_Backend_Barracuda_HostAddress}}/cardlist/
+Content-Type: application/json
+
+### Create a new card list with cards and sub-lists
+POST {{SDG_Backend_Barracuda_HostAddress}}/cardlist
+Content-Type: application/json
+
+{
+  "cardIds": [3, 2],
+  "subListIds": [4]
+}
+
+### Get all card lists
+GET {{SDG_Backend_Barracuda_HostAddress}}/cardlist
+Accept: application/json
+
+### Get a card list by ID (includes cards and sub-lists)
+GET {{SDG_Backend_Barracuda_HostAddress}}/cardlist/1
+Accept: application/json
+
+### Update a card list
+PUT {{SDG_Backend_Barracuda_HostAddress}}/cardlist/1
+Content-Type: application/json
+
+{
+  "cardIds": [4],
+  "subListIds": []
+}
+
+### Delete a card list
+DELETE {{SDG_Backend_Barracuda_HostAddress}}/cardlist/1