From 3541c23e1cb953f9669ec07dd6eab710ee8faf1c Mon Sep 17 00:00:00 2001 From: "DESKTOP-S0O2C44\\ROG" Date: Wed, 16 Mar 2022 22:45:32 +0100 Subject: Ispravljen dataset,model i predictor kontroler. Zavrsene crud metode. Odradjeni servisi #41 --- backend/api/api/Controllers/DatasetController.cs | 119 +++++++++++++-- backend/api/api/Controllers/ModelController.cs | 90 ++++++++++-- backend/api/api/Controllers/PredictorController.cs | 159 +++++++++++++++++++++ backend/api/api/Data/UserStoreDatabaseSettings.cs | 2 +- .../api/Interfaces/IUserStoreDatabaseSettings.cs | 2 +- backend/api/api/Models/Predictor.cs | 23 +++ backend/api/api/Program.cs | 1 + backend/api/api/Services/DatasetService.cs | 7 +- backend/api/api/Services/IDatasetService.cs | 3 +- backend/api/api/Services/IModelService.cs | 3 +- backend/api/api/Services/IPredictorService.cs | 16 +++ backend/api/api/Services/ModelService.cs | 11 +- backend/api/api/Services/PredictorService.cs | 50 +++++++ backend/api/api/appsettings.json | 19 +-- 14 files changed, 459 insertions(+), 46 deletions(-) create mode 100644 backend/api/api/Controllers/PredictorController.cs create mode 100644 backend/api/api/Models/Predictor.cs create mode 100644 backend/api/api/Services/IPredictorService.cs create mode 100644 backend/api/api/Services/PredictorService.cs (limited to 'backend/api') diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs index 3d008744..bc7448e1 100644 --- a/backend/api/api/Controllers/DatasetController.cs +++ b/backend/api/api/Controllers/DatasetController.cs @@ -1,6 +1,9 @@ using api.Models; using api.Services; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Net.Http.Headers; +using System.Net.Http.Headers; // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 @@ -11,24 +14,64 @@ namespace api.Controllers public class DatasetController : ControllerBase { private readonly IDatasetService _datasetService; + private JwtToken jwtToken; - public DatasetController(IDatasetService datasetService) + public DatasetController(IDatasetService datasetService, IConfiguration configuration) { _datasetService = datasetService; + jwtToken = new JwtToken(configuration); } - // GET: api//{username}/datasets - [HttpGet("{username}/datasets")] - public ActionResult> Get(string username) + // GET: api//mydatasets + [HttpGet("/mydatasets")] + [Authorize(Roles = "User")] + public ActionResult> Get() { - return _datasetService.GetAllDatesets(username); + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + + //ako bude trebao ID, samo iz baze uzeti + + return _datasetService.GetMyDatesets(username); + } + + // GET: api//publicdatasets + [HttpGet("/datasets")] + public ActionResult> GetPublicDS() + { + return _datasetService.GetPublicDatesets(); } - // GET api//{username}/{name} - [HttpGet("{username}/{name}")] - public ActionResult Get(string username, string name) + // GET api//{name} + //get odredjeni dataset + [HttpGet("/{name}")] + [Authorize(Roles = "User")] + public ActionResult Get(string name) { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + var dataset = _datasetService.GetOneDataset(username, name); if (dataset == null) @@ -37,10 +80,27 @@ namespace api.Controllers return dataset; } + /*za pretragu vratiti dataset koji je public + public ActionResult Get(string name) + { + + + var dataset = _datasetService.GetOneDataset(username, name); + + if (dataset == null) + return NotFound($"Dataset with name = {name} or user with username = {username} not found"); + + return dataset; + } + */ + // POST api//add [HttpPost("add")] + [Authorize(Roles = "User")] public ActionResult Post([FromBody] Dataset dataset) { + //da li ce preko tokena da se ubaci username ili front salje + //dataset.username = usernameToken; var existingDataset = _datasetService.GetOneDataset(dataset.username, dataset.name); if (existingDataset != null) @@ -53,10 +113,24 @@ namespace api.Controllers } } - // PUT api//{username}/{name} - [HttpPut("{username}/{name}")] - public ActionResult Put(string username, string name, [FromBody] Dataset dataset) + // PUT api//{name} + [HttpPut("/{name}")] + [Authorize(Roles = "User")] + public ActionResult Put(string name, [FromBody] Dataset dataset) { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + var existingDataset = _datasetService.GetOneDataset(username, name); //ne mora da se proverava @@ -64,13 +138,28 @@ namespace api.Controllers return NotFound($"Dataset with name = {name} or user with username = {username} not found"); _datasetService.Update(username, name, dataset); - return NoContent(); + + return Ok($"Dataset with name = {name} updated"); } - // DELETE api//username/name - [HttpDelete("{username}/{name}")] - public ActionResult Delete(string username, string name) + // DELETE api//name + [HttpDelete("/{name}")] + [Authorize(Roles = "User")] + public ActionResult Delete(string name) { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + var dataset = _datasetService.GetOneDataset(username, name); if (dataset == null) diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs index deb622b8..1d03d924 100644 --- a/backend/api/api/Controllers/ModelController.cs +++ b/backend/api/api/Controllers/ModelController.cs @@ -3,6 +3,8 @@ using api.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.Net.Http.Headers; +using System.Net.Http.Headers; namespace api.Controllers { @@ -13,12 +15,14 @@ namespace api.Controllers private IMlConnectionService _mlService; private readonly IModelService _modelService; - + private JwtToken jwtToken; - public ModelController(IMlConnectionService mlService, IModelService modelService) + + public ModelController(IMlConnectionService mlService, IModelService modelService, IConfiguration configuration) { _mlService = mlService; _modelService = modelService; + jwtToken = new JwtToken(configuration); } [HttpPost("sendModel")] @@ -29,18 +33,46 @@ namespace api.Controllers return Ok(result); } - // GET: api//{username}/models - [HttpGet("{username}/models")] - public ActionResult> Get(string username) + // GET: api//mymodels + [HttpGet("/mymodels")] + [Authorize(Roles = "User")] + public ActionResult> Get() { - return _modelService.GetAllModels(username); + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + + return _modelService.GetMyModels(username); } - //id korisnika, name modela - // GET api//{username}/{name} - [HttpGet("{username}/{name}")] - public ActionResult Get(string username, string name) + // name modela + // GET api//{name} + [HttpGet("/{name}")] + [Authorize(Roles = "User")] + public ActionResult Get(string name) { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + var model = _modelService.GetOneModel(username, name); if (model == null) @@ -51,6 +83,7 @@ namespace api.Controllers // POST api//add [HttpPost("add")] + [Authorize(Roles = "User")] public ActionResult Post([FromBody] Model model) { var existingModel = _modelService.GetOneModel(model.username, model.name); @@ -66,9 +99,24 @@ namespace api.Controllers } // PUT api//{username}/{name} - [HttpPut("{username}/{name}")] - public ActionResult Put(string username, string name, [FromBody] Model model) + [HttpPut("{name}")] + [Authorize(Roles = "User")] + public ActionResult Put(string name, [FromBody] Model model) { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + + var existingModel = _modelService.GetOneModel(username, name); if (existingModel == null) @@ -79,9 +127,23 @@ namespace api.Controllers } // DELETE api//username - [HttpDelete("{username}/{name}")] - public ActionResult Delete(string username, string name) + [HttpDelete("{name}")] + [Authorize(Roles = "User")] + public ActionResult Delete(string name) { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + var model = _modelService.GetOneModel(username, name); if (model == null) diff --git a/backend/api/api/Controllers/PredictorController.cs b/backend/api/api/Controllers/PredictorController.cs new file mode 100644 index 00000000..d5a55b3c --- /dev/null +++ b/backend/api/api/Controllers/PredictorController.cs @@ -0,0 +1,159 @@ +using api.Models; +using api.Services; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Net.Http.Headers; +using System.Net.Http.Headers; + +namespace api.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class PredictorController : Controller + { + private readonly IPredictorService _predictorService; + private JwtToken jwtToken; + + public PredictorController(IPredictorService predictorService, IConfiguration configuration) + { + _predictorService = predictorService; + jwtToken = new JwtToken(configuration); + } + + // GET: api//mypredictors + [HttpGet("mypredictors")] + [Authorize(Roles = "User")] + public ActionResult> Get() + { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + + return _predictorService.GetMyPredictors(username); + } + // GET: api//publicpredictors + [HttpGet("publicpredictors")] + public ActionResult> GetPublicPredictors() + { + return _predictorService.GetPublicPredictors(); + } + + // GET api//{name} + [HttpGet("/{name}")] + [Authorize(Roles = "User")] + public ActionResult Get(string name) + { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + + var predictor = _predictorService.GetOnePredictor(username, name); + + if (predictor == null) + return NotFound($"Predictor with name = {name} or user with username = {username} not found"); + + return predictor; + } + + // POST api//add + [HttpPost("add")] + [Authorize(Roles = "User")] + public ActionResult Post([FromBody] Predictor predictor) + { + var existingModel = _predictorService.GetOnePredictor(predictor.username, predictor.name); + + if (existingModel != null) + return NotFound($"Predictor with name = {predictor.name} exisits"); + else + { + _predictorService.Create(predictor); + + return CreatedAtAction(nameof(Get), new { id = predictor._id }, predictor); + } + } + + + + // PUT api//{name} + [HttpPut("/{name}")] + [Authorize(Roles = "User")] + public ActionResult Put(string name, [FromBody] Predictor predictor) + { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + + var existingDataset = _predictorService.GetOnePredictor(username, name); + + //ne mora da se proverava + if (existingDataset == null) + return NotFound($"Predictor with name = {name} or user with username = {username} not found"); + + _predictorService.Update(username, name, predictor); + + return Ok($"Predictor with name = {name} updated"); + } + + + // DELETE api//name + [HttpDelete("/{name}")] + [Authorize(Roles = "User")] + public ActionResult Delete(string name) + { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + + var predictor = _predictorService.GetOnePredictor(username, name); + + if (predictor == null) + return NotFound($"Predictor with name = {name} or user with username = {username} not found"); + + _predictorService.Delete(predictor.username, predictor.name); + + return Ok($"Predictor with name = {name} deleted"); + + } + + + + + } +} diff --git a/backend/api/api/Data/UserStoreDatabaseSettings.cs b/backend/api/api/Data/UserStoreDatabaseSettings.cs index 6416ab05..6841a3e0 100644 --- a/backend/api/api/Data/UserStoreDatabaseSettings.cs +++ b/backend/api/api/Data/UserStoreDatabaseSettings.cs @@ -10,7 +10,7 @@ namespace api.Data public string DatabaseName { get; set; } = String.Empty; public string CollectionName { get; set; } = String.Empty; public string DatasetCollectionName { get; set; } = String.Empty; - public string ModelCollectionName { get; set; } = String.Empty; + public string PredictorCollectionName { get; set; } = String.Empty; public string FilesCollectionName { get; set; } = String.Empty; } } diff --git a/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs b/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs index 82312649..94d3e1fc 100644 --- a/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs +++ b/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs @@ -6,7 +6,7 @@ string DatabaseName { get; set; } string CollectionName { get; set; } string DatasetCollectionName { get; set; } - string ModelCollectionName { get; } + string PredictorCollectionName { get; } string FilesCollectionName { get; set; } } } diff --git a/backend/api/api/Models/Predictor.cs b/backend/api/api/Models/Predictor.cs new file mode 100644 index 00000000..638495bd --- /dev/null +++ b/backend/api/api/Models/Predictor.cs @@ -0,0 +1,23 @@ +using System; +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; + +namespace api.Models +{ + public class Predictor + { + [BsonId] + [BsonRepresentation(BsonType.ObjectId)]//mongo data type to .net + public string _id { get; set; } + public string username { get; set; } + + public string name { get; set; } + public string description { get; set; } + public string[] inputs { get; set; } + public string output { get; set; } + public bool isPublic { get; set; } + public bool accessibleByLink { get; set; } + public string dateCreated { get; set; } + } +} + diff --git a/backend/api/api/Program.cs b/backend/api/api/Program.cs index f3287b4c..65399bdf 100644 --- a/backend/api/api/Program.cs +++ b/backend/api/api/Program.cs @@ -30,6 +30,7 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs index 80c31758..27a8b3ee 100644 --- a/backend/api/api/Services/DatasetService.cs +++ b/backend/api/api/Services/DatasetService.cs @@ -26,15 +26,20 @@ namespace api.Services _dataset.DeleteOne(dataset => (dataset.username == username && dataset.name == name)); } - public List GetAllDatesets(string username) + public List GetMyDatesets(string username) { return _dataset.Find(dataset => dataset.username == username).ToList(); } + public List GetPublicDatesets() + { + return _dataset.Find(dataset => dataset.isPublic == true).ToList(); + } public Dataset GetOneDataset(string username, string name) { return _dataset.Find(dataset => dataset.username == username && dataset.name == name).FirstOrDefault(); } + //odraditi za pretragu getOne //ako je potrebno da se zameni name ili ekstenzija public void Update(string username, string name, Dataset dataset) diff --git a/backend/api/api/Services/IDatasetService.cs b/backend/api/api/Services/IDatasetService.cs index 49013e29..61a04b94 100644 --- a/backend/api/api/Services/IDatasetService.cs +++ b/backend/api/api/Services/IDatasetService.cs @@ -6,7 +6,8 @@ namespace api.Services public interface IDatasetService { Dataset GetOneDataset(string username, string name); - List GetAllDatesets(string username); + List GetMyDatesets(string username); + List GetPublicDatesets(); Dataset Create(Dataset dataset); void Update(string username, string name, Dataset dataset); void Delete(string username, string name); diff --git a/backend/api/api/Services/IModelService.cs b/backend/api/api/Services/IModelService.cs index 149afd4a..c1931ffa 100644 --- a/backend/api/api/Services/IModelService.cs +++ b/backend/api/api/Services/IModelService.cs @@ -6,7 +6,8 @@ namespace api.Services public interface IModelService { Model GetOneModel(string username, string name); - List GetAllModels(string username); + List GetMyModels(string username); + //List GetPublicModels(); Model Create(Model model); void Update(string username, string name, Model model); void Delete(string username, string name); diff --git a/backend/api/api/Services/IPredictorService.cs b/backend/api/api/Services/IPredictorService.cs new file mode 100644 index 00000000..594b233b --- /dev/null +++ b/backend/api/api/Services/IPredictorService.cs @@ -0,0 +1,16 @@ +using System; +using api.Models; + +namespace api.Services +{ + public interface IPredictorService + { + Predictor GetOnePredictor(string username, string name); + List GetMyPredictors(string username); + List GetPublicPredictors(); + Predictor Create(Predictor predictor); + void Update(string username, string name, Predictor predictor); + void Delete(string username, string name); + } +} + diff --git a/backend/api/api/Services/ModelService.cs b/backend/api/api/Services/ModelService.cs index 33dea30e..a3939b29 100644 --- a/backend/api/api/Services/ModelService.cs +++ b/backend/api/api/Services/ModelService.cs @@ -13,7 +13,7 @@ namespace api.Services public ModelService(IUserStoreDatabaseSettings settings, IMongoClient mongoClient) { var database = mongoClient.GetDatabase(settings.DatabaseName); - _model = database.GetCollection(settings.ModelCollectionName); + _model = database.GetCollection(settings.PredictorCollectionName); } public Model Create(Model model) @@ -27,11 +27,16 @@ namespace api.Services _model.DeleteOne(model => (model.username == username && model.name == name)); } - public List GetAllModels(string username) + public List GetMyModels(string username) { return _model.Find(model => model.username == username).ToList(); } - + /* + public List GetPublicModels() + { + return _model.Find(model => model.isPublic == true).ToList(); + } + */ public Model GetOneModel(string username, string name) { return _model.Find(model => model.username == username && model.name == name).FirstOrDefault(); diff --git a/backend/api/api/Services/PredictorService.cs b/backend/api/api/Services/PredictorService.cs new file mode 100644 index 00000000..69fb25c9 --- /dev/null +++ b/backend/api/api/Services/PredictorService.cs @@ -0,0 +1,50 @@ +using api.Interfaces; +using api.Models; +using MongoDB.Driver; + +namespace api.Services +{ + public class PredictorService : IPredictorService + { + private readonly IMongoCollection _predictor; + + public PredictorService(IUserStoreDatabaseSettings settings, IMongoClient mongoClient) + { + var database = mongoClient.GetDatabase(settings.DatabaseName); + _predictor = database.GetCollection(settings.PredictorCollectionName); + } + + public Predictor Create(Predictor predictor) + { + _predictor.InsertOne(predictor); + return predictor; + } + + public void Delete(string username, string name) + { + _predictor.DeleteOne(predictor => (predictor.username == username && predictor.name == name)); + } + + public List GetMyPredictors(string username) + { + return _predictor.Find(predictor => predictor.username == username).ToList(); + } + + public Predictor GetOnePredictor(string username, string name) + { + return _predictor.Find(predictor => predictor.username == username && predictor.name == name).FirstOrDefault(); + + } + + public List GetPublicPredictors() + { + return _predictor.Find(predictor => predictor.isPublic == true).ToList(); + } + + public void Update(string username, string name, Predictor predictor) + { + _predictor.ReplaceOne(predictor => predictor.username == username && predictor.name == name, predictor); + + } + } +} diff --git a/backend/api/api/appsettings.json b/backend/api/api/appsettings.json index 86363075..3ccba198 100644 --- a/backend/api/api/appsettings.json +++ b/backend/api/api/appsettings.json @@ -9,19 +9,20 @@ } }, "AllowedHosts": "*", - "UserStoreDatabaseSettings": { - /* LocalHost + "UserStoreDatabaseSettings": { + /* LocalHost "ConnectionString": "mongodb://127.0.0.1:27017/", "DatabaseName": "si_project", "CollectionName": "User", "DatasetCollectionName" : "Dataset", "ModelCollectionName" : "Model" */ - "ConnectionString": "mongodb+srv://si_user:si_user@sidatabase.twtfm.mongodb.net/myFirstDatabase?retryWrites=true&w=majority", - "DatabaseName": "si_db", - "CollectionName": "users", - "DatasetCollectionName": "Dataset", - "ModelCollectionName": "Model", - "FilesCollectionName": "Files" - } + "ConnectionString": "mongodb+srv://si_user:si_user@sidatabase.twtfm.mongodb.net/myFirstDatabase?retryWrites=true&w=majority", + "DatabaseName": "si_db", + "CollectionName": "users", + "DatasetCollectionName": "Dataset", + "ModelCollectionName": "Model", + "PredictorCollectionName": "Predictor", + "FilesCollectionName": "Files" + } } -- cgit v1.2.3 From ffbd223fdf3c6d23308c272491fbaa1cd511d334 Mon Sep 17 00:00:00 2001 From: "DESKTOP-S0O2C44\\ROG" Date: Wed, 16 Mar 2022 23:12:08 +0100 Subject: Izmenjen konekcija sa bazom --- backend/api/api/Controllers/DatasetController.cs | 32 ++++++++---------------- backend/api/api/Models/Dataset.cs | 2 +- backend/api/api/appsettings.json | 15 ++++++----- 3 files changed, 20 insertions(+), 29 deletions(-) (limited to 'backend/api') diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs index bc7448e1..c0ba0039 100644 --- a/backend/api/api/Controllers/DatasetController.cs +++ b/backend/api/api/Controllers/DatasetController.cs @@ -175,27 +175,15 @@ namespace api.Controllers /* { - "_id": "", - "uploaderId" : "uploaderId", - "name" : "name", - "description" : "description", - "dateCreated" : "dateCreated", - "inputColumns" : [2,3,4], - "columnToPredict" : 1, - "randomTestSet" : true, - "randomTestSetDistribution" : 1, - "type" : "type", - "encoding" : "encoding", - "optimizer" : "optimizer", - "lossFunction" : "lossFunction", - "inputNeurons" : 2, - "hiddenLayerNeurons" : 3, - "hiddenLayers" : 8, - "batchSize" : 6, - "inputLayerActivationFunction" : "inputLayerActivationFunction", - "hiddenLayerActivationFunction" : "hiddenLayerActivationFunction", - "outputLayerActivationFunction" : "outputLayerActivationFunction", - "extension" : "extension" - + "_id": "", + "name": "name", + "description": "description", + "header" : ["ag","rt"], + "fileId" : "652", + "extension": "csb", + "isPublic" : true, + "accessibleByLink": true, + "dateCreated": "dateCreated", + "lastUpdated" : "proba12" } */ \ No newline at end of file diff --git a/backend/api/api/Models/Dataset.cs b/backend/api/api/Models/Dataset.cs index 6cb0b1e9..70092bd2 100644 --- a/backend/api/api/Models/Dataset.cs +++ b/backend/api/api/Models/Dataset.cs @@ -14,7 +14,7 @@ namespace api.Models public string name { get; set; } public string description { get; set; } public string[] header { get; set; } - public int fileId { get; set; } + public string fileId { get; set; } public string extension { get; set; } public bool isPublic { get; set; } public bool accessibleByLink { get; set; } diff --git a/backend/api/api/appsettings.json b/backend/api/api/appsettings.json index 3ccba198..fdccfb07 100644 --- a/backend/api/api/appsettings.json +++ b/backend/api/api/appsettings.json @@ -11,18 +11,21 @@ "AllowedHosts": "*", "UserStoreDatabaseSettings": { /* LocalHost + */ "ConnectionString": "mongodb://127.0.0.1:27017/", "DatabaseName": "si_project", - "CollectionName": "User", - "DatasetCollectionName" : "Dataset", - "ModelCollectionName" : "Model" - */ + "CollectionName": "users", + "DatasetCollectionName": "Dataset", + "ModelCollectionName": "Model", + "PredictorCollectionName": "Predictor", + "FilesCollectionName": "Files" + /* "ConnectionString": "mongodb+srv://si_user:si_user@sidatabase.twtfm.mongodb.net/myFirstDatabase?retryWrites=true&w=majority", "DatabaseName": "si_db", "CollectionName": "users", "DatasetCollectionName": "Dataset", "ModelCollectionName": "Model", "PredictorCollectionName": "Predictor", - "FilesCollectionName": "Files" + "FilesCollectionName": "Files"*/ } -} +} \ No newline at end of file -- cgit v1.2.3 From e22b83919e6442dfb55d7953d9227268c850adf8 Mon Sep 17 00:00:00 2001 From: Danijel Andjelkovic Date: Thu, 17 Mar 2022 00:32:49 +0100 Subject: Napravio neophodne izmene tako da backend i frontend komuniciraju uspesno. --- backend/api/api/Data/UserStoreDatabaseSettings.cs | 1 + .../api/Interfaces/IUserStoreDatabaseSettings.cs | 3 +- backend/api/api/Models/Dataset.cs | 2 +- backend/api/api/Models/Model.cs | 8 +- backend/api/api/Models/Predictor.cs | 1 - backend/api/api/Services/ModelService.cs | 2 +- backend/api/api/api.csproj | 1 + frontend/src/app/Shared.ts | 3 +- frontend/src/app/_data/Dataset.ts | 4 +- frontend/src/app/_data/Model.ts | 4 +- frontend/src/app/_data/Predictor.ts | 1 + .../app/_pages/add-model/add-model.component.html | 147 +++++++++++---------- .../app/_pages/add-model/add-model.component.ts | 37 +++--- frontend/src/app/_services/auth.service.ts | 3 +- frontend/src/app/_services/models.service.ts | 15 +-- 15 files changed, 129 insertions(+), 103 deletions(-) (limited to 'backend/api') diff --git a/backend/api/api/Data/UserStoreDatabaseSettings.cs b/backend/api/api/Data/UserStoreDatabaseSettings.cs index 6841a3e0..e83d2b54 100644 --- a/backend/api/api/Data/UserStoreDatabaseSettings.cs +++ b/backend/api/api/Data/UserStoreDatabaseSettings.cs @@ -11,6 +11,7 @@ namespace api.Data public string CollectionName { get; set; } = String.Empty; public string DatasetCollectionName { get; set; } = String.Empty; public string PredictorCollectionName { get; set; } = String.Empty; + public string ModelCollectionName { get; set; } = String.Empty; public string FilesCollectionName { get; set; } = String.Empty; } } diff --git a/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs b/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs index 94d3e1fc..a5b5f5eb 100644 --- a/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs +++ b/backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs @@ -6,7 +6,8 @@ string DatabaseName { get; set; } string CollectionName { get; set; } string DatasetCollectionName { get; set; } - string PredictorCollectionName { get; } + string PredictorCollectionName { get; set; } + string ModelCollectionName { get; set; } string FilesCollectionName { get; set; } } } diff --git a/backend/api/api/Models/Dataset.cs b/backend/api/api/Models/Dataset.cs index 70092bd2..d4649c17 100644 --- a/backend/api/api/Models/Dataset.cs +++ b/backend/api/api/Models/Dataset.cs @@ -6,7 +6,7 @@ namespace api.Models { public class Dataset { - public string username; + public string username { get; set; } [BsonId] [BsonRepresentation(BsonType.ObjectId)]//mongo data type to .net diff --git a/backend/api/api/Models/Model.cs b/backend/api/api/Models/Model.cs index 7b22ded8..dfc4336a 100644 --- a/backend/api/api/Models/Model.cs +++ b/backend/api/api/Models/Model.cs @@ -21,11 +21,11 @@ namespace api.Models public string datasetId { get; set; } //Test set settings - public int[] inputColumns { get; set; } - public int columnToPredict { get; set; } - public bool radnomOrder {get;set;} + public string[] inputColumns { get; set; } + public string columnToPredict { get; set; } + public bool randomOrder {get;set;} public bool randomTestSet { get; set; } - public int randomTestSetDistribution { get; set; } + public float randomTestSetDistribution { get; set; } //Neural net training public string type { get; set; } diff --git a/backend/api/api/Models/Predictor.cs b/backend/api/api/Models/Predictor.cs index 638495bd..cd2f4557 100644 --- a/backend/api/api/Models/Predictor.cs +++ b/backend/api/api/Models/Predictor.cs @@ -10,7 +10,6 @@ namespace api.Models [BsonRepresentation(BsonType.ObjectId)]//mongo data type to .net public string _id { get; set; } public string username { get; set; } - public string name { get; set; } public string description { get; set; } public string[] inputs { get; set; } diff --git a/backend/api/api/Services/ModelService.cs b/backend/api/api/Services/ModelService.cs index a3939b29..2ba3c54d 100644 --- a/backend/api/api/Services/ModelService.cs +++ b/backend/api/api/Services/ModelService.cs @@ -13,7 +13,7 @@ namespace api.Services public ModelService(IUserStoreDatabaseSettings settings, IMongoClient mongoClient) { var database = mongoClient.GetDatabase(settings.DatabaseName); - _model = database.GetCollection(settings.PredictorCollectionName); + _model = database.GetCollection(settings.ModelCollectionName); } public Model Create(Model model) diff --git a/backend/api/api/api.csproj b/backend/api/api/api.csproj index f38621ca..f63407ca 100644 --- a/backend/api/api/api.csproj +++ b/backend/api/api/api.csproj @@ -22,6 +22,7 @@ + diff --git a/frontend/src/app/Shared.ts b/frontend/src/app/Shared.ts index 126dc846..0adcd4d6 100644 --- a/frontend/src/app/Shared.ts +++ b/frontend/src/app/Shared.ts @@ -1,6 +1,7 @@ class Shared { constructor( - public loggedIn: boolean + public loggedIn: boolean, + public username: string = '' ) { } } diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts index aaee50eb..6e6cbffe 100644 --- a/frontend/src/app/_data/Dataset.ts +++ b/frontend/src/app/_data/Dataset.ts @@ -1,4 +1,5 @@ export default class Dataset { + _id: string = ''; constructor( public name: string = 'Novi izvor podataka', public description: string = '', @@ -8,6 +9,7 @@ export default class Dataset { public isPublic: boolean = false, public accessibleByLink: boolean = false, public dateCreated: Date = new Date(), - public lastUpdated: Date = new Date() + public lastUpdated: Date = new Date(), + public username: string = 'tester1' ) { } } \ No newline at end of file diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts index c0bc339d..a891c10c 100644 --- a/frontend/src/app/_data/Model.ts +++ b/frontend/src/app/_data/Model.ts @@ -1,4 +1,5 @@ export default class Model { + _id: string = ''; constructor( public name: string = 'Novi model', public description: string = '', @@ -24,7 +25,8 @@ export default class Model { public batchSize: number = 5, public inputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid, public hiddenLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid, - public outputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid + public outputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid, + public username: string = '' ) { } } diff --git a/frontend/src/app/_data/Predictor.ts b/frontend/src/app/_data/Predictor.ts index 05b993f1..7e902eae 100644 --- a/frontend/src/app/_data/Predictor.ts +++ b/frontend/src/app/_data/Predictor.ts @@ -1,4 +1,5 @@ export default class Predictor { + _id: string = ''; constructor( public name: string = 'Novi prediktor', public description: string = '', diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html index 004f308b..c6f21f1e 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.html +++ b/frontend/src/app/_pages/add-model/add-model.component.html @@ -3,15 +3,15 @@
- +
- -
+ +
+

