fix pkgs' models, fix tests

krustowski · krustowski · commit 20f5e720e0c8 · 2024-10-22T22:57:25.000+02:00
diff --git a/pkg/alvax/controllers_test.go b/pkg/alvax/controllers_test.go
@@ -141,12 +141,12 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count int `json:"count"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
 	//t.Logf("%s", jsonValue)
 
 	assert.Equal(t, http.StatusCreated, w.Code)
-	assert.Equal(t, 1, ret.Count)
+	assert.Equal(t, []int{1}, ret.Count)
 }
diff --git a/pkg/backups/controllers_test.go b/pkg/backups/controllers_test.go
@@ -149,14 +149,14 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count int `json:"count"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
 	//t.Logf("%s", jsonValue)
 
 	assert.Equal(t, http.StatusCreated, w.Code)
-	assert.Equal(t, 1, ret.Count)
+	assert.Equal(t, []int{1}, ret.Count)
 }
 
 func TestActiveToggleBackupByServiceKey(t *testing.T) {
diff --git a/pkg/business/controllers_test.go b/pkg/business/controllers_test.go
@@ -144,10 +144,10 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count int `json:"count"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
 	assert.Equal(t, http.StatusCreated, w.Code)
-	assert.Equal(t, 1, ret.Count)
+	assert.Equal(t, []int{1}, ret.Count)
 }
diff --git a/pkg/depots/controllers_test.go b/pkg/depots/controllers_test.go
@@ -144,10 +144,10 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count int `json:"count"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
 	assert.Equal(t, http.StatusCreated, w.Code)
-	assert.Equal(t, 1, ret.Count)
+	assert.Equal(t, []int{1}, ret.Count)
 }
