Progress meow

storage/storage.go

@@ -1,7 +1,10 @@
 package storage
 
 import (
+	"errors"
+
 	"github.com/glebarez/sqlite"
+	"gitlab.com/mstarongitlab/linstrom/storage/cache"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 )
@@ -9,30 +12,33 @@ import (
 // Storage is responsible for all database, cache and media related actions
 // and serves as the lowest layer of the cake
 type Storage struct {
-	db *gorm.DB
+	db    *gorm.DB
+	cache *cache.Cache
 }
 
+var ErrInvalidData = errors.New("invalid data")
+
 // Build a new storage using sqlite as database backend
-func NewStorageSqlite(filePath string) (*Storage, error) {
+func NewStorageSqlite(filePath string, cache *cache.Cache) (*Storage, error) {
 	db, err := gorm.Open(sqlite.Open(filePath))
 	if err != nil {
 		return nil, err
 	}
-	return storageFromEmptyDb(db)
+	return storageFromEmptyDb(db, cache)
 }
 
-func NewStoragePostgres(dbUrl string) (*Storage, error) {
+func NewStoragePostgres(dbUrl string, cache *cache.Cache) (*Storage, error) {
 	db, err := gorm.Open(postgres.Open(dbUrl))
 	if err != nil {
 		return nil, err
 	}
-	return storageFromEmptyDb(db)
+	return storageFromEmptyDb(db, cache)
 }
 
-func storageFromEmptyDb(db *gorm.DB) (*Storage, error) {
+func storageFromEmptyDb(db *gorm.DB, cache *cache.Cache) (*Storage, error) {
 	// AutoMigrate ensures the db is in a state where all the structs given here
 	// have their own tables and relations setup. It also updates tables if necessary
-	db.AutoMigrate(
+	err := db.AutoMigrate(
 		MediaFile{},
 		Account{},
 		RemoteServer{},
@@ -40,9 +46,13 @@ func storageFromEmptyDb(db *gorm.DB) (*Storage, error) {
 		Role{},
 		PasskeySession{},
 	)
+	if err != nil {
+		return nil, err
+	}
 
 	// And finally, build the actual storage struct
 	return &Storage{
-		db: db,
+		db:    db,
+		cache: cache,
 	}, nil
 }