User Story: Save linearized graph

src/api/Flooq.Api/Controllers/DataFlowController.cs

@@ -10,10 +10,12 @@ namespace Flooq.Api.Controllers
     public class DataFlowController : ControllerBase
     { 
         private readonly IDataFlowService _dataFlowService;
+        private readonly ILinearizedGraphService _graphService;
 
-        public DataFlowController(IDataFlowService dataFlowService)
+        public DataFlowController(IDataFlowService dataFlowService, ILinearizedGraphService graphService)
         { 
           _dataFlowService = dataFlowService;
+          _graphService = graphService;
         }
 
         // GET: api/DataFlow
@@ -37,10 +39,9 @@ public async Task<ActionResult<IEnumerable<DataFlow>>> GetDataFlows()
         /// or <see cref="NotFoundResult"/> if no <see cref="DataFlow"/> was identified by the id.
         /// </returns>
         [HttpGet("{id}")]
-        public async Task<ActionResult<DataFlow>> GetDataFlow(Guid? id)
+        public async Task<ActionResult<DataFlow?>> GetDataFlow(Guid? id)
         {
           var actionResult = await _dataFlowService.GetDataFlow(id);
-
           return actionResult.Value == null ? NotFound() : actionResult;
         }
 
@@ -59,14 +60,14 @@ public async Task<ActionResult<DataFlow>> GetDataFlow(Guid? id)
         [HttpPut("{id}")]
         public async Task<ActionResult<DataFlow>> PutDataFlow(Guid? id, DataFlow dataFlow)
         {
-            if (id != dataFlow.Id)
+            if (id == null || id != dataFlow.Id)
             {
                 return BadRequest();
             }
 
             dataFlow.LastEdited = DateTime.UtcNow;
 
-            var actionResult = _dataFlowService.PutDataFlow(dataFlow);
+            var actionResultDataFlow = _dataFlowService.PutDataFlow(dataFlow);
 
             try
             {
@@ -80,8 +81,17 @@ public async Task<ActionResult<DataFlow>> PutDataFlow(Guid? id, DataFlow dataFlo
                 }
                 throw;
             }
+
+            // Delete LinearizedGraph of changed DataFlow
+            var actionResultGraph = await _graphService.GetGraph(id.Value);
+            var graph = actionResultGraph?.Value; // Conditional access qualifier is needed!
+            if (graph != null)
+            {
+              _graphService.RemoveGraph(graph);
+              await _graphService.SaveChangesAsync();
+            }
 
-            return actionResult;
+            return actionResultDataFlow;
         }
 
         // POST: api/DataFlow
@@ -107,7 +117,7 @@ public async Task<ActionResult<DataFlow>> PostDataFlow(DataFlow dataFlow)
           _dataFlowService.AddDataFlow(dataFlow);
           await _dataFlowService.SaveChangesAsync();
 
-          return CreatedAtAction("GetDataFlow", new { id = dataFlow.Id }, dataFlow);
+          return CreatedAtAction(nameof(GetDataFlow), new { id = dataFlow.Id }, dataFlow);
         }
 
         // DELETE: api/DataFlow/5

src/api/Flooq.Api/Controllers/LinearizedGraphController.cs

