Merge pull request #119 from amosproj/main

sprint-09-release

.github/workflows/Reactjs.yml

@@ -7,7 +7,7 @@ on:
   push:
     branches: [ main, release ]
   pull_request:
-    branches: [ main, frontend-dev, release ]
+    branches: [ main, frontend-dev, release, dev ]
 
 jobs:
   buildAndTest:

.github/workflows/dotnet.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main, release ]
   pull_request:
-    branches: [ main, backend-dev, release ]
+    branches: [ main, backend-dev, release, dev ]
 
 jobs:
   build:

.gitignore

@@ -2,3 +2,5 @@ node_modules
 .idea
 /.vs/slnx.sqlite-journal
 .vs/slnx.sqlite
+
+frontend/yarn.lock

backend/Backend/Middleware/RequestInterceptorDelegatingHandler.cs

@@ -0,0 +1,68 @@
+using Microsoft.Extensions.Configuration;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using System.IO.Compression;
+using System.IO;
+using System.Text;
+
+namespace Backend.Middleware
+{
+    // Catch the http post request(postCalculationRequest) from front-end.
+    // Further process the request and send back the Results to fornt-end.
+    public class RequestInterceptorDelegatingHandler : DelegatingHandler
+    {
+        private readonly string baseUrl;
+
+        public RequestInterceptorDelegatingHandler(IConfiguration configuration)
+        {
+            baseUrl = Environment.GetEnvironmentVariable("BaseUrl") ?? configuration["BaseUrl"];
+        }
+
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request,
+      CancellationToken cancellationToken)
+        {
+            if (request.RequestUri.ToString().Contains("api/calculation"))
+            {
+                var requestResponse = await base.SendAsync(request, cancellationToken);
+                var contentString = await requestResponse.Content.ReadAsStringAsync();
+                //Retrieve the CalculationId from the post request
+                var responseContent = JObject.Parse(contentString);
+                var calculationId = responseContent["Result"]["CalculationId"].ToString();
+
+                // Get the status of the calculation based on the CalculationId earlier created.
+                var calculationStateRequest = new HttpRequestMessage(new HttpMethod("GET"), baseUrl + "calculation/state/" + calculationId) { };
+                HttpResponseMessage calculationStateResponse;
+
+                Thread.Sleep(500);
+                //Checks of the calculation is completed.
+                //Results: Calulating,Storing,Stored,Not Stored, Not Found
+                while (true)
+                {
+                    calculationStateResponse = await base.SendAsync(calculationStateRequest, cancellationToken);
+
+                    var calculationResponseContent = JObject.Parse(await calculationStateResponse.Content.ReadAsStringAsync());
+                    var calculationResultStatus = calculationResponseContent["Result"].ToString();
+
+                    if (calculationResultStatus == "Stored")
+                    {
+                        break;
+                    }
+                    Thread.Sleep(500);
+                }
+                //If the calculation is stored.Send a post post request to retrieve the results and send back to the front-end.
+                var calculationResultRequest = new HttpRequestMessage(new HttpMethod("POST"), baseUrl + "calculation/result/" + calculationId) {
+                    Content = new StringContent(JsonConvert.SerializeObject(""), Encoding.UTF8, "application/json")
+                };
+                HttpResponseMessage calculationResultResponse = await base.SendAsync(calculationResultRequest, cancellationToken);
+                return calculationResultResponse;
+            }
+
+            return await base.SendAsync(request, cancellationToken);
+
+        }
+    }
+}

backend/Backend/Startup.cs

@@ -1,5 +1,6 @@
 using AspNetCore.Proxy;
 using Backend.Security;
+using Backend.Middleware;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -14,6 +15,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Net.Http;
+using System.Net;
 
 namespace Backend
 {
@@ -39,13 +42,24 @@ public void ConfigureServices(IServiceCollection services)
             services.AddProxies();
             //Used to  get the authenticate/process the Http requests.
             services.AddTransient<SimaProLoginDelegatingHandler>();
+
+            //Used to intercept and process frontend requests.
+            services.AddTransient<RequestInterceptorDelegatingHandler>();
+            //Decompress the gZip results recieved from the api
+            HttpClientHandler handler = new HttpClientHandler() { AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate };
+
             services.AddHttpClient("SimaProClient",
                  client => {
                      var baseUrl = Environment.GetEnvironmentVariable("BaseUrl") ?? Configuration["BaseUrl"];
                      client.BaseAddress = new Uri(baseUrl);
                      //client.Timeout = TimeSpan.FromSeconds(30);
                  })
+                .ConfigurePrimaryHttpMessageHandler(() => {
+                    return handler;
+                })
+                .AddHttpMessageHandler<RequestInterceptorDelegatingHandler>()
                 .AddHttpMessageHandler<SimaProLoginDelegatingHandler>();
+
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

frontend/.gitignore

@@ -21,5 +21,6 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+yarn.lock
 
 package-lock.json

frontend/package.json

@@ -4,9 +4,11 @@
     "version": "0.1.0",
     "private": true,
     "dependencies": {
+        "@material-ui/core": "^4.11.4",
         "@react-pdf/renderer": "^2.0.12",
         "apexcharts": "^3.26.1",
         "axios": "^0.21.1",
+        "cors": "^2.8.5",
         "html2canvas": "^1.0.0-rc.7",
         "jspdf": "^2.3.1",
         "jspdf-autotable": "^3.5.14",