Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

10 files changed, 121 insertions, 37 deletions

diff --git a/backend/api/api/Controllers/AuthController.cs b/backend/api/api/Controllers/AuthController.cs
index 6dfe483a..7167d1bf 100644
--- a/backend/api/api/Controllers/AuthController.cs
+++ b/backend/api/api/Controllers/AuthController.cs
@@ -49,8 +49,6 @@ namespace api.Controllers
             return Ok(newToken);
 
 
-
-
         }
 
 
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/Controllers/UserController.cs b/backend/api/api/Controllers/UserController.cs
index d41a42e3..58121656 100644
--- a/backend/api/api/Controllers/UserController.cs
+++ b/backend/api/api/Controllers/UserController.cs
@@ -1,5 +1,6 @@
 using api.Models;
 using api.Services;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics;
 
@@ -72,6 +73,7 @@ namespace api.Controllers
 
         // PUT api/<UserController>/5
         [HttpPut("{id}")]
+        [Authorize(Roles = "User")]
         public ActionResult Put(string id, [FromBody] User user)
         {
             var existingUser = userService.Get(id);
@@ -86,6 +88,7 @@ namespace api.Controllers
 
         // DELETE api/<UserController>/5
         [HttpDelete("{id}")]
+        [Authorize(Roles = "User")]
         public ActionResult Delete(string id)
         {
             var user = userService.Get(id);
diff --git a/backend/api/api/Models/Dataset.cs b/backend/api/api/Models/Dataset.cs
index 0dc87f40..d58b3143 100644
--- a/backend/api/api/Models/Dataset.cs
+++ b/backend/api/api/Models/Dataset.cs
@@ -1,46 +1,25 @@
-using MongoDB.Bson;
+using System;
+using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 
 namespace api.Models
 {
-    public class Dataset
-    {
+	public class Dataset
+	{
         internal string uploaderId;
 
         [BsonId]
         [BsonRepresentation(BsonType.ObjectId)]//mongo data type to .net
         public string _id { get; set; }
-        [BsonElement("uploaderId")]
-        public string UploaderId { get; set; }
-        [BsonElement("name")]
         public string name { get; set; }
-
         public string description { get; set; }
-        //datetime
-        public string dateCreated { get; set; }
-        
-        public int[] inputColumns { get; set; }
-        public int columnToPredict { get; set; }
-        public bool randomTestSet { get; set; }
-        public int randomTestSetDistribution { get; set; }
-
-
-        public string type { get; set; }
-        public string encoding { get; set; }
-        public string optimizer { get; set; }
-        public string lossFunction { get; set; }
-        public int inputNeurons { get; set; }
-        public int hiddenLayerNeurons { get; set; }
-        public int hiddenLayers { get; set; }
-        public int batchSize { get; set; }
-        public string inputLayerActivationFunction { get; set; }
-        public string hiddenLayerActivationFunction { get; set; }
-        public string outputLayerActivationFunction { get; set; }
-
-
-        [BsonElement("extension")]
+        public string header { get; set; }
+        public int fileId { get; set; }
         public string extension { get; set; }
-        
-
+        public bool isPublic { get; set; }
+        public bool accessibleByLink { get; set; }
+        public string dateCreated { get; set; }
+        public string lastUpdated { get; set; }
     }
 }
+
diff --git a/backend/api/api/Models/Model.cs b/backend/api/api/Models/Model.cs
new file mode 100644
index 00000000..2e2dd5be
--- /dev/null
+++ b/backend/api/api/Models/Model.cs
@@ -0,0 +1,47 @@
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace api.Models
+{
+    public class Model
+    {
+        internal string uploaderId;
+
+        [BsonId]
+        [BsonRepresentation(BsonType.ObjectId)]//mongo data type to .net
+        public string _id { get; set; }
+        [BsonElement("uploaderId")]
+        public string UploaderId { get; set; }
+
+
+        public string name { get; set; }
+        public string description { get; set; }
+        //datetime
+        public string dateCreated { get; set; }
+        public string lastUpdated { get; set; }
+        //proveriti id
+        public string datasetId { get; set; }
+
+        //Test set settings
+        public int[] inputColumns { get; set; }
+        public int columnToPredict { get; set; }
+        public bool radnomOrder {get;set;}
+        public bool randomTestSet { get; set; }
+        public int randomTestSetDistribution { get; set; }
+
+        //Neural net training
+        public string type { get; set; }
+        public string encoding { get; set; }
+        public string optimizer { get; set; }
+        public string lossFunction { get; set; }
+        public int inputNeurons { get; set; }
+        public int hiddenLayerNeurons { get; set; }
+        public int hiddenLayers { get; set; }
+        public int batchSize { get; set; }
+        public string inputLayerActivationFunction { get; set; }
+        public string hiddenLayerActivationFunction { get; set; }
+        public string outputLayerActivationFunction { get; set; }
+
+
+    }
+}
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/DatasetService.cs b/backend/api/api/Services/DatasetService.cs
index 1b6d22be..32136a2e 100644
--- a/backend/api/api/Services/DatasetService.cs
+++ b/backend/api/api/Services/DatasetService.cs
@@ -23,7 +23,7 @@ namespace api.Services
         //brisanje odredjenog name-a
         public void Delete(string uploaderId, string name)
         {
-            _dataset.DeleteOne(dataset => (dataset.UploaderId == uploaderId && dataset.name == name)); 
+            _dataset.DeleteOne(dataset => (dataset.uploaderId == uploaderId && dataset.name == name)); 
         }
         public List<Dataset> GetAllDatesets(string uploaderId)
         {
@@ -31,13 +31,13 @@ namespace api.Services
         }
         public Dataset GetOneDataset(string uploaderId, string name)
         {
-            return _dataset.Find(dataset => dataset.UploaderId == uploaderId && dataset.name == name).FirstOrDefault();
+            return _dataset.Find(dataset => dataset.uploaderId == uploaderId && dataset.name == name).FirstOrDefault();
         }
 
         //ako je potrebno da se zameni name  ili ekstenzija
         public void Update(string uploaderId, string name, Dataset dataset)
         {
-            _dataset.ReplaceOne(dataset => dataset.UploaderId == uploaderId && dataset.name == name, dataset);
+            _dataset.ReplaceOne(dataset => dataset.uploaderId == uploaderId && dataset.name == name, dataset);
         }
     }
 }
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..7adade0c
--- /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("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
+
+        }
+    }
+}
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>