Space id for wi, wit and tracker query

account/identity_blackbox_test.go

@@ -1,7 +1,6 @@
 package account_test
 
 import (
-	"context"
 	"os"
 	"testing"
 
@@ -12,17 +11,20 @@ import (
 	"github.com/almighty/almighty-core/models"
 	"github.com/almighty/almighty-core/resource"
 	"github.com/almighty/almighty-core/workitem"
+
 	"github.com/jinzhu/gorm"
 	"github.com/satori/go.uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"golang.org/x/net/context"
 )
 
 type identityBlackBoxTest struct {
 	gormsupport.DBTestSuite
 	repo  account.IdentityRepository
 	clean func()
+	ctx   context.Context
 }
 
 func TestRunIdentityBlackBoxTest(t *testing.T) {
@@ -38,7 +40,8 @@ func (s *identityBlackBoxTest) SetupSuite() {
 	// Make sure the database is populated with the correct types (e.g. bug etc.)
 	if _, c := os.LookupEnv(resource.Database); c != false {
 		if err := models.Transactional(s.DB, func(tx *gorm.DB) error {
-			return migration.PopulateCommonTypes(context.Background(), tx, workitem.NewWorkItemTypeRepository(tx))
+			s.ctx = migration.NewMigrationContext(context.Background())
+			return migration.PopulateCommonTypes(s.ctx, tx, workitem.NewWorkItemTypeRepository(tx))
 		}); err != nil {
 			panic(err.Error())
 		}
@@ -66,15 +69,15 @@ func (s *identityBlackBoxTest) TestOKToDelete() {
 		Username:     "onemoreuserTestIdentity",
 		ProviderType: account.KeycloakIDP}
 
-	err := s.repo.Create(context.Background(), identity)
+	err := s.repo.Create(s.ctx, identity)
 	require.Nil(s.T(), err, "Could not create identity")
-	err = s.repo.Create(context.Background(), identity2)
+	err = s.repo.Create(s.ctx, identity2)
 	require.Nil(s.T(), err, "Could not create identity")
 	// when
-	err = s.repo.Delete(context.Background(), identity.ID)
+	err = s.repo.Delete(s.ctx, identity.ID)
 	// then
 	assert.Nil(s.T(), err)
-	identities, err := s.repo.List(context.Background())
+	identities, err := s.repo.List(s.ctx)
 	require.Nil(s.T(), err, "Could not list identities")
 	require.True(s.T(), len(identities.Data) > 0)
 	for _, data := range identities.Data {
@@ -91,7 +94,7 @@ func (s *identityBlackBoxTest) TestOKToSave() {
 	identity := createAndLoad(s)
 	// when
 	identity.Username = "newusernameTestIdentity"
-	err := s.repo.Save(context.Background(), identity)
+	err := s.repo.Save(s.ctx, identity)
 	// then
 	require.Nil(s.T(), err, "Could not update identity")
 }
@@ -102,10 +105,10 @@ func createAndLoad(s *identityBlackBoxTest) *account.Identity {
 		Username:     "someuserTestIdentity2",
 		ProviderType: account.KeycloakIDP}
 
-	err := s.repo.Create(context.Background(), identity)
+	err := s.repo.Create(s.ctx, identity)
 	require.Nil(s.T(), err, "Could not create identity")
 	// when
-	idnt, err := s.repo.Load(context.Background(), identity.ID)
+	idnt, err := s.repo.Load(s.ctx, identity.ID)
 	// then
 	require.Nil(s.T(), err, "Could not load identity")
 	require.Equal(s.T(), "someuserTestIdentity2", idnt.Username)

application/repositories.go

@@ -3,6 +3,8 @@ package application
 import (
 	"github.com/almighty/almighty-core/app"
 	"github.com/almighty/almighty-core/criteria"
+
+	uuid "github.com/satori/go.uuid"
 	"golang.org/x/net/context"
 )
 
@@ -17,7 +19,7 @@ type TrackerRepository interface {
 
 // TrackerQueryRepository encapsulate storage & retrieval of tracker queries
 type TrackerQueryRepository interface {
-	Create(ctx context.Context, query string, schedule string, tracker string) (*app.TrackerQuery, error)
+	Create(ctx context.Context, query string, schedule string, tracker string, spaceID uuid.UUID) (*app.TrackerQuery, error)
 	Save(ctx context.Context, tq app.TrackerQuery) (*app.TrackerQuery, error)
 	Load(ctx context.Context, ID string) (*app.TrackerQuery, error)
 	Delete(ctx context.Context, ID string) error

comment/comment_repository_blackbox_test.go

@@ -29,6 +29,7 @@ type TestCommentRepository struct {
 	clean        func()
 	testIdentity account.Identity
 	repo         comment.Repository
+	ctx          context.Context
 }
 
 func TestRunCommentRepository(t *testing.T) {
@@ -44,7 +45,8 @@ func (s *TestCommentRepository) SetupSuite() {
 	// Make sure the database is populated with the correct types (e.g. bug etc.)
 	if _, c := os.LookupEnv(resource.Database); c != false {
 		if err := models.Transactional(s.DB, func(tx *gorm.DB) error {
-			return migration.PopulateCommonTypes(context.Background(), tx, workitem.NewWorkItemTypeRepository(tx))
+			s.ctx = migration.NewMigrationContext(s.ctx)
+			return migration.PopulateCommonTypes(s.ctx, tx, workitem.NewWorkItemTypeRepository(tx))
 		}); err != nil {
 			panic(err.Error())
 		}
@@ -73,7 +75,7 @@ func newComment(parentID, body, markup string) *comment.Comment {
 }
 
 func (s *TestCommentRepository) createComment(c *comment.Comment, creator uuid.UUID) {
-	err := s.repo.Create(context.Background(), c, creator)
+	err := s.repo.Create(s.ctx, c, creator)
 	require.Nil(s.T(), err)
 }
 
@@ -87,7 +89,7 @@ func (s *TestCommentRepository) TestCreateCommentWithMarkup() {
 	// given
 	comment := newComment("A", "Test A", rendering.SystemMarkupMarkdown)
 	// when
-	s.repo.Create(context.Background(), comment, s.testIdentity.ID)
+	s.repo.Create(s.ctx, comment, s.testIdentity.ID)
 	// then
 	assert.NotNil(s.T(), comment.ID, "Comment was not created, ID nil")
 	require.NotNil(s.T(), comment.CreatedAt, "Comment was not created?")
@@ -98,7 +100,7 @@ func (s *TestCommentRepository) TestCreateCommentWithoutMarkup() {
 	// given
 	comment := newComment("A", "Test A", "")
 	// when
-	s.repo.Create(context.Background(), comment, s.testIdentity.ID)
+	s.repo.Create(s.ctx, comment, s.testIdentity.ID)
 	// then
 	assert.NotNil(s.T(), comment.ID, "Comment was not created, ID nil")
 	require.NotNil(s.T(), comment.CreatedAt, "Comment was not created?")
@@ -114,10 +116,10 @@ func (s *TestCommentRepository) TestSaveCommentWithMarkup() {
 	// when
 	comment.Body = "Test AB"
 	comment.Markup = rendering.SystemMarkupMarkdown
-	s.repo.Save(context.Background(), comment, s.testIdentity.ID)
+	s.repo.Save(s.ctx, comment, s.testIdentity.ID)
 	offset := 0
 	limit := 1
-	comments, _, err := s.repo.List(context.Background(), comment.ParentID, &offset, &limit)
+	comments, _, err := s.repo.List(s.ctx, comment.ParentID, &offset, &limit)
 	// then
 	require.Nil(s.T(), err)
 	require.Equal(s.T(), 1, len(comments), "List returned more then expected based on parentID")
@@ -133,10 +135,10 @@ func (s *TestCommentRepository) TestSaveCommentWithoutMarkup() {
 	// when
 	comment.Body = "Test AB"
 	comment.Markup = ""
-	s.repo.Save(context.Background(), comment, s.testIdentity.ID)
+	s.repo.Save(s.ctx, comment, s.testIdentity.ID)
 	offset := 0
 	limit := 1
-	comments, _, err := s.repo.List(context.Background(), comment.ParentID, &offset, &limit)
+	comments, _, err := s.repo.List(s.ctx, comment.ParentID, &offset, &limit)
 	// then
 	require.Nil(s.T(), err)
 	require.Equal(s.T(), 1, len(comments), "List returned more then expected based on parentID")
@@ -153,10 +155,10 @@ func (s *TestCommentRepository) TestDeleteComment() {
 		CreatedBy: uuid.NewV4(),
 		ID:        uuid.NewV4(),
 	}
-	s.repo.Create(context.Background(), c, s.testIdentity.ID)
+	s.repo.Create(s.ctx, c, s.testIdentity.ID)
 	require.NotEqual(s.T(), uuid.Nil, c.ID)
 	// when
-	err := s.repo.Delete(context.Background(), c.ID, s.testIdentity.ID)
+	err := s.repo.Delete(s.ctx, c.ID, s.testIdentity.ID)
 	// then
 	assert.Nil(s.T(), err)
 }
@@ -169,7 +171,7 @@ func (s *TestCommentRepository) TestCountComments() {
 	comments := []*comment.Comment{comment1, comment2}
 	s.createComments(comments, s.testIdentity.ID)
 	// when
-	count, err := s.repo.Count(context.Background(), parentID)
+	count, err := s.repo.Count(s.ctx, parentID)
 	// then
 	require.Nil(s.T(), err)
 	assert.Equal(s.T(), 1, count)
@@ -184,7 +186,7 @@ func (s *TestCommentRepository) TestListComments() {
 	// when
 	offset := 0
 	limit := 1
-	comments, _, err := s.repo.List(context.Background(), comment1.ParentID, &offset, &limit)
+	comments, _, err := s.repo.List(s.ctx, comment1.ParentID, &offset, &limit)
 	// then
 	require.Nil(s.T(), err)
 	require.Equal(s.T(), 1, len(comments))
@@ -200,7 +202,7 @@ func (s *TestCommentRepository) TestListCommentsWrongOffset() {
 	// when
 	offset := -1
 	limit := 1
-	_, _, err := s.repo.List(context.Background(), comment1.ParentID, &offset, &limit)
+	_, _, err := s.repo.List(s.ctx, comment1.ParentID, &offset, &limit)
 	// then
 	assert.NotNil(s.T(), err)
 }
@@ -214,7 +216,7 @@ func (s *TestCommentRepository) TestListCommentsWrongLimit() {
 	// when
 	offset := 0
 	limit := -1
-	_, _, err := s.repo.List(context.Background(), comment1.ParentID, &offset, &limit)
+	_, _, err := s.repo.List(s.ctx, comment1.ParentID, &offset, &limit)
 	// then
 	assert.NotNil(s.T(), err)
 }
@@ -224,7 +226,7 @@ func (s *TestCommentRepository) TestLoadComment() {
 	comment := newComment("A", "Test A", rendering.SystemMarkupMarkdown)
 	s.createComment(comment, s.testIdentity.ID)
 	// when
-	loadedComment, err := s.repo.Load(context.Background(), comment.ID)
+	loadedComment, err := s.repo.Load(s.ctx, comment.ID)
 	// then
 	require.Nil(s.T(), err)
 	assert.Equal(s.T(), comment.ID, loadedComment.ID)

controller/area.go

@@ -13,6 +13,8 @@ import (
 	"github.com/almighty/almighty-core/login"
 	"github.com/almighty/almighty-core/path"
 	"github.com/almighty/almighty-core/rest"
+	"github.com/almighty/almighty-core/space"
+
 	"github.com/goadesign/goa"
 	uuid "github.com/satori/go.uuid"
 )
@@ -168,10 +170,7 @@ func ConvertAreas(appl application.Application, request *goa.RequestData, areas
 // ConvertArea converts between internal and external REST representation
 func ConvertArea(appl application.Application, request *goa.RequestData, ar *area.Area, additional ...AreaConvertFunc) *app.Area {
 	areaType := area.APIStringTypeAreas
-	spaceType := "spaces"
-
 	spaceID := ar.SpaceID.String()
-
 	selfURL := rest.AbsoluteURL(request, app.AreaHref(ar.ID))
 	childURL := rest.AbsoluteURL(request, app.AreaHref(ar.ID)+"/children")
 	spaceSelfURL := rest.AbsoluteURL(request, app.SpaceHref(spaceID))
@@ -188,7 +187,7 @@ func ConvertArea(appl application.Application, request *goa.RequestData, ar *are
 		Relationships: &app.AreaRelations{
 			Space: &app.RelationGeneric{
 				Data: &app.GenericData{
-					Type: &spaceType,
+					Type: &space.SpaceType,
 					ID:   &spaceID,
 				},
 				Links: &app.GenericLinks{

controller/comments_blackbox_test.go

@@ -3,6 +3,7 @@ package controller_test
 import (
 	"fmt"
 	"html"
+	"net/http"
 	"testing"
 
 	"github.com/almighty/almighty-core/account"
@@ -14,6 +15,8 @@ import (
 	"github.com/almighty/almighty-core/gormsupport/cleaner"
 	"github.com/almighty/almighty-core/rendering"
 	"github.com/almighty/almighty-core/resource"
+	"github.com/almighty/almighty-core/rest"
+	"github.com/almighty/almighty-core/space"
 	testsupport "github.com/almighty/almighty-core/test"
 	almtoken "github.com/almighty/almighty-core/token"
 	"github.com/almighty/almighty-core/workitem"
@@ -78,6 +81,9 @@ func (s *CommentsSuite) securedControllers(identity account.Identity) (*goa.Serv
 
 // createWorkItem creates a workitem that will be used to perform the comment operations during the tests.
 func (s *CommentsSuite) createWorkItem(identity account.Identity) string {
+	spaceSelfURL := rest.AbsoluteURL(&goa.RequestData{
+		Request: &http.Request{Host: "api.service.domain.org"},
+	}, app.SpaceHref(space.SystemSpace.String()))
 	createWorkitemPayload := app.CreateWorkitemPayload{
 		Data: &app.WorkItem2{
 			Type: APIStringTypeWorkItem,
@@ -91,6 +97,7 @@ func (s *CommentsSuite) createWorkItem(identity account.Identity) string {
 						ID:   workitem.SystemBug,
 					},
 				},
+				Space: space.NewSpaceRelation(space.SystemSpace, spaceSelfURL),
 			},
 		},
 	}

controller/iteration.go

@@ -11,7 +11,9 @@ import (
 	"github.com/almighty/almighty-core/jsonapi"
 	"github.com/almighty/almighty-core/login"
 	"github.com/almighty/almighty-core/rest"
+	"github.com/almighty/almighty-core/space"
 	"github.com/almighty/almighty-core/workitem"
+
 	"github.com/goadesign/goa"
 	uuid "github.com/satori/go.uuid"
 )
@@ -192,10 +194,8 @@ func ConvertIterations(request *goa.RequestData, Iterations []*iteration.Iterati
 // ConvertIteration converts between internal and external REST representation
 func ConvertIteration(request *goa.RequestData, itr *iteration.Iteration, additional ...IterationConvertFunc) *app.Iteration {
 	iterationType := iteration.APIStringTypeIteration
-	spaceType := "spaces"
 
 	spaceID := itr.SpaceID.String()
-
 	selfURL := rest.AbsoluteURL(request, app.IterationHref(itr.ID))
 	spaceSelfURL := rest.AbsoluteURL(request, app.SpaceHref(spaceID))
 	workitemsRelatedURL := rest.AbsoluteURL(request, app.WorkitemHref("?filter[iteration]="+itr.ID.String()))
@@ -215,7 +215,7 @@ func ConvertIteration(request *goa.RequestData, itr *iteration.Iteration, additi
 		Relationships: &app.IterationRelations{
 			Space: &app.RelationGeneric{
 				Data: &app.GenericData{
-					Type: &spaceType,
+					Type: &space.SpaceType,
 					ID:   &spaceID,
 				},
 				Links: &app.GenericLinks{

controller/iteration_test.go

@@ -2,6 +2,8 @@ package controller_test
 
 import (
 	"fmt"
+	"net/http"
+	"net/url"
 	"strings"
 	"testing"
 	"time"
@@ -19,6 +21,7 @@ import (
 	testsupport "github.com/almighty/almighty-core/test"
 	almtoken "github.com/almighty/almighty-core/token"
 	"github.com/almighty/almighty-core/workitem"
+
 	"github.com/goadesign/goa"
 	uuid "github.com/satori/go.uuid"
 	"github.com/stretchr/testify/assert"
@@ -187,9 +190,13 @@ func (rest *TestIterationREST) TestSuccessUpdateIterationWithWICounts() {
 	testIdentity, err := testsupport.CreateTestIdentity(rest.DB, "test user", "test provider")
 	require.Nil(rest.T(), err)
 	wirepo := workitem.NewWorkItemRepository(rest.DB)
+	req := &http.Request{Host: "localhost"}
+	params := url.Values{}
+	ctx := goa.NewContext(context.Background(), nil, req, params)
+
 	for i := 0; i < 4; i++ {
 		wi, err := wirepo.Create(
-			context.Background(), workitem.SystemBug,
+			ctx, itr.SpaceID, workitem.SystemBug,
 			map[string]interface{}{
 				workitem.SystemTitle:     fmt.Sprintf("New issue #%d", i),
 				workitem.SystemState:     workitem.SystemStateNew,
@@ -201,7 +208,7 @@ func (rest *TestIterationREST) TestSuccessUpdateIterationWithWICounts() {
 	}
 	for i := 0; i < 5; i++ {
 		wi, err := wirepo.Create(
-			context.Background(), workitem.SystemBug,
+			ctx, itr.SpaceID, workitem.SystemBug,
 			map[string]interface{}{
 				workitem.SystemTitle:     fmt.Sprintf("Closed issue #%d", i),
 				workitem.SystemState:     workitem.SystemStateClosed,