Nov model:

- - + +
@@ -25,7 +25,7 @@ value="{{newModel.dateCreated | date: 'dd/MM/yyyy'}}" readonly>
- +

Izvor podataka:

@@ -33,37 +33,41 @@
-
-

Izaberite ulazne kolone:

-
-
-
- -   - -
-
-
-
-

Izaberite izlaznu kolonu:

-
-
-
- -   - -
-
-
+
+

Izaberite ulazne kolone:

+
+
+
+ +   + +
+
+
+
+

Izaberite izlaznu kolonu:

+
+
+
+ +   + +
+
+
- - + +

Parametri treniranja:

@@ -87,7 +91,8 @@
- +
@@ -111,7 +116,8 @@
- +
@@ -123,7 +129,8 @@
- @@ -157,7 +166,8 @@
- +
@@ -167,17 +177,18 @@
- +
- +
@@ -188,7 +199,7 @@      test + [disabled]="!newModel.randomTestSet" [(ngModel)]="newModel.randomTestSetDistribution"> trening @@ -200,16 +211,17 @@
- +
- +
@@ -222,11 +234,12 @@
- +
-
-
- - + \ No newline at end of file diff --git a/frontend/src/app/_pages/add-model/add-model.component.ts b/frontend/src/app/_pages/add-model/add-model.component.ts index 76a09782..a4cabb82 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.ts +++ b/frontend/src/app/_pages/add-model/add-model.component.ts @@ -4,6 +4,7 @@ import Model from 'src/app/_data/Model'; import { ANNType, Encoding, ActivationFunction, LossFunction, Optimizer } from 'src/app/_data/Model'; import { DatasetLoadComponent } from 'src/app/_elements/dataset-load/dataset-load.component'; import { ModelsService } from 'src/app/_services/models.service'; +import shared from 'src/app/Shared'; @Component({ @@ -24,6 +25,7 @@ export class AddModelComponent implements OnInit { LossFunction = LossFunction; Optimizer = Optimizer; Object = Object; + shared = shared; constructor(private models: ModelsService) { this.newModel = new Model(); @@ -44,24 +46,27 @@ export class AddModelComponent implements OnInit { } saveModel(temporary: boolean): any { - console.log('ADD MODEL: STEP 1 - UPLOAD FILE'); - if (this.datasetLoadComponent) { - this.models.uploadData(this.datasetLoadComponent.files[0]).subscribe((fileId) => { - console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + fileId); - if (this.datasetLoadComponent) { - this.datasetLoadComponent.dataset.fileId = fileId; - this.models.addDataset(this.datasetLoadComponent.dataset).subscribe((datasetId) => { - console.log('ADD MODEL: STEP 3 - ADD MODEL WITH DATASET ID ' + datasetId); - this.newModel.datasetId = datasetId; - this.getCheckedInputCols(); - this.getCheckedOutputCol(); - if (this.validationInputsOutput()) + this.getCheckedInputCols(); + this.getCheckedOutputCol(); + if (this.validationInputsOutput()) { + console.log('ADD MODEL: STEP 1 - UPLOAD FILE'); + if (this.datasetLoadComponent) { + this.models.uploadData(this.datasetLoadComponent.files[0]).subscribe((file) => { + console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + file._id); + if (this.datasetLoadComponent) { + this.datasetLoadComponent.dataset.fileId = file._id; + this.datasetLoadComponent.dataset.username = shared.username; + this.models.addDataset(this.datasetLoadComponent.dataset).subscribe((dataset) => { + console.log('ADD MODEL: STEP 3 - ADD MODEL WITH DATASET ID ', dataset._id); + this.newModel.datasetId = dataset._id; + this.newModel.username = shared.username; this.models.addModel(this.newModel).subscribe((response) => { - console.log('ADD MODEL: DONE! REPLY:\n' + response); + console.log('ADD MODEL: DONE! REPLY:\n', response); }); - }); - } - }); + }); + } + }); + } } } diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts index afc1567b..20ff45f3 100644 --- a/frontend/src/app/_services/auth.service.ts +++ b/frontend/src/app/_services/auth.service.ts @@ -46,7 +46,7 @@ export class AuthService { this.http.post(`${API_SETTINGS.apiURL}/auth/renewJwt`, {}, { headers: this.authHeader(), responseType: 'text' }).subscribe((response) => { this.authenticate(response); }); - }, exp.getTime() - new Date().getTime()); + }, exp.getTime() - new Date().getTime() - 60000); } authenticate(token: string) { @@ -62,6 +62,7 @@ export class AuthService { if (this.cookie.check('token')) { const token = this.cookie.get('token'); this.shared.loggedIn = this.isAuthenticated(); + this.shared.username = jwtHelper.decodeToken(token).name; this.enableAutoRefresh(); } } diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts index e9a5ee18..8299016b 100644 --- a/frontend/src/app/_services/models.service.ts +++ b/frontend/src/app/_services/models.service.ts @@ -22,21 +22,20 @@ export class ModelsService { const options = { params: params, - reportProgress: true, + reportProgress: false, headers: this.authService.authHeader() }; - const req = new HttpRequest('POST', `${API_SETTINGS.apiURL}/file/csv`, formData, options); - return this.http.request(req); + return this.http.post(`${API_SETTINGS.apiURL}/file/csv`, formData, options); } - addModel(model: Model) { + addModel(model: Model): Observable { return this.http.post(`${API_SETTINGS.apiURL}/model/add`, model, { headers: this.authService.authHeader() }); } - addDataset(dataset: Dataset) { - return this.http.post(`${API_SETTINGS.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader(), responseType: 'text' }); + addDataset(dataset: Dataset): Observable { + return this.http.post(`${API_SETTINGS.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader() }); } - trainModel(modelId: string) { - return this.http.post(`${API_SETTINGS.apiURL}/model/train`, modelId, { headers: this.authService.authHeader(), responseType: 'text' }); + trainModel(modelId: string): Observable { + return this.http.post(`${API_SETTINGS.apiURL}/model/train`, modelId, { headers: this.authService.authHeader() }); } } -- cgit v1.2.3 From ff5bf81a14d3024f8ff1764db488dec6790ed37e Mon Sep 17 00:00:00 2001 From: Ivan Ljubisavljevic Date: Sat, 19 Mar 2022 17:56:13 +0100 Subject: GetLatestDatasets i GetOldestDatasets odradjen. Potrebne ispravke #41 --- backend/api/api/Controllers/DatasetController.cs | 75 ++++++++++++++++++++++-- backend/api/api/Services/DatasetService.cs | 14 ++++- backend/api/api/Services/IDatasetService.cs | 3 +- 3 files changed, 84 insertions(+), 8 deletions(-) (limited to 'backend/api') diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs index c0ba0039..1ad180b7 100644 --- a/backend/api/api/Controllers/DatasetController.cs +++ b/backend/api/api/Controllers/DatasetController.cs @@ -24,7 +24,7 @@ namespace api.Controllers // GET: api//mydatasets - [HttpGet("/mydatasets")] + [HttpGet("mydatasets")] [Authorize(Roles = "User")] public ActionResult> Get() { @@ -40,14 +40,77 @@ namespace api.Controllers } else return BadRequest(); - + //ako bude trebao ID, samo iz baze uzeti return _datasetService.GetMyDatesets(username); } + // GET: api//getlatestdataset/{number} + [HttpGet("getlatestdatasets/{latest}")] + [Authorize(Roles = "User")] + public ActionResult> GetLatestDatasets(int latest) + { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + + //ako bude trebao ID, samo iz baze uzeti + + List lista = _datasetService.GetMyDatesets(username); + + List novaLista = new List(); + + lista.Reverse(); + + for(int i = 0; i < latest; i++) + novaLista.Add(lista[i]); + + return novaLista; + } + + // GET: api//getoldestdataset/{number} + [HttpGet("getoldestdatasets/{oldest}")] + [Authorize(Roles = "User")] + public ActionResult> GetOldestDatasets(int oldest) + { + string username; + var header = Request.Headers[HeaderNames.Authorization]; + if (AuthenticationHeaderValue.TryParse(header, out var headerValue)) + { + var scheme = headerValue.Scheme; + var parameter = headerValue.Parameter; + username = jwtToken.TokenToUsername(parameter); + if (username == null) + return null; + } + else + return BadRequest(); + + //ako bude trebao ID, samo iz baze uzeti + + List lista = _datasetService.GetMyDatesets(username); + + List novaLista = new List(); + + for (int i = 0; i < oldest; i++) + novaLista.Add(lista[i]); + + return novaLista; + } + + // GET: api//publicdatasets - [HttpGet("/datasets")] + [HttpGet("publicdatasets")] public ActionResult> GetPublicDS() { return _datasetService.GetPublicDatesets(); @@ -55,7 +118,7 @@ namespace api.Controllers // GET api//{name} //get odredjeni dataset - [HttpGet("/{name}")] + [HttpGet("{name}")] [Authorize(Roles = "User")] public ActionResult Get(string name) { @@ -114,7 +177,7 @@ namespace api.Controllers } // PUT api//{name} - [HttpPut("/{name}")] + [HttpPut("{name}")] [Authorize(Roles = "User")] public ActionResult Put(string name, [FromBody] Dataset dataset) { @@ -143,7 +206,7 @@ namespace api.Controllers } // DELETE api//name - [HttpDelete("/{name}")] + [HttpDelete("{name}")] [Authorize(Roles = "User")] public ActionResult Delete(string name) { diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs index 27a8b3ee..880570dd 100644 --- a/backend/api/api/Services/DatasetService.cs +++ b/backend/api/api/Services/DatasetService.cs @@ -1,4 +1,5 @@ -using api.Interfaces; +using System.Linq; +using api.Interfaces; using api.Models; using MongoDB.Driver; @@ -30,6 +31,17 @@ namespace api.Services { return _dataset.Find(dataset => dataset.username == username).ToList(); } + + public List GetLatestDatasets(string username, int latest) + { + List list = _dataset.Find(dataset => dataset.username == username).ToList(); + + + + + return list; + } + public List GetPublicDatesets() { return _dataset.Find(dataset => dataset.isPublic == true).ToList(); diff --git a/backend/api/api/Services/IDatasetService.cs b/backend/api/api/Services/IDatasetService.cs index 61a04b94..19a0aabc 100644 --- a/backend/api/api/Services/IDatasetService.cs +++ b/backend/api/api/Services/IDatasetService.cs @@ -6,7 +6,8 @@ namespace api.Services public interface IDatasetService { Dataset GetOneDataset(string username, string name); - List GetMyDatesets(string username); + List GetMyDatesets(string username); + List GetLatestDatasets(string username, int latest); List GetPublicDatesets(); Dataset Create(Dataset dataset); void Update(string username, string name, Dataset dataset); -- cgit v1.2.3