feat: read/write improved names/pronouns for users, read/write improved fields/names/pronouns for members
This commit is contained in:
parent
c6537c920d
commit
d6017f1edf
GPG key ID:
B4EF20DDE721CAA1
11 changed files with 231 additions and 370 deletions
|
|
@ -2,234 +2,52 @@ package db
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"codeberg.org/u1f320/pronouns.cc/backend/db/queries"
|
||||
"emperror.dev/errors"
|
||||
"github.com/georgysavva/scany/pgxscan"
|
||||
"github.com/jackc/pgx/v4"
|
||||
"github.com/rs/xid"
|
||||
)
|
||||
|
||||
type Name struct {
|
||||
ID int64 `json:"-"`
|
||||
Name string `json:"name"`
|
||||
Status WordStatus `json:"status"`
|
||||
}
|
||||
|
||||
func (n Name) Validate() string {
|
||||
if n.Name == "" {
|
||||
return "name cannot be empty"
|
||||
}
|
||||
|
||||
if len([]rune(n.Name)) > FieldEntryMaxLength {
|
||||
return fmt.Sprintf("name must be %d characters or less, is %d", FieldEntryMaxLength, len([]rune(n.Name)))
|
||||
}
|
||||
|
||||
if n.Status == StatusUnknown || n.Status >= wordStatusMax {
|
||||
return fmt.Sprintf("status is invalid, must be between 1 and %d, is %d", wordStatusMax-1, n.Status)
|
||||
}
|
||||
|
||||
return ""
|
||||
}
|
||||
|
||||
type Pronoun struct {
|
||||
ID int64 `json:"-"`
|
||||
DisplayText *string `json:"display_text"`
|
||||
Pronouns string `json:"pronouns"`
|
||||
Status WordStatus `json:"status"`
|
||||
}
|
||||
|
||||
func (p Pronoun) Validate() string {
|
||||
if p.Pronouns == "" {
|
||||
return "pronouns cannot be empty"
|
||||
}
|
||||
|
||||
if p.DisplayText != nil {
|
||||
if len([]rune(*p.DisplayText)) > FieldEntryMaxLength {
|
||||
return fmt.Sprintf("display_text must be %d characters or less, is %d", FieldEntryMaxLength, len([]rune(*p.DisplayText)))
|
||||
}
|
||||
}
|
||||
|
||||
if len([]rune(p.Pronouns)) > FieldEntryMaxLength {
|
||||
return fmt.Sprintf("pronouns must be %d characters or less, is %d", FieldEntryMaxLength, len([]rune(p.Pronouns)))
|
||||
}
|
||||
|
||||
if p.Status == StatusUnknown || p.Status >= wordStatusMax {
|
||||
return fmt.Sprintf("status is invalid, must be between 1 and %d, is %d", wordStatusMax-1, p.Status)
|
||||
}
|
||||
|
||||
return ""
|
||||
}
|
||||
|
||||
func (p Pronoun) String() string {
|
||||
if p.DisplayText != nil {
|
||||
return *p.DisplayText
|
||||
}
|
||||
|
||||
split := strings.Split(p.Pronouns, "/")
|
||||
if len(split) <= 2 {
|
||||
return strings.Join(split, "/")
|
||||
}
|
||||
|
||||
return strings.Join(split[:1], "/")
|
||||
}
|
||||
|
||||
func (db *DB) SetUserNames(ctx context.Context, tx pgx.Tx, userID xid.ID, names []Name) (err error) {
|
||||
sql, args, err := sq.Delete("user_names").Where("user_id = ?", userID).ToSql()
|
||||
func (db *DB) SetUserNamesPronouns(ctx context.Context, tx pgx.Tx, userID xid.ID, names []FieldEntry, pronouns []PronounEntry) (err error) {
|
||||
_, err = queries.NewQuerier(tx).UpdateUserNamesPronouns(ctx, queries.UpdateUserNamesPronounsParams{
|
||||
ID: userID.String(),
|
||||
Names: entriesToDBEntries(names),
|
||||
Pronouns: pronounEntriesToDBEntries(pronouns),
|
||||
})
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "building sql")
|
||||
}
|
||||
|
||||
_, err = tx.Exec(ctx, sql, args...)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "deleting existing names")
|
||||
}
|
||||
|
||||
_, err = tx.CopyFrom(ctx,
|
||||
pgx.Identifier{"user_names"},
|
||||
[]string{"user_id", "name", "status"},
|
||||
pgx.CopyFromSlice(len(names), func(i int) ([]any, error) {
|
||||
return []any{
|
||||
userID,
|
||||
names[i].Name,
|
||||
names[i].Status,
|
||||
}, nil
|
||||
}))
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "inserting new names")
|
||||
return errors.Wrap(err, "executing update names/pronouns query")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *DB) SetUserPronouns(ctx context.Context, tx pgx.Tx, userID xid.ID, names []Pronoun) (err error) {
|
||||
sql, args, err := sq.Delete("user_pronouns").Where("user_id = ?", userID).ToSql()
|
||||
func (db *DB) SetMemberNamesPronouns(ctx context.Context, tx pgx.Tx, memberID xid.ID, names []FieldEntry, pronouns []PronounEntry) (err error) {
|
||||
_, err = queries.NewQuerier(tx).UpdateMemberNamesPronouns(ctx, queries.UpdateMemberNamesPronounsParams{
|
||||
ID: memberID.String(),
|
||||
Names: entriesToDBEntries(names),
|
||||
Pronouns: pronounEntriesToDBEntries(pronouns),
|
||||
})
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "building sql")
|
||||
}
|
||||
|
||||
_, err = tx.Exec(ctx, sql, args...)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "deleting existing pronouns")
|
||||
}
|
||||
|
||||
_, err = tx.CopyFrom(ctx,
|
||||
pgx.Identifier{"user_pronouns"},
|
||||
[]string{"user_id", "pronouns", "display_text", "status"},
|
||||
pgx.CopyFromSlice(len(names), func(i int) ([]any, error) {
|
||||
return []any{
|
||||
userID,
|
||||
names[i].Pronouns,
|
||||
names[i].DisplayText,
|
||||
names[i].Status,
|
||||
}, nil
|
||||
}))
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "inserting new pronouns")
|
||||
return errors.Wrap(err, "executing update names/pronouns query")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *DB) MemberNames(ctx context.Context, memberID xid.ID) (ns []Name, err error) {
|
||||
sql, args, err := sq.Select("id", "name", "status").From("member_names").Where("member_id = ?", memberID).OrderBy("id").ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "building sql")
|
||||
}
|
||||
|
||||
err = pgxscan.Select(ctx, db, &ns, sql, args...)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "executing query")
|
||||
}
|
||||
return ns, nil
|
||||
}
|
||||
|
||||
func (db *DB) MemberPronouns(ctx context.Context, memberID xid.ID) (ps []Pronoun, err error) {
|
||||
sql, args, err := sq.
|
||||
Select("id", "display_text", "pronouns", "status").
|
||||
From("member_pronouns").Where("member_id = ?", memberID).
|
||||
OrderBy("id").ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "building sql")
|
||||
}
|
||||
|
||||
err = pgxscan.Select(ctx, db, &ps, sql, args...)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "executing query")
|
||||
}
|
||||
return ps, nil
|
||||
}
|
||||
|
||||
func (db *DB) SetMemberNames(ctx context.Context, tx pgx.Tx, memberID xid.ID, names []Name) (err error) {
|
||||
sql, args, err := sq.Delete("member_names").Where("member_id = ?", memberID).ToSql()
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "building sql")
|
||||
}
|
||||
|
||||
_, err = tx.Exec(ctx, sql, args...)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "deleting existing names")
|
||||
}
|
||||
|
||||
_, err = tx.CopyFrom(ctx,
|
||||
pgx.Identifier{"member_names"},
|
||||
[]string{"member_id", "name", "status"},
|
||||
pgx.CopyFromSlice(len(names), func(i int) ([]any, error) {
|
||||
return []any{
|
||||
memberID,
|
||||
names[i].Name,
|
||||
names[i].Status,
|
||||
}, nil
|
||||
}))
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "inserting new names")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *DB) SetMemberPronouns(ctx context.Context, tx pgx.Tx, memberID xid.ID, names []Pronoun) (err error) {
|
||||
sql, args, err := sq.Delete("member_pronouns").Where("member_id = ?", memberID).ToSql()
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "building sql")
|
||||
}
|
||||
|
||||
_, err = tx.Exec(ctx, sql, args...)
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "deleting existing pronouns")
|
||||
}
|
||||
|
||||
_, err = tx.CopyFrom(ctx,
|
||||
pgx.Identifier{"member_pronouns"},
|
||||
[]string{"member_id", "pronouns", "display_text", "status"},
|
||||
pgx.CopyFromSlice(len(names), func(i int) ([]any, error) {
|
||||
return []any{
|
||||
memberID,
|
||||
names[i].Pronouns,
|
||||
names[i].DisplayText,
|
||||
names[i].Status,
|
||||
}, nil
|
||||
}))
|
||||
if err != nil {
|
||||
return errors.Wrap(err, "inserting new pronouns")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func namesFromDB(dn []queries.FieldEntry) []Name {
|
||||
names := make([]Name, len(dn))
|
||||
func fieldEntriesFromDB(dn []queries.FieldEntry) []FieldEntry {
|
||||
names := make([]FieldEntry, len(dn))
|
||||
for i := range dn {
|
||||
names[i] = Name{
|
||||
Name: *dn[i].Value,
|
||||
names[i] = FieldEntry{
|
||||
Value: *dn[i].Value,
|
||||
Status: WordStatus(*dn[i].Status),
|
||||
}
|
||||
}
|
||||
return names
|
||||
}
|
||||
|
||||
func pronounsFromDB(dn []queries.PronounEntry) []Pronoun {
|
||||
pronouns := make([]Pronoun, len(dn))
|
||||
func pronounsFromDB(dn []queries.PronounEntry) []PronounEntry {
|
||||
pronouns := make([]PronounEntry, len(dn))
|
||||
for i := range dn {
|
||||
pronouns[i] = Pronoun{
|
||||
pronouns[i] = PronounEntry{
|
||||
DisplayText: dn[i].DisplayValue,
|
||||
Pronouns: *dn[i].Value,
|
||||
Status: WordStatus(*dn[i].Status),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue