More work on defining the new data structure

storage-new/migrations.go

@@ -4,12 +4,33 @@ import (
 	"fmt"
 	"strings"
 
+	"git.mstar.dev/mstar/goutils/other"
 	"git.mstar.dev/mstar/goutils/sliceutils"
 	"gorm.io/gorm"
 
 	"git.mstar.dev/mstar/linstrom/storage-new/models"
 )
 
+func Migrate(db *gorm.DB) error {
+	if err := createAccountAuthMethodType(db); err != nil {
+		return other.Error("storage", "Failed to create Auth Method type", err)
+	}
+	if err := createBeingType(db); err != nil {
+		return other.Error("storage", "Failed to create Being type", err)
+	}
+	if err := createAccountRelationType(db); err != nil {
+		return other.Error("storage", "Failed to create Account Relation type", err)
+	}
+	if err := createRemoteServerSoftwareType(db); err != nil {
+		return other.Error("storage", "Failed to create Server Software type", err)
+	}
+	if err := migrateTypes(db); err != nil {
+		return other.Error("storage", "Failed to automigrate data structs", err)
+	}
+	return nil
+}
+
+// Returns the raw error created by gorm, with no wrapping
 func migrateTypes(db *gorm.DB) error {
 	if err := db.AutoMigrate(
 		&models.Emote{},
@@ -31,7 +52,7 @@ func migrateTypes(db *gorm.DB) error {
 		&models.UserRole{},
 		&models.UserTag{},
 	); err != nil {
-		return fmt.Errorf("storage: automigrate structs: %w", err)
+		return err
 	}
 	return nil
 }
@@ -81,7 +102,11 @@ func createRemoteServerSoftwareType(db *gorm.DB) error {
 // Helper function for ensuring the existence of an enum with the given values
 func migrateEnum(db *gorm.DB, name string, values []string) error {
 	if err := db.Exec("DROP TYPE IF EXISTS " + name).Error; err != nil {
-		return fmt.Errorf("storage: migrate %s: %w", name, err)
+		return other.Error(
+			"storage",
+			fmt.Sprintf("Failed to remove old type %s (if it exists)", name),
+			err,
+		)
 	}
 	queryBuilder := strings.Builder{}
 	queryBuilder.WriteString("CREATE TYPE")
@@ -96,7 +121,7 @@ func migrateEnum(db *gorm.DB, name string, values []string) error {
 		}
 	}
 	if err := db.Exec(queryBuilder.String()).Error; err != nil {
-		return fmt.Errorf("storage: migrate %s: %w", name, err)
+		return err
 	}
 	return nil
 }

storage-new/models/Note.go

@@ -30,4 +30,9 @@ type Note struct {
 	Quotes         *string         // url of the message this note quotes
 	AccessLevel    NoteAccessLevel // Where to send this message to (public, home, followers, dm)
 	OriginServer   string          // Url of the origin server. Also the primary key for those
+
+	AttachmentRelations []NoteToAttachment `gorm:"foreignKey:NoteId"`
+	EmoteRelations      []NoteToEmote      `gorm:"foreignKey:NoteId"`
+	PingRelations       []NoteToPing       `gorm:"foreignKey:NoteId"`
+	Tags                []NoteTag          `gorm:"foreignKey:NoteId"`
 }

storage-new/models/NoteToAttachments.go

@@ -1,6 +1,8 @@
 package models
 
 type NoteToAttachment struct {
-	UserId       string
+	Note         Note
+	NoteId       string
+	Attachment   MediaMetadata
 	AttachmentId string
 }

storage-new/models/NoteToEmotes.go

@@ -1,6 +1,8 @@
 package models
 
 type NoteToEmote struct {
-	UserId  string
+	Note    Note
+	NoteId  string
+	Emote   Emote
 	EmoteId string
 }

storage-new/models/NoteToPing.go

@@ -1,6 +1,8 @@
 package models
 
 type NoteToPing struct {
-	UserId       string
+	Note         Note
+	NoteId       string
+	PingTarget   User
 	PingTargetId string
 }

storage-new/models/NoteToTag.go

@@ -1,6 +1,7 @@
 package models
 
 type NoteTag struct {
-	UserId string
+	Note   Note
+	NoteId string
 	Tag    string
 }

storage-new/models/Reaction.go

@@ -4,7 +4,10 @@ import "gorm.io/gorm"
 
 type Reaction struct {
 	gorm.Model
+	Note      Note
 	NoteId    string
+	Reactor   User
 	ReactorId string
+	Emote     Emote
 	EmoteId   uint
 }

storage-new/models/UserAuthentication.go

@@ -1,6 +1,7 @@
 package models
 
 type UserAuthMethod struct {
+	User       User
 	UserId     string
 	AuthMethod AuthenticationMethodType `gorm:"type:auth_method_type"`
 	Token      []byte

storage-new/models/UserBeings.go

@@ -1,6 +1,7 @@
 package models
 
 type UserBeings struct {
+	User   User
 	UserId string
 	Being  BeingType `gorm:"type:being_type"`
 }

storage-new/models/UserInfoField.go

@@ -15,5 +15,6 @@ type UserInfoField struct {
 	// of the provided url via the common method of
 	// "Does the target url contain a rel='me' link to the owner's account"
 	Confirmed bool
+	User      User
 	UserId    string // Id of account this info field belongs to
 }

storage-new/models/UserRelation.go

@@ -1,7 +1,9 @@
 package models
 
 type UserRelation struct {
+	User         User
 	UserId       string
+	TargetUser   User
 	TargetUserId string
 	Relation     RelationType `gorm:"type:relation_type"`
 }

storage-new/models/UserRemote.go

@@ -6,6 +6,7 @@ type UserRemoteLinks struct {
 	// ---- Section: gorm
 	// Sets this struct up as a value that an Account may have
 	gorm.Model
+	User   User
 	UserId string
 
 	// Just about every link here is optional to accomodate for servers with only minimal accounts

storage-new/models/UserRoles.go

@@ -1,6 +1,8 @@
 package models
 
 type UserRole struct {
+	User   User
 	UserId string
+	Role   Role
 	RoleId uint
 }

storage-new/models/UserTags.go

@@ -1,6 +1,7 @@
 package models
 
 type UserTag struct {
+	User   User
 	UserId string
 	Tag    string
 }