From 1b37cb045fd687b3bc72cfcdc1eba62693aeef41 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 28 Nov 2023 13:40:26 +0800
Subject: [PATCH] * Refactor message::getMessages, and modify its unit test.

---
 module/message/model.php                  | 10 +++++++++-
 module/message/test/message.class.php     | 24 +++++++++++++++++++----
 module/message/test/model/getmessages.php |  9 ++++-----
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/module/message/model.php b/module/message/model.php
index 638909a3fa..8180047aa2 100755
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -12,7 +12,15 @@ declare(strict_types=1);
  */
 class messageModel extends model
 {
-    public function getMessages($status = '')
+    /**
+     * 获取消息。
+     * Get messages.
+     *
+     * @param  string $status
+     * @access public
+     * @return array
+     */
+    public function getMessages(string $status = ''): array
     {
         return $this->dao->select('*')->from(TABLE_NOTIFY)
             ->where('objectType')->eq('message')
diff --git a/module/message/test/message.class.php b/module/message/test/message.class.php
index dae6f3a58f..ffbf006139 100644
--- a/module/message/test/message.class.php
+++ b/module/message/test/message.class.php
@@ -1,19 +1,35 @@
 <?php
+declare(strict_types=1);
 class messageTest
 {
-    public function __construct()
+    /**
+     * 构造函数。
+     * Construct function.
+     *
+     * @access public
+     * @return void
+     */
+    public function __construct(): void
     {
          global $tester;
          $this->objectModel = $tester->loadModel('message');
     }
 
-    public function getMessagesTest($status)
+    /**
+     * 测试获取消息。
+     * Test get messages.
+     *
+     * @param  string       $status
+     * @access public
+     * @return string|array
+     */
+    public function getMessagesTest(string $status): string|array
     {
         $objects = $this->objectModel->getMessages($status);
 
         if(dao::isError()) return dao::getError();
 
-        return $objects;
+        return implode(',', array_keys($objects));
     }
 
     /**
@@ -96,7 +112,7 @@ class messageTest
     public function getToListTest($objectType)
     {
         global $tester;
-        $table   = $tester->config->objectTables[$objectType]; 
+        $table   = $tester->config->objectTables[$objectType];
         $object  = $tester->dao->select('*')->from($table)->where('id')->eq('1')->fetch();
         $objects = $this->objectModel->getToList($object, $objectType);
 
diff --git a/module/message/test/model/getmessages.php b/module/message/test/model/getmessages.php
index 9bf4d3ff62..ae353a7702 100755
--- a/module/message/test/model/getmessages.php
+++ b/module/message/test/model/getmessages.php
@@ -1,5 +1,6 @@
 #!/usr/bin/env php
 <?php
+declare(strict_types=1);
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/message.class.php';
 
@@ -12,13 +13,11 @@ title=测试 messageModel->getMessages();
 cid=1
 pid=1
 
-拿取status为wait的数据信息 >> 1
-拿取status为wait的数据信息 >> wait;wait;wait
-
 */
 
+$type = array('wait', '');
 
 $message = new messageTest();
 
-r($message->getMessagesTest('wait')) && p('1:id')                       && e('1');              //拿取status为wait的数据信息
-r($message->getMessagesTest('wait')) && p('1:status;3:status;5:status') && e('wait;wait;wait'); //拿取status为wait的数据信息
+r($message->getMessagesTest($type[0])) && p() && e('1,3,5');        // 测试获取status为 wait 的数据信息
+r($message->getMessagesTest($type[1])) && p() && e('1,2,3,4,5,10'); // 测试获取数据信息