From c1356ddc1c5cd5cbc1603384555b741824831104 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Sun, 13 Mar 2022 18:32:12 +0100
Subject: Proslediti model poslat od frontend-a na python microservice.

---
 backend/api/api/Controllers/ModelController.cs   | 29 ++++++++++++++++++++++++
 backend/api/api/Program.cs                       |  1 +
 backend/api/api/Services/IMlConnectionService.cs |  8 +++++++
 backend/api/api/Services/MlConnectionService.cs  | 17 ++++++++++++++
 backend/api/api/api.csproj                       |  2 ++
 5 files changed, 57 insertions(+)
 create mode 100644 backend/api/api/Controllers/ModelController.cs
 create mode 100644 backend/api/api/Services/IMlConnectionService.cs
 create mode 100644 backend/api/api/Services/MlConnectionService.cs

(limited to 'backend/api')

diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs
new file mode 100644
index 00000000..5e22c61d
--- /dev/null
+++ b/backend/api/api/Controllers/ModelController.cs
@@ -0,0 +1,29 @@
+using api.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace api.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class ModelController : ControllerBase
+    {
+
+        private IMlConnectionService _mlService;
+
+        public ModelController(IMlConnectionService mlService)
+        {
+            _mlService = mlService;
+        }
+
+        [HttpPost("sendModel")]
+        [Authorize(Roles = "User")]
+        public async Task<ActionResult<string>> Test([FromBody] object model)
+        {
+            var result = await _mlService.SendModelAsync(model);
+            return Ok(result);
+        }
+
+    }
+}
diff --git a/backend/api/api/Program.cs b/backend/api/api/Program.cs
index 2c569daf..702ef259 100644
--- a/backend/api/api/Program.cs
+++ b/backend/api/api/Program.cs
@@ -28,6 +28,7 @@ builder.Services.AddSingleton<IMongoClient>(s =>
 builder.Services.AddScoped<IDatasetService, DatasetService>();
 builder.Services.AddScoped<IUserService, UserService>();
 builder.Services.AddScoped<IAuthService, AuthService>();
+builder.Services.AddScoped<IMlConnectionService, MlConnectionService>();
 
 //Add Authentication
 builder.Services.AddAuthentication(
diff --git a/backend/api/api/Services/IMlConnectionService.cs b/backend/api/api/Services/IMlConnectionService.cs
new file mode 100644
index 00000000..f38fb50a
--- /dev/null
+++ b/backend/api/api/Services/IMlConnectionService.cs
@@ -0,0 +1,8 @@
+
+namespace api.Services
+{
+    public interface IMlConnectionService
+    {
+        Task<string> SendModelAsync(object model);
+    }
+}
\ No newline at end of file
diff --git a/backend/api/api/Services/MlConnectionService.cs b/backend/api/api/Services/MlConnectionService.cs
new file mode 100644
index 00000000..a7c81c43
--- /dev/null
+++ b/backend/api/api/Services/MlConnectionService.cs
@@ -0,0 +1,17 @@
+using RestSharp;
+
+namespace api.Services
+{
+    public class MlConnectionService : IMlConnectionService
+    {
+        public async Task<string> SendModelAsync(object model)
+        {
+            RestClient client = new RestClient("https://jsonplaceholder.typicode.com");//Promeniti na python api kad se odradi
+            var request = new RestRequest("posts", Method.Post);//Promeniti na python api kad se odradi
+            request.AddJsonBody(model);
+            var result = await client.ExecuteAsync(request);
+            return result.Content;//Response od ML microservisa
+
+        }
+    }
+}
diff --git a/backend/api/api/api.csproj b/backend/api/api/api.csproj
index 46842c3e..f38621ca 100644
--- a/backend/api/api/api.csproj
+++ b/backend/api/api/api.csproj
@@ -10,6 +10,8 @@
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.3" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.16.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="RestSharp" Version="107.3.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.16.0" />
   </ItemGroup>
 
-- 
cgit v1.2.3


From 0fc05f3be0332b38acbefe86319aebd4affc456c Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 15 Mar 2022 16:44:54 +0100
Subject: Dodata putanja do python API-a.

---
 backend/api/api/Services/MlConnectionService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'backend/api')

diff --git a/backend/api/api/Services/MlConnectionService.cs b/backend/api/api/Services/MlConnectionService.cs
index a7c81c43..7adade0c 100644
--- a/backend/api/api/Services/MlConnectionService.cs
+++ b/backend/api/api/Services/MlConnectionService.cs
@@ -6,8 +6,8 @@ namespace api.Services
     {
         public async Task<string> SendModelAsync(object model)
         {
-            RestClient client = new RestClient("https://jsonplaceholder.typicode.com");//Promeniti na python api kad se odradi
-            var request = new RestRequest("posts", Method.Post);//Promeniti na python api kad se odradi
+            RestClient client = new RestClient("http://localhost:5000");
+            var request = new RestRequest("data", Method.Post);
             request.AddJsonBody(model);
             var result = await client.ExecuteAsync(request);
             return result.Content;//Response od ML microservisa
-- 
cgit v1.2.3