zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-27 23:31:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

DRY Principle - Simplified if-else for insert SQL.

Browse Source
This commit is contained in:
Aleksandr Melnikov
2020-04-16 15:48:54 -07:00
parent ad36870b28
commit bcfa8d986d
1 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pkg/workflow_execution.go
View File

@@ -378,32 +378,22 @@ func (c *Client) AddWorkflowExecutionStatistic(namespace, name string, workflowT
return err return err
} }
defer tx.Rollback() defer tx.Rollback()
insertMap := sq.Eq{
"workflow_template_id": workflowTemplateID,
"name": name,
"namespace": namespace,
"created_at": createdAt.UTC(),
}
if workflowOutcomeIsSuccess { if workflowOutcomeIsSuccess {
_, err := sb.Insert("workflow_executions"). insertMap["finished_at"] = time.Now().UTC()
SetMap(sq.Eq{
"workflow_template_id": workflowTemplateID,
"name": name,
"namespace": namespace,
"created_at": createdAt.UTC(),
"finished_at": time.Now().UTC(),
}).RunWith(tx).Exec()
if err != nil {
return err
}
err = tx.Commit()
if err != nil {
return err
}
return err
} else { } else {
_, err := sb.Insert("workflow_executions"). insertMap["failed_at"] = time.Now().UTC()
SetMap(sq.Eq{ }
"workflow_template_id": workflowTemplateID,
"name": name, _, err = sb.Insert("workflow_executions").
"namespace": namespace, SetMap(insertMap).RunWith(tx).Exec()
"created_at": createdAt.UTC(),
"failed_at": time.Now().UTC(),
}).RunWith(tx).Exec()
if err != nil { if err != nil {
return err return err
} }
@@ -413,7 +403,6 @@ func (c *Client) AddWorkflowExecutionStatistic(namespace, name string, workflowT
} }
return err return err
} }
}
func (c *Client) GetWorkflowExecution(namespace, name string) (workflow *WorkflowExecution, err error) { func (c *Client) GetWorkflowExecution(namespace, name string) (workflow *WorkflowExecution, err error) {
wf, err := c.ArgoprojV1alpha1().Workflows(namespace).Get(name, metav1.GetOptions{}) wf, err := c.ArgoprojV1alpha1().Workflows(namespace).Get(name, metav1.GetOptions{})