Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions backend/infra/rest/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,34 @@ func (projectHandler *ProjectHandler) ProjectDeleteHandler(w http.ResponseWriter
// Hard delete dummy project
projectHandler.ProjectRepository.DeleteHard(requestSession, currentProject.Key)

// Hard delete auditlogs
if currentProject.HasParent() {
parentProject := projectHandler.ProjectRepository.FindByKey(requestSession, currentProject.Parent, false)
if parentProject != nil {
filteredChildren := make([]string, 0, len(parentProject.Children))
removed := false

oldParentProject := project.Project{}
copier.Copy(&oldParentProject, parentProject)

for _, childKey := range parentProject.Children {
if childKey == currentProject.Key {
removed = true
continue
}
filteredChildren = append(filteredChildren, childKey)
}

if removed {
parentProject.Children = filteredChildren
parentProject.HasChildren = len(filteredChildren) > 0

projectHandler.AuditLogListRepository.CreateAuditEntryByKey(requestSession, parentProject.Key, username, message.ProjectUpdated, cmp.Diff, parentProject, &oldParentProject)

projectHandler.ProjectRepository.Update(requestSession, parentProject)
}
}
}

projectHandler.AuditLogListRepository.DeleteHard(requestSession, currentProject.Key)

w.WriteHeader(200)
Expand All @@ -753,7 +780,6 @@ func (projectHandler *ProjectHandler) ProjectDeleteHandler(w http.ResponseWriter
if existingFlag != parentProject.HasChildren {
projectHandler.ProjectRepository.Update(requestSession, parentProject)
}

}

w.WriteHeader(200)
Expand Down
4 changes: 4 additions & 0 deletions backend/infra/service/project-label/project-label.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ func (s *ProjectLabelService) AllChildrenHaveLabel(requestSession *logy.RequestS
}
for _, cId := range pr.Children {
c := s.ProjectRepo.FindByKeyWithDeleted(requestSession, cId, true)
if c == nil {
logy.Errorf(requestSession, "Child project '%s' referenced by project '%s' not found. Potentially hard deleted dummy sub-project.", cId, pr.Key)
continue
}
if c.Deleted {
continue
}
Expand Down
Loading