README.md

@@ -31,8 +31,6 @@ The following functions are supported:
   }
   ```
 
-  Note that `geometry` must contain at least two points.
-
 - DELETE `/api/streets/<streetname>`: Delete a street
 
   Deletes the street with the given name.
@@ -65,6 +63,6 @@ The following functions are supported:
       "x": int,
       "y": int
     },
-    "usePostGIS": bool // Optional, default is 'false'
+    "method": "Backend" | "Database" | "PostGIS" // Optional, default is "Backend"
   }
   ```

src/API/StreetController.cs

@@ -1,88 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using NetTopologySuite.Geometries;
-
-[ApiController]
-[Route("api/streets")]
-public class StreetController : ControllerBase
-{
-    private readonly StreetService StreetService;
-
-    public StreetController(StreetService streetService, ILogger<StreetController> logger)
-    {
-        StreetService = streetService;
-    }
-
-    // POST /api/streets/
-    [HttpPost]
-    public async Task<IActionResult> CreateStreet([FromBody] CreateStreetDTO dto)
-    {
-        if (dto == null)
-            return BadRequest("Invalid request body.");
-
-        try
-        {
-            var geometry = StreetService.ToGeometry(dto.Geometry);
-
-            var street = new Street(dto.Name, dto.Capacity, geometry);
-            var createdStreet = await StreetService.CreateStreetAsync(street);
-
-            return Created();
-        }
-        catch (InvalidOperationException ex)
-        {
-            return Conflict(ex);
-        }
-    }
-
-    // GET /api/streets/{streetname}
-    [HttpGet("{streetname}")]
-    public async Task<IActionResult> GetStreet(string streetname)
-    {
-        try
-        {
-            var street = await StreetService.GetStreetAsync(streetname);
-            return Ok(street);
-        }
-        catch (KeyNotFoundException ex)
-        {
-            return NotFound(ex);
-        }
-    }
-
-    // DELETE /api/streets/{streetname}
-    [HttpDelete("{streetname}")]
-    public async Task<IActionResult> DeleteStreet(string streetname)
-    {
-        var deleted = await StreetService.DeleteStreetAsync(streetname);
-        if (!deleted)
-            return NotFound($"Street '{streetname}' not found.");
-
-        return NoContent();
-    }
-
-    // PATCH /api/streets/{streetname}
-    [HttpPatch("{streetname}")]
-    public async Task<IActionResult> AddPoint(string streetname, [FromBody] AddPointDTO dto)
-    {
-        if (dto == null)
-            return BadRequest("Invalid request body.");
-
-        try
-        {
-            await StreetService.AddPointAsync(streetname, StreetService.ToGeometryPoint(dto.Point), dto.usePostGIS);
-            return Ok();
-        }
-        catch (KeyNotFoundException ex)
-        {
-            return NotFound(ex);
-        }
-        catch (ArgumentException ex)
-        {
-            return BadRequest(ex);
-        }
-        catch
-        {
-            return Conflict("Concurrency conflict. Please retry your request.");
-        }
-    }
-}

src/Application/AddPointDTO.cs

@@ -1,5 +0,0 @@
-public class AddPointDTO
-{
-    public CoordinateDTO Point { get; set; }
-    public bool usePostGIS { get; set; }
-}

src/Application/CoordinateDTO.cs

@@ -1,5 +0,0 @@
-public class CoordinateDTO
-{
-    public int X { get; set; }
-    public int Y { get; set; }
-}

src/Application/CreateStreetDTO.cs

@@ -1,6 +0,0 @@
-public class CreateStreetDTO
-{
-    public string Name { get; set; }
-    public int Capacity { get; set; }
-    public List<CoordinateDTO> Geometry { get; set; }
-}

src/Application/GetStreetDTO.cs

@@ -1,6 +0,0 @@
-public class GetStreetDTO
-{
-    public string Name { get; set; }
-    public int Capacity { get; set; }
-    public List<CoordinateDTO> Geometry { get; set; }
-}

src/Application/StreetService.cs