@@ -0,0 +1,55 @@
+#nullable disable
+using Microsoft.AspNetCore.Mvc;
+using Flooq.Api.Models;
+using Flooq.Api.Services;
+
+namespace Flooq.Api.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class LinearizedGraphController : ControllerBase
+    {
+        private readonly ILinearizedGraphService _graphService;
+
+        public LinearizedGraphController(ILinearizedGraphService graphService)
+        { 
+          _graphService = graphService;
+        }
+
+        // GET: api/LinearizedGraph
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<LinearizedGraph>>> GetGraphs()
+        {
+          return await _graphService.GetGraphs();
+        }
+
+        // GET: api/LinearizedGraph/5
+        [HttpGet("{id}")]
+        public async Task<ActionResult<LinearizedGraph>> GetGraph(Guid id)
+        {
+            var actionResult = await _graphService.GetGraph(id);
+            return actionResult.Value == null ? NotFound() : actionResult;
+        }
+
+        // POST: api/LinearizedGraph
+        // To protect from overposting attacks, see https://go.microsoft.com/fwlink/?linkid=2123754
+        [HttpPost]
+        public async Task<ActionResult<LinearizedGraph>> PostGraph(LinearizedGraph linearizedGraph)
+        {
+            if (LinearizedGraphExists(linearizedGraph.Id))
+            {
+              return BadRequest();
+            }
+
+            _graphService.AddGraph(linearizedGraph);
+            await _graphService.SaveChangesAsync();
+
+            return CreatedAtAction(nameof(GetGraph), new { id = linearizedGraph.Id }, linearizedGraph);
+        }
+
+        private bool LinearizedGraphExists(Guid id)
+        {
+          return _graphService.LinearizedGraphExists(id);
+        }
+    }
+}

src/api/Flooq.Api/Controllers/VersionController.cs

@@ -19,7 +19,7 @@ public async Task<ActionResult<Models.Version>> GetVersion()
     {
       var version = await _versionService.GetLatestVersion();
 
-      return version == null ? NotFound() : version;
+      return version.Value == null ? NotFound() : version;
     }
   }
 }

src/api/Flooq.Api/Domain/FlooqContext.cs

@@ -11,6 +11,7 @@ public FlooqContext(DbContextOptions<FlooqContext> options) : base(options)
     { }
     public DbSet<DataFlow> DataFlows => Set<DataFlow>();
     public DbSet<Version> Versions => Set<Version>();
