mirror of
https://github.com/navidrome/navidrome.git
synced 2025-04-03 20:47:35 +03:00
fa85e2a781
* [bugfix] player: use userId, other fixes This PR primarily resolves #1928 by switching the foreign key of `player` from `user.user_name` to `user.id`. There are also a few other fixes/changes: - For some bizarre reason, `ip_address` is never returned from `read`/`get`. Change the field to `ip`, which works. Somehow - Update `players_test.go` mock to also check for user agent, replicating the actual code - Update `player_repository.go` `isPermitted` to check user id. I don't know how this worked before... - tests! - a few places referred to `typ`, when it is really `userAgent`. Change the field names * baseRequest -> selectPlayer * remove comment * update migration, make all of persistence foreign key enabled * maybe don't forget to save the file first
63 lines
1.7 KiB
Go
63 lines
1.7 KiB
Go
package persistence
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/navidrome/navidrome/db"
|
|
"github.com/navidrome/navidrome/log"
|
|
"github.com/navidrome/navidrome/model"
|
|
. "github.com/onsi/ginkgo/v2"
|
|
. "github.com/onsi/gomega"
|
|
)
|
|
|
|
var _ = Describe("SQLStore", func() {
|
|
var ds model.DataStore
|
|
var ctx context.Context
|
|
BeforeEach(func() {
|
|
ds = New(db.Db())
|
|
ctx = context.Background()
|
|
log.SetLevel(log.LevelFatal)
|
|
})
|
|
AfterEach(func() {
|
|
log.SetLevel(log.LevelError)
|
|
})
|
|
Describe("WithTx", func() {
|
|
Context("When block returns nil", func() {
|
|
It("commits changes to the DB", func() {
|
|
err := ds.WithTx(func(tx model.DataStore) error {
|
|
pl := tx.Player(ctx)
|
|
err := pl.Put(&model.Player{ID: "666", UserId: "userid"})
|
|
Expect(err).ToNot(HaveOccurred())
|
|
|
|
pr := tx.Property(ctx)
|
|
err = pr.Put("777", "value")
|
|
Expect(err).ToNot(HaveOccurred())
|
|
return nil
|
|
})
|
|
Expect(err).ToNot(HaveOccurred())
|
|
Expect(ds.Player(ctx).Get("666")).To(Equal(&model.Player{ID: "666", UserId: "userid", Username: "userid"}))
|
|
Expect(ds.Property(ctx).Get("777")).To(Equal("value"))
|
|
})
|
|
})
|
|
Context("When block returns an error", func() {
|
|
It("rollbacks changes to the DB", func() {
|
|
err := ds.WithTx(func(tx model.DataStore) error {
|
|
pr := tx.Property(ctx)
|
|
err := pr.Put("999", "value")
|
|
Expect(err).ToNot(HaveOccurred())
|
|
|
|
// Will fail as it is missing the UserName
|
|
pl := tx.Player(ctx)
|
|
err = pl.Put(&model.Player{ID: "888"})
|
|
Expect(err).To(HaveOccurred())
|
|
return err
|
|
})
|
|
Expect(err).To(HaveOccurred())
|
|
_, err = ds.Property(ctx).Get("999")
|
|
Expect(err).To(MatchError(model.ErrNotFound))
|
|
_, err = ds.Player(ctx).Get("888")
|
|
Expect(err).To(MatchError(model.ErrNotFound))
|
|
})
|
|
})
|
|
})
|
|
})
|