diff --git a/configmanage/server/service/configinstance_test.go b/configmanage/server/service/configinstance_test.go index 2fa3f79a25be027e9931670fc14b9b62084e66b0..bf29ca500b7e66f72155bd20a70ab0e9d7fd9e27 100644 --- a/configmanage/server/service/configinstance_test.go +++ b/configmanage/server/service/configinstance_test.go @@ -16,7 +16,7 @@ func TestConfigInstance_Add(t *testing.T) { Description: "test-repo-description", BatchIds: []int{1, 2, 3}, DepartIds: []int{10, 20, 30}, - Nodes: []string{""}, + Nodes: []string{"11111111-5f8e-42df-b2d0-49bf55cfeb56"}, } err := ci.Add() if err != nil { diff --git a/configmanage/server/service/repo.go b/configmanage/server/service/repo.go index 32b727e87dc8188c3532615834fb2611b08484f4..1b67622d512daa297ee6ba9720561c30bb098b43 100644 --- a/configmanage/server/service/repo.go +++ b/configmanage/server/service/repo.go @@ -29,14 +29,8 @@ type RepoConfig struct { IsActive bool `json:"isactive"` } -func (rc *RepoConfig) Record() error { - //检查info的uuid是否存在 - ci, err := GetInfoByUUID(rc.ConfigInfoUUID) - if err != nil || ci.UUID == "" { - return errors.New("configinfo uuid not exist") - } - - rf := RepoFile{ +func (rc *RepoConfig) toRepoFile() RepoFile { + return RepoFile{ UUID: rc.UUID, ConfigInfoUUID: rc.ConfigInfoUUID, Path: rc.Path, @@ -45,6 +39,28 @@ func (rc *RepoConfig) Record() error { Version: fmt.Sprintf("v%s", time.Now().Format("2006-01-02-15-04-05")), IsActive: rc.IsActive, } +} + +func toRepoConfig(rf *RepoFile) RepoConfig { + return RepoConfig{ + UUID: rf.UUID, + ConfigInfoUUID: rf.ConfigInfoUUID, + Path: rf.Path, + Name: rf.Name, + Content: rf.Content, + Version: rf.Version, + IsActive: rf.IsActive, + } +} + +func (rc *RepoConfig) Record() error { + //检查info的uuid是否存在 + ci, err := GetInfoByUUID(rc.ConfigInfoUUID) + if err != nil || ci.UUID == "" { + return errors.New("configinfo uuid not exist") + } + + rf := rc.toRepoFile() return rf.Add() } @@ -230,15 +246,7 @@ func GetRopeFilesByNode(nodeid string) ([]RepoConfig, error) { if err != nil { return nil, err } - rc := RepoConfig{ - UUID: rf.UUID, - ConfigInfoUUID: rf.ConfigInfoUUID, - Path: rf.Path, - Name: rf.Name, - Content: rf.Content, - Version: rf.Version, - IsActive: rf.IsActive, - } + rc := toRepoConfig(&rf) rcs = append(rcs, rc) } return rcs, nil diff --git a/configmanage/server/service/repo_test.go b/configmanage/server/service/repo_test.go index 66924583daa4a03bbe643c4f5a6633761546363d..ad945ce97caf91229e895e552e89832a6e367f7f 100644 --- a/configmanage/server/service/repo_test.go +++ b/configmanage/server/service/repo_test.go @@ -47,6 +47,19 @@ func TestGetRopeFilesByCinfigUUID(t *testing.T) { fmt.Println(len(files)) } +func TestGetRopeFilesByNode(t *testing.T) { + // 设置测试数据 + nodeid := "11111111-5f8e-42df-b2d0-49bf55cfeb56" + + // 调用被测试的函数 + rcs, err := GetRopeFilesByNode(nodeid) + if err != nil { + fmt.Printf("GetRopeFilesByNode error: %s\n", err) + os.Exit(-1) + } + fmt.Println(len(rcs)) +} + func TestMain(m *testing.M) { fmt.Println("begin") err := config.Init(".././config.yaml")