Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add error display to file upload

Browse source
This commit is contained in:
Eli Ribble 2026-04-15 19:02:25 +00:00
parent 344f4bcaa5
commit 66d35428fa
No known key found for this signature in database
7 changed files with 93 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
db/dbinfo/fileupload.file.bob.go
View file

@ -114,6 +114,15 @@ var FileuploadFiles = Table[
Generated: false,
AutoIncr: false,
},
Error: column{
Name: "error",
DBType: "text",
Default: "",
Comment: "",
Nullable: false,
Generated: false,
AutoIncr: false,
},
},
Indexes: fileuploadFileIndexes{
FilePkey: index{
@ -184,11 +193,12 @@ type fileuploadFileColumns struct {
SizeBytes column
FileUUID column
Committer column
Error column
}
func (c fileuploadFileColumns) AsSlice() []column {
return []column{
c.ID, c.ContentType, c.Created, c.CreatorID, c.Deleted, c.Name, c.OrganizationID, c.Status, c.SizeBytes, c.FileUUID, c.Committer,
c.ID, c.ContentType, c.Created, c.CreatorID, c.Deleted, c.Name, c.OrganizationID, c.Status, c.SizeBytes, c.FileUUID, c.Committer, c.Error,
}
}

6
db/migrations/00135_fileupload_file_error.sql Normal file
View file

@ -0,0 +1,6 @@
-- +goose Up
ALTER TABLE fileupload.file ADD COLUMN error TEXT;
UPDATE fileupload.file SET error = '';
ALTER TABLE fileupload.file ALTER COLUMN error SET NOT NULL;
-- +goose Down
ALTER TABLE fileupload.file DROP COLUMN error;

33
db/models/fileupload.file.bob.go
View file

@ -38,6 +38,7 @@ type FileuploadFile struct {
SizeBytes int32 `db:"size_bytes" `
FileUUID uuid.UUID `db:"file_uuid" `
Committer null.Val[int32] `db:"committer" `
Error string `db:"error" `
R fileuploadFileR `db:"-" `
}
@ -65,7 +66,7 @@ type fileuploadFileR struct {
func buildFileuploadFileColumns(alias string) fileuploadFileColumns {
return fileuploadFileColumns{
ColumnsExpr: expr.NewColumnsExpr(
"id", "content_type", "created", "creator_id", "deleted", "name", "organization_id", "status", "size_bytes", "file_uuid", "committer",
"id", "content_type", "created", "creator_id", "deleted", "name", "organization_id", "status", "size_bytes", "file_uuid", "committer", "error",
).WithParent("fileupload.file"),
tableAlias: alias,
ID: psql.Quote(alias, "id"),
@ -79,6 +80,7 @@ func buildFileuploadFileColumns(alias string) fileuploadFileColumns {
SizeBytes: psql.Quote(alias, "size_bytes"),
FileUUID: psql.Quote(alias, "file_uuid"),
Committer: psql.Quote(alias, "committer"),
Error: psql.Quote(alias, "error"),
}
}
@ -96,6 +98,7 @@ type fileuploadFileColumns struct {
SizeBytes psql.Expression
FileUUID psql.Expression
Committer psql.Expression
Error psql.Expression
}
func (c fileuploadFileColumns) Alias() string {
@ -121,10 +124,11 @@ type FileuploadFileSetter struct {
SizeBytes omit.Val[int32] `db:"size_bytes" `
FileUUID omit.Val[uuid.UUID] `db:"file_uuid" `
Committer omitnull.Val[int32] `db:"committer" `
Error omit.Val[string] `db:"error" `
}
func (s FileuploadFileSetter) SetColumns() []string {
vals := make([]string, 0, 11)
vals := make([]string, 0, 12)
if s.ID.IsValue() {
vals = append(vals, "id")
}
@ -158,6 +162,9 @@ func (s FileuploadFileSetter) SetColumns() []string {
if !s.Committer.IsUnset() {
vals = append(vals, "committer")
}
if s.Error.IsValue() {
vals = append(vals, "error")
}
return vals
}
@ -195,6 +202,9 @@ func (s FileuploadFileSetter) Overwrite(t *FileuploadFile) {
if !s.Committer.IsUnset() {
t.Committer = s.Committer.MustGetNull()
}
if s.Error.IsValue() {
t.Error = s.Error.MustGet()
}
}
func (s *FileuploadFileSetter) Apply(q *dialect.InsertQuery) {
@ -203,7 +213,7 @@ func (s *FileuploadFileSetter) Apply(q *dialect.InsertQuery) {
})
q.AppendValues(bob.ExpressionFunc(func(ctx context.Context, w io.StringWriter, d bob.Dialect, start int) ([]any, error) {
vals := make([]bob.Expression, 11)
vals := make([]bob.Expression, 12)
if s.ID.IsValue() {
vals[0] = psql.Arg(s.ID.MustGet())
} else {
@ -270,6 +280,12 @@ func (s *FileuploadFileSetter) Apply(q *dialect.InsertQuery) {
vals[10] = psql.Raw("DEFAULT")
}
if s.Error.IsValue() {
vals[11] = psql.Arg(s.Error.MustGet())
} else {
vals[11] = psql.Raw("DEFAULT")
}
return bob.ExpressSlice(ctx, w, d, start, vals, "", ", ", "")
}))
}
@ -279,7 +295,7 @@ func (s FileuploadFileSetter) UpdateMod() bob.Mod[*dialect.UpdateQuery] {
}
func (s FileuploadFileSetter) Expressions(prefix ...string) []bob.Expression {
exprs := make([]bob.Expression, 0, 11)
exprs := make([]bob.Expression, 0, 12)
if s.ID.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
@ -358,6 +374,13 @@ func (s FileuploadFileSetter) Expressions(prefix ...string) []bob.Expression {
}})
}
if s.Error.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
psql.Quote(append(prefix, "error")...),
psql.Arg(s.Error),
}})
}
return exprs
}
@ -1074,6 +1097,7 @@ type fileuploadFileWhere[Q psql.Filterable] struct {
SizeBytes psql.WhereMod[Q, int32]
FileUUID psql.WhereMod[Q, uuid.UUID]
Committer psql.WhereNullMod[Q, int32]
Error psql.WhereMod[Q, string]
}
func (fileuploadFileWhere[Q]) AliasedAs(alias string) fileuploadFileWhere[Q] {
@ -1093,6 +1117,7 @@ func buildFileuploadFileWhere[Q psql.Filterable](cols fileuploadFileColumns) fil
SizeBytes: psql.Where[Q, int32](cols.SizeBytes),
FileUUID: psql.Where[Q, uuid.UUID](cols.FileUUID),
Committer: psql.WhereNull[Q, int32](cols.Committer),
Error: psql.Where[Q, string](cols.Error),
}
}