cleanup: remove ListGroupRelations and its usage (#756)

Co-authored-by: Aman Prasad <[email protected]>
raystack · Aug 29, 2024 · b61d9b9 · b61d9b9
1 parent c9dd0fb
commit b61d9b9
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 183 deletions.
diff --git a/core/group/group.go b/core/group/group.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/raystack/frontier/internal/bootstrap/schema"
 
-	"github.com/raystack/frontier/core/relation"
 	"github.com/raystack/frontier/pkg/metadata"
 )
 
@@ -32,7 +31,6 @@ type Repository interface {
 	GetByIDs(ctx context.Context, groupIDs []string, flt Filter) ([]Group, error)
 	List(ctx context.Context, flt Filter) ([]Group, error)
 	UpdateByID(ctx context.Context, toUpdate Group) (Group, error)
-	ListGroupRelations(ctx context.Context, objectId, subjectType, role string) ([]relation.Relation, error)
 	SetState(ctx context.Context, id string, state State) error
 	Delete(ctx context.Context, id string) error
 }

diff --git a/core/group/mocks/repository.go b/core/group/mocks/repository.go
diff --git a/internal/store/postgres/group_repository.go b/internal/store/postgres/group_repository.go
@@ -8,12 +8,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/raystack/frontier/internal/bootstrap/schema"
-
 	"github.com/doug-martin/goqu/v9"
 	"github.com/raystack/frontier/core/group"
 	"github.com/raystack/frontier/core/organization"
-	"github.com/raystack/frontier/core/relation"
 	"github.com/raystack/frontier/pkg/db"
 )
 
@@ -274,49 +271,6 @@ func (r GroupRepository) UpdateByID(ctx context.Context, grp group.Group) (group
 	return updated, nil
 }
 
-// TODO(kushsharma): no longer in use, delete if needed
-func (r GroupRepository) ListGroupRelations(ctx context.Context, objectId string, subject_type string, role string) ([]relation.Relation, error) {
-	whereClauseExp := goqu.Ex{}
-	whereClauseExp["object_id"] = objectId
-	whereClauseExp["object_namespace_name"] = schema.GroupNamespace
-
-	if subject_type != "" {
-		if subject_type == "user" {
-			whereClauseExp["subject_namespace_name"] = schema.UserPrincipal
-		} else if subject_type == "group" {
-			whereClauseExp["subject_namespace_name"] = schema.GroupPrincipal
-		}
-	}
-
-	if role != "" {
-		like := "%:" + role
-		whereClauseExp["role_id"] = goqu.Op{"like": like}
-	}
-
-	query, params, err := dialect.Select(&relationCols{}).From(TABLE_RELATIONS).Where(whereClauseExp).ToSQL()
-	if err != nil {
-		return []relation.Relation{}, fmt.Errorf("%w: %s", queryErr, err)
-	}
-
-	var fetchedRelations []Relation
-	if err = r.dbc.WithTimeout(ctx, TABLE_GROUPS, "ListGroupRelations", func(ctx context.Context) error {
-		return r.dbc.SelectContext(ctx, &fetchedRelations, query, params...)
-	}); err != nil {
-		// List should return empty list and no error instead
-		if errors.Is(err, sql.ErrNoRows) {
-			return []relation.Relation{}, nil
-		}
-		return []relation.Relation{}, fmt.Errorf("%w: %s", dbErr, err)
-	}
-
-	var transformedRelations []relation.Relation
-	for _, r := range fetchedRelations {
-		transformedRelations = append(transformedRelations, r.transformToRelationV2())
-	}
-
-	return transformedRelations, nil
-}
-
 func (r GroupRepository) SetState(ctx context.Context, id string, state group.State) error {
 	query, params, err := dialect.Update(TABLE_GROUPS).Set(
 		goqu.Record{

diff --git a/internal/store/postgres/group_repository_test.go b/internal/store/postgres/group_repository_test.go
@@ -534,77 +534,6 @@ func (s *GroupRepositoryTestSuite) TestUpdateByID() {
 	}
 }
 
-func (s *GroupRepositoryTestSuite) TestListGroupRelations() {
-	type testCase struct {
-		Description       string
-		ObjectID          string
-		SubjectType       string
-		Role              string
-		ExpectedRelations []relation.Relation
-		ErrString         string
-	}
-
-	var testCases = []testCase{
-		{
-			Description: "should get a list of relations",
-			ObjectID:    s.groups[0].ID,
-			SubjectType: "user",
-			Role:        "member",
-			ExpectedRelations: []relation.Relation{
-				{
-					Object: relation.Object{
-						ID:        s.groups[0].ID,
-						Namespace: schema.GroupNamespace,
-					},
-					Subject: relation.Subject{
-						ID:              s.users[0].ID,
-						Namespace:       schema.UserPrincipal,
-						SubRelationName: "frontier/group:member",
-					},
-				},
-				{
-					Object: relation.Object{
-						ID:        s.groups[0].ID,
-						Namespace: schema.GroupNamespace,
-					},
-					Subject: relation.Subject{
-						ID:              s.users[1].ID,
-						Namespace:       schema.UserPrincipal,
-						SubRelationName: "frontier/group:member",
-					},
-				},
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		s.Run(tc.Description, func() {
-			got, err := s.repository.ListGroupRelations(s.ctx, tc.ObjectID, tc.SubjectType, tc.Role)
-			if tc.ErrString != "" && err != nil {
-				if err.Error() != tc.ErrString {
-					s.T().Fatalf("got error %s, expected was %s", err.Error(), tc.ErrString)
-				}
-			}
-
-			for _, rel := range got {
-				found := false
-				for _, expectedRel := range tc.ExpectedRelations {
-					if cmp.Equal(rel, expectedRel, cmpopts.IgnoreFields(relation.Relation{},
-						"ID",
-						"CreatedAt",
-						"UpdatedAt")) {
-						found = true
-						break
-					}
-				}
-				if !found {
-					s.T().Fatalf("can't find relation %+v", rel)
-				}
-			}
-		})
-	}
-}
-
 func (s *GroupRepositoryTestSuite) TestSetState() {
 	type testCase struct {
 		Description   string