Merge master in develop (#27)

Sverrevg · JeapfromtheLake · EGKangaroo · web-flow · commit eb8907a77c56 · 2021-05-25T11:10:55.000+02:00
* Develop into master (#26) * Task/#257 controller skeleton * Task/#263 koppeling pakket service * cors (#5) * dockerfile added local file * Add license (#6) * Update README.md * Create LICENSE * Update README.md Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> * Build (#11) Co-authored-by: Aron Heesakkers <aron.heesakkers@via.nl> * Hardcoded values to appsettings (#12) Co-authored-by: Aron Heesakkers <aron.heesakkers@via.nl> * Update README.md (#13) * Develop (#7) * Task/#257 controller skeleton * Task/#263 koppeling pakket service * cors (#5) * dockerfile added local file * Add license (#6) * Update README.md * Create LICENSE * Update README.md Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> Co-authored-by: Wieling,Kevin C.F.J <k.wieling@student.fontys.nl> Co-authored-by: Gompel,Sverre S. van <sverre.vangompel@student.fontys.nl> Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> Co-authored-by: EGKangaroo <EGKangaroo@yahoo.com> * Update README.md Co-authored-by: Wieling,Kevin C.F.J <k.wieling@student.fontys.nl> Co-authored-by: Gompel,Sverre S. van <sverre.vangompel@student.fontys.nl> Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> Co-authored-by: EGKangaroo <EGKangaroo@yahoo.com> * Update README.md * Gateway fix (#16) * Changes * gateway fix, same request model as package service * created at action bug fixed Co-authored-by: Aron Heesakkers <aron.heesakkers@via.nl> Co-authored-by: EGKangaroo <EGKangaroo@yahoo.com> * Task/#264 koppeling locatieservice (#18) * added locationservice url * added models * location controller * fixed room requestmodel * fix endpoints and constants * more model fixes * getpackage conversion fix * Story/#333 pakketgegevens (#20) * personeel-service toegevoegd * start error handling. persoon toegevoegd aan GetPackage(id) * sender is receiverid bugfix * collectionpoint ophalen bij GetPackage{id} * 400 - 404 errors allowed. getpackages haalt nu ook locatie en ontvanger op * merge fix * Story/#16 edit locations (#23) * Docker Local Appsettings * README update * Update methods finished * Changed name Co-authored-by: Aron Heesakkers <aron.heesakkers@via.nl> * #358 delete endpoints (#24) * all calls make use of flurl extension and return ObjectResults * Delete endpoints toegevoegd aan locatiecontroller * Error handling voor delete endpoints * conflict httpstatus added * Small formatting fix in locatiecontroller Co-authored-by: JaapvanderMeer <43168682+JeapfromtheLake@users.noreply.github.com> Co-authored-by: Wieling,Kevin C.F.J <k.wieling@student.fontys.nl> Co-authored-by: Gompel,Sverre S. van <sverre.vangompel@student.fontys.nl> Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> Co-authored-by: EGKangaroo <EGKangaroo@yahoo.com> Co-authored-by: Shady^ <36726909+ShadyDL@users.noreply.github.com> Co-authored-by: Aron Heesakkers <aron.heesakkers@via.nl> Co-authored-by: Sverre <43172180+Sverrevg@users.noreply.github.com> * Update docker-publish.yml * Update appsettings.json * Update appsettings.json * Rename appsettings.Docker.json to tmp * Rename tmp to appsettings.Docker.json * Add kestral * gethealth call Co-authored-by: Jaap van der Meer <43168682+JeapfromtheLake@users.noreply.github.com> Co-authored-by: Wieling,Kevin C.F.J <k.wieling@student.fontys.nl> Co-authored-by: Gompel,Sverre S. van <sverre.vangompel@student.fontys.nl> Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> Co-authored-by: EGKangaroo <EGKangaroo@yahoo.com> Co-authored-by: Shady^ <36726909+ShadyDL@users.noreply.github.com> Co-authored-by: Aron Heesakkers <aron.heesakkers@via.nl>
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -19,6 +19,7 @@ jobs:
             files: 'appsettings.json'
         env:
             PackageApiUrl: "${{ secrets.PAKKET_URL }}"
+            PersonApiUrl: "${{ secrets.PERSON_URL }}"
             LocationApiUrl: "${{ secrets.LOCATION_URL }}"
           
       - name: Push to Docker Hub
diff --git a/Controllers/PersonController.cs b/Controllers/PersonController.cs
@@ -70,5 +70,11 @@ public async Task<ActionResult<PersonServiceModel>> GetPersonById(string id)
             PersonServiceModel responseModel = await flurlResponse.GetJsonAsync<PersonServiceModel>();
             return Ok(responseModel);
         }
+        
+        [HttpGet("health")]
+        public ActionResult Health()
+        {
+            return Ok();
+        }
     }
 }
