Fix: Correct list of SubProjects after deletion

coscine/issues#710
coscine/issues#687

src/Project/Controllers/ProjectController.cs

@@ -37,8 +37,7 @@ namespace Coscine.Api.Project.Controllers
             return Ok(_projectModel.GetWithAccess(user, UserRoles.Member, UserRoles.Owner).ToList()
                 .Select((project) => _projectModel.CreateReturnObjectFromDatabaseObject(project))
                 .OrderBy(element => element.DisplayName)
-                );
-
+            );
         }
 
         [HttpGet("[controller]/{id}")]
@@ -124,13 +123,16 @@ namespace Coscine.Api.Project.Controllers
         public void DeleteProject(Database.DataModel.Project project, bool isHard = false, bool propegateAction = true)
         {
             var subProjectModel = new SubProjectModel();
-            foreach(var subProject in subProjectModel.GetAllWhere((subProject) => subProject.ProjectId == project.Id))
+            foreach (var subProject in subProjectModel.GetAllWhere(
+                (subProject) => subProject.ProjectId == project.Id
+                                && (subProject.SubProject_FK.Deleted == false || isHard)
+            ))
             {
                 Database.DataModel.Project subProjectObject;
                 if (isHard)
                 {
-                    subProjectModel.Delete(subProject);
                     subProjectObject = _projectModel.GetByIdIncludingDeleted(subProject.SubProjectId);
+                    subProjectModel.Delete(subProject);
                 }
                 else
                 {