@@ -1,81 +0,0 @@
-using System.Data;
-using NetTopologySuite.Geometries;
-
-public class StreetService
-{
-    private readonly StreetRepository repository;
-
-    public StreetService(StreetRepository repository)
-    {
-        this.repository = repository;
-    }
-
-    public static Point ToGeometryPoint(CoordinateDTO coordinate)
-    {
-        return new Point(coordinate.X, coordinate.Y);
-    }
-
-    public static LineString ToGeometry(List<CoordinateDTO> coordinates)
-    {
-
-        if (coordinates == null || coordinates.Count() < 2)
-        {
-            throw new ArgumentException("Street must contain at least two points.");
-        }
-
-        var geometryFactory = new GeometryFactory();
-
-        return geometryFactory.CreateLineString(coordinates.Select(g => new Coordinate(g.X, g.Y)).ToArray());
-    }
-
-    public async Task<Street> CreateStreetAsync(Street street)
-    {
-        if (await repository.ExistsAsync(street.Name))
-        {
-            throw new InvalidOperationException($"Street '{street.Name}' already exists.");
-        }
-
-        await repository.AddAsync(street);
-        return street;
-    }
-
-    public async Task<bool> DeleteStreetAsync(string name)
-    {
-        if (!await repository.ExistsAsync(name))
-        {
-            throw new InvalidOperationException($"Street '{name}' does not exist.");
-        }
-        return await repository.RemoveAsync(name);
-    }
-
-    public async Task<GetStreetDTO> GetStreetAsync(string name)
-    {
-        var street = await repository.GetByNameAsync(name);
-        if (street == null)
-        {
-            throw new KeyNotFoundException($"Street '{name}' not found.");
-        }
-
-        return new GetStreetDTO { Name = street.Name, Capacity = street.Capacity, Geometry = street.Geometry.Coordinates.Select(c => new CoordinateDTO { X = (int)c.X, Y = (int)c.Y }).ToList() };
-    }
-
-    public async Task AddPointAsync(string name, Point point, bool usePostGIS)
-    {
-        try
-        {
-            if (usePostGIS)
-            {
-                await repository.UpdateGeometryWithPostGIS(name, point);
-            }
-            else
-            {
-                await repository.UpdateGeometryInBackend(name, point);
-            }
-        }
-        catch
-        {
-            throw;
-        }
-    }
-
-}

src/Domain/Street.cs

@@ -1,50 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using NetTopologySuite.Geometries;
-
-public class Street
-{
-    public string Name { get; private set; }
-    public int Capacity { get; private set; }
-    // Could be changed to a more general geometry type instead of the implementation specific LineString
-    public LineString Geometry { get; private set; }
-
-    [Timestamp]
-    public uint Version { get; set; }
-
-    public Street(string name, int capacity, LineString geometry)
-    {
-        if (string.IsNullOrWhiteSpace(name))
-        {
-            throw new ArgumentException("Street name cannot be empty.", nameof(name));
-        }
-
-        if (capacity <= 0)
-        {
-            throw new ArgumentOutOfRangeException(nameof(capacity), "Capacity must be positive.");
-        }
-
-        if (geometry == null || geometry.IsEmpty)
-        {
-            throw new ArgumentException("Geometry cannot be null or empty.", nameof(geometry));
-        }
-
-        Name = name;
-        Capacity = capacity;
-        Geometry = geometry;
-    }
-
-    public void AddPointToGeometry(Coordinate point, bool atEnd = true)
-    {
-        if (point == null)
-        {
-            throw new ArgumentNullException(nameof(point), "Point cannot be null.");
-        }
-
-        var coords = Geometry.Coordinates.ToList();
-
-        coords.Add(point);
-
-        Geometry = new LineString(coords.ToArray());
-    }
-}

src/Infrastructure/StreetDbContext.cs

