Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu

module/task/model.php

@@ -122,7 +122,6 @@ class taskModel extends model
             $taskID = $this->dao->lastInsertID();
 
             /* Sync this task to gitlab issue. */
-
             $object = $this->getByID($taskID);
             $this->loadModel('gitlab')->apiCreateIssue($this->post->gitlab, $this->post->gitlabProject, 'task', $taskID, $object);
 
@@ -455,6 +454,58 @@ class taskModel extends model
         return $mails;
     }
 
+    /**
+     * Create task from gitlab issue.
+     * 
+     * @param  object    $task 
+     * @param  int       $executionID 
+     * @access public
+     * @return int
+     */
+    public function createTaskFromGitlabIssue($task, $executionID)
+    {
+        foreach($task as $feild => $value) $_POST[$feild] = $value;
+        $requiredFields = ',' . $this->config->task->create->requiredFields . ',';
+        $requiredFields = trim($requiredFields, ',');
+        $task = fixer::input('post')
+            ->setDefault('execution', $executionID)
+            ->setDefault('estimate,left,story', 0)
+            ->setDefault('status', 'wait')
+            ->setIF($this->config->systemMode == 'new', 'project', $this->getProjectID($executionID))
+            ->setIF($this->post->estimate != false, 'left', $this->post->estimate)
+            ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
+            ->setDefault('estStarted', '0000-00-00')
+            ->setDefault('deadline', '0000-00-00')
+            ->setIF(strpos($requiredFields, 'estStarted') !== false, 'estStarted', helper::isZeroDate($this->post->estStarted) ? '' : $this->post->estStarted)
+            ->setIF(strpos($requiredFields, 'deadline') !== false, 'deadline', helper::isZeroDate($this->post->deadline) ? '' : $this->post->deadline)
+            ->setIF(strpos($requiredFields, 'estimate') !== false, 'estimate', $this->post->estimate)
+            ->setIF(strpos($requiredFields, 'left') !== false, 'left', $this->post->left)
+            ->setIF(strpos($requiredFields, 'story') !== false, 'story', $this->post->story)
+            ->setIF(is_numeric($this->post->estimate), 'estimate', (float)$this->post->estimate)
+            ->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed)
+            ->setIF(is_numeric($this->post->left),     'left',     (float)$this->post->left)
+            ->setDefault('openedBy',   $this->app->user->account)
+            ->setDefault('openedDate', helper::now())
+            ->cleanINT('execution,story,module')
+            ->stripTags($this->config->task->editor->create['id'], $this->config->allowedTags)
+            ->join('mailto', ',')
+            ->remove('objectTypeList,productList,executionList,gitlabID,gitlabProjectID,after,files,labels,assignedTo,uid,storyEstimate,storyDesc,storyPri,team,teamEstimate,teamMember,multiple,teams,contactListMenu,selectTestStory,testStory,testPri,testEstStarted,testDeadline,testAssignedTo,testEstimate,sync')
+            ->add('version', 1)
+            ->get();
+
+        $this->dao->insert(TABLE_TASK)->data($task, $skip = 'id')
+             ->autoCheck()
+             ->batchCheck($requiredFields, 'notempty')
+             ->checkIF($task->estimate != '', 'estimate', 'float')
+             ->checkIF(!helper::isZeroDate($task->deadline), 'deadline', 'ge', $task->estStarted)
+             ->exec();
+            
+        if(dao::isError()) return false;
+
+        $taskID = $this->dao->lastInsertID();
+        return $taskID;
+    }
+
     /**
      * Compute parent task working hours.
      *
@@ -948,18 +999,9 @@ class taskModel extends model
             ->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty')
             ->where('id')->eq((int)$taskID)->exec();
 
-            /* update story to gitlab issue. */
-            $object = $this->getByID($taskID);
-
-            if(!empty($object)) 
-            {
-                $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
-                if($relation)
-                {
-                    if(!empty($object)) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $object);
-                } 
-
-            }
+        /* update story to gitlab issue. */
+        $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
+        if(!empty($relation)) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task);
 
         if(!dao::isError())
         {
@@ -1356,6 +1398,7 @@ class taskModel extends model
         
         $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
         $task     = $this->getByID($taskID);
+
         // TODO(dingguodong) we should alert to operator when can not find the user, and the operator should reconfigure user binding.
         $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task);
 
@@ -1699,12 +1742,7 @@ class taskModel extends model
         {
             $singleIssue = new stdclass();
             $singleIssue = $this->loadModel('gitlab')->apiGetSingleIssue($relation->gitlabID, $relation->issueID);
-
-            if($singleIssue->state != 'closed')
-            { 
-                $object = $this->getByID($taskID);
-                $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $object);
-            }
+            if($singleIssue->state != 'closed') $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task);
         }
 
         if($oldTask->parent > 0) $this->updateParentStatus($taskID);
@@ -1763,17 +1801,13 @@ class taskModel extends model
 
         $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('id')->eq((int)$taskID)->exec();
 
-        $object = $this->getByID($bugID);
         $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
         if(!empty($relation))
         {
             $singleIssue = new stdclass();
             $singleIssue = $this->loadModel('gitlab')->apiGetSingleIssue($relation->gitlabID, $relation->issueID);
 
-            if($singleIssue->state != 'closed')
-            { 
-                if(!empty($object)) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'bug', $object);
-            }
+            if($singleIssue->state != 'closed') $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'bug', $task);
         }
 
         if(!dao::isError())
@@ -1820,17 +1854,13 @@ class taskModel extends model
         }
         if($oldTask->story)  $this->loadModel('story')->setStage($oldTask->story);
         
-        $object = $this->getByID($taskID);
         $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
         if(!empty($relation))
         {
             $singleIssue = new stdclass();
             $singleIssue = $this->loadModel('gitlab')->apiGetSingleIssue($relation->gitlabID, $relation->issueID);
 
-            if($singleIssue->state != 'closed')
-            { 
-                if(!empty($object)) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $object);
-            }
+            if($singleIssue->state != 'closed') $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task);
         }
 
         if(!dao::isError()) return common::createChanges($oldTask, $task);
@@ -1897,6 +1927,10 @@ class taskModel extends model
             $this->computeWorkingHours($taskID);
         }
         if($oldTask->story)  $this->loadModel('story')->setStage($oldTask->story);
+
+        $relation = $this->loadModel('gitlab')->getRelationByObject('task', $taskID);
+        if(!empty($relation)) $this->loadModel('gitlab')->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task);
+
         if(!dao::isError()) return common::createChanges($oldTask, $task);
     }