jiazhizhong/certimate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: clean code

Browse Source
This commit is contained in:
Fu Diwei
2024-12-27 19:35:50 +08:00
parent 047479426a
commit 86133ba52b
41 changed files with 396 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/repository/access.go
View File

@@ -26,9 +26,9 @@ func (a *AccessRepository) GetById(ctx context.Context, id string) (*domain.Acce
rs := &domain.Access{
Meta: domain.Meta{
Id: record.GetId(),
Created: record.GetTime("created"),
Updated: record.GetTime("updated"),
Id: record.GetId(),
CreatedAt: record.GetTime("created"),
UpdatedAt: record.GetTime("updated"),
},
Name: record.GetString("name"),
Config: record.GetString("config"),

10
internal/repository/acme_account.go
View File

@@ -47,13 +47,15 @@ func (r *AcmeAccountRepository) GetByCAAndEmail(ca, email string) (*domain.AcmeA
}
return &domain.AcmeAccount{
Id: record.GetString("id"),
Ca: record.GetString("ca"),
Meta: domain.Meta{
Id: record.GetString("id"),
CreatedAt: record.GetTime("created"),
UpdatedAt: record.GetTime("updated"),
},
CA: record.GetString("ca"),
Email: record.GetString("email"),
Key: record.GetString("key"),
Resource: resource,
Created: record.GetTime("created"),
Updated: record.GetTime("updated"),
}, nil
}

15
internal/repository/setting.go
View File

@@ -3,6 +3,7 @@ package repository
import (
"context"
"github.com/pocketbase/dbx"
"github.com/usual2970/certimate/internal/app"
"github.com/usual2970/certimate/internal/domain"
)
@@ -13,18 +14,20 @@ func NewSettingRepository() *SettingRepository {
return &SettingRepository{}
}
func (s *SettingRepository) GetByName(ctx context.Context, name string) (*domain.Setting, error) {
resp, err := app.GetApp().Dao().FindFirstRecordByFilter("settings", "name='"+name+"'")
func (s *SettingRepository) GetByName(ctx context.Context, name string) (*domain.Settings, error) {
resp, err := app.GetApp().Dao().FindFirstRecordByFilter("settings", "name={:name}", dbx.Params{"name": name})
if err != nil {
return nil, err
}
rs := &domain.Setting{
ID: resp.GetString("id"),
rs := &domain.Settings{
Meta: domain.Meta{
Id: resp.GetString("id"),
CreatedAt: resp.GetTime("created"),
UpdatedAt: resp.GetTime("updated"),
},
Name: resp.GetString("name"),
Content: resp.GetString("content"),
Created: resp.GetTime("created"),
Updated: resp.GetTime("updated"),
}
return rs, nil

6
internal/repository/workflow.go
View File

@@ -77,9 +77,9 @@ func record2Workflow(record *models.Record) (*domain.Workflow, error) {
workflow := &domain.Workflow{
Meta: domain.Meta{
Id: record.GetId(),
Created: record.GetTime("created"),
Updated: record.GetTime("updated"),
Id: record.GetId(),
CreatedAt: record.GetTime("created"),
UpdatedAt: record.GetTime("updated"),
},
Name: record.GetString("name"),
Description: record.GetString("description"),

24
internal/repository/workflow_output.go
View File

@@ -42,9 +42,9 @@ func (w *WorkflowOutputRepository) Get(ctx context.Context, nodeId string) (*dom
rs := &domain.WorkflowOutput{
Meta: domain.Meta{
Id: record.GetId(),
Created: record.GetCreated().Time(),
Updated: record.GetUpdated().Time(),
Id: record.GetId(),
CreatedAt: record.GetCreated().Time(),
UpdatedAt: record.GetUpdated().Time(),
},
Workflow: record.GetString("workflow"),
NodeId: record.GetString("nodeId"),
@@ -72,20 +72,20 @@ func (w *WorkflowOutputRepository) GetCertificate(ctx context.Context, nodeId st
rs := &domain.Certificate{
Meta: domain.Meta{
Id: record.GetId(),
Created: record.GetDateTime("created").Time(),
Updated: record.GetDateTime("updated").Time(),
Id: record.GetId(),
CreatedAt: record.GetDateTime("created").Time(),
UpdatedAt: record.GetDateTime("updated").Time(),
},
Certificate: record.GetString("certificate"),
PrivateKey: record.GetString("privateKey"),
IssuerCertificate: record.GetString("issuerCertificate"),
SAN: record.GetString("san"),
Output: record.GetString("output"),
WorkflowOutputId: record.GetString("output"),
ExpireAt: record.GetDateTime("expireAt").Time(),
CertUrl: record.GetString("certUrl"),
CertStableUrl: record.GetString("certStableUrl"),
Workflow: record.GetString("workflow"),
NodeId: record.GetString("nodeId"),
WorkflowId: record.GetString("workflow"),
WorkflowNodeId: record.GetString("nodeId"),
}
return rs, nil
}
@@ -132,12 +132,12 @@ func (w *WorkflowOutputRepository) Save(ctx context.Context, output *domain.Work
certRecord.Set("privateKey", certificate.PrivateKey)
certRecord.Set("issuerCertificate", certificate.IssuerCertificate)
certRecord.Set("san", certificate.SAN)
certRecord.Set("output", certificate.Output)
certRecord.Set("output", certificate.WorkflowOutputId)
certRecord.Set("expireAt", certificate.ExpireAt)
certRecord.Set("certUrl", certificate.CertUrl)
certRecord.Set("certStableUrl", certificate.CertStableUrl)
certRecord.Set("workflow", certificate.Workflow)
certRecord.Set("nodeId", certificate.NodeId)
certRecord.Set("workflow", certificate.WorkflowId)
certRecord.Set("nodeId", certificate.WorkflowNodeId)
if err := app.GetApp().Dao().SaveRecord(certRecord); err != nil {
return err