Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions internal/storage/postgres/bundle_reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ import (
. "github.com/onsi/gomega"

"github.com/Permify/permify/internal/storage"
"github.com/Permify/permify/pkg/database"
PQDatabase "github.com/Permify/permify/pkg/database/postgres"
base "github.com/Permify/permify/pkg/pb/base/v1"
"github.com/Permify/permify/pkg/testinstance"
)

var _ = Describe("BundleReader", func() {
var db database.Database
var db *testinstance.PostgresInstance
var bundleWriter *BundleWriter
var bundleReader *BundleReader

Expand All @@ -27,8 +25,8 @@ var _ = Describe("BundleReader", func() {
}

db = testinstance.PostgresDB(version)
bundleWriter = NewBundleWriter(db.(*PQDatabase.Postgres))
bundleReader = NewBundleReader(db.(*PQDatabase.Postgres))
bundleWriter = NewBundleWriter(db.Postgres)
bundleReader = NewBundleReader(db.Postgres)
})

AfterEach(func() {
Expand Down Expand Up @@ -117,7 +115,7 @@ var _ = Describe("BundleReader", func() {
ctx := context.Background()

// First, write a bundle with valid JSON that doesn't match the protobuf structure
postgresDB := db.(*PQDatabase.Postgres)
postgresDB := db.Postgres

// Insert valid JSON that doesn't match the DataBundle structure
invalidJSON := `{"invalid_field": "invalid_value", "another_field": 123}`
Expand Down
8 changes: 3 additions & 5 deletions internal/storage/postgres/bundle_writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ import (
. "github.com/onsi/gomega"

"github.com/Permify/permify/internal/storage"
"github.com/Permify/permify/pkg/database"
PQDatabase "github.com/Permify/permify/pkg/database/postgres"
base "github.com/Permify/permify/pkg/pb/base/v1"
"github.com/Permify/permify/pkg/testinstance"
)

var _ = Describe("BundleWriter", func() {
var db database.Database
var db *testinstance.PostgresInstance
var bundleWriter *BundleWriter
var bundleReader *BundleReader

Expand All @@ -27,8 +25,8 @@ var _ = Describe("BundleWriter", func() {
}

db = testinstance.PostgresDB(version)
bundleWriter = NewBundleWriter(db.(*PQDatabase.Postgres))
bundleReader = NewBundleReader(db.(*PQDatabase.Postgres))
bundleWriter = NewBundleWriter(db.Postgres)
bundleReader = NewBundleReader(db.Postgres)
})

AfterEach(func() {
Expand Down
91 changes: 45 additions & 46 deletions internal/storage/postgres/data_reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ import (

"github.com/Permify/permify/pkg/attribute"
"github.com/Permify/permify/pkg/database"
PQDatabase "github.com/Permify/permify/pkg/database/postgres"
base "github.com/Permify/permify/pkg/pb/base/v1"
"github.com/Permify/permify/pkg/testinstance"
"github.com/Permify/permify/pkg/token"
"github.com/Permify/permify/pkg/tuple"
)

var _ = Describe("DataReader", func() {
var db database.Database
var db *testinstance.PostgresInstance
var dataWriter *DataWriter
var dataReader *DataReader

Expand All @@ -30,8 +29,8 @@ var _ = Describe("DataReader", func() {
}

db = testinstance.PostgresDB(version)
dataWriter = NewDataWriter(db.(*PQDatabase.Postgres))
dataReader = NewDataReader(db.(*PQDatabase.Postgres))
dataWriter = NewDataWriter(db.Postgres)
dataReader = NewDataReader(db.Postgres)
})

AfterEach(func() {
Expand Down Expand Up @@ -499,8 +498,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger errors
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand Down Expand Up @@ -533,8 +532,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger SQL builder error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -552,8 +551,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger execution error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -572,8 +571,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger scan error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -595,8 +594,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger errors
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand Down Expand Up @@ -641,8 +640,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger SQL builder error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -660,8 +659,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger execution error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -680,8 +679,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger scan error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -703,8 +702,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger errors
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand Down Expand Up @@ -737,8 +736,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger SQL builder error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -756,8 +755,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger execution error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -776,8 +775,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger scan error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -799,8 +798,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger errors
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand Down Expand Up @@ -845,8 +844,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger SQL builder error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -864,8 +863,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger execution error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -884,8 +883,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger scan error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand Down Expand Up @@ -922,8 +921,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger SQL builder error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -941,8 +940,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger execution error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -961,8 +960,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger scan error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -984,8 +983,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger SQL builder error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand All @@ -1011,8 +1010,8 @@ var _ = Describe("DataReader", func() {
ctx := context.Background()

// Create a dataReader with a closed database to trigger scan error
closedDB := db.(*PQDatabase.Postgres)
err := closedDB.Close()
closedDB := db.Postgres
err := db.Close()
Expect(err).ShouldNot(HaveOccurred())

readerWithClosedDB := NewDataReader(closedDB)
Expand Down
Loading
Loading