Merge branch 'Develop'

Author: GodOfAllBeings

App/API/Endpoints.cs

@@ -14,32 +14,15 @@ namespace Repository.App.API
 {
     public class Endpoints
     {
-        // TODO: Delete this dict and its uses before hand-in
-        static Dictionary<string, int> numUpdates = new Dictionary<string, int>();
-        //static DatabaseManager databaseManager = new DatabaseManager(new MetadataDb());
-        //static ResourceManager resourceManager = new ResourceManager(new FileDb(), new MetadataDb());
         public Endpoints(WebApplication app)
         {
-            //databaseManager.TrackAllDynamicResources();
-
-            // TODO: Delete if we don't end up using MultiThreadFileWriter
-            //var fileWriter = app.Services.GetRequiredService<MultiThreadFileWriter>();
-            //fileWriter.WriteLine("yo", "c:\\myfile.txt");
-
-            // Rate limiting is added to some endpoints only, as it will keep the program stable.
-            // The endpoints without rate limiting, such as ping, are endpoints we don't expect to break anything from a large amount of requests, and rate limiting would only be to prevent ddos attacks.
-            // If we add rate limiting to these endpoints, we need to add another policy that allows a higher request rate than the one used for files.
-            // Metadata already has an internal queue for writing updates, which means rate limiting isn't required.
-            // TODO: metadata queue only applies when writing to the file, not reading from. This hasn't been an issue so far, but maybe rate limiting on metadata read requests could be useful.
             var ratePolicy = "fixed";
 
             var _hostEnvironment = app.Environment;
             #region connection
             // To maintain connection
             app.MapGet("ping", (HttpContext httpContext) =>
             {
-                //var appUrl = app.Urls.FirstOrDefault();
-                //Console.WriteLine("Repo URL: " + appUrl);
                 return "pong";
             });
 
@@ -58,30 +41,25 @@ public Endpoints(WebApplication app)
                 Console.WriteLine("Received GET request for file on resource id: " + resourceId);
                 return manager.GetFileById(resourceId);
             });
-            //.RequireRateLimiting(ratePolicy); // TODO: Find out if retrieving files without rate limiter can be an issue (especially with streaming)
 
             // To save incomming files (.png, .xes, .bpmn, .pnml etc)
             app.MapPost("/resources", (HttpContext context, ResourceManager manager) => {
                 Console.WriteLine("Received POST request to save file");
-                var appUrl = app.Urls.FirstOrDefault();
-                var formObject = context.Request.Form.ToFormObject();
+                var request = context.Request;
+                //var appUrl = $"{request.Scheme}://{request.Host}{request.PathBase}{request.Path}{request.QueryString}"; // Full URL with path and everything
+                var appUrl = $"{request.Scheme}://{request.Host}{request.PathBase}";
+                var formObject = context.Request.Form.ToFormObject(appUrl);
 
                 if (formObject == null) return Results.BadRequest("Invalid FormData keys");
                 if (formObject.File == null) return Results.BadRequest("Exactly one file is required");
                 if (formObject.Host == null) formObject.Host = $"{appUrl}/resources/";
-                return manager.PostFile(formObject, appUrl!);
+                return manager.PostFile(formObject);
             })
             .RequireRateLimiting(ratePolicy);
 
             app.MapPut("/resources/{resourceId}", (HttpContext context, string resourceId, ResourceManager manager) =>
             {
                 Console.WriteLine("Received PUT request to update file with id: " + resourceId);
-
-                // TODO: Delete the following section. Just to track number of updates and to print headers:
-                if (numUpdates.ContainsKey(resourceId)) numUpdates[resourceId] += 1;
-                else numUpdates[resourceId] = 1;
-                Console.WriteLine($"Num updates for {resourceId} = {numUpdates[resourceId]}");
-
                 var requestFiles = context.Request.Form.Files;
                 if (requestFiles?.Count != 1) return Results.BadRequest("Exactly one file is required");
                 var formFile = requestFiles.Single();
@@ -113,32 +91,22 @@ public Endpoints(WebApplication app)
                 return manager.GetChildrenMetadataList(resourceId);
             });
 
+            // To save metadata object without a file
             app.MapPost("/resources/metadata", (HttpRequest request, ResourceManager manager) =>
             {
                 Console.WriteLine("Received POST request to create metadata object without a file");
-                var appUrl = app.Urls.FirstOrDefault(); // TODO: This isn't the cleanest way to get our own URL. Maybe change at some point.
-
-                //request.EnableBuffering();
-                //request.Body.Seek(0, SeekOrigin.Begin);
-                //if (request.ContentLength == 0)
-                //    return Results.BadRequest("Invalid request. Body must have form data.");
+                var appUrl = $"{request.Scheme}://{request.Host}{request.PathBase}";
 
                 var formObject = request.Form.ToFormObject();
                 if (formObject == null) return Results.BadRequest("Invalid FormData keys");
                 return manager.PostMetadata(formObject, appUrl!);
-                //return manager.PostMetadata(request.Form, appUrl!);
             });
 
+            // To update metadata object only
             app.MapPut("/resources/metadata/{resourceId}", (HttpRequest request, string resourceId, ResourceManager manager) =>
             {
                 Console.WriteLine("Received PUT request to update metadata object without a file");
-                var appUrl = app.Urls.FirstOrDefault(); // TODO: This isn't the cleanest way to get our own URL. Maybe change at some point.
-
-                //request.EnableBuffering();
-                //request.Body.Seek(0, SeekOrigin.Begin);
-                //if (request.ContentLength == 0)
-                //    return Results.BadRequest("Invalid request. Body must have form data.");
-
+                var appUrl = $"{request.Scheme}://{request.Host}{request.PathBase}";
                 return manager.UpdateMetadataObject(request.Form, appUrl!, resourceId);
             });
 
@@ -151,19 +119,21 @@ public Endpoints(WebApplication app)
                 return manager.GetFilteredList(bodyString);
             });
             #endregion
