From fdfe2da8c1e71ec1dddeb81bc32356fb746c0c7f Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Mon, 18 Apr 2022 14:29:54 +0200
Subject: Napravi eksperiment - sredjen bag u carousel-u, poslednja izlazna
 kolona cekirana, ispis poruke kad nema nedostajucih vrednosti za
 popunjavanje. Na back-u izmenjen DatasetController i Service (name umesto
 id-a u post requestu)

---
 backend/api/api/Controllers/DatasetController.cs | 26 ++++++++++++------------
 backend/api/api/Services/DatasetService.cs       |  4 ++--
 backend/api/api/Services/IDatasetService.cs      |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'backend/api')

diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs
index 58a903eb..0a9fe0bd 100644
--- a/backend/api/api/Controllers/DatasetController.cs
+++ b/backend/api/api/Controllers/DatasetController.cs
@@ -136,7 +136,7 @@ namespace api.Controllers
             var existingDataset = _datasetService.GetOneDataset(dataset.uploaderId, dataset.name);
 
             if (existingDataset != null)
-                return NotFound($"Dateset with name = {dataset.name} exisits");
+                return NotFound($"Dataset with this name already exists");
             else
             {
                 FileModel fileModel = _fileService.getFile(dataset.fileId);
@@ -149,46 +149,46 @@ namespace api.Controllers
 
 
         // PUT api/<DatasetController>/{name}
-        [HttpPut("{id}")]
+        [HttpPut("{name}")]
         [Authorize(Roles = "User")]
-        public ActionResult Put(string id, [FromBody] Dataset dataset)
+        public ActionResult Put(string name, [FromBody] Dataset dataset)
         {
             string uploaderId = getUserId();
 
             if (uploaderId == null)
                 return BadRequest();
 
-            var existingDataset = _datasetService.GetOneDataset(uploaderId, id);
+            var existingDataset = _datasetService.GetOneDataset(uploaderId, name);
 
             //ne mora da se proverava
             if (existingDataset == null)
-                return NotFound($"Dataset with ID = {id} or user with ID = {uploaderId} not found");
+                return NotFound($"Dataset with name = {name} or user with ID = {uploaderId} not found");
 
             dataset.lastUpdated = DateTime.UtcNow;
 
-            _datasetService.Update(uploaderId, id, dataset);
+            _datasetService.Update(uploaderId, name, dataset);
 
-            return Ok($"Dataset with ID = {id} updated");
+            return Ok($"Dataset with name = {name} updated");
         }
 
         // DELETE api/<DatasetController>/name
-        [HttpDelete("{id}")]
+        [HttpDelete("{name}")]
         [Authorize(Roles = "User")]
-        public ActionResult Delete(string id)
+        public ActionResult Delete(string name)
         {
             string uploaderId = getUserId();
 
             if (uploaderId == null)
                 return BadRequest();
 
-            var dataset = _datasetService.GetOneDataset(uploaderId, id);
+            var dataset = _datasetService.GetOneDataset(uploaderId, name);
 
             if (dataset == null)
-                return NotFound($"Dataset with ID = {id} or user with ID = {uploaderId} not found");
+                return NotFound($"Dataset with name = {name} or user with ID = {uploaderId} not found");
 
-            _datasetService.Delete(dataset.uploaderId, dataset._id);
+            _datasetService.Delete(dataset.uploaderId, dataset.name);
 
-            return Ok($"Dataset with ID = {id} deleted");
+            return Ok($"Dataset with name = {name} deleted");
 
         }
     }
diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs
index 6c2efe14..f260a1ba 100644
--- a/backend/api/api/Services/DatasetService.cs
+++ b/backend/api/api/Services/DatasetService.cs
@@ -62,9 +62,9 @@ namespace api.Services
             return _dataset.Find(dataset => dataset.isPublic == true && dataset.isPreProcess).ToList();
         }
 
-        public Dataset GetOneDataset(string userId, string id)
+        public Dataset GetOneDataset(string userId, string name)
         {
-            return _dataset.Find(dataset => dataset.uploaderId == userId && dataset._id == id && dataset.isPreProcess).FirstOrDefault();
+            return _dataset.Find(dataset => dataset.uploaderId == userId && dataset.name == name && dataset.isPreProcess).FirstOrDefault();
         }
         //odraditi za pretragu getOne
 
diff --git a/backend/api/api/Services/IDatasetService.cs b/backend/api/api/Services/IDatasetService.cs
index bb06208d..f493a2ec 100644
--- a/backend/api/api/Services/IDatasetService.cs
+++ b/backend/api/api/Services/IDatasetService.cs
@@ -5,7 +5,7 @@ namespace api.Services
 {
     public interface IDatasetService
     {
-        Dataset GetOneDataset(string userId, string id);
+        Dataset GetOneDataset(string userId, string name);
         Dataset GetOneDataset(string id);
         List<Dataset> SearchDatasets(string name);
         List<Dataset> GetMyDatasets(string userId);
-- 
cgit v1.2.3