chore: cleanup and populate approval records

Author: adityachoudhari26

apps/workspace-engine/pkg/workspace/populate_workspace.go

@@ -56,9 +56,10 @@ func PopulateWorkspaceWithInitialState(ctx context.Context, ws *Workspace) error
 		}
 	}
 	for _, githubEntity := range initialWorkspaceState.GithubEntities() {
-		if err := ws.GithubEntities().Upsert(ctx, githubEntity); err != nil {
-			return err
-		}
+		ws.GithubEntities().Upsert(ctx, githubEntity)
+	}
+	for _, userApprovalRecord := range initialWorkspaceState.UserApprovalRecords() {
+		ws.UserApprovalRecords().Upsert(ctx, userApprovalRecord)
 	}
 
 	return nil

apps/workspace-engine/pkg/workspace/store/github_entities.go

@@ -22,13 +22,12 @@ func (g *GithubEntities) key(slug string, installationId int) string {
 	return fmt.Sprintf("%s-%d", slug, installationId)
 }
 
-func (g *GithubEntities) Upsert(ctx context.Context, githubEntity *oapi.GithubEntity) error {
+func (g *GithubEntities) Upsert(ctx context.Context, githubEntity *oapi.GithubEntity) {
 	key := g.key(githubEntity.Slug, githubEntity.InstallationId)
 	g.repo.GithubEntities.Set(key, githubEntity)
 	if cs, ok := changeset.FromContext[any](ctx); ok {
 		cs.Record(changeset.ChangeTypeUpsert, githubEntity)
 	}
-	return nil
 }
 
 func (g *GithubEntities) Get(slug string, installationId int) (*oapi.GithubEntity, bool) {

apps/workspace-engine/pkg/workspace/workspace.go

@@ -98,6 +98,10 @@ func (w *Workspace) GithubEntities() *store.GithubEntities {
 	return w.store.GithubEntities
 }
 
+func (w *Workspace) UserApprovalRecords() *store.UserApprovalRecords {
+	return w.store.UserApprovalRecords
+}
+
 func (w *Workspace) GobEncode() ([]byte, error) {
 	return w.store.GobEncode()
 }
@@ -119,10 +123,6 @@ func (w *Workspace) GobDecode(data []byte) error {
 	return nil
 }
 
-func (w *Workspace) UserApprovalRecords() *store.UserApprovalRecords {
-	return w.store.UserApprovalRecords
-}
-
 func (w *Workspace) RelationshipRules() *store.RelationshipRules {
 	return w.store.Relationships
 }