Izmena na frontu i ml-u(username -> userId) #71

5 files changed, 23 insertions, 23 deletions

diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs
index bdac9ed9..58a903eb 100644
--- a/backend/api/api/Controllers/DatasetController.cs
+++ b/backend/api/api/Controllers/DatasetController.cs
@@ -149,46 +149,46 @@ namespace api.Controllers
 
 
         // PUT api/<DatasetController>/{name}
-        [HttpPut("{name}")]
+        [HttpPut("{id}")]
         [Authorize(Roles = "User")]
-        public ActionResult Put(string name, [FromBody] Dataset dataset)
+        public ActionResult Put(string id, [FromBody] Dataset dataset)
         {
             string uploaderId = getUserId();
 
             if (uploaderId == null)
                 return BadRequest();
 
-            var existingDataset = _datasetService.GetOneDataset(uploaderId, name);
+            var existingDataset = _datasetService.GetOneDataset(uploaderId, id);
 
             //ne mora da se proverava
             if (existingDataset == null)
-                return NotFound($"Dataset with name = {name} or user with ID = {uploaderId} not found");
+                return NotFound($"Dataset with ID = {id} or user with ID = {uploaderId} not found");
 
             dataset.lastUpdated = DateTime.UtcNow;
 
-            _datasetService.Update(uploaderId, name, dataset);
+            _datasetService.Update(uploaderId, id, dataset);
 
-            return Ok($"Dataset with name = {name} updated");
+            return Ok($"Dataset with ID = {id} updated");
         }
 
         // DELETE api/<DatasetController>/name
-        [HttpDelete("{name}")]
+        [HttpDelete("{id}")]
         [Authorize(Roles = "User")]
-        public ActionResult Delete(string name)
+        public ActionResult Delete(string id)
         {
             string uploaderId = getUserId();
 
             if (uploaderId == null)
                 return BadRequest();
 
-            var dataset = _datasetService.GetOneDataset(uploaderId, name);
+            var dataset = _datasetService.GetOneDataset(uploaderId, id);
 
             if (dataset == null)
-                return NotFound($"Dataset with name = {name} or user with ID = {uploaderId} not found");
+                return NotFound($"Dataset with ID = {id} or user with ID = {uploaderId} not found");
 
-            _datasetService.Delete(dataset.uploaderId, dataset.name);
+            _datasetService.Delete(dataset.uploaderId, dataset._id);
 
-            return Ok($"Dataset with name = {name} deleted");
+            return Ok($"Dataset with ID = {id} deleted");
 
         }
     }
diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs
index 1ec01ab8..fe16507b 100644
--- a/backend/api/api/Controllers/ModelController.cs
+++ b/backend/api/api/Controllers/ModelController.cs
@@ -82,7 +82,7 @@ namespace api.Controllers
         {
             
             var model=_modelService.GetOneModel(info.ModelId);
-            var user = _userService.GetUserByUsername(model.uploaderId);
+            var user = _userService.GetUserById(model.uploaderId);
 
             if (ChatHub.CheckUser(user._id))
                 await _ichat.Clients.Client(ChatHub.Users[user._id]).SendAsync("NotifyEpoch",model.name,info.ModelId,info.Stat,model.epochs,info.EpochNum);
diff --git a/backend/api/api/Controllers/PredictorController.cs b/backend/api/api/Controllers/PredictorController.cs
index 26fe8f1d..dd5aa5fd 100644
--- a/backend/api/api/Controllers/PredictorController.cs
+++ b/backend/api/api/Controllers/PredictorController.cs
@@ -213,7 +213,7 @@ namespace api.Controllers
         }
 
         // DELETE api/<PredictorController>/name
-        [HttpDelete("{name}")]
+        [HttpDelete("{id}")]
         [Authorize(Roles = "User")]
         public ActionResult Delete(string id)
         {
diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs
index 33026687..6c2efe14 100644
--- a/backend/api/api/Services/DatasetService.cs
+++ b/backend/api/api/Services/DatasetService.cs
@@ -27,9 +27,9 @@ namespace api.Services
         }
 
         //brisanje odredjenog name-a
-        public void Delete(string userId, string name)
+        public void Delete(string userId, string id)
         {
-            _dataset.DeleteOne(dataset => (dataset.uploaderId == userId && dataset.name == name)); 
+            _dataset.DeleteOne(dataset => (dataset.uploaderId == userId && dataset._id == id)); 
         }
 
         public List<Dataset> GetMyDatasets(string userId)
@@ -62,9 +62,9 @@ namespace api.Services
             return _dataset.Find(dataset => dataset.isPublic == true && dataset.isPreProcess).ToList();
         }
 
-        public Dataset GetOneDataset(string userId, string name)
+        public Dataset GetOneDataset(string userId, string id)
         {
-            return _dataset.Find(dataset => dataset.uploaderId == userId && dataset.name == name && dataset.isPreProcess).FirstOrDefault();
+            return _dataset.Find(dataset => dataset.uploaderId == userId && dataset._id == id && dataset.isPreProcess).FirstOrDefault();
         }
         //odraditi za pretragu getOne
 
@@ -74,9 +74,9 @@ namespace api.Services
         }
 
         //ako je potrebno da se zameni name  ili ekstenzija
-        public void Update(string userId, string name, Dataset dataset )
+        public void Update(string userId, string id, Dataset dataset )
         {
-            _dataset.ReplaceOne(dataset => dataset.uploaderId == userId && dataset.name == name, dataset);
+            _dataset.ReplaceOne(dataset => dataset.uploaderId == userId && dataset._id == id, dataset);
         }
         public void Update(Dataset dataset)
         {
diff --git a/backend/api/api/Services/IDatasetService.cs b/backend/api/api/Services/IDatasetService.cs
index b700e87c..bb06208d 100644
--- a/backend/api/api/Services/IDatasetService.cs
+++ b/backend/api/api/Services/IDatasetService.cs
@@ -5,15 +5,15 @@ namespace api.Services
 {
     public interface IDatasetService
     {
-        Dataset GetOneDataset(string userId, string name);
+        Dataset GetOneDataset(string userId, string id);
         Dataset GetOneDataset(string id);
         List<Dataset> SearchDatasets(string name);
         List<Dataset> GetMyDatasets(string userId);
         List<Dataset> SortDatasets(string userId, bool ascdsc, int latest);
         List<Dataset> GetPublicDatasets();
         Dataset Create(Dataset dataset);
-        void Update(string userId, string name, Dataset dataset);
-        void Delete(string userId, string name);
+        void Update(string userId, string id, Dataset dataset);
+        void Delete(string userId, string id);
         public List<Dataset> GetGuestDatasets();
         public void Update(Dataset dataset);
         string GetDatasetId(string fileId);