Let snapshot only hold identity IDs

Author: GlancingMind

api/graphql/graph/gen_graph.go

@@ -21,9 +21,9 @@ type BugWrapper interface {
 	Description() (*commentary.Comment, error)
 	Comments() ([]commentary.Comment, error)
 	Labels() []bug.Label
-	Author() (IdentityWrapper, error)
-	Actors() ([]IdentityWrapper, error)
-	Participants() ([]IdentityWrapper, error)
+	Author() entity.Id
+	Actors() []entity.Id
+	Participants() []entity.Id
 	CreatedAt() time.Time
 	Timeline() ([]bug.TimelineItem, error)
 	Operations() ([]bug.Operation, error)
@@ -115,32 +115,16 @@ func (lb *lazyBug) Labels() []bug.Label {
 	return lb.excerpt.Labels
 }
 
-func (lb *lazyBug) Author() (IdentityWrapper, error) {
-	return lb.identity(lb.excerpt.AuthorId)
+func (lb *lazyBug) Author() entity.Id {
+	return lb.excerpt.AuthorId
 }
 
-func (lb *lazyBug) Actors() ([]IdentityWrapper, error) {
-	result := make([]IdentityWrapper, len(lb.excerpt.Actors))
-	for i, actorId := range lb.excerpt.Actors {
-		actor, err := lb.identity(actorId)
-		if err != nil {
-			return nil, err
-		}
-		result[i] = actor
-	}
-	return result, nil
+func (lb *lazyBug) Actors() []entity.Id {
+	return lb.excerpt.Actors
 }
 
-func (lb *lazyBug) Participants() ([]IdentityWrapper, error) {
-	result := make([]IdentityWrapper, len(lb.excerpt.Participants))
-	for i, participantId := range lb.excerpt.Participants {
-		participant, err := lb.identity(participantId)
-		if err != nil {
-			return nil, err
-		}
-		result[i] = participant
-	}
-	return result, nil
+func (lb *lazyBug) Participants() []entity.Id {
+	return lb.excerpt.Participants
 }
 
 func (lb *lazyBug) CreatedAt() time.Time {
@@ -198,24 +182,16 @@ func (l *loadedBug) Labels() []bug.Label {
 	return l.Snapshot.Labels()
 }
 
-func (l *loadedBug) Author() (IdentityWrapper, error) {
-	return NewLoadedIdentity(l.Snapshot.Author()), nil
+func (l *loadedBug) Author() entity.Id {
+	return l.Snapshot.Author()
 }
 
-func (l *loadedBug) Actors() ([]IdentityWrapper, error) {
-	res := make([]IdentityWrapper, len(l.Snapshot.Actors()))
-	for i, actor := range l.Snapshot.Actors() {
-		res[i] = NewLoadedIdentity(actor)
-	}
-	return res, nil
+func (l *loadedBug) Actors() []entity.Id {
+	return l.Snapshot.Actors()
 }
 
-func (l *loadedBug) Participants() ([]IdentityWrapper, error) {
-	res := make([]IdentityWrapper, len(l.Snapshot.Participants()))
-	for i, participant := range l.Snapshot.Participants() {
-		res[i] = NewLoadedIdentity(participant)
-	}
-	return res, nil
+func (l *loadedBug) Participants() []entity.Id {
+	return l.Snapshot.Participants()
 }
 
 func (l *loadedBug) CreatedAt() time.Time {

api/graphql/models/lazy_bug.go

@@ -8,11 +8,31 @@ import (
 	"github.com/MichaelMure/git-bug/api/graphql/models"
 	"github.com/MichaelMure/git-bug/bug"
 	"github.com/MichaelMure/git-bug/commentary"
+	"github.com/MichaelMure/git-bug/entity"
 )
 
 var _ graph.BugResolver = &bugResolver{}
 
-type bugResolver struct{}
+type bugResolver struct {
+	identityResolver
+}
+
+// resolveIdentity is a helper function to call the identityResolver
+func (r bugResolver) resolveIdentity(id entity.Id) (models.IdentityWrapper, error) {
+	return r.identityResolver.resolveIdentity(id)
+}
+
+func (r bugResolver) resolveAllIdentities(ids []entity.Id) ([]models.IdentityWrapper, error) {
+	result := make([]models.IdentityWrapper, len(ids))
+	for i, id := range ids {
+		identity, err := r.resolveIdentity(id)
+		if err != nil {
+			return nil, err
+		}
+		result[i] = identity
+	}
+	return result, nil
+}
 
 func (bugResolver) ID(_ context.Context, obj models.BugWrapper) (string, error) {
 	return obj.Id().String(), nil
@@ -22,6 +42,10 @@ func (bugResolver) HumanID(_ context.Context, obj models.BugWrapper) (string, er
 	return obj.Id().Human(), nil
 }
 
+func (r bugResolver) Author(_ context.Context, obj models.BugWrapper) (models.IdentityWrapper, error) {
+	return r.resolveIdentity(obj.Author())
+}
+
 func (bugResolver) Status(_ context.Context, obj models.BugWrapper) (models.Status, error) {
 	return convertStatus(obj.Status())
 }
@@ -126,7 +150,7 @@ func (bugResolver) Timeline(_ context.Context, obj models.BugWrapper, after *str
 	return connections.TimelineItemCon(timeline, edger, conMaker, input)
 }
 
-func (bugResolver) Actors(_ context.Context, obj models.BugWrapper, after *string, before *string, first *int, last *int) (*models.IdentityConnection, error) {
+func (r bugResolver) Actors(_ context.Context, obj models.BugWrapper, after *string, before *string, first *int, last *int) (*models.IdentityConnection, error) {
 	input := models.ConnectionInput{
 		Before: before,
 		After:  after,
@@ -150,15 +174,15 @@ func (bugResolver) Actors(_ context.Context, obj models.BugWrapper, after *strin
 		}, nil
 	}
 
-	actors, err := obj.Actors()
+	actors, err := r.resolveAllIdentities(obj.Actors())
 	if err != nil {
 		return nil, err
 	}
 
 	return connections.IdentityCon(actors, edger, conMaker, input)
 }
 
-func (bugResolver) Participants(_ context.Context, obj models.BugWrapper, after *string, before *string, first *int, last *int) (*models.IdentityConnection, error) {
+func (r bugResolver) Participants(_ context.Context, obj models.BugWrapper, after *string, before *string, first *int, last *int) (*models.IdentityConnection, error) {
 	input := models.ConnectionInput{
 		Before: before,
 		After:  after,
@@ -182,7 +206,7 @@ func (bugResolver) Participants(_ context.Context, obj models.BugWrapper, after
 		}, nil
 	}
 
-	participants, err := obj.Participants()
+	participants, err := r.resolveAllIdentities(obj.Participants())
 	if err != nil {
 		return nil, err
 	}

api/graphql/resolvers/bug.go

@@ -5,11 +5,40 @@ import (
 
 	"github.com/MichaelMure/git-bug/api/graphql/graph"
 	"github.com/MichaelMure/git-bug/api/graphql/models"
+	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/entity"
 )
 
 var _ graph.IdentityResolver = &identityResolver{}
 
-type identityResolver struct{}
+type identityResolver struct {
+	cache *cache.MultiRepoCache
+}
+
+func (r identityResolver) resolveIdentity(id entity.Id) (models.IdentityWrapper, error) {
+	var repo, err = r.cache.DefaultRepo()
+	if err != nil {
+		return nil, err
+	}
+
+	excerpt, err := repo.ResolveIdentityExcerpt(id)
+	if err != nil {
+		return nil, err
+	}
+
+	return models.NewLazyIdentity(repo, excerpt), nil
+
+	//var repo, err = r.cache.DefaultRepo()
+	//if err != nil {
+	//	return nil, err
+	//}
+
+	//identity, err := repo.ResolveIdentity(id)
+	//if err != nil {
+	//	return nil, err
+	//}
+	//return models.NewLoadedIdentity(identity.Identity), nil
+}
 
 func (identityResolver) ID(ctx context.Context, obj models.IdentityWrapper) (string, error) {
 	return obj.Id().String(), nil

api/graphql/resolvers/identity.go

@@ -34,8 +34,12 @@ func (RootResolver) Repository() graph.RepositoryResolver {
 	return &repoResolver{}
 }
 
-func (RootResolver) Bug() graph.BugResolver {
-	return &bugResolver{}
+func (r RootResolver) Bug() graph.BugResolver {
+	return &bugResolver{
+		identityResolver{
+			cache: r.MultiRepoCache,
+		},
+	}
 }
 
 func (RootResolver) Color() graph.ColorResolver {
@@ -52,8 +56,10 @@ func (RootResolver) Label() graph.LabelResolver {
 	return &labelResolver{}
 }
 
-func (RootResolver) Identity() graph.IdentityResolver {
-	return &identityResolver{}
+func (r RootResolver) Identity() graph.IdentityResolver {
+	return &identityResolver{
+		cache: r.MultiRepoCache,
+	}
 }
 
 func (RootResolver) Alteration() graph.AlterationResolver {

api/graphql/resolvers/root.go

@@ -203,7 +203,7 @@ func (ge *githubExporter) exportBug(ctx context.Context, b *cache.BugCache, out
 
 	// first operation is always createOp
 	createOp := snapshot.Operations[0].(*bug.CreateOperation)
-	author := snapshot.Author()
+	authorID := snapshot.Author()
 
 	// skip bug if origin is not allowed
 	origin, ok := snapshot.GetCreateMetadata(core.MetaKeyOrigin)
@@ -242,7 +242,7 @@ func (ge *githubExporter) exportBug(ctx context.Context, b *cache.BugCache, out
 
 	} else {
 		// check that we have a token for operation author
-		client, err := ge.getClientForIdentity(author.Id())
+		client, err := ge.getClientForIdentity(authorID)
 		if err != nil {
 			// if bug is still not exported and we do not have the author stop the execution
 			out <- core.NewExportNothing(b.Id(), fmt.Sprintf("missing author token"))

bridge/github/export.go

@@ -171,7 +171,7 @@ func (ge *gitlabExporter) exportBug(ctx context.Context, b *cache.BugCache, out
 
 	// first operation is always createOp
 	createOp := snapshot.Operations[0].(*bug.CreateOperation)
-	author := snapshot.Author()
+	authorID := snapshot.Author()
 
 	// get gitlab bug ID
 	gitlabID, ok := snapshot.GetCreateMetadata(metaKeyGitlabId)
@@ -204,7 +204,7 @@ func (ge *gitlabExporter) exportBug(ctx context.Context, b *cache.BugCache, out
 
 	} else {
 		// check that we have a token for operation author
-		client, err := ge.getIdentityClient(author.Id())
+		client, err := ge.getIdentityClient(authorID)
 		if err != nil {
 			// if bug is still not exported and we do not have the author stop the execution
 			out <- core.NewExportNothing(b.Id(), fmt.Sprintf("missing author token"))

bridge/gitlab/export.go

@@ -200,7 +200,7 @@ func (je *jiraExporter) exportBug(ctx context.Context, b *cache.BugCache, out ch
 
 	// first operation is always createOp
 	createOp := snapshot.Operations[0].(*bug.CreateOperation)
-	author := snapshot.Author()
+	authorID := snapshot.Author()
 
 	// skip bug if it was imported from some other bug system
 	origin, ok := snapshot.GetCreateMetadata(core.MetaKeyOrigin)
@@ -226,13 +226,13 @@ func (je *jiraExporter) exportBug(ctx context.Context, b *cache.BugCache, out ch
 		bugJiraID = jiraID
 	} else {
 		// check that we have credentials for operation author
-		client, err := je.getClientForIdentity(author.Id())
+		client, err := je.getClientForIdentity(authorID)
 		if err != nil {
 			// if bug is not yet exported and we do not have the author's credentials
 			// then there is nothing we can do, so just skip this bug
 			out <- core.NewExportNothing(
 				b.Id(), fmt.Sprintf("missing author credentials for user %.8s",
-					author.Id().String()))
+					authorID.String()))
 			return err
 		}
 
@@ -314,7 +314,7 @@ func (je *jiraExporter) exportBug(ctx context.Context, b *cache.BugCache, out ch
 		if err != nil {
 			out <- core.NewExportError(
 				fmt.Errorf("missing operation author credentials for user %.8s",
-					author.Id().String()), op.Id())
+					authorID.String()), op.Id())
 			continue
 		}
 

bridge/jira/export.go

@@ -29,8 +29,8 @@ func (op *AddCommentOperation) Id() entity.Id {
 }
 
 func (op *AddCommentOperation) Apply(snapshot *Snapshot) {
-	snapshot.addActor(op.Author_)
-	snapshot.addParticipant(op.Author_)
+	snapshot.addActor(op.Author_.Id())
+	snapshot.addParticipant(op.Author_.Id())
 	var comment, _ = commentary.UnsafeComment{
 		Id:        entity.CombineIds(snapshot.Id(), op.Id()),
 		Message:   op.Message,

bug/op_add_comment.go

@@ -50,8 +50,8 @@ func (op *CreateOperation) Apply(snapshot *Snapshot) {
 	}
 
 	snapshot.id = op.Id()
-	snapshot.addActor(op.Author_)
-	snapshot.addParticipant(op.Author_)
+	snapshot.addActor(op.Author_.Id())
+	snapshot.addParticipant(op.Author_.Id())
 	snapshot.changeTitleTo(op.Title)
 
 	var desc, _ = commentary.UnsafeComment{
@@ -62,7 +62,7 @@ func (op *CreateOperation) Apply(snapshot *Snapshot) {
 	}.Validate()
 	if desc != nil {
 		snapshot.description = *desc
-		snapshot.author = op.Author_
+		snapshot.authorID = op.Author_.Id()
 		snapshot.CreateTime = op.Time()
 		snapshot.comments = []commentary.Comment{}
 		snapshot.timeline = []TimelineItem{}