diff --git a/machines/app/api/router.go b/machines/app/api/router.go index 5bdcc54..b903684 100644 --- a/machines/app/api/router.go +++ b/machines/app/api/router.go @@ -2,6 +2,7 @@ package api import ( "fmt" + "machines/app/cfg" "machines/app/db" "net/http" "strconv" @@ -10,9 +11,6 @@ import ( "gorm.io/gorm" ) -const HOST = "0.0.0.0" -const PORT = 3000 - func handlePing(c *gin.Context) { c.JSON( http.StatusOK, @@ -56,6 +54,11 @@ func handleGetMachine(dbConn *gorm.DB) gin.HandlerFunc { } } +func handleGetMachineProducts(dbConn *gorm.DB) gin.HandlerFunc { + return func(c *gin.Context) { + } +} + func initRouter(dbConn *gorm.DB) *gin.Engine { gin.SetMode(gin.ReleaseMode) router := gin.Default() @@ -65,13 +68,15 @@ func initRouter(dbConn *gorm.DB) *gin.Engine { routes.GET("/ping", handlePing) routes.GET("", handleGetMachines(dbConn)) routes.GET("/:machineId", handleGetMachine(dbConn)) + routes.GET("/:machineId/products", handleGetMachineProducts(dbConn)) } return router } func Serve(dbConn *gorm.DB) { - serverAddr := fmt.Sprintf("%s:%d", HOST, PORT) + serverAddr := fmt.Sprintf("%s:%d", cfg.Config.AppHost, cfg.Config.AppPort) + fmt.Printf("Starting serving on %s\n", serverAddr) router := initRouter(dbConn) router.Run(serverAddr) diff --git a/machines/app/cfg/config.go b/machines/app/cfg/config.go index b6b3f26..9f9fe4d 100644 --- a/machines/app/cfg/config.go +++ b/machines/app/cfg/config.go @@ -5,11 +5,15 @@ import ( ) type configStruct struct { - DbHost string `default:"localhost"` - DbPort int `default:"55432"` - DbName string `default:"komponiranje"` - DbUser string `default:"pero"` - DbPassword string `default:"pero.000"` + AppHost string `default:"0.0.0.0"` + AppPort int `default:"3000"` + DbHost string `default:"localhost"` + DbPort int `default:"55432"` + DbName string `default:"komponiranje"` + DbUser string `default:"pero"` + DbPassword string `default:"pero.000"` + ProductsAppHost string `default:"localhost"` + ProductsAppPort int `default:"3001"` } const ENV_PREFIX = "" diff --git a/machines/go.mod b/machines/go.mod index 015cdc4..2b55fcc 100644 --- a/machines/go.mod +++ b/machines/go.mod @@ -4,6 +4,7 @@ go 1.21.5 require ( github.com/gin-gonic/gin v1.9.1 + github.com/kelseyhightower/envconfig v1.4.0 gorm.io/driver/postgres v1.5.4 gorm.io/gorm v1.25.5 ) @@ -24,7 +25,6 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kelseyhightower/envconfig v1.4.0 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.2.4 // indirect diff --git a/products/app/api/router.go b/products/app/api/router.go index 18638e7..1cc1758 100644 --- a/products/app/api/router.go +++ b/products/app/api/router.go @@ -3,6 +3,7 @@ package api import ( "fmt" "net/http" + "products/app/cfg" "products/app/db" "strconv" @@ -10,9 +11,6 @@ import ( "gorm.io/gorm" ) -const HOST = "0.0.0.0" -const PORT = 3000 - func handlePing(c *gin.Context) { c.JSON( http.StatusOK, @@ -86,7 +84,8 @@ func initRouter(dbConn *gorm.DB) *gin.Engine { } func Serve(dbConn *gorm.DB) { - serverAddr := fmt.Sprintf("%s:%d", HOST, PORT) + serverAddr := fmt.Sprintf("%s:%d", cfg.Config.AppHost, cfg.Config.AppPort) + fmt.Printf("Starting serving on %s\n", serverAddr) router := initRouter(dbConn) router.Run(serverAddr) diff --git a/products/app/cfg/config.go b/products/app/cfg/config.go index b6b3f26..d23ffcf 100644 --- a/products/app/cfg/config.go +++ b/products/app/cfg/config.go @@ -5,6 +5,8 @@ import ( ) type configStruct struct { + AppHost string `default:"0.0.0.0"` + AppPort int `default:"3001"` DbHost string `default:"localhost"` DbPort int `default:"55432"` DbName string `default:"komponiranje"`