From 38a0f4bbfde8a92e43596bfeebb8c143c9b231f5 Mon Sep 17 00:00:00 2001
From: lichengjun <lichengjun@easycorp.ltd>
Date: Tue, 29 Jun 2021 08:36:51 +0800
Subject: [PATCH] * Add update story to gitlab issue.

---
 module/gitlab/model.php | 15 +++++++++++++++
 module/story/model.php  | 14 +++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index f100bd43cb..7a2c9fd117 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -77,6 +77,21 @@ class gitlabModel extends model
                     ->fetchPairs();
     }
 
+    /**
+     * Get gitlab gitlabID and gitlabProjectID.
+     * 
+     * @param  int    $gitlab 
+     * @access public
+     * @return void
+     */
+    public function getGitlabToGitlabProject($storyID)
+    {
+        return $this->dao->select('BID,BVersion')->from(TABLE_RELATION)
+                    ->where('relation')->eq('gitlab')
+                    ->andWhere('AID')->eq($storyID)
+                    ->fetchAll();
+    }
+
     /**
      * Get zentao account gitlab user id pairs of one gitlab.
      * 
diff --git a/module/story/model.php b/module/story/model.php
index d92b9329d3..dfb669f2e0 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -828,10 +828,10 @@ class storyModel extends model
                 $reviewData->version  = $oldStory->version;
                 $reviewData->reviewer = $reviewer;
                 $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
-            }
-
-            /* Push this story to gitlab issue. */
-            $this->loadModel('gitlab')->pushStory($storyID, $this->post->gitlab, $this->post->gitlabProject);
+           }
+            /* update story to gitlab issue. */
+            $objectID = $this->loadModel('gitlab')->getGitlabToGitlabProject($storyID);
+            if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $this->post->gitlab, $this->post->gitlabProject);
 
             unset($oldStory->parent);
             unset($story->parent);
@@ -1767,11 +1767,11 @@ class storyModel extends model
         $story->assignedTo     = $assignedTo;
         $story->assignedDate   = $now;
 
-        $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
         if(!dao::isError())
         {
-            /* Push this story to gitlab issue. */
-            $this->loadModel('gitlab')->pushStory($storyID, $this->post->gitlab, $this->post->gitlabProject);
+            /* Update this story to gitlab issue. */
+            $objectID = $this->loadModel('gitlab')->getGitlabToGitlabProject($storyID);
+            if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $this->post->gitlab, $this->post->gitlabProject);
 
             return common::createChanges($oldStory, $story);
         }