diff --git a/pkg/dish/controllers.go b/pkg/dish/controllers.go
@@ -38,10 +38,17 @@ var Package *core.Package = &core.Package{
 }
 
 var restorePackage = &core.RestorePackage{
-	Name:        pkgName,
-	Cache:       caches,
-	CacheNames:  []string{"CacheIncidents", "CacheSockets", "CacheStreamer"},
-	Subpackages: []string{"incidents", "sockets"},
+	Name:  pkgName,
+	Cache: caches,
+	CacheNames: []string{
+		"CacheIncidents",
+		"CacheSockets",
+		"CacheStreamer",
+	},
+	Subpackages: []string{
+		"incidents",
+		"sockets",
+	},
 	SubpackageModels: map[string]any{
 		"incidents": Incident{},
 		"sockets":   Socket{},
diff --git a/pkg/dish/controllers_test.go b/pkg/dish/controllers_test.go
@@ -74,7 +74,7 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count []int `json:"counter"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
diff --git a/pkg/finance/controllers.go b/pkg/finance/controllers.go
@@ -31,10 +31,16 @@ var Package *core.Package = &core.Package{
 }
 
 var restorePackage = &core.RestorePackage{
-	Name:        pkgName,
-	Cache:       caches,
-	CacheNames:  []string{"CacheAccounts", "CacheItems"},
-	Subpackages: []string{"accounts", "items"},
+	Name:  pkgName,
+	Cache: caches,
+	CacheNames: []string{
+		"CacheAccounts",
+		"CacheItems",
+	},
+	Subpackages: []string{
+		"accounts",
+		"items",
+	},
 	SubpackageModels: map[string]any{
 		"accounts": Account{},
 		"items":    Item{},
@@ -443,6 +449,11 @@ func GetRootData(ctx *gin.Context) {
 // @Produce json
 // @Router /finance/restore [post]
 func PostDumpRestore(ctx *gin.Context) {
+	core.BatchRestoreItems[FinanceRoot](ctx, restorePackage)
+	return
+}
+
+func PostDumpRestore2(ctx *gin.Context) {
 	var counter []int = []int{0, 0}
 
 	var importFinance = struct {
diff --git a/pkg/finance/controllers_test.go b/pkg/finance/controllers_test.go
@@ -77,7 +77,7 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count []int `json:"counter"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
@@ -157,7 +157,7 @@ func TestGetAccounts(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, w.Code)
 
-	// number 2 down below is wrong, see notes above (cca L87)
+	// TODO: number 2 there is not correct, the "invalid" account should not be imported
 	assert.Equal(t, 2, items.Count)
 	assert.NotEmpty(t, items.Accounts)
 }
@@ -295,7 +295,7 @@ func TestGetItemsByAccountID(t *testing.T) {
 	json.Unmarshal(w.Body.Bytes(), &items)
 
 	assert.Equal(t, http.StatusOK, w.Code)
-	assert.Equal(t, 2, items.Count)
+	assert.Equal(t, 1, items.Count)
 	assert.NotEmpty(t, items.Items)
 }
 
diff --git a/pkg/finance/models.go b/pkg/finance/models.go
@@ -4,6 +4,11 @@ import (
 	"time"
 )
 
+type FinanceRoot struct {
+	Accounts map[string]Account `json:"accounts"`
+	Items    map[string]Item    `json:"items"`
+}
+
 type Account struct {
 	// Account unique ID, snake_cased identifier.
 	ID string `json:"id" binding:"required" required:"true" readonly:"true"`
diff --git a/pkg/infra/controllers.go b/pkg/infra/controllers.go
@@ -34,9 +34,13 @@ var Package *core.Package = &core.Package{
 }
 
 var restorePackage = &core.RestorePackage{
-	Name:       pkgName,
-	Cache:      caches,
-	CacheNames: []string{"Cache"},
+	Name:  pkgName,
+	Cache: caches,
+	CacheNames: []string{
+		"CacheDomains",
+		"CacheḦosts",
+		"CacheNetworks",
+	},
 	Subpackages: []string{
 		"domains",
 		"hosts",
diff --git a/pkg/infra/controllers_test.go b/pkg/infra/controllers_test.go
@@ -25,20 +25,20 @@ var TestPackage *core.Package = &core.Package{
 	Routes: Routes,
 }
 
-/*
- *  unit/integration tests
- */
+//
+//  unit/integration tests
+//
 
-/*
- *  common
- */
+//
+//  common
+//
 
 func TestPostDumpRestore(t *testing.T) {
 	r := core.SetupTestEnv(TestPackage)
 
 	var items = struct {
-		Domains  map[string]Domain  `json:"Domains"`
-		Hosts    map[string]Host    `json:"Hosts"`
+		Domains  map[string]Domain  `json:"domains"`
+		Hosts    map[string]Host    `json:"hosts"`
 		Networks map[string]Network `json:"networks"`
 	}{
 		Domains: map[string]Domain{
@@ -93,7 +93,7 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count []int `json:"counter"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
diff --git a/pkg/infra/models.go b/pkg/infra/models.go
@@ -6,18 +6,18 @@ import (
 
 type Infrastructures struct {
 	// Whole infrastructure object.
-	Infrastructure Infrastructure `json:"infrastructure"`
+	Infrastructures []Infrastructure `json:"infrastructures"`
 }
 
 type Infrastructure struct {
 	// Domains linked to such infrastructure.
-	Domains []Domain `json:"domains"`
+	Domains map[string]Domain `json:"domains"`
 
 	// Hosts/nodes linked to such infrastructure.
-	Hosts []Host `json:"hosts"`
+	Hosts map[string]Host `json:"hosts"`
 
 	// Networks linked to such infrastructure.
-	Networks []Network `json:"networks"`
+	Networks map[string]Network `json:"networks"`
 }
 
 type Domain struct {
@@ -45,7 +45,7 @@ type Domain struct {
 
 // High-level struct for batch []Host array importing.
 type Hosts struct {
-	Hosts []Host `json:"hosts"`
+	Hosts map[string]Host `json:"hosts"`
 }
 
 // Low-level Host model for a generic machine.
diff --git a/pkg/links/controllers_test.go b/pkg/links/controllers_test.go
@@ -159,10 +159,10 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count int `json:"count"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
 	assert.Equal(t, http.StatusCreated, w.Code)
-	assert.Equal(t, 1, ret.Count)
+	assert.Equal(t, []int{1}, ret.Count)
 }
diff --git a/pkg/projects/controllers_test.go b/pkg/projects/controllers_test.go
@@ -172,14 +172,14 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count int `json:"count"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
 	//t.Logf("%s", jsonValue)
 
 	assert.Equal(t, http.StatusCreated, w.Code)
-	assert.Equal(t, 1, ret.Count)
+	assert.Equal(t, []int{1}, ret.Count)
 }
 
 /*
diff --git a/pkg/queue/controllers_test.go b/pkg/queue/controllers_test.go
@@ -164,10 +164,10 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count int `json:"count"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
 	assert.Equal(t, http.StatusCreated, w.Code)
-	assert.Equal(t, 1, ret.Count)
+	assert.Equal(t, []int{1}, ret.Count)
 }
diff --git a/pkg/roles/controllers_test.go b/pkg/roles/controllers_test.go
@@ -154,12 +154,12 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count int `json:"count"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
 	//t.Logf("%s", jsonValue)
 
 	assert.Equal(t, http.StatusCreated, w.Code)
-	assert.Equal(t, 1, ret.Count)
+	assert.Equal(t, []int{1}, ret.Count)
 }
diff --git a/pkg/users/controllers_test.go b/pkg/users/controllers_test.go
@@ -146,14 +146,14 @@ func TestPostDumpRestore(t *testing.T) {
 	r.ServeHTTP(w, req)
 
 	var ret = struct {
-		Count int `json:"count"`
+		Count []int `json:"count"`
 	}{}
 	json.Unmarshal(w.Body.Bytes(), &ret)
 
 	//t.Logf("%s", jsonValue)
 
 	assert.Equal(t, http.StatusCreated, w.Code)
-	assert.Equal(t, 1, ret.Count)
+	assert.Equal(t, []int{1}, ret.Count)
 }
 
 func TestActiveToggleUserByKey(t *testing.T) {
