appview/models: move db.Spindle* into models

Signed-off-by: oppiliappan <[e-mail]>

appview/db/spindle.go

···
 	"strings"
 	"time"
 
-	"github.com/bluesky-social/indigo/atproto/syntax"
+	"tangled.org/core/appview/models"
 )
 
-type Spindle struct {
-	Id           int
-	Owner        syntax.DID
-	Instance     string
-	Verified     *time.Time
-	Created      time.Time
-	NeedsUpgrade bool
-}
-
-type SpindleMember struct {
-	Id       int
-	Did      syntax.DID // owner of the record
-	Rkey     string     // rkey of the record
-	Instance string
-	Subject  syntax.DID // the member being added
-	Created  time.Time
-}
-
-func GetSpindles(e Execer, filters ...filter) ([]Spindle, error) {
-	var spindles []Spindle
+func GetSpindles(e Execer, filters ...filter) ([]models.Spindle, error) {
+	var spindles []models.Spindle
 
 	var conditions []string
 	var args []any
···
 	defer rows.Close()
 
 	for rows.Next() {
-		var spindle Spindle
+		var spindle models.Spindle
 		var createdAt string
 		var verified sql.NullString
 		var needsUpgrade int
···
 }
 
 // if there is an existing spindle with the same instance, this returns an error
-func AddSpindle(e Execer, spindle Spindle) error {
+func AddSpindle(e Execer, spindle models.Spindle) error {
 	_, err := e.Exec(
 		`insert into spindles (owner, instance) values (?, ?)`,
 		spindle.Owner,
···
 	return err
 }
 
-func AddSpindleMember(e Execer, member SpindleMember) error {
+func AddSpindleMember(e Execer, member models.SpindleMember) error {
 	_, err := e.Exec(
 		`insert or ignore into spindle_members (did, rkey, instance, subject) values (?, ?, ?, ?)`,
 		member.Did,
···
 	return err
 }
 
-func GetSpindleMembers(e Execer, filters ...filter) ([]SpindleMember, error) {
-	var members []SpindleMember
+func GetSpindleMembers(e Execer, filters ...filter) ([]models.SpindleMember, error) {
+	var members []models.SpindleMember
 
 	var conditions []string
 	var args []any
···
 	defer rows.Close()
 
 	for rows.Next() {
-		var member SpindleMember
+		var member models.SpindleMember
 		var createdAt string
 
 		if err := rows.Scan(

appview/ingester.go

···
 			return fmt.Errorf("failed to index profile record, invalid db cast")
 		}
 
-		err = db.AddSpindleMember(ddb, db.SpindleMember{
+		err = db.AddSpindleMember(ddb, models.SpindleMember{
 			Did:      syntax.DID(did),
 			Rkey:     e.Commit.RKey,
 			Instance: record.Instance,
···
 			return fmt.Errorf("failed to index profile record, invalid db cast")
 		}
 
-		err := db.AddSpindle(ddb, db.Spindle{
+		err := db.AddSpindle(ddb, models.Spindle{
 			Owner:    syntax.DID(did),
 			Instance: instance,
 		})

appview/models/spindle.go

···
+package models
+
+import (
+	"time"
+
+	"github.com/bluesky-social/indigo/atproto/syntax"
+)
+
+type Spindle struct {
+	Id           int
+	Owner        syntax.DID
+	Instance     string
+	Verified     *time.Time
+	Created      time.Time
+	NeedsUpgrade bool
+}
+
+type SpindleMember struct {
+	Id       int
+	Did      syntax.DID // owner of the record
+	Rkey     string     // rkey of the record
+	Instance string
+	Subject  syntax.DID // the member being added
+	Created  time.Time
+}

appview/pages/pages.go

···
 
 type UpgradeBannerParams struct {
 	Registrations []models.Registration
-	Spindles      []db.Spindle
+	Spindles      []models.Spindle
 }
 
 func (p *Pages) UpgradeBanner(w io.Writer, params UpgradeBannerParams) error {
···
 
 type SpindlesParams struct {
 	LoggedInUser *oauth.User
-	Spindles     []db.Spindle
+	Spindles     []models.Spindle
 }
 
 func (p *Pages) Spindles(w io.Writer, params SpindlesParams) error {
···
 }
 
 type SpindleListingParams struct {
-	db.Spindle
+	models.Spindle
 }
 
 func (p *Pages) SpindleListing(w io.Writer, params SpindleListingParams) error {
···
 
 type SpindleDashboardParams struct {
 	LoggedInUser *oauth.User
-	Spindle      db.Spindle
+	Spindle      models.Spindle
 	Members      []string
 	Repos        map[string][]models.Repo
 }

appview/spindles/spindles.go

···
 		s.Enforcer.E.LoadPolicy()
 	}()
 
-	err = db.AddSpindle(tx, db.Spindle{
+	err = db.AddSpindle(tx, models.Spindle{
 		Owner:    syntax.DID(user.Did),
 		Instance: instance,
 	})
···
 	rkey := tid.TID()
 
 	// add member to db
-	if err = db.AddSpindleMember(tx, db.SpindleMember{
+	if err = db.AddSpindleMember(tx, models.SpindleMember{
 		Did:      syntax.DID(user.Did),
 		Rkey:     rkey,
 		Instance: instance,