From 74a180193e1b16a3ae47b31fc035850bbaf21d64 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Wed, 2 Aug 2023 14:13:31 +0800
Subject: [PATCH] * Refactor pipline module.

---
 module/pipeline/lang/en.php    |  2 +-
 module/pipeline/lang/zh-cn.php |  2 +-
 module/pipeline/model.php      | 15 ++++-----------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/module/pipeline/lang/en.php b/module/pipeline/lang/en.php
index 34072e6ece..13b1693dcf 100644
--- a/module/pipeline/lang/en.php
+++ b/module/pipeline/lang/en.php
@@ -1,6 +1,6 @@
 <?php
 $lang->pipeline->id       = 'ID';
-$lang->pipeline->name     = 'Server Name';
+$lang->pipeline->name     = 'Application Name';
 $lang->pipeline->url      = 'Server URL';
 $lang->pipeline->token    = 'Token';
 $lang->pipeline->account  = 'Username';
diff --git a/module/pipeline/lang/zh-cn.php b/module/pipeline/lang/zh-cn.php
index 75d1d9a52f..d77321aa96 100644
--- a/module/pipeline/lang/zh-cn.php
+++ b/module/pipeline/lang/zh-cn.php
@@ -1,6 +1,6 @@
 <?php
 $lang->pipeline->id       = 'ID';
-$lang->pipeline->name     = '服务器名称';
+$lang->pipeline->name     = '应用名称';
 $lang->pipeline->url      = '服务器地址';
 $lang->pipeline->token    = 'Token';
 $lang->pipeline->account  = '用户名';
diff --git a/module/pipeline/model.php b/module/pipeline/model.php
index 5db705518b..a806f18a68 100644
--- a/module/pipeline/model.php
+++ b/module/pipeline/model.php
@@ -42,7 +42,7 @@ class pipelineModel extends model
     {
         return $this->dao->select('*')->from(TABLE_PIPELINE)
             ->where('deleted')->eq('0')
-            ->AndWhere('type')->in($type)
+            ->beginIF($type)->AndWhere('type')->in($type)->fi()
             ->orderBy($orderBy)
             ->page($pager)
             ->fetchAll('id');
@@ -69,16 +69,9 @@ class pipelineModel extends model
      * @access public
      * @return bool
      */
-    public function create($type)
+    public function create(object $pipeline): int|false
     {
-        $pipeline = fixer::input('post')
-            ->add('type', $type)
-            ->add('private',md5(rand(10,113450)))
-            ->add('createdBy', $this->app->user->account)
-            ->add('createdDate', helper::now())
-            ->trim('url,token,account,password')
-            ->skipSpecial('url,token,account,password')
-            ->get();
+        $type = $pipeline->type;
         if($type == 'gitlab') $pipeline->url = rtrim($pipeline->url, '/');
 
         if(isset($pipeline->password)) $pipeline->password = base64_encode($pipeline->password);
@@ -160,7 +153,7 @@ class pipelineModel extends model
             if($job) return false;
         }
         $this->dao->update(TABLE_PIPELINE)->set('deleted')->eq(1)->where('id')->eq($id)->exec();
-        $this->loadModel('action')->create($object, $id, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
+        $this->loadModel('action')->create($object, $id, 'deleted', '');
 
         $actionID = $this->dao->lastInsertID();
         return $actionID;