From af83167fb06c4e3f00dd99da4c7960be668f5f8c Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 14 Dec 2023 16:07:31 +0800
Subject: [PATCH] * Modify return type of tutorialModel::getTutorialed, and
 modify its unit test.

---
 module/tutorial/model.php                    |  4 ++--
 module/tutorial/test/model/gettutorialed.php | 21 +++++++++++++-------
 module/tutorial/test/tutorial.class.php      | 11 ++++------
 module/tutorial/test/yaml/config.yaml        | 17 ++++++++++++++++
 4 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 module/tutorial/test/yaml/config.yaml

diff --git a/module/tutorial/model.php b/module/tutorial/model.php
index 0401e97f5b..7d45919beb 100644
--- a/module/tutorial/model.php
+++ b/module/tutorial/model.php
@@ -466,9 +466,9 @@ class tutorialModel extends model
      * Get tutorialed.
      *
      * @access public
-     * @return object
+     * @return string
      */
-    public function getTutorialed(): object
+    public function getTutorialed(): string
     {
         return $this->dao->select('*')->from(TABLE_CONFIG)->where('module')->eq('tutorial')->andWhere('owner')->eq($this->app->user->account)->andWhere('section')->eq('tasks')->andWhere('`key`')->eq('setting')->fetch('value');
     }
diff --git a/module/tutorial/test/model/gettutorialed.php b/module/tutorial/test/model/gettutorialed.php
index 805d22477c..1fc831c17e 100755
--- a/module/tutorial/test/model/gettutorialed.php
+++ b/module/tutorial/test/model/gettutorialed.php
@@ -1,19 +1,26 @@
 #!/usr/bin/env php
 <?php
-include dirname(__FILE__, 5) . '/test/lib/init.php';
-include dirname(__FILE__, 2) . '/tutorial.class.php';
-su('admin');
-
+declare(strict_types=1);
 /**
 
 title=测试 tutorialModel->getTutorialed();
 cid=1
-pid=1
 
-测试是否能拿到数据 >> 0
+- 测试是否能拿到 admin 的数据 @3
+- 测试是否能拿到 user1 的数据 @4
 
 */
 
+include dirname(__FILE__, 5) . '/test/lib/init.php';
+include dirname(__FILE__, 2) . '/tutorial.class.php';
+
+zdTable('user')->gen(5);
+zdTable('config')->config('config')->gen(16);
+
 $tutorial = new tutorialTest();
 
-r($tutorial->getTutorialedTest()) && p() && e('0'); //测试是否能拿到数据
\ No newline at end of file
+su('admin');
+r($tutorial->getTutorialedTest()) && p() && e('3'); // 测试是否能拿到 admin 的数据
+
+su('user1');
+r($tutorial->getTutorialedTest()) && p() && e('4'); // 测试是否能拿到 user1 的数据
diff --git a/module/tutorial/test/tutorial.class.php b/module/tutorial/test/tutorial.class.php
index 30b5660706..79b6a695a9 100644
--- a/module/tutorial/test/tutorial.class.php
+++ b/module/tutorial/test/tutorial.class.php
@@ -243,17 +243,14 @@ class tutorialTest
     }
 
     /**
+     * 测试获取新手模式进度。
      * Get tutorialed.
      *
      * @access public
-     * @return void
+     * @return string
      */
-    public function getTutorialedTest()
+    public function getTutorialedTest(): string
     {
-        $objects = $this->objectModel->getTutorialed();
-
-        if(dao::isError()) return dao::getError();
-
-        return $objects;
+        return $this->objectModel->getTutorialed();
     }
 }
diff --git a/module/tutorial/test/yaml/config.yaml b/module/tutorial/test/yaml/config.yaml
new file mode 100644
index 0000000000..a75d1c63a7
--- /dev/null
+++ b/module/tutorial/test/yaml/config.yaml
@@ -0,0 +1,17 @@
+title: config.
+desc: config data.
+author: Mengyi Liu
+version: "1.0"
+fields:
+  - field: id
+    range: 1-1000
+  - field: module
+    range: tutorial{8},system{8}
+  - field: section
+    range: tasks{4},stories{4}
+  - field: key
+    range: URSR{2},setting{2}
+  - field: owner
+    range: admin,user1
+  - field: value
+    range: 1-100