From 0eb71c34b3166bee726e73056b2307f3240238ed Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 29 Nov 2023 13:29:52 +0800
Subject: [PATCH] * Add test file for the method of getDefaultCharts.

---
 module/chart/model.php                       |  4 ++--
 module/chart/test/model/getdefaultcharts.php | 22 ++++++++++++++++++++
 module/chart/test/model/getfirstgroup.php    |  5 +++--
 module/chart/test/yaml/module.yaml           | 16 +++++++-------
 4 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 module/chart/test/model/getdefaultcharts.php

diff --git a/module/chart/model.php b/module/chart/model.php
index a0c45b6385..630a11f118 100644
--- a/module/chart/model.php
+++ b/module/chart/model.php
@@ -30,9 +30,9 @@ class chartModel extends model
      *
      * @param  int    $dimensionID
      * @access public
-     * @return int
+     * @return int|string
      */
-    public function getFirstGroup(int $dimensionID): int
+    public function getFirstGroup(int $dimensionID): int|string
     {
         return $this->dao->select('id')->from(TABLE_MODULE)
             ->where('deleted')->eq('0')
diff --git a/module/chart/test/model/getdefaultcharts.php b/module/chart/test/model/getdefaultcharts.php
new file mode 100644
index 0000000000..7bf5dab789
--- /dev/null
+++ b/module/chart/test/model/getdefaultcharts.php
@@ -0,0 +1,22 @@
+#!/usr/bin/env php
+<?php
+/**
+
+title=测试 chartModel::getDefaultCharts();
+cid=1
+pid=1
+
+*/
+
+include dirname(__FILE__, 5) . '/test/lib/init.php';
+
+zdTable('module')->config('module')->gen(27);
+zdTable('user')->gen(5);
+su('admin');
+
+global $tester;
+$chart = $tester->loadModel('chart');
+
+r($chart->getDefaultCharts(36))  && p() && e('0');                //测试传入的分组是子分组时，返回空数据
+r($chart->getDefaultCharts(123)) && p() && e('0');                //测试查询不存在的分组
+r($chart->getDefaultCharts(35))  && p('0:currentGroup') && e(45); //获取组织分组下第一个图表的当前分组ID
diff --git a/module/chart/test/model/getfirstgroup.php b/module/chart/test/model/getfirstgroup.php
index 9c41a2dab1..9934216123 100644
--- a/module/chart/test/model/getfirstgroup.php
+++ b/module/chart/test/model/getfirstgroup.php
@@ -10,10 +10,11 @@ pid=1
 
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 
-zdTable('module')->config('module')->gen(12);
+zdTable('module')->config('module')->gen(27);
 zdTable('user')->gen(5);
 su('admin');
 
 global $tester;
 
-r($tester->loadModel('chart')->getFirstGroup(1)) && p() && e(1); //测试获取宏观管理维度下的第一个分组ID
+r($tester->loadModel('chart')->getFirstGroup(1))   && p() && e(32); //测试获取宏观管理维度下的第一个分组ID
+r($tester->loadModel('chart')->getFirstGroup(111)) && p() && e(0);  //测试获取一个不存在的维度的分组ID
diff --git a/module/chart/test/yaml/module.yaml b/module/chart/test/yaml/module.yaml
index f6f5a865e0..cc5658bd42 100644
--- a/module/chart/test/yaml/module.yaml
+++ b/module/chart/test/yaml/module.yaml
@@ -3,27 +3,27 @@ author: Qiyu Xie
 version: "1.0"
 fields:
   - field: id
-    range: 1-100
+    range: 32-58
   - field: root
     range: 1
   - field: branch
     range: 0
   - field: name
-    range: "产品,项目,测试,需求,发布,项目,任务,迭代,成本,工期,需求,Bug"
+    range: "产品,项目,测试,组织,需求,发布,项目,任务,迭代,成本,工期,需求,Bug,项目集,项目,产品,计划,迭代,发布,需求,任务,Bug,文档,成本,人员,工时,行为"
   - field: parent
-    range: 0{3},1{2},2{6},3{1}
+    range: 0{4},32{2},33{6},34{1},35{14}
   - field: path
-    range: "`,1,`,`,2,`,`,3,`,`,1,4,`,`,1,5,`,`,2,6,`,`,2,7,`,`,2,8,`,`,2,9,`,`,2,10,`,`,2,11,`,`,3,12,`"
+    range: "`,32,`,`,33,`,`,34,`,`,35,`,`,32,36,`,`,32,37,`,`,33,38,`,`,33,39,`,`,33,40,`,`,33,41,`,`,33,42,`,`,33,43,`,`,34,44,`,`,35,45,`,`,35,46,`,`,35,47,`,`,35,48,`,`,35,49,`,`,35,50,`,`,35,51,`,`,35,52,`,`,35,53,`,`,35,54,`,`,35,55,`,`,35,56,`,`,35,57,`,`,35,58,`"
   - field: grade
-    range: 1{3},2{9}
+    range: 1{4},2{23}
   - field: order
-    range: "10,20,30,10,20,10,20,30,40,50,60,10"
+    range: "10,20,30,40,10,20,10,20,30,40,50,60,10,10,20,30,40,50,60,70,80,90,100,110,120,130,140"
   - field: type
     range: chart
   - field: owner
-    range: "system{3},[]{9}"
+    range: "system{4},[]{23}"
   - field: collector
-    range: "product,project,test,[]{9}"
+    range: "product,project,test,staff,[]{23}"
   - field: short
     range: []
   - field: deleted