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

9 files changed, 58 insertions, 58 deletions

diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs
index 8ad92149..babdbe9a 100644
--- a/backend/api/api/Controllers/DatasetController.cs
+++ b/backend/api/api/Controllers/DatasetController.cs
@@ -41,7 +41,7 @@ namespace api.Controllers
         [HttpPost("post")]
         public ActionResult<Dataset> Post([FromBody] Dataset dataset)
         {
-            var existingDataset = _datasetService.GetOneDataset(dataset.uploaderId,dataset.name);
+            var existingDataset = _datasetService.GetOneDataset(dataset.username, dataset.name);
 
             if (existingDataset != null)
                 return NotFound($"Dateset with name = {dataset.name} exisits");
@@ -67,16 +67,16 @@ namespace api.Controllers
             return NoContent();
         }
 
-        // DELETE api/<DatasetController>/5
-        [HttpDelete("{id}")]
-        public ActionResult Delete(string id, string name)
+        // DELETE api/<DatasetController>/username
+        [HttpDelete("{username}")]
+        public ActionResult Delete(string username, string name)
         {
-            var dataset = _datasetService.GetOneDataset(id, name);
+            var dataset = _datasetService.GetOneDataset(username, name);
 
             if (dataset == null)
-                return NotFound($"Dataset with name = {name} or user with id = {id} not found");
+                return NotFound($"Dataset with name = {name} or user with username = {username} not found");
 
-            _datasetService.Delete(dataset.uploaderId,dataset.name);
+            _datasetService.Delete(dataset.username, dataset.name);
 
             return Ok($"Dataset with name = {name} deleted");
 
diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs
index ac45f45b..dde44472 100644
--- a/backend/api/api/Controllers/ModelController.cs
+++ b/backend/api/api/Controllers/ModelController.cs
@@ -29,23 +29,22 @@ namespace api.Controllers
             return Ok(result);
         }
 
-        //id korisnika
-        // GET: api/<ModelController>/{id}/datasets
-        [HttpGet("{id}/models")]
-        public ActionResult<List<Model>> Get(string id)
+        // GET: api/<ModelController>/{username}/models
+        [HttpGet("{username}/models")]
+        public ActionResult<List<Model>> Get(string username)
         {
-            return _modelService.GetAllModels(id);
+            return _modelService.GetAllModels(username);
         }
 
         //id korisnika, name modela
-        // GET api/<ModelController>/{id}/{name}
-        [HttpGet("{id}/{name}")]
-        public ActionResult<Model> Get(string id, string name)
+        // GET api/<ModelController>/{username}/{name}
+        [HttpGet("{username}/{name}")]
+        public ActionResult<Model> Get(string username, string name)
         {
-            var model = _modelService.GetOneModel(id, name);
+            var model = _modelService.GetOneModel(username, name);
 
             if (model == null)
-                return NotFound($"Model with name = {name} or user with id = {id} not found");
+                return NotFound($"Model with name = {name} or user with username = {username} not found");
 
             return model;
         }
@@ -54,7 +53,7 @@ namespace api.Controllers
         [HttpPost("post")]
         public ActionResult<Model> Post([FromBody] Model model)
         {
-            var existingModel = _modelService.GetOneModel(model.uploaderId, model.name);
+            var existingModel = _modelService.GetOneModel(model.username, model.name);
 
             if (existingModel != null)
                 return NotFound($"Model with name = {model.name} exisits");
@@ -66,30 +65,30 @@ namespace api.Controllers
             }
         }
 
-        // PUT api/<ModelController>/{id}/{name}
-        [HttpPut("{id}/{name}")]
-        public ActionResult Put(string id, string name, [FromBody] Model model)
+        // PUT api/<ModelController>/{username}/{name}
+        [HttpPut("{username}/{name}")]
+        public ActionResult Put(string username, string name, [FromBody] Model model)
         {
-            var existingModel = _modelService.GetOneModel(id, name);
+            var existingModel = _modelService.GetOneModel(username, name);
 
             //ne mora da se proverava
             if (existingModel == null)
-                return NotFound($"Model with name = {name} or user with id = {id} not found");
+                return NotFound($"Model with name = {name} or user with username = {username} not found");
 
-            _modelService.Update(id, name, model);
+            _modelService.Update(username, name, model);
             return NoContent();
         }
 
-        // DELETE api/<ModelController>/5
-        [HttpDelete("{id}")]
-        public ActionResult Delete(string id, string name)
+        // DELETE api/<ModelController>/username
+        [HttpDelete("{username}")]
+        public ActionResult Delete(string username, string name)
         {
-            var model = _modelService.GetOneModel(id, name);
+            var model = _modelService.GetOneModel(username, name);
 
             if (model == null)
-                return NotFound($"Model with name = {name} or user with id = {id} not found");
+                return NotFound($"Model with name = {name} or user with username = {username} not found");
 
-            _modelService.Delete(model.uploaderId, model.name);
+            _modelService.Delete(model.username, model.name);
 
             return Ok($"Model with name = {name} deleted");
 
diff --git a/backend/api/api/Data/UserStoreDatabaseSettings.cs b/backend/api/api/Data/UserStoreDatabaseSettings.cs
index 0d923fc7..d2391c71 100644
--- a/backend/api/api/Data/UserStoreDatabaseSettings.cs
+++ b/backend/api/api/Data/UserStoreDatabaseSettings.cs
@@ -10,5 +10,6 @@ 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;
     }
 }
