From cb75571bd3f38ab560f85e4997334debed5f0d89 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Fri, 15 Dec 2023 14:07:40 +0800
Subject: [PATCH] * Refactor design::delete method.

---
 module/design/control.php | 20 +++++---------------
 module/design/model.php   | 17 +++++++++++++++--
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/module/design/control.php b/module/design/control.php
index 9d86518a5d..47d45a98b1 100755
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -449,31 +449,21 @@ class design extends control
     }
 
     /**
+     * 删除一个设计。
      * Delete a design.
      *
      * @param  int    $designID
      * @access public
      * @return void
      */
-    public function delete($designID = 0)
+    public function delete(int $designID = 0)
     {
         $design = $this->design->getByID($designID);
         $this->design->delete(TABLE_DESIGN, $designID);
-        $this->dao->delete()->from(TABLE_RELATION)->where('Atype')->eq('design')->andWhere('AID')->eq($designID)->andWhere('Btype')->eq('commit')->andwhere('relation')->eq('completedin')->exec();
-        $this->dao->delete()->from(TABLE_RELATION)->where('Atype')->eq('commit')->andWhere('BID')->eq($designID)->andWhere('Btype')->eq('design')->andwhere('relation')->eq('completedfrom')->exec();
+        $this->design->unlinkCommit($designID);
 
-        if(dao::isError())
-        {
-            $response['result']  = 'fail';
-            $response['message'] = dao::getError();
-        }
-        else
-        {
-            $response['result'] = 'success';
-            $response['load']   = inLink('browse', "projectID={$design->project}");
-        }
-
-        return $this->send($response);
+        if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+        return $this->send(array('result' => 'success', 'load' => inlink('browse', "projectID={$design->project}")));
     }
 
     /**
diff --git a/module/design/model.php b/module/design/model.php
index b79383307c..8db1a0a75b 100755
--- a/module/design/model.php
+++ b/module/design/model.php
@@ -203,8 +203,21 @@ class designModel extends model
     public function unlinkCommit(int $designID = 0, int $commitID = 0): bool
     {
         /* Delete linked commit in the relation table. */
-        $this->dao->delete()->from(TABLE_RELATION)->where('AType')->eq('design')->andwhere('AID')->eq($designID)->andwhere('BType')->eq('commit')->andwhere('relation')->eq('completedin')->andWhere('BID')->eq($commitID)->exec();
-        $this->dao->delete()->from(TABLE_RELATION)->where('AType')->eq('commit')->andwhere('BID')->eq($designID)->andwhere('BType')->eq('design')->andwhere('relation')->eq('completedfrom')->andWhere('AID')->eq($commitID)->exec();
+        $this->dao->delete()->from(TABLE_RELATION)
+            ->where('AType')->eq('design')
+            ->andwhere('AID')->eq($designID)
+            ->andwhere('BType')->eq('commit')
+            ->andwhere('relation')->eq('completedin')
+            ->beginIF(!empty($commitID))->andWhere('BID')->eq($commitID)->fi()
+            ->exec();
+
+        $this->dao->delete()->from(TABLE_RELATION)
+            ->where('AType')->eq('commit')
+            ->andwhere('BID')->eq($designID)
+            ->andwhere('BType')->eq('design')
+            ->andwhere('relation')->eq('completedfrom')
+            ->beginIF(!empty($commitID))->andWhere('AID')->eq($commitID)->fi()
+            ->exec();
 
         /* Update linked commit in the design table. */
         $commit = $this->dao->select('BID')->from(TABLE_RELATION)->where('AType')->eq('design')->andWhere('AID')->eq($designID)->andWhere('BType')->eq('commit')->andwhere('relation')->eq('completedin')->fetchAll('BID');