aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backend/api/api/Controllers/DatasetController.cs119
-rw-r--r--backend/api/api/Controllers/ModelController.cs90
-rw-r--r--backend/api/api/Controllers/PredictorController.cs159
-rw-r--r--backend/api/api/Data/UserStoreDatabaseSettings.cs2
-rw-r--r--backend/api/api/Interfaces/IUserStoreDatabaseSettings.cs2
-rw-r--r--backend/api/api/Models/Predictor.cs23
-rw-r--r--backend/api/api/Program.cs1
-rw-r--r--backend/api/api/Services/DatasetService.cs7
-rw-r--r--backend/api/api/Services/IDatasetService.cs3
-rw-r--r--backend/api/api/Services/IModelService.cs3
-rw-r--r--backend/api/api/Services/IPredictorService.cs16
-rw-r--r--backend/api/api/Services/ModelService.cs11
-rw-r--r--backend/api/api/Services/PredictorService.cs50
-rw-r--r--backend/api/api/appsettings.json19
14 files changed, 459 insertions, 46 deletions
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/<DatasetController>/{username}/datasets
- [HttpGet("{username}/datasets")]
- public ActionResult<List<Dataset>> Get(string username)
+ // GET: api/<DatasetController>/mydatasets
+ [HttpGet("/mydatasets")]
+ [Authorize(Roles = "User")]
+ public ActionResult<List<Dataset>> 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/<DatasetController>/publicdatasets
+ [HttpGet("/datasets")]
+ public ActionResult<List<Dataset>> GetPublicDS()
+ {
+ return _datasetService.GetPublicDatesets();
}
- // GET api/<DatasetController>/{username}/{name}
- [HttpGet("{username}/{name}")]
- public ActionResult<Dataset> Get(string username, string name)
+ // GET api/<DatasetController>/{name}
+ //get odredjeni dataset
+ [HttpGet("/{name}")]
+ [Authorize(Roles = "User")]
+ public ActionResult<Dataset> 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<Dataset> 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/<DatasetController>/add
[HttpPost("add")]
+ [Authorize(Roles = "User")]
public ActionResult<Dataset> 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/<DatasetController>/{username}/{name}
- [HttpPut("{username}/{name}")]
- public ActionResult Put(string username, string name, [FromBody] Dataset dataset)
+ // PUT api/<DatasetController>/{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/<DatasetController>/username/name
- [HttpDelete("{username}/{name}")]
- public ActionResult Delete(string username, string name)
+ // DELETE api/<DatasetController>/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/<ModelController>/{username}/models
- [HttpGet("{username}/models")]
- public ActionResult<List<Model>> Get(string username)
+ // GET: api/<ModelController>/mymodels
+ [HttpGet("/mymodels")]
+ [Authorize(Roles = "User")]
+ public ActionResult<List<Model>> 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/<ModelController>/{username}/{name}
- [HttpGet("{username}/{name}")]
- public ActionResult<Model> Get(string username, string name)
+ // name modela
+ // GET api/<ModelController>/{name}
+ [HttpGet("/{name}")]
+ [Authorize(Roles = "User")]
+ public ActionResult<Model> 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/<ModelController>/add
[HttpPost("add")]
+ [Authorize(Roles = "User")]
public ActionResult<Model> Post([FromBody] Model model)
{
var existingModel = _modelService.GetOneModel(model.username, model.name);
@@ -66,9 +99,24 @@ namespace api.Controllers
}
// PUT api/<ModelController>/{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/<ModelController>/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/<PredictorController>/mypredictors
+ [HttpGet("mypredictors")]
+ [Authorize(Roles = "User")]
+ public ActionResult<List<Predictor>> 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/<PredictorController>/publicpredictors
+ [HttpGet("publicpredictors")]
+ public ActionResult<List<Predictor>> GetPublicPredictors()
+ {
+ return _predictorService.GetPublicPredictors();
+ }
+
+ // GET api/<PredictorController>/{name}
+ [HttpGet("/{name}")]
+ [Authorize(Roles = "User")]
+ public ActionResult<Predictor> 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/<PredictorController>/add
+ [HttpPost("add")]
+ [Authorize(Roles = "User")]
+ public ActionResult<Predictor> 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/<PredictorController>/{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/<PredictorController>/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<IUserService, UserService>();
builder.Services.AddScoped<IAuthService, AuthService>();
builder.Services.AddScoped<IMlConnectionService, MlConnectionService>();
builder.Services.AddScoped<IModelService, ModelService>();
+builder.Services.AddScoped<IPredictorService, PredictorService>();
builder.Services.AddScoped<IFileService, FileService>();
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<Dataset> GetAllDatesets(string username)
+ public List<Dataset> GetMyDatesets(string username)
{
return _dataset.Find(dataset => dataset.username == username).ToList();
}
+ public List<Dataset> 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<Dataset> GetAllDatesets(string username);
+ List<Dataset> GetMyDatesets(string username);
+ List<Dataset> 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<Model> GetAllModels(string username);
+ List<Model> GetMyModels(string username);
+ //List<Model> 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<Predictor> GetMyPredictors(string username);
+ List<Predictor> 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<Model>(settings.ModelCollectionName);
+ _model = database.GetCollection<Model>(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<Model> GetAllModels(string username)
+ public List<Model> GetMyModels(string username)
{
return _model.Find(model => model.username == username).ToList();
}
-
+ /*
+ public List<Model> 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> _predictor;
+
+ public PredictorService(IUserStoreDatabaseSettings settings, IMongoClient mongoClient)
+ {
+ var database = mongoClient.GetDatabase(settings.DatabaseName);
+ _predictor = database.GetCollection<Predictor>(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<Predictor> 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<Predictor> 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"
+ }
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-20 05:52:50 +0000