From a3a3fad7ad76b82700b86670048349097c4cd3b7 Mon Sep 17 00:00:00 2001 From: Ivan Ljubisavljevic Date: Sat, 30 Apr 2022 21:49:54 +0200 Subject: Ispravljen upload #129 --- backend/api/api/Models/Dataset.cs | 4 ++-- backend/api/api/Services/DatasetService.cs | 4 ++-- backend/api/api/Services/FillAnEmptyDb.cs | 2 +- backend/api/api/Services/IDatasetService.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'backend') diff --git a/backend/api/api/Models/Dataset.cs b/backend/api/api/Models/Dataset.cs index cc7185f0..0faa43d5 100644 --- a/backend/api/api/Models/Dataset.cs +++ b/backend/api/api/Models/Dataset.cs @@ -12,9 +12,9 @@ namespace api.Models [BsonId] [BsonRepresentation(BsonType.ObjectId)]//mongo data type to .net public string _id { get; set; } - public string name { get; set; } + public string description { get; set; } - public string[] header { get; set; } + public string name { get; set; } public string fileId { get; set; } public string extension { get; set; } public bool isPublic { get; set; } diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs index fe177d77..f39cac29 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/FillAnEmptyDb.cs b/backend/api/api/Services/FillAnEmptyDb.cs index 216e1221..062eada3 100644 --- a/backend/api/api/Services/FillAnEmptyDb.cs +++ b/backend/api/api/Services/FillAnEmptyDb.cs @@ -55,7 +55,7 @@ namespace api.Services dataset.uploaderId = "000000000000000000000000"; dataset.name = "Titanik dataset"; dataset.description = "Titanik dataset"; - dataset.header = new string[] { "PassengerId", "Survived", "Pclass", "Name", "Sex", "Age", "SibSp", "Parch", "Ticket", "Fare", "Cabin", "Embarked" }; + //dataset.header = new string[] { "PassengerId", "Survived", "Pclass", "Name", "Sex", "Age", "SibSp", "Parch", "Ticket", "Fare", "Cabin", "Embarked" }; dataset.fileId = _fileService.GetFileId(fullPath); dataset.extension = ".csv"; dataset.isPublic = true; 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 SearchDatasets(string name); List GetMyDatasets(string userId); -- cgit v1.2.3