Merge branch 'dev' into 'master'

Release: Sprint/2022 19 

See merge request !179

src/Database/Models/ProjectModel.cs

@@ -421,7 +421,8 @@ namespace Coscine.Database.Models
                 project.Slug,
                 project.DateCreated,
                 parentId,
-                project.Creator
+                project.Creator,
+                project.Deleted
                 );
         }
 

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
             );
         }
 

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;
         }
     }
 }

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;
         }
     }
 }