diff options
| -rw-r--r-- | backend/api/api/Controllers/ModelController.cs | 1 | ||||
| -rw-r--r-- | backend/api/api/Services/FileService.cs | 8 | ||||
| -rw-r--r-- | frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts | 11 |
3 files changed, 14 insertions, 6 deletions
diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs index b4a4b4f2..b997efa3 100644 --- a/backend/api/api/Controllers/ModelController.cs +++ b/backend/api/api/Controllers/ModelController.cs @@ -126,6 +126,7 @@ namespace api.Controllers public ActionResult<Model> Post([FromBody] Model model) { //username="" ako je GUEST + model.inputNeurons = model.inputColumns.Length; if (_modelService.CheckHyperparameters(model.inputNeurons, model.hiddenLayerNeurons, model.hiddenLayers, model.outputNeurons) == false) return BadRequest("Bad parameters!"); diff --git a/backend/api/api/Services/FileService.cs b/backend/api/api/Services/FileService.cs index b02d0da4..c5759953 100644 --- a/backend/api/api/Services/FileService.cs +++ b/backend/api/api/Services/FileService.cs @@ -8,11 +8,13 @@ namespace api.Services { private readonly IMongoCollection<FileModel> _file; + private readonly IMongoCollection<Dataset> _dataset; public FileService(IUserStoreDatabaseSettings settings, IMongoClient mongoClient) { var database = mongoClient.GetDatabase(settings.DatabaseName); _file = database.GetCollection<FileModel>(settings.FilesCollectionName); + _dataset = database.GetCollection<Dataset>(settings.DatasetCollectionName); } public FileModel Create(FileModel file) @@ -25,7 +27,11 @@ namespace api.Services } public string GetFilePath(string id, string username) { - FileModel file = _file.Find(x => x._id == id && x.username == username).FirstOrDefault(); + FileModel file; + if (_dataset.Find(x=>x.fileId==id && x.isPublic==true).FirstOrDefault()!=null) + file = _file.Find(x => x._id == id).FirstOrDefault(); + else + file = _file.Find(x => x._id == id && x.username == username).FirstOrDefault(); if (file == null) return null; return file.path; diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts index bc13a51c..f6b78ded 100644 --- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts +++ b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts @@ -27,11 +27,12 @@ export class FilterDatasetsComponent implements OnInit { //this.router.navigateByUrl('/predict?id='+id); const helper = new JwtHelperService(); const decodedToken = helper.decodeToken(this.cookie.get("token")); - dataset._id = ""; - dataset.isPublic = false; - dataset.lastUpdated = new Date(); - dataset.username = decodedToken.name; - this.datasets.addDataset(dataset).subscribe((response:string)=>{ + const newDataset={...dataset}; + newDataset._id = ""; + newDataset.isPublic = false; + newDataset.lastUpdated = new Date(); + newDataset.username = decodedToken.name; + this.datasets.addDataset(newDataset).subscribe((response:string)=>{ console.log(response); }); }; |