diff --git a/Program.cs b/Program.cs
@@ -3,7 +3,9 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
@@ -18,10 +20,32 @@ public static void Main(string[] args)
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
+
+            .ConfigureServices((context, services) =>
+            {
+                services.Configure<KestrelServerOptions>(
+                    context.Configuration.GetSection("Kestrel"));
+            })
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.ConfigureKestrel(serverOptions =>
                 {
-                    webBuilder.UseStartup<Startup>()
-                    .UseUrls("http://*:8123");
-                });
+                    serverOptions.Limits.MaxConcurrentConnections = 100;
+                    serverOptions.Limits.MaxConcurrentUpgradedConnections = 100;
+                    serverOptions.Limits.MaxRequestBodySize = 10 * 1024;
+                    serverOptions.Limits.MinRequestBodyDataRate =
+                        new MinDataRate(bytesPerSecond: 100,
+                            gracePeriod: TimeSpan.FromSeconds(10));
+                    serverOptions.Limits.MinResponseDataRate =
+                        new MinDataRate(bytesPerSecond: 100,
+                            gracePeriod: TimeSpan.FromSeconds(10));
+                    serverOptions.Limits.KeepAliveTimeout =
+                        TimeSpan.FromDays(30);
+                    serverOptions.Limits.RequestHeadersTimeout =
+                        TimeSpan.FromDays(30);
+                })
+                .UseStartup<Startup>()
+                .UseUrls("http://*:8123");
+            });
     }
 }
diff --git a/Startup.cs b/Startup.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -29,6 +30,9 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
+            services.Configure<KestrelServerOptions>(
+            Configuration.GetSection("Kestrel"));
+
             Constants.PackageApiUrl = Configuration.GetValue<string>("PackageApiUrl");
             Constants.LocationApiUrl = Configuration.GetValue<string>("LocationApiUrl");
             Constants.PersonApiUrl = Configuration.GetValue<string>("PersonApiUrl");
diff --git a/appsettings.json b/appsettings.json
@@ -9,5 +9,5 @@
   "AllowedHosts": "*",
   "PackageApiUrl": "",
   "LocationApiUrl": "",
-  "PersonApiUrl":  ""
+  "PersonApiUrl": ""
 }

Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,11 @@ public async Task<ActionResult<PersonServiceModel>> GetPersonById(string id)`
`70`	`70`	`PersonServiceModel responseModel = await flurlResponse.GetJsonAsync<PersonServiceModel>();`
`71`	`71`	`return Ok(responseModel);`
`72`	`72`	`}`
	`73`	`+`
	`74`	`+ [HttpGet("health")]`
	`75`	`+ public ActionResult Health()`
	`76`	`+ {`
	`77`	`+ return Ok();`
	`78`	`+ }`
`73`	`79`	`}`
`74`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@`
`9`	`9`	`"AllowedHosts": "*",`
`10`	`10`	`"PackageApiUrl": "",`
`11`	`11`	`"LocationApiUrl": "",`
`12`		`- "PersonApiUrl": ""`
	`12`	`+ "PersonApiUrl": ""`
`13`	`13`	`}`