Skip to content

Commit 5d25b19

Browse files
committed
add dummy team and team component relationship and fixed test
1 parent 2dcdd0d commit 5d25b19

16 files changed

+127
-48
lines changed

fixtures/dummy/all.go

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ func PopulateDBWithDummyModels(gormDB *gorm.DB) error {
2828
return err
2929
}
3030
}
31+
for _, c := range AllDummyTeams {
32+
if err := gormDB.Create(&c).Error; err != nil {
33+
return err
34+
}
35+
}
36+
for _, c := range AllTeamComponents {
37+
if err := gormDB.Create(&c).Error; err != nil {
38+
return err
39+
}
40+
}
3141
for _, c := range AllDummyComponentRelationships {
3242
c.UpdatedAt = createTime
3343
err = gormDB.Create(&c).Error
@@ -61,11 +71,6 @@ func PopulateDBWithDummyModels(gormDB *gorm.DB) error {
6171
return err
6272
}
6373
}
64-
for _, c := range AllTeams {
65-
if err := gormDB.Create(&c).Error; err != nil {
66-
return err
67-
}
68-
}
6974
for _, c := range AllDummyIncidents {
7075
err = gormDB.Create(&c).Error
7176
if err != nil {
@@ -160,6 +165,12 @@ func DeleteDummyModelsFromDB(gormDB *gorm.DB) error {
160165
return err
161166
}
162167
}
168+
for _, c := range AllTeamComponents {
169+
err = gormDB.Delete(&c).Error
170+
if err != nil {
171+
return err
172+
}
173+
}
163174
for _, c := range AllDummyCheckComponentRelationships {
164175
err = gormDB.Where("component_id = ?", c.ComponentID).Delete(&c).Error
165176
if err != nil {
@@ -178,7 +189,7 @@ func DeleteDummyModelsFromDB(gormDB *gorm.DB) error {
178189
return err
179190
}
180191
}
181-
for _, c := range AllTeams {
192+
for _, c := range AllDummyTeams {
182193
if err := gormDB.Delete(&c).Error; err != nil {
183194
return err
184195
}

fixtures/dummy/common.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ var (
77

88
DummyYearOldDate = time.Now().AddDate(-1, 0, 0)
99
)
10+
11+
func ptr[T any](t T) *T {
12+
return &t
13+
}

fixtures/dummy/incidents.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -109,23 +109,3 @@ var TelegramResponder = models.Responder{
109109
}
110110

111111
var AllDummyResponders = []models.Responder{JiraResponder, GitHubIssueResponder, SlackResponder, MsPlannerResponder, TelegramResponder}
112-
113-
var BackendTeam = models.Team{
114-
ID: uuid.New(),
115-
Name: "Backend",
116-
Icon: "backend",
117-
CreatedBy: JohnDoe.ID,
118-
CreatedAt: time.Now(),
119-
UpdatedAt: time.Now(),
120-
}
121-
122-
var FrontendTeam = models.Team{
123-
ID: uuid.New(),
124-
Name: "Frontend",
125-
Icon: "frontend",
126-
CreatedBy: JohnDoe.ID,
127-
CreatedAt: time.Now(),
128-
UpdatedAt: time.Now(),
129-
}
130-
131-
var AllTeams = []models.Team{BackendTeam, FrontendTeam}

fixtures/dummy/team_components.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package dummy
2+
3+
import "github.com/flanksource/duty/models"
4+
5+
var LogisticBackendTeamComponent = models.TeamComponent{
6+
TeamID: BackendTeam.ID,
7+
ComponentID: Logistics.ID,
8+
SelectorID: ptr("366d4ecb71d8ce12cf253e55d541f987"),
9+
}
10+
11+
var PaymentsTeamComponent = models.TeamComponent{
12+
TeamID: PaymentTeam.ID,
13+
ComponentID: PaymentsAPI.ID,
14+
SelectorID: ptr("7fbaeebb537818e8b334fd336613f8d4 "),
15+
}
16+
17+
var AllTeamComponents = []models.TeamComponent{LogisticBackendTeamComponent, PaymentsTeamComponent}

fixtures/dummy/teams.go

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package dummy
2+
3+
import (
4+
"time"
5+
6+
"github.com/flanksource/duty/models"
7+
"github.com/google/uuid"
8+
)
9+
10+
var FrontendTeam = models.Team{
11+
ID: uuid.New(),
12+
Name: "Frontend",
13+
Icon: "frontend",
14+
CreatedBy: JohnDoe.ID,
15+
CreatedAt: time.Now(),
16+
UpdatedAt: time.Now(),
17+
}
18+
19+
var BackendTeam = models.Team{
20+
ID: uuid.MustParse("3d3f49ba-93d6-4058-8acc-96233f7c5c80"),
21+
Name: "Backend",
22+
Spec: []byte(`{"components": [{ "name": "logistics" }]}`),
23+
CreatedBy: JohnDoe.ID,
24+
}
25+
26+
var PaymentTeam = models.Team{
27+
ID: uuid.MustParse("72d965e2-b58b-4a23-ba73-2cae0daf5981"),
28+
Name: "Payment",
29+
Spec: []byte(`{"components": [{ "name": "logistics-ui" }]}`),
30+
CreatedBy: JohnDoe.ID,
31+
}
32+
33+
var AllDummyTeams = []models.Team{BackendTeam, FrontendTeam, PaymentTeam}

fixtures/expectations/topology_depth_1_root_tree.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"healthy",
6868
"unhealthy"
6969
],
70-
"teams": [],
70+
"teams": ["Backend", "Payment"],
7171
"tags": {
7272
"telemetry": [
7373
"enabled"

fixtures/expectations/topology_depth_2_root_tree.json

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,10 @@
153153
"updated_at": "2023-01-01T05:29:00+05:30"
154154
}
155155
],
156-
"healthStatuses": [
157-
"healthy",
158-
"unhealthy"
159-
],
160-
"teams": [],
156+
"healthStatuses": ["healthy", "unhealthy"],
157+
"teams": ["Backend", "Payment"],
161158
"tags": {
162-
"telemetry": [
163-
"enabled"
164-
]
159+
"telemetry": ["enabled"]
165160
},
166161
"types": [
167162
"Application",

fixtures/expectations/topology_root_tree.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
"healthy",
363363
"unhealthy"
364364
],
365-
"teams": [],
365+
"teams": ["Backend", "Payment"],
366366
"tags": {
367367
"telemetry": [
368368
"enabled"

fixtures/expectations/topology_tree_with_agent_id.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"healthStatuses": [
1919
"healthy"
2020
],
21-
"teams": [],
21+
"teams": ["Payment"],
2222
"tags": null,
2323
"types": [
2424
"Application",

fixtures/expectations/topology_tree_with_label_filter.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"healthStatuses": [
4848
"healthy"
4949
],
50-
"teams": [],
50+
"teams": ["Backend"],
5151
"tags": {
5252
"telemetry": [
5353
"enabled"

0 commit comments

Comments
 (0)