feat: enhance certificate model
This commit is contained in:
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/pocketbase/dbx"
|
||||
"github.com/pocketbase/pocketbase/core"
|
||||
@@ -17,13 +18,13 @@ func NewWorkflowOutputRepository() *WorkflowOutputRepository {
|
||||
return &WorkflowOutputRepository{}
|
||||
}
|
||||
|
||||
func (r *WorkflowOutputRepository) GetByNodeId(ctx context.Context, nodeId string) (*domain.WorkflowOutput, error) {
|
||||
func (r *WorkflowOutputRepository) GetByNodeId(ctx context.Context, workflowNodeId string) (*domain.WorkflowOutput, error) {
|
||||
records, err := app.GetApp().FindRecordsByFilter(
|
||||
domain.CollectionNameWorkflowOutput,
|
||||
"nodeId={:nodeId}",
|
||||
"-created",
|
||||
1, 0,
|
||||
dbx.Params{"nodeId": nodeId},
|
||||
dbx.Params{"nodeId": workflowNodeId},
|
||||
)
|
||||
if err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
@@ -34,7 +35,61 @@ func (r *WorkflowOutputRepository) GetByNodeId(ctx context.Context, nodeId strin
|
||||
if len(records) == 0 {
|
||||
return nil, domain.ErrRecordNotFound
|
||||
}
|
||||
record := records[0]
|
||||
|
||||
return r.castRecordToModel(records[0])
|
||||
}
|
||||
|
||||
func (r *WorkflowOutputRepository) Save(ctx context.Context, workflowOutput *domain.WorkflowOutput) (*domain.WorkflowOutput, error) {
|
||||
record, err := r.saveRecord(ctx, workflowOutput)
|
||||
if err != nil {
|
||||
return workflowOutput, err
|
||||
}
|
||||
|
||||
workflowOutput.Id = record.Id
|
||||
workflowOutput.CreatedAt = record.GetDateTime("created").Time()
|
||||
workflowOutput.UpdatedAt = record.GetDateTime("updated").Time()
|
||||
return workflowOutput, nil
|
||||
}
|
||||
|
||||
func (r *WorkflowOutputRepository) SaveWithCertificate(ctx context.Context, workflowOutput *domain.WorkflowOutput, certificate *domain.Certificate) (*domain.WorkflowOutput, error) {
|
||||
record, err := r.saveRecord(ctx, workflowOutput)
|
||||
if err != nil {
|
||||
return workflowOutput, err
|
||||
} else {
|
||||
workflowOutput.Id = record.Id
|
||||
workflowOutput.CreatedAt = record.GetDateTime("created").Time()
|
||||
workflowOutput.UpdatedAt = record.GetDateTime("updated").Time()
|
||||
}
|
||||
|
||||
if certificate != nil {
|
||||
certificate.WorkflowId = workflowOutput.WorkflowId
|
||||
certificate.WorkflowNodeId = workflowOutput.NodeId
|
||||
certificate.WorkflowOutputId = workflowOutput.Id
|
||||
certificate, err := NewCertificateRepository().Save(ctx, certificate)
|
||||
if err != nil {
|
||||
return workflowOutput, err
|
||||
}
|
||||
|
||||
// 写入证书 ID 到工作流输出结果中
|
||||
for i, item := range workflowOutput.Outputs {
|
||||
if item.Name == string(domain.WorkflowNodeIONameCertificate) {
|
||||
workflowOutput.Outputs[i].Value = certificate.Id
|
||||
break
|
||||
}
|
||||
}
|
||||
record.Set("outputs", workflowOutput.Outputs)
|
||||
if err := app.GetApp().Save(record); err != nil {
|
||||
return workflowOutput, err
|
||||
}
|
||||
}
|
||||
|
||||
return workflowOutput, err
|
||||
}
|
||||
|
||||
func (r *WorkflowOutputRepository) castRecordToModel(record *core.Record) (*domain.WorkflowOutput, error) {
|
||||
if record == nil {
|
||||
return nil, fmt.Errorf("record is nil")
|
||||
}
|
||||
|
||||
node := &domain.WorkflowNode{}
|
||||
if err := record.UnmarshalJSONField("node", node); err != nil {
|
||||
@@ -46,7 +101,7 @@ func (r *WorkflowOutputRepository) GetByNodeId(ctx context.Context, nodeId strin
|
||||
return nil, errors.New("failed to unmarshal output")
|
||||
}
|
||||
|
||||
rs := &domain.WorkflowOutput{
|
||||
workflowOutput := &domain.WorkflowOutput{
|
||||
Meta: domain.Meta{
|
||||
Id: record.Id,
|
||||
CreatedAt: record.GetDateTime("created").Time(),
|
||||
@@ -58,25 +113,22 @@ func (r *WorkflowOutputRepository) GetByNodeId(ctx context.Context, nodeId strin
|
||||
Outputs: outputs,
|
||||
Succeeded: record.GetBool("succeeded"),
|
||||
}
|
||||
|
||||
return rs, nil
|
||||
return workflowOutput, nil
|
||||
}
|
||||
|
||||
// 保存节点输出
|
||||
func (r *WorkflowOutputRepository) Save(ctx context.Context, output *domain.WorkflowOutput, certificate *domain.Certificate, cb func(id string) error) error {
|
||||
var record *core.Record
|
||||
var err error
|
||||
func (r *WorkflowOutputRepository) saveRecord(ctx context.Context, output *domain.WorkflowOutput) (*core.Record, error) {
|
||||
collection, err := app.GetApp().FindCollectionByNameOrId(domain.CollectionNameWorkflowOutput)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var record *core.Record
|
||||
if output.Id == "" {
|
||||
collection, err := app.GetApp().FindCollectionByNameOrId(domain.CollectionNameWorkflowOutput)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
record = core.NewRecord(collection)
|
||||
} else {
|
||||
record, err = app.GetApp().FindRecordById(domain.CollectionNameWorkflowOutput, output.Id)
|
||||
record, err = app.GetApp().FindRecordById(collection, output.Id)
|
||||
if err != nil {
|
||||
return err
|
||||
return record, err
|
||||
}
|
||||
}
|
||||
record.Set("workflowId", output.WorkflowId)
|
||||
@@ -84,53 +136,9 @@ func (r *WorkflowOutputRepository) Save(ctx context.Context, output *domain.Work
|
||||
record.Set("node", output.Node)
|
||||
record.Set("outputs", output.Outputs)
|
||||
record.Set("succeeded", output.Succeeded)
|
||||
|
||||
if err := app.GetApp().Save(record); err != nil {
|
||||
return err
|
||||
return record, err
|
||||
}
|
||||
|
||||
if cb != nil && certificate != nil {
|
||||
if err := cb(record.Id); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
certCollection, err := app.GetApp().FindCollectionByNameOrId(domain.CollectionNameCertificate)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
certRecord := core.NewRecord(certCollection)
|
||||
certRecord.Set("source", string(certificate.Source))
|
||||
certRecord.Set("subjectAltNames", certificate.SubjectAltNames)
|
||||
certRecord.Set("certificate", certificate.Certificate)
|
||||
certRecord.Set("privateKey", certificate.PrivateKey)
|
||||
certRecord.Set("issuerCertificate", certificate.IssuerCertificate)
|
||||
certRecord.Set("effectAt", certificate.EffectAt)
|
||||
certRecord.Set("expireAt", certificate.ExpireAt)
|
||||
certRecord.Set("acmeCertUrl", certificate.ACMECertUrl)
|
||||
certRecord.Set("acmeCertStableUrl", certificate.ACMECertStableUrl)
|
||||
certRecord.Set("workflowId", certificate.WorkflowId)
|
||||
certRecord.Set("workflowNodeId", certificate.WorkflowNodeId)
|
||||
certRecord.Set("workflowOutputId", certificate.WorkflowOutputId)
|
||||
|
||||
if err := app.GetApp().Save(certRecord); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 更新 certificate
|
||||
for i, item := range output.Outputs {
|
||||
if item.Name == string(domain.WorkflowNodeIONameCertificate) {
|
||||
output.Outputs[i].Value = certRecord.Id
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
record.Set("outputs", output.Outputs)
|
||||
|
||||
if err := app.GetApp().Save(record); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
}
|
||||
return nil
|
||||
return record, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user