feat(workflow-contract): Add contract name to revision item (#1276)

Signed-off-by: Javier Rodriguez <[email protected]>

Author: javirln

app/controlplane/api/controlplane/v1/response_messages.pb.go

@@ -135,6 +135,9 @@ message WorkflowContractVersionItem {
 
   RawBody raw_contract = 5;
 
+  // The name of the contract used for this run
+  string contract_name = 6;
+
   message RawBody {
     bytes body = 1;
     Format format = 2 [(buf.validate.field).enum = {

app/controlplane/api/controlplane/v1/response_messages.proto

@@ -136,14 +136,15 @@ func (s *WorkflowRunService) View(ctx context.Context, req *pb.WorkflowRunServic
 		return nil, handleUseCaseErr(err, s.log)
 	}
 
-	contractVersion, err := s.workflowContractUseCase.FindVersionByID(ctx, run.ContractVersionID.String())
+	contractAndVersion, err := s.workflowContractUseCase.FindVersionByID(ctx, run.ContractVersionID.String())
 	if err != nil {
 		return nil, handleUseCaseErr(err, s.log)
 	}
 
 	wr := bizWorkFlowRunToPb(run)
 	wr.Workflow = bizWorkflowToPb(run.Workflow)
-	wr.ContractVersion = bizWorkFlowContractVersionToPb(contractVersion)
+	wr.ContractVersion = bizWorkFlowContractVersionToPb(contractAndVersion.Version)
+	wr.ContractVersion.ContractName = contractAndVersion.Contract.Name
 	res := &pb.WorkflowRunServiceViewResponse_Result{
 		WorkflowRun: wr,
 		Attestation: attestation,

app/controlplane/api/gen/frontend/controlplane/v1/response_messages.ts

@@ -80,7 +80,7 @@ type WorkflowContractRepo interface {
 	FindByIDInOrg(ctx context.Context, orgID, ID uuid.UUID) (*WorkflowContract, error)
 	FindByNameInOrg(ctx context.Context, orgID uuid.UUID, name string) (*WorkflowContract, error)
 	Describe(ctx context.Context, orgID, contractID uuid.UUID, revision int) (*WorkflowContractWithVersion, error)
-	FindVersionByID(ctx context.Context, versionID uuid.UUID) (*WorkflowContractVersion, error)
+	FindVersionByID(ctx context.Context, versionID uuid.UUID) (*WorkflowContractWithVersion, error)
 	Update(ctx context.Context, orgID uuid.UUID, name string, opts *ContractUpdateOpts) (*WorkflowContractWithVersion, error)
 	SoftDelete(ctx context.Context, contractID uuid.UUID) error
 }
@@ -248,7 +248,7 @@ func (uc *WorkflowContractUseCase) Describe(ctx context.Context, orgID, contract
 	return uc.repo.Describe(ctx, orgUUID, contractUUID, revision)
 }
 
-func (uc *WorkflowContractUseCase) FindVersionByID(ctx context.Context, versionID string) (*WorkflowContractVersion, error) {
+func (uc *WorkflowContractUseCase) FindVersionByID(ctx context.Context, versionID string) (*WorkflowContractWithVersion, error) {
 	versionUUID, err := uuid.Parse(versionID)
 	if err != nil {
 		return nil, err

app/controlplane/internal/service/workflowrun.go

@@ -107,15 +107,24 @@ func (r *WorkflowContractRepo) Create(ctx context.Context, opts *biz.ContractCre
 	return res, nil
 }
 
-func (r *WorkflowContractRepo) FindVersionByID(ctx context.Context, versionID uuid.UUID) (*biz.WorkflowContractVersion, error) {
-	version, err := r.data.DB.WorkflowContractVersion.Get(ctx, versionID)
+func (r *WorkflowContractRepo) FindVersionByID(ctx context.Context, versionID uuid.UUID) (*biz.WorkflowContractWithVersion, error) {
+	// .Get(ctx, versionID) is an alias to .Query().Where(workflowcontractversion.ID(versionID)).Only(ctx)
+	version, err := r.data.DB.WorkflowContractVersion.Query().Where(workflowcontractversion.ID(versionID)).WithContract().Only(ctx)
 	if err != nil && !ent.IsNotFound(err) {
 		return nil, err
 	} else if version == nil {
 		return nil, nil
 	}
 
-	return entContractVersionToBizContractVersion(version)
+	contractVersion, err := entContractVersionToBizContractVersion(version)
+	if err != nil {
+		return nil, err
+	}
+
+	return &biz.WorkflowContractWithVersion{
+		Contract: entContractToBizContract(version.Edges.Contract, version, nil),
+		Version:  contractVersion,
+	}, nil
 }
 
 func (r *WorkflowContractRepo) Describe(ctx context.Context, orgID, contractID uuid.UUID, revision int) (*biz.WorkflowContractWithVersion, error) {