diff --git a/backend/api/api/Models/Dataset.cs b/backend/api/api/Models/Dataset.cs
index de88fd4f..6cb0b1e9 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
 	{
-        internal string uploaderId;
+        public string username;
 
         [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 2e2dd5be..7b22ded8 100644
--- a/backend/api/api/Models/Model.cs
+++ b/backend/api/api/Models/Model.cs
@@ -5,13 +5,11 @@ 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 username { get; set; }
 
 
         public string name { get; set; }
diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs
index 32136a2e..80c31758 100644
--- a/backend/api/api/Services/DatasetService.cs
+++ b/backend/api/api/Services/DatasetService.cs
@@ -21,23 +21,25 @@ namespace api.Services
         }
 
         //brisanje odredjenog name-a
-        public void Delete(string uploaderId, string name)
+        public void Delete(string username, string name)
         {
-            _dataset.DeleteOne(dataset => (dataset.uploaderId == uploaderId && dataset.name == name)); 
+            _dataset.DeleteOne(dataset => (dataset.username == username && dataset.name == name)); 
         }
-        public List<Dataset> GetAllDatesets(string uploaderId)
+
+        public List<Dataset> GetAllDatesets(string username)
         {
-            return _dataset.Find(dataset => dataset.uploaderId == uploaderId).ToList();
+            return _dataset.Find(dataset => dataset.username == username).ToList();
         }
-        public Dataset GetOneDataset(string uploaderId, string name)
+
+        public Dataset GetOneDataset(string username, string name)
         {
-            return _dataset.Find(dataset => dataset.uploaderId == uploaderId && dataset.name == name).FirstOrDefault();
+            return _dataset.Find(dataset => dataset.username == username && dataset.name == name).FirstOrDefault();
         }
 
         //ako je potrebno da se zameni name  ili ekstenzija
-        public void Update(string uploaderId, string name, Dataset dataset)
+        public void Update(string username, string name, Dataset dataset)
         {
-            _dataset.ReplaceOne(dataset => dataset.uploaderId == uploaderId && dataset.name == name, dataset);
+            _dataset.ReplaceOne(dataset => dataset.username == username && dataset.name == name, dataset);
         }
     }
 }
diff --git a/backend/api/api/Services/IDatasetService.cs b/backend/api/api/Services/IDatasetService.cs
index 9cf8c3cb..49013e29 100644
--- a/backend/api/api/Services/IDatasetService.cs
+++ b/backend/api/api/Services/IDatasetService.cs
@@ -5,10 +5,10 @@ namespace api.Services
 {
     public interface IDatasetService
     {
-        Dataset GetOneDataset(string uploaderId, string name);
-        List<Dataset> GetAllDatesets(string uploaderId);
+        Dataset GetOneDataset(string username, string name);
+        List<Dataset> GetAllDatesets(string username);
         Dataset Create(Dataset dataset);
-        void Update(string uploaderId, string name, Dataset dataset);
-        void Delete(string uploaderId, string name);
+        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 988f3ab9..149afd4a 100644
--- a/backend/api/api/Services/IModelService.cs
+++ b/backend/api/api/Services/IModelService.cs
@@ -5,11 +5,11 @@ namespace api.Services
 {
 	public interface IModelService
 	{
-        Model GetOneModel(string uploaderId, string name);
-        List<Model> GetAllModels(string uploaderId);
+        Model GetOneModel(string username, string name);
+        List<Model> GetAllModels(string username);
         Model Create(Model model);
-        void Update(string uploaderId, string name, Model model);
-        void Delete(string uploaderId, string name);
+        void Update(string username, string name, Model model);
+        void Delete(string username, string name);
     }
 }
 
diff --git a/backend/api/api/Services/ModelService.cs b/backend/api/api/Services/ModelService.cs
index 97402d90..33dea30e 100644
--- a/backend/api/api/Services/ModelService.cs
+++ b/backend/api/api/Services/ModelService.cs
@@ -22,24 +22,24 @@ namespace api.Services
             return model;
         }
 
-        public void Delete(string uploaderId, string name)
+        public void Delete(string username, string name)
         {
-            _model.DeleteOne(model => (model.uploaderId == uploaderId && model.name == name));
+            _model.DeleteOne(model => (model.username == username && model.name == name));
         }
 
-        public List<Model> GetAllModels(string uploaderId)
+        public List<Model> GetAllModels(string username)
         {
-            return _model.Find(model => model.uploaderId == uploaderId).ToList();
+            return _model.Find(model => model.username == username).ToList();
         }
 
-        public Model GetOneModel(string uploaderId, string name)
+        public Model GetOneModel(string username, string name)
         {
-            return _model.Find(model => model.uploaderId == uploaderId && model.name == name).FirstOrDefault();
+            return _model.Find(model => model.username == username && model.name == name).FirstOrDefault();
         }
 
-        public void Update(string uploaderId, string name, Model model)
+        public void Update(string username, string name, Model model)
         {
-            _model.ReplaceOne(model => model.uploaderId == uploaderId && model.name == name, model);
+            _model.ReplaceOne(model => model.username == username && model.name == name, model);
         }
         
     }