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

8 files changed, 44 insertions, 9 deletions

diff --git a/backend/api/api/Controllers/ExperimentController.cs b/backend/api/api/Controllers/ExperimentController.cs
index 3fa02943..eecbe756 100644
--- a/backend/api/api/Controllers/ExperimentController.cs
+++ b/backend/api/api/Controllers/ExperimentController.cs
@@ -88,5 +88,28 @@ namespace api.Controllers
             var experiments=_experimentService.GetMyExperiments(uploaderId);
             return Ok(experiments);
         }
+
+        // PUT api/<ExperimentController>/{name}
+        [HttpPut("{id}")]
+        [Authorize(Roles = "User")]
+        public ActionResult Put(string id, [FromBody] Experiment experiment)
+        {
+            string uploaderId = getUserId();
+
+            if (uploaderId == null)
+                return BadRequest();
+
+            var existingDataset = _experimentService.GetOneExperiment(uploaderId, id);
+
+            //ne mora da se proverava
+            if (existingDataset == null)
+                return NotFound($"Experiment with ID = {id} or user with ID = {uploaderId} not found");
+
+            experiment.lastUpdated = DateTime.UtcNow;
+
+            _experimentService.Update(uploaderId, id, experiment);
+
+            return Ok($"Experiment with ID = {id} updated");
+        }
     }
 }
diff --git a/backend/api/api/Interfaces/IExperimentService.cs b/backend/api/api/Interfaces/IExperimentService.cs
index 47c86046..2a69cff9 100644
--- a/backend/api/api/Interfaces/IExperimentService.cs
+++ b/backend/api/api/Interfaces/IExperimentService.cs
@@ -8,5 +8,8 @@ namespace api.Services
         public Experiment Get(string id);
         public List<Experiment> GetMyExperiments(string id);
         public Experiment Get(string uploaderId, string name);
+        Experiment GetOneExperiment(string userId, string name);
+        void Update(string userId, string id, Experiment experiment);
+
     }
 }
\ No newline at end of file
diff --git a/backend/api/api/Models/IJwtToken.cs b/backend/api/api/Interfaces/IJwtToken.cs
index 2afb6683..2afb6683 100644
--- a/backend/api/api/Models/IJwtToken.cs
+++ b/backend/api/api/Interfaces/IJwtToken.cs
diff --git a/backend/api/api/Models/Experiment.cs b/backend/api/api/Models/Experiment.cs
index cfff337c..3af063be 100644
--- a/backend/api/api/Models/Experiment.cs
+++ b/backend/api/api/Models/Experiment.cs
@@ -17,6 +17,8 @@ namespace api.Models
         public string[] inputColumns { get; set; }
         public string outputColumn { get; set; }
         public string nullValues { get; set; }
+        public DateTime dateCreated { get; set; }
+        public DateTime lastUpdated { get; set; }
         public NullValues[] nullValuesReplacers { get; set; }
         public ColumnEncoding[] encodings { get; set; }
 
diff --git a/backend/api/api/Services/ExperimentService.cs b/backend/api/api/Services/ExperimentService.cs
index 7bdf9a6e..539e4c08 100644
--- a/backend/api/api/Services/ExperimentService.cs
+++ b/backend/api/api/Services/ExperimentService.cs
@@ -36,5 +36,15 @@ namespace api.Services
             return _experiment.Find(e=>e.uploaderId==id).ToList();
 
         }
+
+        public Experiment GetOneExperiment(string userId, string name)
+        {
+            return _experiment.Find(experiment => experiment.uploaderId == userId && experiment.name == name).FirstOrDefault();
+        }
+
+        public void Update(string userId, string id, Experiment experiment)
+        {
+            _experiment.ReplaceOne(experiment => experiment.uploaderId == userId && experiment._id == id, experiment);
+        }
     }
 }
diff --git a/backend/api/api/Services/FillAnEmptyDb.cs b/backend/api/api/Services/FillAnEmptyDb.cs
index 1b6b8bbf..99bbb91f 100644
--- a/backend/api/api/Services/FillAnEmptyDb.cs
+++ b/backend/api/api/Services/FillAnEmptyDb.cs
@@ -118,9 +118,8 @@ namespace api.Services
                 experiment.uploaderId = "000000000000000000000000";
                 experiment.inputColumns = new string[] { "Embarked" };
                 experiment.outputColumn = "Survived";
-                //experiment.randomOrder = true;
-                //experiment.randomTestSet = true;
-                //experiment.randomTestSetDistribution = 0.30000001192092896f;
+                experiment.dateCreated = DateTime.Now;
+                experiment.lastUpdated = DateTime.Now;
                 experiment.nullValues = "delete_rows";
                 experiment.nullValuesReplacers = new NullValues[] { };
                 experiment.encodings = new[]
@@ -230,9 +229,8 @@ namespace api.Services
                 experiment.uploaderId = "000000000000000000000000";
                 experiment.inputColumns = new string[] { "Unnamed: 0", "carat", "cut", "color", "clarity", "depth", "table", "x", "y", "z" };
                 experiment.outputColumn = "price";
-                //experiment.randomOrder = true;
-                //experiment.randomTestSet = true;
-                //experiment.randomTestSetDistribution = 0.30000001192092896f;
+                experiment.dateCreated = DateTime.Now;
+                experiment.lastUpdated = DateTime.Now;
                 experiment.nullValues = "delete_rows";
                 experiment.nullValuesReplacers = new NullValues[] { };
                 experiment.encodings = new[]
@@ -337,9 +335,8 @@ namespace api.Services
                 experiment.uploaderId = "000000000000000000000000";
                 experiment.inputColumns = new string[] { "sepal_length", "sepal_width", "petal_length", "petal_width" };
                 experiment.outputColumn = "class";
-                //experiment.randomOrder = true;
-                //experiment.randomTestSet = true;
-                //experiment.randomTestSetDistribution = 0.20000000298023224f;
+                experiment.dateCreated = DateTime.Now;
+                experiment.lastUpdated = DateTime.Now;
                 experiment.nullValues = "delete_rows";
                 experiment.nullValuesReplacers = new NullValues[] { };
                 experiment.encodings = new[]
diff --git a/backend/api/api/Models/JwtToken.cs b/backend/api/api/Services/JwtToken.cs
index 06b3a666..06b3a666 100644
--- a/backend/api/api/Models/JwtToken.cs
+++ b/backend/api/api/Services/JwtToken.cs
diff --git a/backend/api/api/Models/PasswordCrypt.cs b/backend/api/api/Services/PasswordCrypt.cs
index 016fde51..016fde51 100644
--- a/backend/api/api/Models/PasswordCrypt.cs
+++ b/backend/api/api/Services/PasswordCrypt.cs