remove items entirely in preparation for a simpler one-type datagraph…

… node tree

app/resources/datagraph/cluster.go

@@ -34,7 +34,6 @@ type Cluster struct {
 	Visibility  post.Visibility
 	Properties  any
 
-	Items    []*Item
 	Clusters []*Cluster
 }
 

app/resources/datagraph/cluster/cluster.go

@@ -117,15 +117,3 @@ func WithChildClusterRemove(id xid.ID) Option {
 		c.RemoveClusterIDs(id)
 	}
 }
-
-func WithItemAdd(id xid.ID) Option {
-	return func(c *ent.ClusterMutation) {
-		c.AddItemIDs(id)
-	}
-}
-
-func WithItemRemove(id xid.ID) Option {
-	return func(c *ent.ClusterMutation) {
-		c.RemoveItemIDs(id)
-	}
-}

app/resources/datagraph/cluster/db.go

@@ -15,7 +15,6 @@ import (
 	"github.com/Southclaws/storyden/app/resources/datagraph"
 	"github.com/Southclaws/storyden/internal/ent"
 	"github.com/Southclaws/storyden/internal/ent/cluster"
-	"github.com/Southclaws/storyden/internal/ent/item"
 	"github.com/Southclaws/storyden/internal/ent/link"
 )
 
@@ -98,12 +97,6 @@ func (d *database) Get(ctx context.Context, slug datagraph.ClusterSlug) (*datagr
 		WithLinks(func(lq *ent.LinkQuery) {
 			lq.WithAssets().Order(link.ByCreatedAt(sql.OrderDesc()))
 		}).
-		WithItems(func(iq *ent.ItemQuery) {
-			iq.
-				WithAssets().
-				WithOwner().
-				Order(item.ByUpdatedAt(sql.OrderDesc()), item.ByCreatedAt(sql.OrderDesc()))
-		}).
 		WithClusters(func(cq *ent.ClusterQuery) {
 			cq.
 				WithAssets().
@@ -132,12 +125,6 @@ func (d *database) GetByID(ctx context.Context, id datagraph.ClusterID) (*datagr
 		WithLinks(func(lq *ent.LinkQuery) {
 			lq.WithAssets().Order(link.ByCreatedAt(sql.OrderDesc()))
 		}).
-		WithItems(func(iq *ent.ItemQuery) {
-			iq.
-				WithAssets().
-				WithOwner().
-				Order(item.ByUpdatedAt(sql.OrderDesc()), item.ByCreatedAt(sql.OrderDesc()))
-		}).
 		WithClusters(func(cq *ent.ClusterQuery) {
 			cq.
 				WithAssets().

app/resources/datagraph/cluster_children/db.go

@@ -13,7 +13,6 @@ import (
 	"github.com/Southclaws/storyden/app/resources/datagraph/cluster"
 	"github.com/Southclaws/storyden/internal/ent"
 	cluster_model "github.com/Southclaws/storyden/internal/ent/cluster"
-	"github.com/Southclaws/storyden/internal/ent/item"
 )
 
 type database struct {
@@ -67,24 +66,6 @@ func (d *database) Move(ctx context.Context, fromSlug datagraph.ClusterSlug, toS
 				return fault.Wrap(err)
 			}
 		}
-
-		if o.moveItems {
-			items, err := d.db.Item.Query().Where(item.HasClustersWith(cluster_model.ID(xid.ID(fromCluster.ID)))).All(ctx)
-			if err != nil {
-				return fault.Wrap(err)
-			}
-			childItemIDs := dt.Map(items, func(i *ent.Item) xid.ID { return i.ID })
-
-			err = d.db.Item.Update().
-				RemoveClusterIDs(xid.ID(fromCluster.ID)).
-				AddClusterIDs(xid.ID(toCluster.ID)).
-				Where(item.IDIn(childItemIDs...)).
-				Exec(ctx)
-			if err != nil {
-				return fault.Wrap(err)
-			}
-		}
-
 		return
 	}()
 	if err != nil {

app/resources/datagraph/item_search/search.go → app/resources/datagraph/cluster_search/search.go

@@ -1,4 +1,4 @@
-package item_search
+package cluster_search
 
 import (
 	"context"
@@ -12,11 +12,11 @@ import (
 	"github.com/Southclaws/storyden/app/resources/datagraph"
 	"github.com/Southclaws/storyden/app/resources/post"
 	"github.com/Southclaws/storyden/internal/ent"
-	"github.com/Southclaws/storyden/internal/ent/item"
+	"github.com/Southclaws/storyden/internal/ent/cluster"
 )
 
 type Search interface {
-	Search(ctx context.Context, opts ...Option) ([]*datagraph.Item, error)
+	Search(ctx context.Context, opts ...Option) ([]*datagraph.Cluster, error)
 }
 
 type query struct {
@@ -50,34 +50,34 @@ func New(db *ent.Client, raw *sqlx.DB) Search {
 	}
 }
 
-func (s *service) Search(ctx context.Context, opts ...Option) ([]*datagraph.Item, error) {
+func (s *service) Search(ctx context.Context, opts ...Option) ([]*datagraph.Cluster, error) {
 	q := &query{}
 
 	for _, fn := range opts {
 		fn(q)
 	}
 
-	query := s.db.Item.Query().
+	query := s.db.Cluster.Query().
 		Where(
-			item.NameContainsFold(q.qs),
+			cluster.NameContainsFold(q.qs),
 			// TODO: more query/filter params
 		).
 		WithOwner().
 		WithClusters(func(cq *ent.ClusterQuery) {
 			cq.WithOwner()
 		}).
 		WithAssets().
-		Order(item.ByUpdatedAt(sql.OrderDesc()), item.ByCreatedAt(sql.OrderDesc()))
+		Order(cluster.ByUpdatedAt(sql.OrderDesc()), cluster.ByCreatedAt(sql.OrderDesc()))
 
 	r, err := query.All(ctx)
 	if err != nil {
 		return nil, fault.Wrap(err, fctx.With(ctx))
 	}
 
-	items, err := dt.MapErr(r, datagraph.ItemFromModel)
+	clusters, err := dt.MapErr(r, datagraph.ClusterFromModel)
 	if err != nil {
 		return nil, fault.Wrap(err, fctx.With(ctx))
 	}
 
-	return items, nil
+	return clusters, nil
 }