Skip to content

Commit

Permalink
rename instances of "clus" to "n"
Browse files Browse the repository at this point in the history
  • Loading branch information
Southclaws committed May 13, 2024
1 parent 0eb9961 commit 97e6a2e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions app/resources/datagraph/node_traversal/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,12 @@ func (d *database) Subtree(ctx context.Context, id datagraph.NodeID, fs ...Filte
return nil, fault.Wrap(err, fctx.With(ctx))
}

clus, err := fromRow(c)
n, err := fromRow(c)
if err != nil {
return nil, fault.Wrap(err, fctx.With(ctx))
}

nodes = append(nodes, clus)
nodes = append(nodes, n)
}

return nodes, nil
Expand Down
24 changes: 12 additions & 12 deletions app/services/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,21 @@ func (s *service) Create(ctx context.Context,
return nil, fault.Wrap(err, fctx.With(ctx))
}

clus, err := s.cr.Create(ctx, owner, name, slug, desc, opts...)
n, err := s.cr.Create(ctx, owner, name, slug, desc, opts...)
if err != nil {
return nil, fault.Wrap(err, fctx.With(ctx))
}

return clus, nil
return n, nil
}

func (s *service) Get(ctx context.Context, slug datagraph.NodeSlug) (*datagraph.Node, error) {
clus, err := s.cr.Get(ctx, slug)
n, err := s.cr.Get(ctx, slug)
if err != nil {
return nil, fault.Wrap(err, fctx.With(ctx))
}

return clus, nil
return n, nil
}

func (s *service) Update(ctx context.Context, slug datagraph.NodeSlug, p Partial) (*datagraph.Node, error) {
Expand All @@ -119,13 +119,13 @@ func (s *service) Update(ctx context.Context, slug datagraph.NodeSlug, p Partial
return nil, fault.Wrap(err, fctx.With(ctx))
}

clus, err := s.cr.Get(ctx, slug)
n, err := s.cr.Get(ctx, slug)
if err != nil {
return nil, fault.Wrap(err, fctx.With(ctx))
}

if !clus.Owner.Admin {
if clus.Owner.ID != accountID {
if !n.Owner.Admin {
if n.Owner.ID != accountID {
return nil, fault.Wrap(errNotAuthorised, fctx.With(ctx))
}
}
Expand All @@ -135,12 +135,12 @@ func (s *service) Update(ctx context.Context, slug datagraph.NodeSlug, p Partial
return nil, fault.Wrap(err, fctx.With(ctx))
}

clus, err = s.cr.Update(ctx, clus.ID, opts...)
n, err = s.cr.Update(ctx, n.ID, opts...)
if err != nil {
return nil, fault.Wrap(err, fctx.With(ctx))
}

return clus, nil
return n, nil
}

func (s *service) Delete(ctx context.Context, slug datagraph.NodeSlug, d DeleteOptions) (*datagraph.Node, error) {
Expand All @@ -149,13 +149,13 @@ func (s *service) Delete(ctx context.Context, slug datagraph.NodeSlug, d DeleteO
return nil, fault.Wrap(err, fctx.With(ctx))
}

clus, err := s.cr.Get(ctx, slug)
n, err := s.cr.Get(ctx, slug)
if err != nil {
return nil, fault.Wrap(err, fctx.With(ctx))
}

if !clus.Owner.Admin {
if clus.Owner.ID != accountID {
if !n.Owner.Admin {
if n.Owner.ID != accountID {
return nil, fault.Wrap(errNotAuthorised, fctx.With(ctx))
}
}
Expand Down
8 changes: 4 additions & 4 deletions app/services/node/node_visibility/visibility.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@ func (m *Controller) ChangeVisibility(ctx context.Context, slug datagraph.NodeSl
return nil, fault.Wrap(err, fctx.With(ctx))
}

clus, err := m.cr.Get(ctx, slug)
n, err := m.cr.Get(ctx, slug)
if err != nil {
return nil, fault.Wrap(err, fctx.With(ctx))
}

if !acc.Admin {
if clus.Owner.ID != accountID {
if n.Owner.ID != accountID {
return nil, fault.Wrap(errNotAuthorised, fctx.With(ctx))
}
}

clus, err = m.cr.Update(ctx, clus.ID, node.WithVisibility(visibility))
n, err = m.cr.Update(ctx, n.ID, node.WithVisibility(visibility))
if err != nil {
return nil, fault.Wrap(err, fctx.With(ctx))
}
Expand All @@ -66,5 +66,5 @@ func (m *Controller) ChangeVisibility(ctx context.Context, slug datagraph.NodeSl
// TODO: Emit events, send notifications, etc.
}

return clus, nil
return n, nil
}

0 comments on commit 97e6a2e

Please sign in to comment.