+    public DbSet<LinearizedGraph> Graphs => Set<LinearizedGraph>();
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {

src/api/Flooq.Api/Migrations/20220414121539_AddLinearizedGraph.cs

@@ -0,0 +1,51 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace api.Migrations
+{
+    public partial class AddLinearizedGraph : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "DataFlows",
+                keyColumn: "Id",
+                keyValue: new Guid("493dd34c-55e2-4b2f-9b46-f4f8cf1e8eb7"));
+
+            migrationBuilder.CreateTable(
+                name: "Graphs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uuid", nullable: false),
+                    Graph = table.Column<string>(type: "text", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Graphs", x => x.Id);
+                });
+
+            migrationBuilder.InsertData(
+                table: "DataFlows",
+                columns: new[] { "Id", "Definition", "Name", "Status" },
+                values: new object[] { new Guid("7b72d6dc-23cc-4b01-ad14-98938f65e2f6"), "{\r\n  \"nodes\": [\r\n    {\r\n      \"id\": \"1\",\r\n      \"dragHandle\": \".custom-drag-handle\",\r\n      \"type\": \"httpIn\",\r\n      \"data\": {\r\n        \"title\": \"Http Input\",\r\n        \"input\": {\r\n          \"url\": \"https://executor.dataflow.ch/IJF9K2\",\r\n          \"method\": \"post\",\r\n          \"contentType\": \"application/json\",\r\n          \"sampleBody\": \"{}\"\r\n        },\r\n        \"incomingHandles\": [],\r\n        \"outgoingHandles\": [\r\n          {\r\n            \"id\": \"11\",\r\n            \"name\": \"a\"\r\n          }\r\n        ]\r\n      },\r\n      \"position\": {\r\n        \"x\": 0,\r\n        \"y\": 0\r\n      }\r\n    },\r\n    {\r\n      \"id\": \"2\",\r\n      \"dragHandle\": \".custom-drag-handle\",\r\n      \"type\": \"filter\",\r\n      \"data\": {\r\n        \"title\": \"Filter\",\r\n        \"filter\": {\r\n          \"field\": \"tags\",\r\n          \"value\": \"secret\",\r\n          \"condition\": \"ne\"\r\n        },\r\n        \"incomingHandles\": [\r\n          {\r\n            \"id\": \"21\",\r\n            \"name\": \"a\"\r\n          }\r\n        ],\r\n        \"outgoingHandles\": [\r\n          {\r\n            \"id\": \"21\",\r\n            \"name\": \"a\"\r\n          }\r\n        ]\r\n      },\r\n      \"position\": {\r\n        \"x\": 400,\r\n        \"y\": 100\r\n      }\r\n    },\r\n    {\r\n      \"id\": \"3\",\r\n      \"dragHandle\": \".custom-drag-handle\",\r\n      \"type\": \"httpOut\",\r\n      \"data\": {\r\n        \"title\": \"Http Output\",\r\n        \"output\": {\r\n          \"url\": \"\",\r\n          \"method\": \"post\",\r\n          \"contentType\": \"application/json\",\r\n          \"sampleBody\": \"{}\"\r\n        },\r\n        \"incomingHandles\": [\r\n          {\r\n            \"id\": \"3a\",\r\n            \"name\": \"a\"\r\n          }\r\n        ],\r\n        \"outgoingHandles\": []\r\n      },\r\n      \"position\": {\r\n        \"x\": 800,\r\n        \"y\": 0\r\n      }\r\n    }\r\n  ],\r\n  \"edges\": [\r\n    {\r\n      \"id\": \"e1-2\",\r\n      \"fromNode\": \"1\",\r\n      \"fromHandle\": \"11\",\r\n      \"toNode\": \"2\",\r\n      \"toHandle\": \"2a\"\r\n    },\r\n    {\r\n      \"id\": \"e2-3\",\r\n      \"fromNode\": \"2\",\r\n      \"fromHandle\": \"21\",\r\n      \"toNode\": \"3\",\r\n      \"toHandle\": \"3a\"\r\n    }\r\n  ]\r\n}", "Demo Flow #1", "Active" });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Graphs");
+
+            migrationBuilder.DeleteData(
+                table: "DataFlows",
+                keyColumn: "Id",
+                keyValue: new Guid("7b72d6dc-23cc-4b01-ad14-98938f65e2f6"));
+
+            migrationBuilder.InsertData(
+                table: "DataFlows",
+                columns: new[] { "Id", "Definition", "LastEdited", "Name", "Status" },
+                values: new object[] { new Guid("493dd34c-55e2-4b2f-9b46-f4f8cf1e8eb7"), "{\r\n  \"nodes\": [\r\n    {\r\n      \"id\": \"1\",\r\n      \"dragHandle\": \".custom-drag-handle\",\r\n      \"type\": \"httpIn\",\r\n      \"data\": {\r\n        \"title\": \"Http Input\",\r\n        \"input\": {\r\n          \"url\": \"https://executor.dataflow.ch/IJF9K2\",\r\n          \"method\": \"post\",\r\n          \"contentType\": \"application/json\",\r\n          \"sampleBody\": \"{}\"\r\n        },\r\n        \"incomingHandles\": [],\r\n        \"outgoingHandles\": [\r\n          {\r\n            \"id\": \"11\",\r\n            \"name\": \"a\"\r\n          }\r\n        ]\r\n      },\r\n      \"position\": {\r\n        \"x\": 0,\r\n        \"y\": 0\r\n      }\r\n    },\r\n    {\r\n      \"id\": \"2\",\r\n      \"dragHandle\": \".custom-drag-handle\",\r\n      \"type\": \"filter\",\r\n      \"data\": {\r\n        \"title\": \"Filter\",\r\n        \"filter\": {\r\n          \"field\": \"tags\",\r\n          \"value\": \"secret\",\r\n          \"condition\": \"ne\"\r\n        },\r\n        \"incomingHandles\": [\r\n          {\r\n            \"id\": \"21\",\r\n            \"name\": \"a\"\r\n          }\r\n        ],\r\n        \"outgoingHandles\": [\r\n          {\r\n            \"id\": \"21\",\r\n            \"name\": \"a\"\r\n          }\r\n        ]\r\n      },\r\n      \"position\": {\r\n        \"x\": 400,\r\n        \"y\": 100\r\n      }\r\n    },\r\n    {\r\n      \"id\": \"3\",\r\n      \"dragHandle\": \".custom-drag-handle\",\r\n      \"type\": \"httpOut\",\r\n      \"data\": {\r\n        \"title\": \"Http Output\",\r\n        \"output\": {\r\n          \"url\": \"\",\r\n          \"method\": \"post\",\r\n          \"contentType\": \"application/json\",\r\n          \"sampleBody\": \"{}\"\r\n        },\r\n        \"incomingHandles\": [\r\n          {\r\n            \"id\": \"3a\",\r\n            \"name\": \"a\"\r\n          }\r\n        ],\r\n        \"outgoingHandles\": []\r\n      },\r\n      \"position\": {\r\n        \"x\": 800,\r\n        \"y\": 0\r\n      }\r\n    }\r\n  ],\r\n  \"edges\": [\r\n    {\r\n      \"id\": \"e1-2\",\r\n      \"fromNode\": \"1\",\r\n      \"fromHandle\": \"11\",\r\n      \"toNode\": \"2\",\r\n      \"toHandle\": \"2a\"\r\n    },\r\n    {\r\n      \"id\": \"e2-3\",\r\n      \"fromNode\": \"2\",\r\n      \"fromHandle\": \"21\",\r\n      \"toNode\": \"3\",\r\n      \"toHandle\": \"3a\"\r\n    }\r\n  ]\r\n}", new DateTime(2022, 3, 5, 13, 45, 12, 0, DateTimeKind.Utc), "Demo Flow #1", "Active" });
+        }
+    }
+}

