From b4f0cd025a86c68a5c35a58e62c22b7cedf3d8b5 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Mon, 21 Mar 2022 19:17:44 +0100 Subject: Omoguceno brisanje modela ukoliko gost koristi public dataset. --- backend/api/api/Services/TempRemovalService.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/backend/api/api/Services/TempRemovalService.cs b/backend/api/api/Services/TempRemovalService.cs index 6e99945b..f96f1273 100644 --- a/backend/api/api/Services/TempRemovalService.cs +++ b/backend/api/api/Services/TempRemovalService.cs @@ -25,11 +25,11 @@ namespace api.Services if ((DateTime.Now.ToUniversalTime() - file.date).TotalDays >= 1) { DeleteFile(file._id); - List datasets = _dataset.Find(dataset => dataset.fileId == file._id).ToList(); + List datasets = _dataset.Find(dataset => dataset.fileId == file._id && dataset.username=="").ToList(); foreach(var dataset in datasets) { DeleteDataset(dataset._id); - List models = _model.Find(model => model.datasetId == dataset._id).ToList(); + List models = _model.Find(model => model.datasetId == dataset._id && model.username=="").ToList(); foreach(var model in models) { DeleteModel(model._id); @@ -39,6 +39,18 @@ namespace api.Services File.Delete(file.path); } } + //Brisanje modela ukoliko gost koristi vec postojeci dataset + List models1= _model.Find(model =>model.username == "").ToList(); + foreach(var model in models1) + { + DateTime modelDate = DateTime.Parse(model.dateCreated); + if ((DateTime.Now.ToUniversalTime() - modelDate.ToUniversalTime()).TotalDays >= 1) + { + DeleteModel(model._id); + } + } + + } -- cgit v1.2.3