+            
             #region visualizers
             // To retrieve graph for given resourceId
-            app.MapGet("/resources/graphs/{resourceId}", (string resourceId, ResourceManager manager) =>
+            app.MapGet("/resources/graphs/{resourceId}", (HttpRequest request, string resourceId, ResourceManager manager) =>
             {
                 Console.WriteLine("Received GET request for relation graph on resource id: " + resourceId);
                 return manager.GetGraphForResource(resourceId);
             });
 
             // To create/retrieve a histogram for an EventLog.
-            app.MapPost("/resources/histograms/{resourceId}", (string resourceId, ResourceManager manager) =>
+            app.MapPost("/resources/histograms/{resourceId}", (HttpRequest request, string resourceId, ResourceManager manager) =>
             {
                 Console.WriteLine("Received POST request for histogram on resource id: " + resourceId);
-                var appUrl = app.Urls.FirstOrDefault(); // TODO: This isn't the cleanest way to get our own URL. Maybe change at some point.
+                //var appUrl = app.Urls.FirstOrDefault(); // TODO: This isn't the cleanest way to get our own URL. Maybe change at some point.
+                var appUrl = $"{request.Scheme}://{request.Host}{request.PathBase}";
                 return manager.GetHistogram(resourceId, appUrl);
             });
             #endregion

App/API/Registration.cs

@@ -1,12 +1,18 @@
-namespace Repository.App.API
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Repository.App.Entities;
+
+namespace Repository.App.API
 {
     public class Registration
     {
         public static string GetConfiguration()
         {
             string path = Path.Combine(Directory.GetCurrentDirectory(), "configuration.json");
             string config = File.ReadAllText(path);
-            return config;
+            var jsonConfig = JObject.Parse(config); // To remove comments
+            string configFormat = JsonConvert.SerializeObject(jsonConfig, Formatting.Indented);
+            return configFormat;
         }
     }
 }