From 1c27519ef2b6b65f8293fc66789f9d701e958ba8 Mon Sep 17 00:00:00 2001
From: lichengjun <lichengjun@easycorp.ltd>
Date: Wed, 30 Jun 2021 16:22:33 +0800
Subject: [PATCH] * Fix story sync Issuse bug.

---
 module/bug/model.php     | 1 +
 module/gitlab/config.php | 3 +--
 module/gitlab/model.php  | 2 --
 module/story/model.php   | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index 9f44bebf2a..899a68062b 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1002,6 +1002,7 @@ class bugModel extends model
             ->checkIF($bug->resolution == 'fixed',     'resolvedBuild','notempty')
             ->where('id')->eq((int)$bugID)
             ->exec();
+
         if(!dao::isError())
         {
             $this->loadModel('score')->create('bug', 'resolve', $oldBug);
diff --git a/module/gitlab/config.php b/module/gitlab/config.php
index ca3f7babb3..7a8db397a8 100644
--- a/module/gitlab/config.php
+++ b/module/gitlab/config.php
@@ -43,10 +43,9 @@ $config->gitlab->maps->story = array();
 $config->gitlab->maps->story['title']        = 'title|field|';
 $config->gitlab->maps->story['spec']         = 'description|fields|verify';
 $config->gitlab->maps->story['openedDate']   = 'created_at|field|datetime';
-$config->gitlab->maps->story['openedBy']     = 'assignee_id|userPairs|';
-$config->gitlab->maps->story['assignedTo']   = 'assignee_id|userPairs|';
 $config->gitlab->maps->story['status']       = 'state|configItems|storyStateMap';
 $config->gitlab->maps->story['pri']          = 'weight|configItems|storyWeightMap';
+$config->gitlab->maps->story['lastEditedBy'] = 'assignee_id|userPairs|';
 
 $config->gitlab->maps->bug = array();
 $config->gitlab->maps->bug['title']      = 'title|field|';
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 4e8d1d3f03..cc2422030e 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -861,11 +861,9 @@ class gitlabModel extends model
             }
             if($value) $issue->$field = $value;
         }
-
         /* issue->state is null when creating it, we should put status_event when updating it. */
         if(isset($issue->state) and $issue->state == 'closed') $issue->state_event='close';
         if(isset($issue->state) and $issue->state == 'opened') $issue->state_event='reopen';
-
         return $issue;
     }
 
diff --git a/module/story/model.php b/module/story/model.php
index 24e9c9b44b..7a911f027f 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1407,7 +1407,7 @@ class storyModel extends model
         $oldStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
         $now      = helper::now();
         $story = fixer::input('post')
-            ->add('assignedTo',   'closed')
+            ->add('assignedTo', 'closed')
             ->add('status', 'closed')
             ->add('stage', 'closed')
             ->setDefault('lastEditedBy',   $this->app->user->account)
@@ -1427,7 +1427,7 @@ class storyModel extends model
             ->where('id')->eq($storyID)->exec();
 
         $objectID = $this->loadModel('gitlab')->getGitlabIDprojectID('story',$storyID);
-        if($objectID) $this->loadModel('gitlab')->pushToissue('story', $storyID, $objectID->gitlabID, $objectID->projectID);
+        if($objectID) $this->loadModel('gitlab')->pushToIssue('story', $storyID, $objectID->gitlabID, $objectID->projectID);
 
         /* Update parent story status. */
         if($oldStory->parent > 0) $this->updateParentStatus($storyID, $oldStory->parent);