improve pkg registration in main.go

.env.example

@@ -4,7 +4,7 @@
 
 APP_NAME=swis-api
 APP_ROOT=/opt/${APP_NAME}
-APP_VERSION=5.16.1
+APP_VERSION=5.16.2
 
 
 #

cmd/swis-api/main.go

@@ -1,5 +1,5 @@
 // @title swis-api (swapi) v5
-// @version 5.16.1
+// @version 5.16.2
 // @description sakalWeb Information System v5 RESTful API documentation
 // @termsOfService http://swagger.io/terms/
 
@@ -126,65 +126,28 @@ func main() {
 	// swis pkg registration
 	//
 
-	// alvax CRUD
-	alvax.Cache = &core.Cache{}
-	alvax.Routes(router.Group("/alvax"))
-
-	// backups CRUD
-	backups.Cache = &core.Cache{}
-	backups.Routes(router.Group("/backups"))
-
-	// business CRUD
-	business.Cache = &core.Cache{}
-	business.Routes(router.Group("/business"))
-
-	// depots CRUD
-	depots.Cache = &core.Cache{}
-	depots.Routes(router.Group("/depots"))
-
-	// dish CRUD
 	dish.Dispatcher = dish.NewDispatcher()
-	dish.CacheIncidents = &core.Cache{}
-	dish.CacheSockets = &core.Cache{}
-	dish.Routes(router.Group("/dish"))
-
-	// finance accounts CRUD
-	finance.CacheAccounts = &core.Cache{}
-	finance.CacheItems = &core.Cache{}
-	finance.Routes(router.Group("/finance"))
-
-	// infra CRUD
-	infra.CacheHosts = &core.Cache{}
-	infra.CacheNetworks = &core.Cache{}
-	infra.CacheDomains = &core.Cache{}
-	infra.Routes(router.Group("/infra"))
-
-	// links CRUD
-	links.Cache = &core.Cache{}
-	links.Routes(router.Group("/links"))
-
-	// news CRUD
-	news.Cache = &core.Cache{}
-	news.Routes(router.Group("/news"))
-
-	// projects and queue pkgis registration
+
+	core.MountPackage(router, alvax.Package)
+	core.MountPackage(router, backups.Package)
+	core.MountPackage(router, business.Package)
+	core.MountPackage(router, depots.Package)
+	core.MountPackage(router, dish.Package)
+	core.MountPackage(router, finance.Package)
+	core.MountPackage(router, infra.Package)
+	core.MountPackage(router, links.Package)
+	core.MountPackage(router, news.Package)
 	core.MountPackage(router, projects.Package)
 	core.MountPackage(router, queue.Package)
+	core.MountPackage(router, roles.Package)
+	core.MountPackage(router, users.Package)
 
 	// bulk registration and mounting of packages
 	/*core.RegisterAndMount(router,
 		projects.Package,
 		roles.Package,
 	)*/
 
-	// roles CRUD
-	roles.Cache = &core.Cache{}
-	roles.Routes(router.Group("/roles"))
-
-	// users CRUD
-	users.Cache = &core.Cache{}
-	users.Routes(router.Group("/users"))
-
 	// attach router to http.Server and start it, check for SERVER_PORT env variable
 	if os.Getenv("SERVER_PORT") == "" {
 		log.Fatal("SERVER_PORT environment variable not provided! refusing to start the server...")

pkg/alvax/controllers.go

@@ -11,6 +11,14 @@ var (
 	pkgName string = "alvax"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&Cache,
+	},
+	Routes: Routes,
+}
+
 // GetConfigs function dumps the alvax cache contents.
 // @Summary Get all alvax configs
 // @Description get alvax config list

pkg/backups/controllers.go

@@ -13,6 +13,14 @@ var (
 	pkgName string = "backups"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&Cache,
+	},
+	Routes: Routes,
+}
+
 // @Summary Get all backed up services
 // @Description get backed up services
 // @Tags backups

pkg/business/controllers.go

@@ -11,6 +11,14 @@ var (
 	pkgName string = "business"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&Cache,
+	},
+	Routes: Routes,
+}
+
 // @Summary Get all business entities
 // @Description get business entities list
 // @Tags business

pkg/depots/controllers.go

@@ -15,6 +15,14 @@ var (
 	pkgName string = "depots"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&Cache,
+	},
+	Routes: Routes,
+}
+
 // GetAllDepotItems GET method
 //
 // @Summary Get all depots and their users/owners

pkg/dish/controllers.go

@@ -20,6 +20,15 @@ var (
 	pkgName        string = "dish"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&CacheIncidents,
+		&CacheSockets,
+	},
+	Routes: Routes,
+}
+
 /*
 
   sockets

pkg/finance/controllers.go

@@ -15,6 +15,15 @@ var (
 	pkgName       string = "finance"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&CacheAccounts,
+		&CacheItems,
+	},
+	Routes: Routes,
+}
+
 /*
 
   accounts

pkg/infra/controllers.go

@@ -16,6 +16,16 @@ var (
 	pkgName       string = "infra"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&CacheDomains,
+		&CacheHosts,
+		&CacheNetworks,
+	},
+	Routes: Routes,
+}
+
 // @Summary Get whole infrastructure
 // @Description get all infrastructure details
 // @Tags infra

pkg/links/controllers.go

@@ -13,6 +13,14 @@ var (
 	pkgName string = "links"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&Cache,
+	},
+	Routes: Routes,
+}
+
 // GetLinks returns JSON serialized list of links and their properties.
 // @Summary Get all links
 // @Description get links complete list

pkg/news/controllers.go

@@ -16,6 +16,14 @@ var (
 	pkgName string = "news"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&Cache,
+	},
+	Routes: Routes,
+}
+
 // GetSources
 // @Summary Get news source list
 // @Description get all news sources

pkg/roles/controllers.go

@@ -11,6 +11,14 @@ var (
 	pkgName string = "roles"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&Cache,
+	},
+	Routes: Routes,
+}
+
 // GetRoles returns JSON serialized list of roles and their properties.
 // @Summary Get all roles
 // @Description get roules complete list

pkg/users/controllers.go

@@ -14,6 +14,14 @@ var (
 	pkgName string = "users"
 )
 
+var Package *core.Package = &core.Package{
+	Name: pkgName,
+	Cache: []**core.Cache{
+		&Cache,
+	},
+	Routes: Routes,
+}
+
 func FindUserByToken(token string) *User {
 	rawUsers, _ := Cache.GetAll()