diff --git a/src/Database/Models/ProjectModel.cs b/src/Database/Models/ProjectModel.cs index 76b43e8d860f22960dffa9a46a3dbefd0add3232..c6c19c7d3e6e54e5d715914212d7552ce67474d0 100644 --- a/src/Database/Models/ProjectModel.cs +++ b/src/Database/Models/ProjectModel.cs @@ -421,7 +421,8 @@ namespace Coscine.Database.Models project.Slug, project.DateCreated, parentId, - project.Creator + project.Creator, + project.Deleted ); } diff --git a/src/Database/Models/ResourceModel.cs b/src/Database/Models/ResourceModel.cs index 484096e81ca3f74870f2963d63ec060e515b5dbd..af80928040d32d992a5312f72d4439b2890bb7ce 100644 --- a/src/Database/Models/ResourceModel.cs +++ b/src/Database/Models/ResourceModel.cs @@ -440,7 +440,8 @@ namespace Coscine.Database.Models JToken.Parse(resource.FixedValues ?? "{}"), resource.DateCreated, resource.Creator, - resource.Archived == "1" + resource.Archived == "1", + resource.Deleted ); } diff --git a/src/Database/ReturnObjects/ProjectObject.cs b/src/Database/ReturnObjects/ProjectObject.cs index ac97d6a453600b1c57712315656269bd64adb102..0e5e09cdd40a4c46dba57ba8a6669863ee17c604 100644 --- a/src/Database/ReturnObjects/ProjectObject.cs +++ b/src/Database/ReturnObjects/ProjectObject.cs @@ -27,8 +27,9 @@ namespace Coscine.Database.ReturnObjects public Guid ParentId { get; set; } public Guid? Creator { get; set; } + public bool Deleted { get; set; } - public ProjectObject(Guid id, string description, string displayName, DateTime startDate, DateTime endDate, string keywords, string projectName, string principleInvestigators, string grantId, IEnumerable<DisciplineObject> discipline, IEnumerable<OrganizationObject> organization, VisibilityObject visibility, string slug, DateTime? dateCreated, Guid parentId = new Guid(), Guid? creator = null) + public ProjectObject(Guid id, string description, string displayName, DateTime startDate, DateTime endDate, string keywords, string projectName, string principleInvestigators, string grantId, IEnumerable<DisciplineObject> discipline, IEnumerable<OrganizationObject> organization, VisibilityObject visibility, string slug, DateTime? dateCreated, Guid parentId = new Guid(), Guid? creator = null, bool deleted = false) { Id = id; Description = description; @@ -48,6 +49,7 @@ namespace Coscine.Database.ReturnObjects Organizations = organization; Visibility = visibility; DateCreated = dateCreated; + Deleted = deleted; } } } diff --git a/src/Database/ReturnObjects/ResourceObject.cs b/src/Database/ReturnObjects/ResourceObject.cs index 9bfd9f012effb1c6d2f70865ba7ef451d795e5d4..09c521be33fff735f37ead54d180763d654c6dbc 100644 --- a/src/Database/ReturnObjects/ResourceObject.cs +++ b/src/Database/ReturnObjects/ResourceObject.cs @@ -26,8 +26,9 @@ namespace Coscine.Database.ReturnObjects public DateTime? DateCreated { get; set; } public Guid? Creator { get; set; } public bool Archived { get; set; } + public bool Deleted { get; set; } - public ResourceObject(Guid id, string displayName, string resourceName, string description, string keywords, string usageRights, ResourceTypeObject type, IEnumerable<DisciplineObject> disciplines, VisibilityObject visibility, LicenseObject license, JObject resourceTypeOption, string applicationProfile, JToken fixedValues, DateTime? dateCreated, Guid? creator = null, bool archived = false) + public ResourceObject(Guid id, string displayName, string resourceName, string description, string keywords, string usageRights, ResourceTypeObject type, IEnumerable<DisciplineObject> disciplines, VisibilityObject visibility, LicenseObject license, JObject resourceTypeOption, string applicationProfile, JToken fixedValues, DateTime? dateCreated, Guid? creator = null, bool archived = false, bool deleted = false) { Id = id; @@ -49,6 +50,7 @@ namespace Coscine.Database.ReturnObjects DateCreated = dateCreated; Creator = creator; Archived = archived; + Deleted = deleted; } } }