aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/api/api/Controllers/DatasetController.cs5
-rw-r--r--backend/api/api/Services/DatasetService.cs7
-rw-r--r--backend/api/api/Services/IDatasetService.cs1
3 files changed, 12 insertions, 1 deletions
diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs
index bae05ba9..d9803744 100644
--- a/backend/api/api/Controllers/DatasetController.cs
+++ b/backend/api/api/Controllers/DatasetController.cs
@@ -24,7 +24,7 @@ namespace api.Controllers
// GET: api/<DatasetController>/mydatasets
[HttpGet("mydatasets")]
- [Authorize(Roles = "User")]
+ [Authorize(Roles = "User,Guest")]
public ActionResult<List<Dataset>> Get()
{
string username;
@@ -39,6 +39,9 @@ namespace api.Controllers
}
else
return BadRequest();
+ //U slucaju da je korisnik gost vrati dataSetove igrannonice
+ if (username == "")
+ return _datasetService.GetGuestDatasets();
//ako bude trebao ID, samo iz baze uzeti
diff --git a/backend/api/api/Services/DatasetService.cs b/backend/api/api/Services/DatasetService.cs
index 5e708d11..ab19935d 100644
--- a/backend/api/api/Services/DatasetService.cs
+++ b/backend/api/api/Services/DatasetService.cs
@@ -36,6 +36,13 @@ namespace api.Services
{
return _dataset.Find(dataset => dataset.username == username).ToList();
}
+ public List<Dataset> GetGuestDatasets()
+ {
+ //Join Igranonica public datasetove sa svim temp uploadanim datasetovima
+ List<Dataset> datasets= _dataset.Find(dataset => dataset.username == "Igrannonica" && dataset.isPublic == true).ToList();
+ datasets.AddRange(_dataset.Find(dataset => dataset.username == "").ToList());
+ return datasets;
+ }
//poslednji datasetovi
public List<Dataset> SortDatasets(string username, bool ascdsc, int latest)
diff --git a/backend/api/api/Services/IDatasetService.cs b/backend/api/api/Services/IDatasetService.cs
index be56f5cb..9beec400 100644
--- a/backend/api/api/Services/IDatasetService.cs
+++ b/backend/api/api/Services/IDatasetService.cs
@@ -13,5 +13,6 @@ namespace api.Services
Dataset Create(Dataset dataset);
void Update(string username, string name, Dataset dataset);
void Delete(string username, string name);
+ public List<Dataset> GetGuestDatasets();
}
}