fix tests

backend/src/apiserver/resource/resource_manager_test.go

@@ -100,9 +100,6 @@ func initWithJob(t *testing.T) (*FakeClientManager, *ResourceManager, *model.Job
 	j, err := manager.CreateJob(job)
 	assert.Nil(t, err)
 
-	_, err = manager.resourceReferenceStore.GetResourceReference(job.Id, common.Job, common.Experiment)
-	assert.Nil(t, err)
-
 	return store, manager, j
 }
 

backend/src/apiserver/server/run_server_test.go

@@ -45,8 +45,8 @@ func TestCreateRun(t *testing.T) {
 			},
 			ResourceReferences: []*api.ResourceReference{
 				{
-					Key:          &api.ResourceKey{Type: api.ResourceType_EXPERIMENT, Id: experiment.UUID},
-					Relationship: api.Relationship_OWNER,
+					Key:  &api.ResourceKey{Type: api.ResourceType_EXPERIMENT, Id: experiment.UUID},
+					Name: "123", Relationship: api.Relationship_OWNER,
 				},
 			},
 		},
@@ -85,8 +85,8 @@ func TestListRun(t *testing.T) {
 		},
 		ResourceReferences: []*api.ResourceReference{
 			{
-				Key:          &api.ResourceKey{Type: api.ResourceType_EXPERIMENT, Id: experiment.UUID},
-				Relationship: api.Relationship_OWNER,
+				Key:  &api.ResourceKey{Type: api.ResourceType_EXPERIMENT, Id: experiment.UUID},
+				Name: "123", Relationship: api.Relationship_OWNER,
 			},
 		},
 	}

backend/src/apiserver/storage/job_store_test.go

@@ -165,7 +165,7 @@ func TestListJobs_Pagination(t *testing.T) {
 			ResourceReferences: []*model.ResourceReference{
 				{
 					ResourceUUID: "2", ResourceType: common.Job,
-					ReferenceUUID: defaultFakeExpIdTwo, ReferenceName:"e1",
+					ReferenceUUID: defaultFakeExpIdTwo, ReferenceName:"e2",
 					ReferenceType: common.Experiment,					Relationship: common.Owner,
 				},
 			},

backend/src/apiserver/storage/resource_reference_store.go

@@ -15,7 +15,7 @@ import (
 type ResourceReferenceStoreInterface interface {
 	// Retrieve the resource reference for a given resource id, type and a reference type.
 	GetResourceReference(resourceId string, resourceType common.ResourceType,
-		referenceType common.ResourceType) (*model.ResourceReference, error)
+			referenceType common.ResourceType) (*model.ResourceReference, error)
 }
 
 type ResourceReferenceStore struct {
@@ -38,7 +38,7 @@ func (s *ResourceReferenceStore) CreateResourceReferences(tx *sql.Tx, refs []*mo
 				return util.NewInternalServerError(err, "Failed to stream resource reference model to a json payload")
 			}
 			resourceRefSqlBuilder = resourceRefSqlBuilder.Values(
-				ref.ResourceUUID, ref.ResourceType, ref.ReferenceUUID, ref.ReferenceType, ref.ReferenceName, ref.Relationship, string(payload))
+				ref.ResourceUUID, ref.ResourceType, ref.ReferenceUUID, ref.ReferenceName, ref.ReferenceType, ref.Relationship, string(payload))
 		}
 		refSql, refArgs, err := resourceRefSqlBuilder.ToSql()
 		if err != nil {
@@ -79,9 +79,9 @@ func (s *ResourceReferenceStore) checkReferenceExist(tx *sql.Tx, referenceId str
 func (s *ResourceReferenceStore) DeleteResourceReferences(tx *sql.Tx, id string, resourceType common.ResourceType) error {
 	refSql, refArgs, err := sq.
 		Delete("resource_references").
-		Where(sq.Or{
-			sq.Eq{"ResourceUUID": id, "ResourceType": resourceType},
-			sq.Eq{"ReferenceUUID": id, "ReferenceType": resourceType}}).
+			Where(sq.Or{
+				sq.Eq{"ResourceUUID": id, "ResourceType": resourceType},
+				sq.Eq{"ReferenceUUID": id, "ReferenceType": resourceType}}).
 		ToSql()
 	_, err = tx.Exec(refSql, refArgs...)
 	if err != nil {
@@ -91,24 +91,24 @@ func (s *ResourceReferenceStore) DeleteResourceReferences(tx *sql.Tx, id string,
 }
 
 func (s *ResourceReferenceStore) GetResourceReference(resourceId string, resourceType common.ResourceType,
-	referenceType common.ResourceType) (*model.ResourceReference, error) {
+		referenceType common.ResourceType) (*model.ResourceReference, error) {
 	sql, args, err := sq.Select("*").
 		From("resource_references").
-		Where(sq.Eq{
-			"ResourceUUID":  resourceId,
-			"ResourceType":  resourceType,
-			"ReferenceType": referenceType}).
+			Where(sq.Eq{
+				"ResourceUUID":  resourceId,
+				"ResourceType":  resourceType,
+				"ReferenceType": referenceType}).
 		Limit(1).ToSql()
 	if err != nil {
 		return nil, util.NewInternalServerError(err,
 			"Failed to create query to get resource reference. "+
-				"Resource ID: %s. Resource Type: %s. Reference Type: %s", resourceId, resourceType, referenceType)
+					"Resource ID: %s. Resource Type: %s. Reference Type: %s", resourceId, resourceType, referenceType)
 	}
 	row, err := s.db.Query(sql, args...)
 	if err != nil {
 		return nil, util.NewInternalServerError(err,
 			"Failed to get resource reference. "+
-				"Resource ID: %s. Resource Type: %s. Reference Type: %s", resourceId, resourceType, referenceType)
+					"Resource ID: %s. Resource Type: %s. Reference Type: %s", resourceId, resourceType, referenceType)
 	}
 	defer row.Close()
 	reference, err := s.scanRows(row)

backend/src/apiserver/storage/resource_reference_store_test.go

@@ -62,7 +62,7 @@ func TestResourceReferenceStore(t *testing.T) {
 	payload, err := json.Marshal(testRefOne)
 	assert.Equal(t, &model.ResourceReference{
 		ResourceUUID: "r1", ResourceType: common.Run,
-		ReferenceUUID: defaultFakeExpId, ReferenceType: common.Experiment,
+		ReferenceUUID: defaultFakeExpId, ReferenceName: "e1", ReferenceType: common.Experiment,
 		Relationship: common.Creator, Payload: string(payload)}, experimentRef)
 
 	// Delete resource references