src/api/Flooq.Api/Migrations/FlooqContextModelSnapshot.cs

@@ -47,6 +47,20 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("DataFlows");
                 });
 
+            modelBuilder.Entity("Flooq.Api.Models.LinearizedGraph", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Graph")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Graphs");
+                });
+
             modelBuilder.Entity("Flooq.Api.Models.Version", b =>
                 {
                     b.Property<string>("Tag")

src/api/Flooq.Api/Models/LinearizedGraph.cs

@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Flooq.Api.Models;
+
+public class LinearizedGraph
+{
+  [Key]
+  public Guid Id { get; set; }
+  public string? Graph { get; set; }
+}

src/api/Flooq.Api/Program.cs

@@ -18,6 +18,7 @@
 
 builder.Services.AddScoped<IVersionService, VersionService>();
 builder.Services.AddScoped<IDataFlowService, DataFlowService>();
+builder.Services.AddScoped<ILinearizedGraphService, LinearizedGraphService>();
 
 builder.Configuration.AddEnvironmentVariables();
 var app = builder.Build();
@@ -36,7 +37,7 @@
 {
   app.UseDeveloperExceptionPage();
   app.UseSwagger();
-  app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "Flooq API v1"));
+  app.UseSwaggerUI(options => options.SwaggerEndpoint("/swagger/v1/swagger.json", "Flooq API v1"));
 }
 
 app.UseHttpsRedirection();

src/api/Flooq.Api/Services/DataFlowService.cs

@@ -20,17 +20,15 @@ public async Task<ActionResult<IEnumerable<DataFlow>>> GetDataFlows()
       return await _context.DataFlows.ToListAsync();
     }
 
-    public async Task<ActionResult<DataFlow>> GetDataFlow(Guid? id)
+    public async Task<ActionResult<DataFlow?>> GetDataFlow(Guid? id)
     {
-      var dataFlows = _context.DataFlows;
-      var actionResult = await dataFlows.FindAsync(id);
-      return actionResult;
+      var dataFlow = await _context.DataFlows.FindAsync(id);
+      return new ActionResult<DataFlow?>(dataFlow);
     }
 
     public ActionResult<DataFlow> PutDataFlow(DataFlow dataFlow)
     {
       _context.Entry(dataFlow).State = EntityState.Modified;
-
       return new ActionResult<DataFlow>(dataFlow);
     }