mirror/phylum
1
0
Fork 0
mirror of https://codeberg.org/shroff/phylum.git synced 2026-01-04 02:31:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

[server] Fix name conflict resolution delete

Browse Source
This commit is contained in:
Abhishek Shroff
2025-01-09 08:36:06 +05:30
parent 403c215a62
commit 8cfc1d2b2e
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
server/internal/core/fs/create.go
View File

@@ -201,19 +201,22 @@ func (f filesystem) createResource(
}
}
case ResourceBindConflictResolutionDelete:
deleted = true
err = f.deleteRecursive(res.ID, parent, true, false)
res, err = f.db.ChildResourceByName(f.ctx, db.ChildResourceByNameParams{Parent: parent, Name: name})
if err == nil {
res, created, _, err = f.createResource(
id,
parent,
name,
dir,
contentLength,
contentType,
contentSHA256,
ResourceBindConflictResolutionError,
)
deleted = true
err = f.deleteRecursive(res.ID, parent, true, false)
if err == nil {
res, created, _, err = f.createResource(
id,
parent,
name,
dir,
contentLength,
contentType,
contentSHA256,
ResourceBindConflictResolutionError,
)
}
}
}
} else if strings.Contains(err.Error(), "resources_pkey") {