Skip to content

Commit ee2f07f

Browse files
committed
implement restorePackage to all internal packages
1 parent 78ed432 commit ee2f07f

File tree

13 files changed

+231
-78
lines changed

13 files changed

+231
-78
lines changed

pkg/alvax/controllers.go

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,29 @@ import (
77
)
88

99
var (
10-
Cache *core.Cache
10+
Cache *core.Cache
11+
12+
caches = []**core.Cache{
13+
&Cache,
14+
}
1115
pkgName string = "alvax"
1216
)
1317

1418
var Package *core.Package = &core.Package{
15-
Name: pkgName,
16-
Cache: []**core.Cache{
17-
&Cache,
18-
},
19+
Name: pkgName,
20+
Cache: caches,
1921
Routes: Routes,
2022
Generic: true,
2123
}
2224

25+
var restorePackage = &core.RestorePackage{
26+
Name: pkgName,
27+
Cache: caches,
28+
CacheNames: []string{"Cache"},
29+
Subpackages: []string{},
30+
SubpackageModels: map[string]any{},
31+
}
32+
2333
// GetConfigs function dumps the alvax cache contents.
2434
// @Summary Get all alvax configs
2535
// @Description get alvax config list
@@ -88,7 +98,7 @@ func DeleteConfigByKey(ctx *gin.Context) {
8898
// @Produce json
8999
// @Router /alvax/restore [post]
90100
func PostDumpRestore(ctx *gin.Context) {
91-
core.BatchRestoreItems[ConfigRoot](ctx, Cache, pkgName)
101+
core.BatchRestoreItems[ConfigRoot](ctx, restorePackage)
92102
return
93103
}
94104

pkg/backups/controllers.go

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,29 @@ import (
99
)
1010

1111
var (
12-
Cache *core.Cache
12+
Cache *core.Cache
13+
14+
caches = []**core.Cache{
15+
&Cache,
16+
}
1317
pkgName string = "backups"
1418
)
1519

1620
var Package *core.Package = &core.Package{
17-
Name: pkgName,
18-
Cache: []**core.Cache{
19-
&Cache,
20-
},
21+
Name: pkgName,
22+
Cache: caches,
2123
Routes: Routes,
2224
Generic: true,
2325
}
2426

27+
var restorePackage = &core.RestorePackage{
28+
Name: pkgName,
29+
Cache: caches,
30+
CacheNames: []string{"Cache"},
31+
Subpackages: []string{},
32+
SubpackageModels: map[string]any{},
33+
}
34+
2535
// @Summary Get all backed up services
2636
// @Description get backed up services
2737
// @Tags backups
@@ -75,7 +85,7 @@ func DeleteBackupByServiceKey(ctx *gin.Context) {
7585
// @Produce json
7686
// @Router /backups/restore [post]
7787
func PostDumpRestore(ctx *gin.Context) {
78-
core.BatchRestoreItems[Backup](ctx, Cache, pkgName)
88+
core.BatchRestoreItems[Backup](ctx, restorePackage)
7989
return
8090
}
8191

pkg/business/controllers.go

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,29 @@ import (
77
)
88

99
var (
10-
Cache *core.Cache
10+
Cache *core.Cache
11+
12+
caches = []**core.Cache{
13+
&Cache,
14+
}
1115
pkgName string = "business"
1216
)
1317

1418
var Package *core.Package = &core.Package{
15-
Name: pkgName,
16-
Cache: []**core.Cache{
17-
&Cache,
18-
},
19+
Name: pkgName,
20+
Cache: caches,
1921
Routes: Routes,
2022
Generic: true,
2123
}
2224

25+
var restorePackage = &core.RestorePackage{
26+
Name: pkgName,
27+
Cache: caches,
28+
CacheNames: []string{"Cache"},
29+
Subpackages: []string{},
30+
SubpackageModels: map[string]any{},
31+
}
32+
2333
// @Summary Get all business entities
2434
// @Description get business entities list
2535
// @Tags business
@@ -86,7 +96,7 @@ func DeleteBusinessByKey(ctx *gin.Context) {
8696
// @Produce json
8797
// @Router /business/restore [post]
8898
func PostDumpRestore(ctx *gin.Context) {
89-
core.BatchRestoreItems[Business](ctx, Cache, pkgName)
99+
core.BatchRestoreItems[Business](ctx, restorePackage)
90100
return
91101
}
92102

pkg/depots/controllers.go

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,31 @@ import (
1111
)
1212

1313
var (
14-
Cache *core.Cache
14+
Cache *core.Cache
15+
16+
caches = []**core.Cache{
17+
&Cache,
18+
}
1519
pkgName string = "depots"
1620
)
1721

1822
var Package *core.Package = &core.Package{
19-
Name: pkgName,
20-
Cache: []**core.Cache{
21-
&Cache,
22-
},
23+
Name: pkgName,
24+
Cache: caches,
2325
Routes: Routes,
2426
Subpackages: []string{
2527
"items",
2628
},
2729
}
2830

31+
var restorePackage = &core.RestorePackage{
32+
Name: pkgName,
33+
Cache: caches,
34+
CacheNames: []string{"Cache"},
35+
Subpackages: []string{},
36+
SubpackageModels: map[string]any{},
37+
}
38+
2939
// GetAllDepotItems GET method
3040
//
3141
// @Summary Get all depots and their users/owners
@@ -95,7 +105,7 @@ func DeleteDepotItemByKey(ctx *gin.Context) {
95105
// @Produce json
96106
// @Router /depots/restore [post]
97107
func PostDumpRestore(ctx *gin.Context) {
98-
core.BatchRestoreItems[DepotItem](ctx, Cache, pkgName)
108+
core.BatchRestoreItems[DepotItem](ctx, restorePackage)
99109
return
100110
}
101111

pkg/dish/controllers.go

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,36 @@ var (
1818
CacheSockets *core.Cache
1919
CacheStreamer *core.Cache
2020
Dispatcher *Stream
21-
pkgName string = "dish"
22-
)
2321

24-
var Package *core.Package = &core.Package{
25-
Name: pkgName,
26-
Cache: []**core.Cache{
22+
caches = []**core.Cache{
2723
&CacheIncidents,
2824
&CacheSockets,
2925
&CacheStreamer,
30-
},
26+
}
27+
pkgName string = "dish"
28+
)
29+
30+
var Package *core.Package = &core.Package{
31+
Name: pkgName,
32+
Cache: caches,
3133
Routes: Routes,
3234
Subpackages: []string{
3335
"incidents",
3436
"sockets",
3537
},
3638
}
3739

40+
var restorePackage = &core.RestorePackage{
41+
Name: pkgName,
42+
Cache: caches,
43+
CacheNames: []string{"CacheIncidents", "CacheSockets", "CacheStreamer"},
44+
Subpackages: []string{"incidents", "sockets"},
45+
SubpackageModels: map[string]any{
46+
"incidents": Incident{},
47+
"sockets": Socket{},
48+
},
49+
}
50+
3851
/*
3952
4053
sockets
@@ -844,6 +857,11 @@ func GetDishRoot(ctx *gin.Context) {
844857
// @Failure 500 {array} dish.Incident
845858
// @Router /dish/restore [post]
846859
func PostDumpRestore(ctx *gin.Context) {
860+
core.BatchRestoreItems[Root](ctx, restorePackage)
861+
return
862+
}
863+
864+
func PostDumpRestore2(ctx *gin.Context) {
847865
var counter []int = []int{0, 0}
848866

849867
var importDish = struct {

pkg/finance/controllers.go

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,35 @@ import (
1212
var (
1313
CacheAccounts *core.Cache
1414
CacheItems *core.Cache
15-
pkgName string = "finance"
16-
)
1715

18-
var Package *core.Package = &core.Package{
19-
Name: pkgName,
20-
Cache: []**core.Cache{
16+
caches = []**core.Cache{
2117
&CacheAccounts,
2218
&CacheItems,
23-
},
19+
}
20+
pkgName string = "finance"
21+
)
22+
23+
var Package *core.Package = &core.Package{
24+
Name: pkgName,
25+
Cache: caches,
2426
Routes: Routes,
2527
Subpackages: []string{
2628
"accounts",
2729
"items",
2830
},
2931
}
3032

33+
var restorePackage = &core.RestorePackage{
34+
Name: pkgName,
35+
Cache: caches,
36+
CacheNames: []string{"CacheAccounts", "CacheItems"},
37+
Subpackages: []string{"accounts", "items"},
38+
SubpackageModels: map[string]any{
39+
"accounts": Account{},
40+
"items": Item{},
41+
},
42+
}
43+
3144
/*
3245
3346
accounts

pkg/infra/controllers.go

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,18 @@ var (
1313
CacheHosts *core.Cache
1414
CacheNetworks *core.Cache
1515
CacheDomains *core.Cache
16-
pkgName string = "infra"
17-
)
1816

19-
var Package *core.Package = &core.Package{
20-
Name: pkgName,
21-
Cache: []**core.Cache{
17+
caches = []**core.Cache{
2218
&CacheDomains,
2319
&CacheHosts,
2420
&CacheNetworks,
25-
},
21+
}
22+
pkgName string = "infra"
23+
)
24+
25+
var Package *core.Package = &core.Package{
26+
Name: pkgName,
27+
Cache: caches,
2628
Routes: Routes,
2729
Subpackages: []string{
2830
"domains",
@@ -31,6 +33,22 @@ var Package *core.Package = &core.Package{
3133
},
3234
}
3335

36+
var restorePackage = &core.RestorePackage{
37+
Name: pkgName,
38+
Cache: caches,
39+
CacheNames: []string{"Cache"},
40+
Subpackages: []string{
41+
"domains",
42+
"hosts",
43+
"networks",
44+
},
45+
SubpackageModels: map[string]any{
46+
"domains": Domain{},
47+
"hosts": Host{},
48+
"networks": Network{},
49+
},
50+
}
51+
3452
// @Summary Get whole infrastructure
3553
// @Description get all infrastructure details
3654
// @Tags infra
@@ -661,6 +679,11 @@ func ListTypesNetworks(ctx *gin.Context) {
661679
// @Produce json
662680
// @Router /infra/restore [post]
663681
func PostDumpRestore(ctx *gin.Context) {
682+
core.BatchRestoreItems[Infrastructure](ctx, restorePackage)
683+
return
684+
}
685+
686+
func PostDumpRestore2(ctx *gin.Context) {
664687
var counter []int = []int{0, 0, 0}
665688

666689
var importInfra = struct {

pkg/links/controllers.go

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,28 @@ import (
99
)
1010

1111
var (
12-
Cache *core.Cache
12+
Cache *core.Cache
13+
14+
caches = []**core.Cache{
15+
&Cache,
16+
}
1317
pkgName string = "links"
1418
)
1519

1620
var Package *core.Package = &core.Package{
17-
Name: pkgName,
18-
Cache: []**core.Cache{
19-
&Cache,
20-
},
21+
Name: pkgName,
2122
Routes: Routes,
2223
Generic: true,
2324
}
2425

26+
var restorePackage = &core.RestorePackage{
27+
Name: pkgName,
28+
Cache: caches,
29+
CacheNames: []string{"Cache"},
30+
Subpackages: []string{},
31+
SubpackageModels: map[string]any{},
32+
}
33+
2534
// GetLinks returns JSON serialized list of links and their properties.
2635
// @Summary Get all links
2736
// @Description get links complete list
@@ -66,7 +75,7 @@ func PostNewLink(ctx *gin.Context) {
6675
// @Produce json
6776
// @Router /links/restore [post]
6877
func PostDumpRestore(ctx *gin.Context) {
69-
core.BatchRestoreItems[Link](ctx, Cache, pkgName)
78+
core.BatchRestoreItems[Link](ctx, restorePackage)
7079
return
7180
}
7281

0 commit comments

Comments
 (0)