@@ -2,23 +2,6 @@ using Microsoft.EntityFrameworkCore;
 
 public class StreetDbContext : DbContext
 {
-    public DbSet<Street> Streets { get; set; }
-
-    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {
-        modelBuilder.HasPostgresExtension("postgis");
-
-        modelBuilder.Entity<Street>(entity =>
-        {
-            entity.HasKey(s => s.Name);
-
-            entity.Property(s => s.Capacity).IsRequired();
-
-            entity.Property(s => s.Geometry).HasColumnType("geometry(LineString,4326)").IsRequired();
-
-            entity.Property(s => s.Version).IsRowVersion();
-        });
-    }
     public StreetDbContext(DbContextOptions<StreetDbContext> options) : base(options)
     {
 

src/Infrastructure/StreetRepository.cs

@@ -1,86 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using NetTopologySuite.Geometries;
-
-public class StreetRepository
-{
-    private readonly StreetDbContext Context;
-
-    public StreetRepository(StreetDbContext context)
-    {
-        Context = context;
-    }
-
-    public async Task<Street> GetByNameAsync(string name)
-    {
-        return await Context.Streets.FirstOrDefaultAsync(s => s.Name == name);
-    }
-
-    public async Task<bool> ExistsAsync(string name)
-    {
-        return await Context.Streets.AnyAsync(s => s.Name == name);
-    }
-
-    public async Task AddAsync(Street street)
-    {
-        await Context.Streets.AddAsync(street);
-        await Context.SaveChangesAsync();
-    }
-
-    public async Task<bool> RemoveAsync(string name)
-    {
-        var street = await GetByNameAsync(name);
-        if (street == null)
-        {
-            return false;
-        }
-
-        Context.Streets.Remove(street);
-        await Context.SaveChangesAsync();
-        return true;
-    }
-
-    public async Task UpdateGeometryInBackend(string name, Geometry point)
-    {
-        var street = await GetByNameAsync(name);
-
-        if (street == null)
-        {
-            throw new KeyNotFoundException($"Street '{name}' not found.");
-        }
-
-        street.AddPointToGeometry(point.Coordinate);
-
-        try
-        {
-            await Context.SaveChangesAsync();
-        }
-        catch (DbUpdateConcurrencyException)
-        {
-            throw new InvalidOperationException("Concurrency conflict: The street was modified by another transaction.");
-        }
-    }
-
-    public async Task UpdateGeometryWithPostGIS(string name, Geometry point)
-    {
-        var street = await GetByNameAsync(name);
-
-        if (street == null)
-        {
-            throw new KeyNotFoundException($"Street '{name}' not found.");
-        }
-
-        try
-        {
-            // PostgreSQL's UPDATE already checks for concurrency by default
-            await Context.Database.ExecuteSqlRawAsync(
-                "UPDATE \"Streets\" SET \"Geometry\" = ST_AddPoint(\"Geometry\", ST_SetSRID(ST_MakePoint({0}, {1}), 4326)) WHERE \"Name\" = {2}",
-                point.Coordinate.X, point.Coordinate.Y, name
-            );
-
-        }
-        catch (DbUpdateConcurrencyException)
-        {
-            throw new InvalidOperationException("Concurrency conflict: The street was modified by another transaction.");
-        }
-    }
-}

src/PTV-Street.csproj

@@ -9,9 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
-    <PackageReference Include="NetTopologySuite" Version="2.6.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-    <PackageReference Include="npgsql.entityframeworkcore.postgresql.nettopologysuite" Version="9.0.4" />
   </ItemGroup>
 
 </Project>

src/Program.cs

@@ -1,18 +1,7 @@
-using Microsoft.EntityFrameworkCore;
-
 var builder = WebApplication.CreateBuilder(args);
-
-builder.Services.AddDbContext<StreetDbContext>(options => options.UseNpgsql("TBD", o => o.UseNetTopologySuite()));
-
-builder.Services.AddScoped<StreetRepository>();
-builder.Services.AddScoped<StreetService>();
-
-builder.Services.AddControllers();
-
 var app = builder.Build();
 
-app.UseRouting();
+app.MapGet("/", () => "Hello World!");
-app.MapControllers();
 
 app.Run();
 

tests/APITests.cs

@@ -1,8 +1,5 @@
 using System.Net.Http.Json;
 using FluentAssertions;
-using FluentAssertions.Json;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 public class APITests : IClassFixture<StreetWebApplicationFactory<Program>>
 {
@@ -29,11 +26,9 @@ public class APITests : IClassFixture<StreetWebApplicationFactory<Program>>
         {
             name = "Kaiserstraße",
             capacity = 100,
-            geometry = new[] { new { x = 10, y = 20 }, new { x = 15, y = 25 } }
+            geometry = new[] { new { x = 10, y = 20 } }
         };
 
-        Console.WriteLine(JsonConvert.SerializeObject(street));
-
         var post_response = await client.PostAsJsonAsync("/api/streets/", street);
 
         post_response.StatusCode.Should().Be(System.Net.HttpStatusCode.Created);
@@ -42,11 +37,9 @@ public class APITests : IClassFixture<StreetWebApplicationFactory<Program>>
 
         get_response.StatusCode.Should().Be(System.Net.HttpStatusCode.OK);
 
-        var expected_street = JObject.Parse(JsonConvert.SerializeObject(street));
+        var responseContent = await get_response.Content.ReadFromJsonAsync<object>();
 
-        var response_street = JObject.Parse(await get_response.Content.ReadAsStringAsync());
+        street.Should().BeEquivalentTo(responseContent);
-
-        response_street.Should().BeEquivalentTo(expected_street);
     }
 
     [Fact]
@@ -56,7 +49,7 @@ public class APITests : IClassFixture<StreetWebApplicationFactory<Program>>
         {
             name = "Adenauerring",
             capacity = 100,
-            geometry = new[] { new { x = 10, y = 20 }, new { x = 50, y = 70 } }
+            geometry = new[] { new { x = 10, y = 20 } }
         };
 
         await client.PostAsJsonAsync("/api/streets/", street);
@@ -65,7 +58,7 @@ public class APITests : IClassFixture<StreetWebApplicationFactory<Program>>
         {
             name = "Adenauerring",
             capacity = 200,
-            geometry = new[] { new { x = 30, y = 40 }, new { x = 100, y = 150 } }
+            geometry = new[] { new { x = 30, y = 40 } }
         };
 
         var response = await client.PostAsJsonAsync("/api/streets", duplicate_street);
@@ -78,7 +71,7 @@ public class APITests : IClassFixture<StreetWebApplicationFactory<Program>>
     {
         var response = await client.GetAsync("/api/streets/Englerstraße");
 
-        response.StatusCode.Should().Be(System.Net.HttpStatusCode.NotFound);
+        response.StatusCode.Should().Be(System.Net.HttpStatusCode.NoContent);
     }
 
     [Fact]
@@ -88,7 +81,7 @@ public class APITests : IClassFixture<StreetWebApplicationFactory<Program>>
         {
             name = "Moltkestraße",
             capacity = 100,
-            geometry = new[] { new { x = 10, y = 20 }, new { x = 50, y = 100 } }
+            geometry = new[] { new { x = 10, y = 20 } }
         };
 
         await client.PostAsJsonAsync("/api/streets/", street);
@@ -122,7 +115,7 @@ public class APITests : IClassFixture<StreetWebApplicationFactory<Program>>
         {
             name = "Ettlingerstraße",
             capacity = 50,
-            geometry = new[] { new { x = 5, y = 3 }, new { x = 6, y = 4 } }
+            geometry = new[] { new { x = 5, y = 3 } }
         };
 
         await client.PostAsJsonAsync("/api/streets/", street);
@@ -140,25 +133,22 @@ public class APITests : IClassFixture<StreetWebApplicationFactory<Program>>
 
         get_response_no_method.StatusCode.Should().Be(System.Net.HttpStatusCode.OK);
 
-        var expected_street_no_method = new
+        var content_no_method = get_response_no_method.Content.ReadFromJsonAsync<object>();
+
+        var expected_content_no_method = new
         {
             name = "Ettlingerstraße",
             capacity = 50,
-            geometry = new[] { new { x = 5, y = 3 }, new { x = 6, y = 4 }, new { x = 15, y = 30 } }
+            geometry = new[] { new { x = 5, y = 3 }, new { x = 15, y = 30 } }
         };
 
-        var expected_street_json = JObject.Parse(JsonConvert.SerializeObject(expected_street_no_method));
+        expected_content_no_method.Should().BeEquivalentTo(content_no_method);
-
-        var response_street_no_method = JObject.Parse(await get_response_no_method.Content.ReadAsStringAsync());
-
-        response_street_no_method.Should().BeEquivalentTo(expected_street_json);
-
 
         // Test with "Backend" method
         var update_backend = new
         {
             Point = new { x = 20, y = 35 },
-            usePostGIS = false,
+            Method = "Backend"
         };
 
         var patch_response_backend = await client.PatchAsJsonAsync("/api/streets/Ettlingerstraße", update_backend);
@@ -169,35 +159,43 @@ public class APITests : IClassFixture<StreetWebApplicationFactory<Program>>
         var update_postgis = new
         {
             Point = new { x = 25, y = 40 },
-            usePostGIS = true,
+            Method = "PostGIS"
         };
 
         var patch_response_postgis = await client.PatchAsJsonAsync("/api/streets/Ettlingerstraße", update_postgis);
 
         patch_response_postgis.StatusCode.Should().Be(System.Net.HttpStatusCode.OK);
 
+        // Test with "Database" method
+        var update_database = new
+        {
+            Point = new { x = 30, y = 45 },
+            Method = "Database"
+        };
+
+        var patch_response_database = await client.PatchAsJsonAsync("/api/streets/Ettlingerstraße", update_database);
+
+        patch_response_database.StatusCode.Should().Be(System.Net.HttpStatusCode.OK);
+
         var get_response_final = await client.GetAsync("/api/streets/Ettlingerstraße");
 
         get_response_final.StatusCode.Should().Be(System.Net.HttpStatusCode.OK);
 
-        var expected_street_final = new
+        var content_final = await get_response_final.Content.ReadFromJsonAsync<object>();
+        var expected_content_final = new
         {
             name = "Ettlingerstraße",
             capacity = 50,
             geometry = new[]
             {
                 new { x = 5, y = 3 },
-                new { x = 6, y = 4 },
                 new { x = 15, y = 30 },
                 new { x = 20, y = 35 },
                 new { x = 25, y = 40 },
+                new { x = 30, y = 45 }
             }
         };
 
-        var expected_street = JObject.Parse(JsonConvert.SerializeObject(expected_street_final));
+        expected_content_final.Should().BeEquivalentTo(content_final);
-
-        var response_street = JObject.Parse(await get_response_final.Content.ReadAsStringAsync());
-
-        response_street.Should().BeEquivalentTo(expected_street);
     }
 }

