feat: unify pipeline trigger chart endpoint with credit chart

pkg/repository/repository.go

@@ -61,10 +61,11 @@ type Repository interface {
 	UpdateOrganization(ctx context.Context, id string, user *datamodel.Owner) error
 	DeleteOrganization(ctx context.Context, id string) error
 
+	GetOwner(ctx context.Context, id string, includeAvatar bool) (*datamodel.Owner, error)
+	GetOwnerByUID(ctx context.Context, uid uuid.UUID) (*datamodel.Owner, error)
+
 	listOwners(ctx context.Context, ownerType string, pageSize int, pageToken string, filter filtering.Filter) ([]*datamodel.Owner, int64, string, error)
 	createOwner(ctx context.Context, ownerType string, user *datamodel.Owner) error
-	getOwner(ctx context.Context, ownerType string, id string, includeAvatar bool) (*datamodel.Owner, error)
-	getOwnerByUID(ctx context.Context, ownerType string, uid uuid.UUID) (*datamodel.Owner, error)
 	updateOwner(ctx context.Context, ownerType string, id string, user *datamodel.Owner) error
 	deleteOwner(ctx context.Context, ownerType string, id string) error
 
@@ -119,11 +120,32 @@ func (r *repository) ListUsers(ctx context.Context, pageSize int, pageToken stri
 func (r *repository) CreateUser(ctx context.Context, user *datamodel.Owner) error {
 	return r.createOwner(ctx, "user", user)
 }
+
+// ownerWithType is used to wrap an owner fetch with a tyupe check.
+func ownerWithType(o *datamodel.Owner, ownerType string) (*datamodel.Owner, error) {
+	if !o.OwnerType.Valid || o.OwnerType.String != ownerType {
+		return nil, gorm.ErrRecordNotFound
+	}
+
+	return o, nil
+}
+
 func (r *repository) GetUser(ctx context.Context, id string, includeAvatar bool) (*datamodel.Owner, error) {
-	return r.getOwner(ctx, "user", id, includeAvatar)
+	owner, err := r.GetOwner(ctx, id, includeAvatar)
+	if err != nil {
+		return nil, err
+	}
+
+	return ownerWithType(owner, "user")
 }
+
 func (r *repository) GetUserByUID(ctx context.Context, uid uuid.UUID) (*datamodel.Owner, error) {
-	return r.getOwnerByUID(ctx, "user", uid)
+	owner, err := r.GetOwnerByUID(ctx, uid)
+	if err != nil {
+		return nil, err
+	}
+
+	return ownerWithType(owner, "user")
 }
 func (r *repository) UpdateUser(ctx context.Context, id string, user *datamodel.Owner) error {
 	return r.updateOwner(ctx, "user", id, user)
@@ -138,12 +160,25 @@ func (r *repository) ListOrganizations(ctx context.Context, pageSize int, pageTo
 func (r *repository) CreateOrganization(ctx context.Context, org *datamodel.Owner) error {
 	return r.createOwner(ctx, "organization", org)
 }
+
 func (r *repository) GetOrganization(ctx context.Context, id string, includeAvatar bool) (*datamodel.Owner, error) {
-	return r.getOwner(ctx, "organization", id, includeAvatar)
+	owner, err := r.GetOwner(ctx, id, includeAvatar)
+	if err != nil {
+		return nil, err
+	}
+
+	return ownerWithType(owner, "organization")
 }
+
 func (r *repository) GetOrganizationByUID(ctx context.Context, uid uuid.UUID) (*datamodel.Owner, error) {
-	return r.getOwnerByUID(ctx, "organization", uid)
+	owner, err := r.GetOwnerByUID(ctx, uid)
+	if err != nil {
+		return nil, err
+	}
+
+	return ownerWithType(owner, "organization")
 }
+
 func (r *repository) UpdateOrganization(ctx context.Context, id string, org *datamodel.Owner) error {
 	return r.updateOwner(ctx, "organization", id, org)
 }
@@ -250,12 +285,11 @@ func (r *repository) createOwner(ctx context.Context, ownerType string, owner *d
 	return nil
 }
 
-func (r *repository) getOwner(ctx context.Context, ownerType string, id string, includeAvatar bool) (*datamodel.Owner, error) {
-
+func (r *repository) GetOwner(ctx context.Context, id string, includeAvatar bool) (*datamodel.Owner, error) {
 	db := r.CheckPinnedUser(ctx, r.db)
 
 	var owner datamodel.Owner
-	queryBuilder := db.Model(&datamodel.Owner{}).Where("owner_type = ?", ownerType).Where("id = ?", id)
+	queryBuilder := db.Model(&datamodel.Owner{}).Where("id = ?", id)
 	if !includeAvatar {
 		queryBuilder = queryBuilder.Omit("profile_avatar")
 	}
@@ -265,12 +299,12 @@ func (r *repository) getOwner(ctx context.Context, ownerType string, id string,
 	return &owner, nil
 }
 
-func (r *repository) getOwnerByUID(ctx context.Context, ownerType string, uid uuid.UUID) (*datamodel.Owner, error) {
-
+func (r *repository) GetOwnerByUID(ctx context.Context, uid uuid.UUID) (*datamodel.Owner, error) {
 	db := r.CheckPinnedUser(ctx, r.db)
 
 	var owner datamodel.Owner
-	if result := db.Model(&datamodel.Owner{}).Omit("profile_avatar").Where("owner_type = ?", ownerType).Where("uid = ?", uid.String()).First(&owner); result.Error != nil {
+	result := db.Model(&datamodel.Owner{}).Omit("profile_avatar").Where("uid = ?", uid.String()).First(&owner)
+	if result.Error != nil {
 		return nil, result.Error
 	}
 	return &owner, nil

pkg/repository/repository_test.go

@@ -6,12 +6,14 @@ package repository
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"os"
 	"testing"
 	"time"
 
 	qt "github.com/frankban/quicktest"
 	"github.com/go-redis/redismock/v9"
+	"github.com/gofrs/uuid"
 	"gorm.io/gorm"
 
 	"github.com/instill-ai/mgmt-backend/config"
@@ -62,3 +64,89 @@ func TestRepository_CreateUser(t *testing.T) {
 	c.Check(got.CreateTime.After(t0), qt.IsTrue)
 	c.Check(got.UpdateTime.After(t0), qt.IsTrue)
 }
+
+func TestRepository_GetOwner(t *testing.T) {
+	c := qt.New(t)
+	ctx := context.Background()
+
+	cache, _ := redismock.NewClientMock()
+	tx := db.Begin()
+	c.Cleanup(func() { tx.Rollback() })
+
+	repo := NewRepository(tx, cache)
+
+	user := &datamodel.Owner{
+		ID:    "piano-wombat",
+		Email: "piano@wombats.com",
+		OwnerType: sql.NullString{
+			String: "user",
+			Valid:  true,
+		},
+	}
+	org := &datamodel.Owner{
+		ID:    "the-wombies",
+		Email: "org@wombats.com",
+		OwnerType: sql.NullString{
+			String: "organization",
+			Valid:  true,
+		},
+	}
+
+	user.UID, org.UID = uuid.Must(uuid.NewV4()), uuid.Must(uuid.NewV4())
+
+	err := repo.CreateUser(ctx, user)
+	c.Check(err, qt.IsNil)
+
+	err = repo.CreateOrganization(ctx, org)
+	c.Check(err, qt.IsNil)
+
+	c.Run("nok - get with wrong type", func(c *qt.C) {
+		_, err := repo.GetUser(ctx, org.ID, false)
+		c.Check(errors.Is(err, gorm.ErrRecordNotFound), qt.IsTrue, qt.Commentf(err.Error()))
+
+		_, err = repo.GetUserByUID(ctx, org.UID)
+		c.Check(errors.Is(err, gorm.ErrRecordNotFound), qt.IsTrue, qt.Commentf(err.Error()))
+
+		_, err = repo.GetOrganization(ctx, user.ID, false)
+		c.Check(errors.Is(err, gorm.ErrRecordNotFound), qt.IsTrue, qt.Commentf(err.Error()))
+
+		_, err = repo.GetOrganizationByUID(ctx, user.UID)
+		c.Check(errors.Is(err, gorm.ErrRecordNotFound), qt.IsTrue, qt.Commentf(err.Error()))
+	})
+
+	c.Run("ok - get with type", func(c *qt.C) {
+		gotUser, err := repo.GetUser(ctx, user.ID, false)
+		c.Check(err, qt.IsNil)
+		c.Check(gotUser.UID, qt.Equals, user.UID)
+
+		gotUser, err = repo.GetUserByUID(ctx, user.UID)
+		c.Check(err, qt.IsNil)
+		c.Check(gotUser.ID, qt.Equals, user.ID)
+
+		gotOrg, err := repo.GetOrganization(ctx, org.ID, false)
+		c.Check(err, qt.IsNil)
+		c.Check(gotOrg.UID, qt.Equals, org.UID)
+
+		gotOrg, err = repo.GetOrganizationByUID(ctx, org.UID)
+		c.Check(err, qt.IsNil)
+		c.Check(gotOrg.ID, qt.Equals, org.ID)
+	})
+
+	c.Run("ok - get without type", func(c *qt.C) {
+		gotUser, err := repo.GetOwner(ctx, user.ID, false)
+		c.Check(err, qt.IsNil)
+		c.Check(gotUser.UID, qt.Equals, user.UID)
+
+		gotUser, err = repo.GetOwnerByUID(ctx, user.UID)
+		c.Check(err, qt.IsNil)
+		c.Check(gotUser.ID, qt.Equals, user.ID)
+
+		gotOrg, err := repo.GetOwner(ctx, org.ID, false)
+		c.Check(err, qt.IsNil)
+		c.Check(gotOrg.UID, qt.Equals, org.UID)
+
+		gotOrg, err = repo.GetOwnerByUID(ctx, org.UID)
+		c.Check(err, qt.IsNil)
+		c.Check(gotOrg.ID, qt.Equals, org.ID)
+	})
+}

pkg/service/metric.go

@@ -91,15 +91,7 @@ func (s *service) ListPipelineTriggerChartRecords(
 // GrantedNamespaceUID returns the UID of a namespace, provided the
 // authenticated user has access to it.
 func (s *service) GrantedNamespaceUID(ctx context.Context, namespaceID string, authenticatedUserUID uuid.UUID) (uuid.UUID, error) {
-	owner, err := s.repository.GetUser(ctx, namespaceID, false)
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		// TODO jvallesm: with the namespace refactor we should have a
-		// GetNamespace method that will allow us to fetch the owner UID
-		// without knowing the owner type. For convenience, we try user first
-		// and fall back to organization.
-		owner, err = s.repository.GetOrganization(ctx, namespaceID, false)
-	}
-
+	owner, err := s.repository.GetOwner(ctx, namespaceID, false)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			err = errdomain.ErrUnauthorized