sam/pronounscc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(backend): use jsonb instead of composite type arrays

Browse source
This commit is contained in:
Sam 2023-03-12 01:31:10 +01:00
parent f358a56053
commit b8a7e7443d
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
14 changed files with 161 additions and 1467 deletions
Download patch file Download diff file Expand all files Collapse all files

99
backend/db/member.go
View file

@ -3,7 +3,6 @@ package db
import (
"context"
"codeberg.org/u1f320/pronouns.cc/backend/db/queries"
"emperror.dev/errors"
"github.com/georgysavva/scany/pgxscan"
"github.com/jackc/pgconn"
@ -33,64 +32,36 @@ const (
ErrMemberNameInUse = errors.Sentinel("member name already in use")
)
func (db *DB) getMember(ctx context.Context, q querier, id xid.ID) (m Member, err error) {
qm, err := queries.NewQuerier(q).GetMemberByID(ctx, id.String())
func (db *DB) Member(ctx context.Context, id xid.ID) (m Member, err error) {
sql, args, err := sq.Select("*").From("members").Where("id = ?", id).ToSql()
if err != nil {
return m, errors.Wrap(err, "getting member from db")
return m, errors.Wrap(err, "building sql")
}
userID, err := xid.FromString(qm.UserID)
err = pgxscan.Get(ctx, db, &m, sql, args...)
if err != nil {
return m, errors.Wrap(err, "parsing user ID")
}
m = Member{
ID: id,
UserID: userID,
Name: qm.Name,
DisplayName: qm.DisplayName,
Bio: qm.Bio,
AvatarURLs: qm.AvatarUrls,
Links: qm.Links,
Names: fieldEntriesFromDB(qm.Names),
Pronouns: pronounsFromDB(qm.Pronouns),
return m, errors.Wrap(err, "executing query")
}
return m, nil
}
func (db *DB) Member(ctx context.Context, id xid.ID) (m Member, err error) {
return db.getMember(ctx, db, id)
}
// UserMember returns a member scoped by user.
func (db *DB) UserMember(ctx context.Context, userID xid.ID, memberRef string) (m Member, err error) {
qm, err := db.q.GetMemberByName(ctx, userID.String(), memberRef)
sql, args, err := sq.Select("*").From("members").Where("user_id = ?", userID).Where("(id = ? or name = ?)", memberRef, memberRef).ToSql()
if err != nil {
return m, errors.Wrap(err, "getting member from db")
return m, errors.Wrap(err, "building sql")
}
memberID, err := xid.FromString(qm.ID)
err = pgxscan.Get(ctx, db, &m, sql, args...)
if err != nil {
return m, errors.Wrap(err, "parsing member ID")
}
m = Member{
ID: memberID,
UserID: userID,
Name: qm.Name,
DisplayName: qm.DisplayName,
Bio: qm.Bio,
AvatarURLs: qm.AvatarUrls,
Links: qm.Links,
Names: fieldEntriesFromDB(qm.Names),
Pronouns: pronounsFromDB(qm.Pronouns),
return m, errors.Wrap(err, "executing query")
}
return m, nil
}
// UserMembers returns all of a user's members, sorted by name.
func (db *DB) UserMembers(ctx context.Context, userID xid.ID) (ms []Member, err error) {
sql, args, err := sq.Select("id", "user_id", "name", "display_name", "bio", "avatar_urls").
sql, args, err := sq.Select("id", "user_id", "name", "display_name", "bio", "avatar_urls", "names", "pronouns").
From("members").Where("user_id = ?", userID).
OrderBy("name", "id").ToSql()
if err != nil {
@ -109,17 +80,19 @@ func (db *DB) UserMembers(ctx context.Context, userID xid.ID) (ms []Member, err
}
// CreateMember creates a member.
func (db *DB) CreateMember(ctx context.Context, tx pgx.Tx, userID xid.ID, name string, displayName *string, bio string, links []string) (m Member, err error) {
func (db *DB) CreateMember(
ctx context.Context, tx pgx.Tx, userID xid.ID,
name string, displayName *string, bio string, links []string,
) (m Member, err error) {
sql, args, err := sq.Insert("members").
Columns("user_id", "id", "name", "display_name", "bio", "links").
Values(userID, xid.New(), name, displayName, bio, links).
Suffix("RETURNING id").ToSql()
Suffix("RETURNING *").ToSql()
if err != nil {
return m, errors.Wrap(err, "building sql")
}
var id xid.ID
err = tx.QueryRow(ctx, sql, args...).Scan(&id)
err = pgxscan.Get(ctx, tx, &m, sql, args...)
if err != nil {
pge := &pgconn.PgError{}
if errors.As(err, &pge) {
@ -131,12 +104,6 @@ func (db *DB) CreateMember(ctx context.Context, tx pgx.Tx, userID xid.ID, name s
return m, errors.Wrap(err, "executing query")
}
m, err = db.getMember(ctx, tx, id)
if err != nil {
return m, errors.Wrap(err, "getting created member")
}
return m, nil
}
@ -177,10 +144,20 @@ func (db *DB) UpdateMember(
avatarURLs []string,
) (m Member, err error) {
if name == nil && displayName == nil && bio == nil && links == nil && avatarURLs == nil {
return db.getMember(ctx, tx, id)
// get member
sql, args, err := sq.Select("*").From("members").Where("id = ?", id).ToSql()
if err != nil {
return m, errors.Wrap(err, "building sql")
}
err = pgxscan.Get(ctx, tx, &m, sql, args...)
if err != nil {
return m, errors.Wrap(err, "executing query")
}
return m, nil
}
builder := sq.Update("members").Where("id = ?", id)
builder := sq.Update("members").Where("id = ?", id).Suffix("RETURNING *")
if name != nil {
if *name == "" {
builder = builder.Set("name", nil)
@ -203,19 +180,11 @@ func (db *DB) UpdateMember(
}
}
if links != nil {
if len(*links) == 0 {
builder = builder.Set("links", nil)
} else {
builder = builder.Set("links", *links)
}
builder = builder.Set("links", *links)
}
if avatarURLs != nil {
if len(avatarURLs) == 0 {
builder = builder.Set("avatar_urls", nil)
} else {
builder = builder.Set("avatar_urls", avatarURLs)
}
builder = builder.Set("avatar_urls", avatarURLs)
}
sql, args, err := builder.ToSql()
@ -223,7 +192,7 @@ func (db *DB) UpdateMember(
return m, errors.Wrap(err, "building sql")
}
_, err = tx.Exec(ctx, sql, args...)
err = pgxscan.Get(ctx, tx, &m, sql, args...)
if err != nil {
pge := &pgconn.PgError{}
if errors.As(err, &pge) {
@ -234,11 +203,5 @@ func (db *DB) UpdateMember(
return m, errors.Wrap(err, "executing sql")
}
m, err = db.getMember(ctx, tx, id)
if err != nil {
return m, errors.Wrap(err, "getting member")
}
return m, nil
}