tests/StreetWebApplicationFactory.cs

@@ -19,7 +19,7 @@ public class StreetWebApplicationFactory<Program> : WebApplicationFactory<Progra
         {
 
             // Use the test database
-            services.AddDbContext<StreetDbContext>(options => options.UseNpgsql(dbTestContainer.GetConnectionString(), o => o.UseNetTopologySuite()));
+            services.AddDbContext<StreetDbContext>(options => options.UseNpgsql(dbTestContainer.GetConnectionString()));
 
             // Ensure the database is created before running the tests
             using var scope = services.BuildServiceProvider().CreateScope();

tests/tests.csproj

@@ -10,15 +10,11 @@
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.2" />
     <PackageReference Include="FluentAssertions" Version="8.2.0" />
-    <PackageReference Include="FluentAssertions.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NetTopologySuite" Version="2.6.0" />
     <PackageReference Include="npgsql" Version="9.0.3" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-    <PackageReference Include="npgsql.entityframeworkcore.postgresql.nettopologysuite" Version="9.0.4" />
-    <PackageReference Include="npgsql.Nettopologysuite" Version="9.0.3" />
     <PackageReference Include="Testcontainers" Version="4.3.0" />
     <PackageReference Include="Testcontainers.PostgreSql" Version="4.3.0" />
     <PackageReference Include="Testcontainers.Xunit" Version="4.3.0" />