Merge branch 'develop'

LICENSE.md

@@ -0,0 +1,173 @@
+# Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
+
+**Using Creative Commons Public Licenses**
+
+Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
+
+* __Considerations for licensors:__ Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors).
+
+* __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
+
+## Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+### Section 1 – Definitions.
+
+a. __Adapted Material__ means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+
+b. __Adapter's License__ means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+
+c. __BY-NC-SA Compatible License__ means a license listed at [creativecommons.org/compatiblelicenses](http://creativecommons.org/compatiblelicenses), approved by Creative Commons as essentially the equivalent of this Public License.
+
+d. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+
+e. __Effective Technological Measures__ means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+
+f. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+
+g. __License Elements__ means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution, NonCommercial, and ShareAlike.
+
+h. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+
+i. __Licensed Rights__ means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+
+j. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
+
+k. __NonCommercial__ means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.
+
+l. __Share__ means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+
+m. __Sui Generis Database Rights__ means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+
+n. __You__ means the individual or entity exercising the Licensed Rights under this Public License. __Your__ has a corresponding meaning.
+
+### Section 2 – Scope.
+
+a. ___License grant.___
+
+   1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+
+        A. reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and
+
+        B. produce, reproduce, and Share Adapted Material for NonCommercial purposes only.
+
+   2. __Exceptions and Limitations.__ For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+
+   3. __Term.__ The term of this Public License is specified in Section 6(a).
+
+   4. __Media and formats; technical modifications allowed.__ The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+
+   5. __Downstream recipients.__
+
+        A. __Offer from the Licensor – Licensed Material.__ Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+
+        B. __Additional offer from the Licensor – Adapted Material.__ Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
+
+        C. __No downstream restrictions.__ You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+
+   6. __No endorsement.__ Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+b. ___Other rights.___
+
+   1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+
+   2. Patent and trademark rights are not licensed under this Public License.
+
+   3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.
+
+### Section 3 – License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+a. ___Attribution.___
+
+   1. If You Share the Licensed Material (including in modified form), You must:
+
+       A. retain the following if it is supplied by the Licensor with the Licensed Material:
+
+         i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+
+         ii. a copyright notice;
+
+         iii. a notice that refers to this Public License;
+
+         iv. a notice that refers to the disclaimer of warranties;
+
+         v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+
+       B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+
+       C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+
+   2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+
+   3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+b. ___ShareAlike.___
+
+In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
+
+1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.
+
+2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
+
+3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
+
+### Section 4 – Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;
+
+b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
+
+c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+### Section 5 – Disclaimer of Warranties and Limitation of Liability.
+
+a. __Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.__
+
+b. __To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.__
+
+c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+### Section 6 – Term and Termination.
+
+a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+
+   1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+
+   2. upon express reinstatement by the Licensor.
+
+   For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+
+c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+
+d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+### Section 7 – Other Terms and Conditions.
+
+a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+
+b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+
+### Section 8 – Interpretation.
+
+a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+
+b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+
+c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+
+d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
+
+> Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
+>
+> Creative Commons may be contacted at creativecommons.org

src/cmd/migrate/main.go

@@ -6,10 +6,13 @@ import (
 	"log"
 	"os"
 
-	"git.pbiernat.dev/egommerce/basket-service/internal/app/config"
-	"git.pbiernat.dev/egommerce/go-api-pkg/fluentd"
 	"github.com/go-pg/migrations/v8"
 	"github.com/go-pg/pg/v10"
+
+	"git.pbiernat.dev/egommerce/go-api-pkg/fluentd"
+
+	"git.pbiernat.dev/egommerce/basket-service/internal/common"
+	cnf "git.pbiernat.dev/egommerce/basket-service/pkg/config"
 )
 
 const (
@@ -32,16 +35,24 @@ Usage:
 `
 
 func main() {
-	if config.ErrLoadingEnvs != nil {
+	if cnf.ErrLoadingEnvs != nil {
-		log.Panicln("Error loading .env file", config.ErrLoadingEnvs)
+		log.Panicln("Error loading .env file", cnf.ErrLoadingEnvs)
 	}
 
-	// dbURL := config.GetEnv("DATABASE_URL", defDbURL)
+	c := common.NewConfig()
-	loggerAddr := config.GetEnv("LOGGER_ADDR", defLoggerAddr)
-	mTblName := config.GetEnv("MIGRATIONS_TABLE_NAME", defMigrationsTableName)
 
-	logHost, logPort := fluentd.ParseAddr(loggerAddr)
+	// dbURL := cnf.GetEnv("DATABASE_URL", defDbURL)
-	logger := fluentd.NewLogger(defAppName, logHost, logPort)
+	mTblName := cnf.GetEnv("MIGRATIONS_TABLE_NAME", defMigrationsTableName)
+
+	logHost, logPort, err := fluentd.ParseAddr(c.LoggerAddr)
+	if err != nil {
+		log.Fatalf("Error parsing logger addr: %s. Err: %v", c.LoggerAddr, err)
+	}
+
+	logger, err := fluentd.NewLogger(c.GetAppFullName(), logHost, logPort) // @Refactor NewLogger return (logger, error)
+	if err != nil {
+		log.Fatalf("Error connecting to %s:%d. Err: %v", logHost, logPort, err)
+	}
 	defer logger.Close()
 
 	flag.Usage = usage
@@ -56,8 +67,8 @@ func main() {
 
 	mig := migrations.NewCollection()
 	mig.SetTableName(mTblName)
-	err := mig.DiscoverSQLMigrations("./migrations")
+
-	if err != nil {
+	if err := mig.DiscoverSQLMigrations("./migrations"); err != nil {
 		logger.Log("migration dicovery error: %#v", err)
 	}
 

src/cmd/server/main.go

@@ -1,97 +1,83 @@
 package main
 
 import (
+	"fmt"
 	"log"
 	"os"
-	"strconv"
 
-	"git.pbiernat.dev/egommerce/basket-service/internal/app/config"
+	cnf "git.pbiernat.dev/egommerce/basket-service/pkg/config"
-	"git.pbiernat.dev/egommerce/basket-service/internal/app/database"
+
 	"git.pbiernat.dev/egommerce/basket-service/internal/app/server"
-	"git.pbiernat.dev/egommerce/go-api-pkg/fluentd"
+	"git.pbiernat.dev/egommerce/basket-service/internal/common"
-	amqp "git.pbiernat.dev/egommerce/go-api-pkg/rabbitmq"
-	"github.com/go-redis/redis/v8"
-)
-
-const (
-	defAppName       = "basket-svc"
-	defAppDomain     = "basket-svc"
-	defPathPrefix    = "/basket"
-	defNetAddr       = ":80"
-	defLoggerAddr    = "api-logger:24224"
-	defRegistryAddr  = "api-registry:8500"
-	defDbURL         = "postgres://postgres:12345678@postgres-db:5432/egommerce"
-	defCacheAddr     = "api-cache:6379"
-	defCachePassword = "12345678"
-	defMongoDbURL    = "mongodb://mongodb:12345678@mongo-db:27017"
-	defEventBusURL   = "amqp://guest:guest@api-eventbus:5672"
-	ebEventsExchange = "api-events"
-	ebEventsQueue    = "basket-svc"
-	defKVNmspc       = "dev.egommerce/service/basket-svc"
 )
 
 func main() {
-	if config.ErrLoadingEnvs != nil {
+	if cnf.ErrLoadingEnvs != nil {
-		log.Panicln("Error loading .env file", config.ErrLoadingEnvs)
+		log.Panicln("Error loading .env file", cnf.ErrLoadingEnvs)
 	}
 
-	c := new(server.Config)
+	c := common.NewConfig()
-	c.AppID, _ = os.Hostname()
+	srv := server.New(
-	c.AppName = config.GetEnv("APP_NAME", defAppName)
+		c,
-	c.AppDomain = config.GetEnv("APP_DOMAIN", defAppDomain)
+		server.WithCache(c),
-	c.PathPrefix = config.GetEnv("APP_PATH_PREFIX", defPathPrefix)
+		server.WithDatabase(c),
-	c.NetAddr = config.GetEnv("SERVER_ADDR", defNetAddr)
+		server.WithEventbus(c),
-	c.Port, _ = strconv.Atoi(c.NetAddr[1:])
+		server.WithLogger(c),
-	c.LoggerAddr = config.GetEnv("LOGGER_ADDR", defLoggerAddr)
+		server.WithRegistry(c),
-	c.RegistryAddr = config.GetEnv("REGISTRY_ADDR", defRegistryAddr)
+	)
-	c.DbURL = config.GetEnv("DATABASE_URL", defDbURL)
-	c.CacheAddr = config.GetEnv("CACHE_ADDR", defCacheAddr)
-	c.CachePassword = config.GetEnv("CACHE_PASSWORD", defCachePassword)
-	c.EventBusURL = config.GetEnv("EVENTBUS_URL", defEventBusURL)
-	c.EventBusExchange = ebEventsExchange
-	c.KVNamespace = config.GetEnv("APP_KV_NAMESPACE", defKVNmspc)
-
-	logHost, logPort := fluentd.ParseAddr(c.LoggerAddr)
-	logger := fluentd.NewLogger(c.GetAppFullName(), logHost, logPort)
-	defer logger.Close()
-
-	// db conn
-	dbConn, err := database.Connect(c.DbURL)
-	if err != nil { // fixme: add wait-for-db...
-		logger.Log("Failed to connect to Database server: %v\n", err)
-		os.Exit(1)
-	}
-	defer dbConn.Close()
-
-	// redis conn
-	redis := redis.NewClient(&redis.Options{
-		Addr:     c.CacheAddr,
-		Password: c.CachePassword,
-		DB:       0,
-	})
-	defer redis.Close()
-
-	// eventbus conn
-	ebConn, ebCh, err := amqp.Open(c.EventBusURL)
-	if err != nil {
-		logger.Log("Failed to connect to EventBus server: %v\n", err)
-		os.Exit(1)
-	}
-	defer ebCh.Close()
-	defer amqp.Close(ebConn)
-
-	err = amqp.NewExchange(ebCh, c.EventBusExchange)
-	if err != nil {
-		logger.Log("Failed to declare EventBus exchange: %v\n", err)
-		os.Exit(1)
-	}
-
-	// start server
-	srv := server.NewServer(c, logger, dbConn, redis, ebCh)
 
 	forever := make(chan struct{})
-	srv.StartWithGracefulShutdown(forever)
+
+	err := srv.Base.Start(forever, srv.Shutdown())
+	// server.SetupMiddleware(srv)
+	// server.SetupRouter(srv)
+
 	<-forever
 
+	if err != nil {
+		log.Fatalf("Failed to start server. Reason: %v\n", err)
+		os.Exit(1)
+	}
+
+	fmt.Println("Done.")
+	os.Exit(0)
+
+	// c.AppDomain = cnf.GetEnv("APP_DOMAIN", defAppDomain)
+	// c.Port, _ = strconv.Atoi(c.NetAddr[1:])
+	// c.KVNamespace = cnf.GetEnv("APP_KV_NAMESPACE", defKVNmspc)
+
+	// logHost, logPort := fluentd.ParseAddr(c.LoggerAddr)
+	// logger := fluentd.NewLogger(c.GetAppFullName(), logHost, logPort)
+	// defer logger.Close()
+
+	// db conn
+	// dbConn, err := database.Connect(c.DbURL)
+	// if err != nil { // fixme: add wait-for-db...
+	// 	logger.Log("Failed to connect to Database server: %v\n", err)
 	// 	os.Exit(1)
+	// }
+	// defer dbConn.Close()
+
+	// redis conn
+	// redis := redis.NewClient(&redis.Options{
+	// 	Addr:     c.CacheAddr,
+	// 	Password: c.CachePassword,
+	// 	DB:       0,
+	// })
+	// defer redis.Close()
+
+	// eventbus conn
+	// ebConn, ebCh, err := amqp.Open(c.EventBusURL)
+	// if err != nil {
+	// 	logger.Log("Failed to connect to EventBus server: %v\n", err)
+	// 	os.Exit(1)
+	// }
+	// defer ebCh.Close()
+	// defer amqp.Close(ebConn)
+
+	// err = amqp.NewExchange(ebCh, c.EventBusExchange)
+	// if err != nil {
+	// 	logger.Log("Failed to declare EventBus exchange: %v\n", err)
+	// 	os.Exit(1)
+	// }
 }

src/cmd/worker/main.go

@@ -1,9 +1,6 @@
 package main
 
 import (
-	"bytes"
-	"encoding/json"
-	"errors"
 	"fmt"
 	"log"
 	"os"
@@ -12,31 +9,33 @@ import (
 	"syscall"
 	"time"
 
-	"git.pbiernat.dev/egommerce/basket-service/internal/app/config"
-	"git.pbiernat.dev/egommerce/basket-service/internal/app/database"
-	"git.pbiernat.dev/egommerce/basket-service/internal/app/event"
-	"git.pbiernat.dev/egommerce/basket-service/internal/app/server"
-	"git.pbiernat.dev/egommerce/basket-service/internal/app/service"
-	"git.pbiernat.dev/egommerce/basket-service/internal/app/ui"
-	discovery "git.pbiernat.dev/egommerce/go-api-pkg/consul"
 	"git.pbiernat.dev/egommerce/go-api-pkg/fluentd"
 	"git.pbiernat.dev/egommerce/go-api-pkg/rabbitmq"
 	"github.com/go-redis/redis/v8"
 	"github.com/streadway/amqp"
+
+	"git.pbiernat.dev/egommerce/go-api-pkg/consul"
+
+	"git.pbiernat.dev/egommerce/basket-service/internal/app/event"
+	"git.pbiernat.dev/egommerce/basket-service/internal/app/service"
+	"git.pbiernat.dev/egommerce/basket-service/internal/app/ui"
+	"git.pbiernat.dev/egommerce/basket-service/internal/common"
+	"git.pbiernat.dev/egommerce/basket-service/pkg/config"
+	"git.pbiernat.dev/egommerce/basket-service/pkg/database"
 )
 
 const (
-	defAppName       = "basket-worker"
+// defAppName       = "basket-worker"
-	defLoggerAddr    = "api-logger:24224"
+// defLoggerAddr    = "api-logger:24224"
-	defRegistryAddr  = "api-registry:8500"
+// defRegistryAddr  = "api-registry:8500"
-	defDbURL         = "postgres://postgres:12345678@postgres-db:5432/egommerce"
+// defDbURL         = "postgres://postgres:12345678@postgres-db:5432/egommerce"
-	defCacheAddr     = "api-cache:6379"
+// defCacheAddr     = "api-cache:6379"
-	defCachePassword = "12345678"
+// defCachePassword = "12345678"
-	defMongoDbURL    = "mongodb://mongodb:12345678@mongo-db:27017"
+// defMongoDbURL    = "mongodb://mongodb:12345678@mongo-db:27017"
-	defEventBusURL   = "amqp://guest:guest@api-eventbus:5672"
+// defEventBusURL   = "amqp://guest:guest@api-eventbus:5672"
-	ebEventsExchange = "api-events"
+// ebEventsExchange = "api-events"
-	ebEventsQueue    = "basket-worker"
+// ebEventsQueue    = "basket-worker"
-	defKVNmspc       = "dev.egommerce/service/basket-worker"
+// defKVNmspc       = "dev.egommerce/service/basket-worker"
 )
 
 func main() {
@@ -44,34 +43,30 @@ func main() {
 		log.Panicln("Error loading .env file", config.ErrLoadingEnvs)
 	}
 
-	c := new(server.Config)
+	c := common.NewConfig()
-	c.AppID, _ = os.Hostname()
+	logHost, logPort, err := fluentd.ParseAddr(c.LoggerAddr)
-	c.AppName = config.GetEnv("APP_NAME", defAppName)
+	if err != nil {
-	c.LoggerAddr = config.GetEnv("LOGGER_ADDR", defLoggerAddr)
+		log.Fatalf("Error parsing logger addr: %s. Err: %v", c.LoggerAddr, err)
-	c.RegistryAddr = config.GetEnv("REGISTRY_ADDR", defRegistryAddr)
+	}
-	c.DbURL = config.GetEnv("DATABASE_URL", defDbURL)
-	c.CacheAddr = config.GetEnv("CACHE_ADDR", defCacheAddr)
-	c.CachePassword = config.GetEnv("CACHE_PASSWORD", defCachePassword)
-	c.EventBusURL = config.GetEnv("EVENTBUS_URL", defEventBusURL)
-	c.EventBusExchange = ebEventsExchange
-	c.EventBusQueue = ebEventsQueue
-	c.KVNamespace = config.GetEnv("APP_KV_NAMESPACE", defKVNmspc)
 
-	logHost, logPort := fluentd.ParseAddr(c.LoggerAddr)
+	logger, err := fluentd.NewLogger(c.GetAppFullName(), logHost, logPort) // @Refactor NewLogger return (logger, error)
-	logger := fluentd.NewLogger(c.GetAppFullName(), logHost, logPort)
+	if err != nil {
+		log.Fatalf("Error connecting to %s:%d. Err: %v", logHost, logPort, err)
+	}
 	defer logger.Close()
 
-	consul, err := discovery.NewService(c.RegistryAddr, c.AppID, c.AppName, c.AppID, "", "", 0)
+	// consul, err := consul.NewService(c.RegistryAddr, c.Base.AppID, c.Base.AppName, c.Base.AppID, "", "", 0)
+	registry, err := consul.NewService(c.RegistryAddr, c.Base.AppID, c.Base.AppName, c.Base.AppID, "", "", 0)
 	if err != nil {
 		logger.Log("Error connecting to %s: %v", c.RegistryAddr, err)
 	}
 
-	go func(consul *discovery.Service) {
+	go func(consul *consul.Service) {
 		ticker := time.NewTicker(time.Second * 15)
 		for range ticker.C {
 			updateKVConfig(consul, c) // FIXME: duplicated in internal/app/server/server.go
 		}
-	}(consul)
+	}(registry)
 
 	// db conn
 	dbConn, err := database.Connect(c.DbURL)
@@ -174,7 +169,7 @@ func main() {
 
 					basket, err := ui.AddProductToBasket(basketSrv, productID, qty, basketID, reqID)
 					if err == nil {
-						logger.Log("Product #%s added to basket #%s. ReqID: #%s", productID, basket.ID, reqID)
+						logger.Log("Product #%d added to basket #%s. ReqID: #%s", productID, basket.ID, reqID)
 					}
 				case strings.Contains(eName, event.EVENT_PRODUCT_REMOVED_FROM_BASKET):
 					productID := int(data["product_id"].(float64))
@@ -182,7 +177,7 @@ func main() {
 
 					basket, err := ui.RemoveProductFromBasket(basketSrv, productID, qty, basketID, reqID)
 					if err == nil {
-						logger.Log("Product #%s removed from basket #%s. ReqID: #%s", productID, basket.ID, reqID)
+						logger.Log("Product #%d removed from basket #%s. ReqID: #%s", productID, basket.ID, reqID)
 					}
 				}
 
@@ -202,21 +197,21 @@ func main() {
 	<-forever
 }
 
-func updateKVConfig(s *discovery.Service, oldCnf *server.Config) error { // FIXME: duplicated in internal/app/server/server.go
+func updateKVConfig(s *consul.Service, oldCnf *common.Config) error { // FIXME: duplicated in internal/app/server/server.go
-	data, _, err := s.KV().Get(oldCnf.KVNamespace, nil)
+	// data, _, err := s.KV().Get(oldCnf.KVNamespace, nil)
-	if err != nil {
+	// if err != nil {
-		return err
+	// 	return err
-	}
+	// }
 
-	if data == nil {
+	// if data == nil {
-		return errors.New("empty KV config data")
+	// 	return errors.New("empty KV config data")
-	}
+	// }
 
-	buf := bytes.NewBuffer(data.Value)
+	// buf := bytes.NewBuffer(data.Value)
-	decoder := json.NewDecoder(buf)
+	// decoder := json.NewDecoder(buf)
-	if err := decoder.Decode(oldCnf); err != nil {
+	// if err := decoder.Decode(oldCnf); err != nil {
-		return err
+	// 	return err
-	}
+	// }
 
 	return nil
 }

src/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	git.pbiernat.dev/egommerce/api-entities v0.0.26
-	git.pbiernat.dev/egommerce/go-api-pkg v0.0.136
+	git.pbiernat.dev/egommerce/go-api-pkg v0.0.150
 	github.com/georgysavva/scany/v2 v2.0.0
 	github.com/go-pg/migrations/v8 v8.1.0
 	github.com/go-pg/pg/v10 v10.10.7

src/go.sum

@@ -3,6 +3,10 @@ git.pbiernat.dev/egommerce/api-entities v0.0.26 h1:Avz02GINwuYWOjw1fmZIJ3QgGEIz3
 git.pbiernat.dev/egommerce/api-entities v0.0.26/go.mod h1:+BXvUcr6Cr6QNpJsW8BUfe1vVILdWDADNE0e3u0lNvU=
 git.pbiernat.dev/egommerce/go-api-pkg v0.0.136 h1:SzJRAkqJKdng/3d0V7o/R0yGh7QaZynPBn/P++on9RA=
 git.pbiernat.dev/egommerce/go-api-pkg v0.0.136/go.mod h1:w2N79aoumjrrcrGPJLkCwxAHtrLd7G4Uj8VOxvPooa0=
+git.pbiernat.dev/egommerce/go-api-pkg v0.0.149 h1:7K4z/XUMAPrnvOPcFfkeeNCpuc5IHoC1Pd68Ht7q9Ts=
+git.pbiernat.dev/egommerce/go-api-pkg v0.0.149/go.mod h1:w2N79aoumjrrcrGPJLkCwxAHtrLd7G4Uj8VOxvPooa0=
+git.pbiernat.dev/egommerce/go-api-pkg v0.0.150 h1:DMM3Kxb6HNw4BExA7Ss7P9ivs+TIeO9DxjfHPKeWrSg=
+git.pbiernat.dev/egommerce/go-api-pkg v0.0.150/go.mod h1:w2N79aoumjrrcrGPJLkCwxAHtrLd7G4Uj8VOxvPooa0=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=

src/internal/app/log.go

@@ -1,20 +0,0 @@
-package app
-
-import (
-	"log"
-)
-
-const AppName = "basket-svc"
-
-func Panic(v ...any) {
-	log.Panicln(AppName+":", v)
-}
-
-func Panicf(format string, v ...any) {
-	log.Panicf(AppName+": "+format, v...)
-}
-
-func Panicln(v ...any) {
-	v = append([]any{AppName + ":"}, v...)
-	log.Panicln(v...)
-}

src/internal/app/server/basket_handler.go

@@ -1,30 +1,31 @@
 package server
 
+// REFACTOR: APP DEDICATED CODE
 import (
 	"context"
 	"time"
 
-	def "git.pbiernat.dev/egommerce/api-entities/http"
+	"git.pbiernat.dev/egommerce/api-entities/http"
 	"git.pbiernat.dev/egommerce/basket-service/internal/app/service"
 	"git.pbiernat.dev/egommerce/basket-service/internal/app/ui"
 	"github.com/gofiber/fiber/v2"
 )
 
 func (s *Server) GetBasketHandler(c *fiber.Ctx) error {
-	req := new(def.GetBasketRequest)
+	req := new(http.GetBasketRequest)
 	if err := c.BodyParser(req); err != nil {
-		return s.Error400(c, err.Error())
+		return s.Base.Error400(c, err.Error())
 	}
 
 	basketID := req.BasketID
-	basketSrv := service.NewBasketService(s.db, s.cache, s.ebCh, s.log)
+	basketSrv := service.NewBasketService(s.Database, s.Cache, s.Eventbus, s.Logger)
 	ctx := context.Background()
 	basket, err := basketSrv.FetchFromDB(ctx, basketID)
 	if err != nil {
-		return s.Error400(c, "Failed to retrieve basket")
+		return s.Base.Error400(c, "Failed to retrieve basket")
 	}
 
-	res := &def.GetBasketResponse{
+	res := &http.GetBasketResponse{
 		ID:        basket.ID,
 		State:     basket.State,
 		CreatedAt: time.Duration(basket.CreatedAt.Time.Unix()),
@@ -38,16 +39,16 @@ func (s *Server) GetBasketHandler(c *fiber.Ctx) error {
 
 func (s *Server) GetBasketItemsHandler(c *fiber.Ctx) error {
 	basketID := c.Params("basketId", "")
-	basketSrv := service.NewBasketService(s.db, s.cache, s.ebCh, s.log)
+	basketSrv := service.NewBasketService(s.Database, s.Cache, s.Eventbus, s.Logger)
 	ctx := context.Background()
 	items, err := basketSrv.FetchItems(ctx, basketID)
 	if err != nil {
-		return s.Error400(c, "Failed to retrieve basket items")
+		return s.Base.Error400(c, "Failed to retrieve basket items")
 	}
 
-	var res []*def.GetBasketItemsResponse // FIXME
+	var res []*http.GetBasketItemsResponse
 	for _, item := range items {
-		resItem := &def.GetBasketItemsResponse{
+		resItem := &http.GetBasketItemsResponse{
 			ID:        item.ID,
 			BasketID:  item.BasketID,
 			ProductID: item.ProductID,
@@ -65,17 +66,17 @@ func (s *Server) GetBasketItemsHandler(c *fiber.Ctx) error {
 }
 
 func (s *Server) CheckoutHandler(c *fiber.Ctx) error {
-	reqID, _ := s.GetRequestID(c)
+	reqID, _ := s.Base.GetRequestID(c)
-	req := new(def.BasketCheckoutRequest)
+	req := new(http.BasketCheckoutRequest)
 	if err := c.BodyParser(req); err != nil {
-		return s.Error400(c, err.Error())
+		return s.Base.Error400(c, err.Error())
 	}
 
 	basketID := req.BasketID
-	basketSrv := service.NewBasketService(s.db, s.cache, s.ebCh, s.log)
+	basketSrv := service.NewBasketService(s.Database, s.Cache, s.Eventbus, s.Logger)
 	res, err := ui.CheckoutBasket(basketSrv, basketID, reqID)
 	if err != nil {
-		return s.Error400(c, "Failed to create order")
+		return s.Base.Error400(c, "Failed to create order")
 	}
 
 	return c.JSON(res)

src/internal/app/server/config.go

@@ -1,32 +0,0 @@
-package server
-
-import "fmt"
-
-type Config struct {
-	AppID        string
-	AppName      string
-	AppDomain    string
-	PathPrefix   string
-	NetAddr      string
-	Port         int
-	RegistryAddr string
-	KVNamespace  string
-
-	LoggerAddr       string `json:"logger_addr"`
-	DbURL            string `json:"db_url"`
-	CacheAddr        string `json:"cache_addr"`
-	CachePassword    string `json:"cache_password"`
-	MongoDbUrl       string `json:"mongodb_url"`
-	EventBusURL      string `json:"eventbus_url"`
-	EventBusExchange string `json:"eventbus_exchange"`
-	EventBusQueue    string `json:"eventbus_queue"`
-
-	HttpReadTimeout  int `json:"http_read_timeout"`
-	HttpWriteTimeout int `json:"http_write_timeout"`
-	HttpIdleTimeout  int `json:"http_idle_timeout"`
-	// Fields with json mapping are available trough ConsulKV
-}
-
-func (c *Config) GetAppFullName() string {
-	return fmt.Sprintf("%s_%s", c.AppName, c.AppID)
-}

src/internal/app/server/health_handler.go

@@ -1,17 +1,18 @@
 package server
 
+// REFACTOR: UNIVERSAL SERVER CODE
 import (
 	"github.com/gofiber/fiber/v2"
 
-	def "git.pbiernat.dev/egommerce/api-entities/http"
+	"git.pbiernat.dev/egommerce/api-entities/http"
 )
 
-func (s *Server) HealthHandler(c *fiber.Ctx) error {
+func (s *Server) HealthHandler(c *fiber.Ctx) error { // TODO add necessary logic
-	return c.JSON(&def.HealthResponse{
+	return c.JSON(&http.HealthResponse{
-		Status: "OK",
+		Status: "OKa",
 	})
 }
 
 func (s *Server) ConfigHandler(c *fiber.Ctx) error {
-	return c.JSON(s.conf)
+	return c.JSON(s.Config)
 }

src/internal/app/server/middleware.go

@@ -0,0 +1,33 @@
+package server
+
+import (
+	"strings"
+
+	"github.com/gofiber/fiber/v2"
+
+	"git.pbiernat.dev/egommerce/go-api-pkg/fluentd"
+)
+
+// "github.com/gofiber/fiber/v2"
+// "github.com/gofiber/fiber/v2/middleware/cors"
+
+func SetupMiddleware(s *Server) {
+	s.Base.Use(defaultCORS)
+	s.Base.Use(LoggingMiddleware(s.Logger))
+}
+
+func LoggingMiddleware(log *fluentd.Logger) func(c *fiber.Ctx) error {
+	return func(c *fiber.Ctx) error {
+		path := string(c.Request().URI().Path())
+		if strings.Contains(path, "/health") {
+			return c.Next()
+		}
+
+		log.Log("Request: %s, remote: %s, via: %s",
+			c.Request().URI().String(),
+			c.Context().RemoteIP().String(),
+			string(c.Context().UserAgent()))
+
+		return c.Next()
+	}
+}

src/internal/app/server/router.go

@@ -1,10 +1,9 @@
 package server
 
+// REFACTOR: APP DEDICATED CODE
 import (
 	"net/http"
-	"strings"
 
-	"git.pbiernat.dev/egommerce/go-api-pkg/fluentd"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
 )
@@ -18,24 +17,19 @@ var (
 	})
 )
 
-func SetupRoutes(s *Server) {
+func SetupRouter(s *Server) {
-	s.App.Options("*", defaultCORS)
+	s.Base.Options("*", defaultCORS)
 
-	s.App.Get("/health", s.HealthHandler)
+	s.Base.Get("/health", s.HealthHandler)
-	s.App.Get("/config", s.ConfigHandler)
+	s.Base.Get("/config", s.ConfigHandler)
 
-	api := s.App.Group("/api")
+	api := s.Base.Group("/api")
 	v1 := api.Group("/v1")
 	v1.Get("/basket", s.GetBasketHandler)
 	v1.Get("/basket/:basketId/items", s.GetBasketItemsHandler)
 	v1.Post("/checkout", s.CheckoutHandler)
 }
 
-func SetupMiddlewares(s *Server) {
-	s.App.Use(defaultCORS)
-	s.App.Use(LoggingMiddleware(s.log))
-}
-
 func CORSPreflightMiddleware(c *fiber.Ctx) error {
 	if string(c.Request().Header.Method()) == http.MethodOptions {
 		c.Response().SetStatusCode(http.StatusOK)
@@ -44,20 +38,3 @@ func CORSPreflightMiddleware(c *fiber.Ctx) error {
 
 	return c.Next()
 }
-
-// Middlewares
-func LoggingMiddleware(log *fluentd.Logger) func(c *fiber.Ctx) error {
-	return func(c *fiber.Ctx) error {
-		path := string(c.Request().URI().Path())
-		if strings.Contains(path, "/health") {
-			return c.Next()
-		}
-
-		log.Log("Request: %s, remote: %s, via: %s",
-			c.Request().URI().String(),
-			c.Context().RemoteIP().String(),
-			string(c.Context().UserAgent()))
-
-		return c.Next()
-	}
-}

src/internal/app/server/server.go

@@ -4,73 +4,147 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
+	"log"
 	"os"
-	"os/signal"
+	"strconv"
-	"syscall"
 	"time"
 
 	"github.com/go-redis/redis/v8"
-	"github.com/gofiber/fiber/v2"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/streadway/amqp"
 
-	def "git.pbiernat.dev/egommerce/api-entities/http"
+	"git.pbiernat.dev/egommerce/go-api-pkg/consul"
-	discovery "git.pbiernat.dev/egommerce/go-api-pkg/consul"
 	"git.pbiernat.dev/egommerce/go-api-pkg/fluentd"
+
+	db "git.pbiernat.dev/egommerce/basket-service/pkg/database"
+	srv "git.pbiernat.dev/egommerce/basket-service/pkg/server"
+
+	"git.pbiernat.dev/egommerce/basket-service/internal/common"
 )
 
-type Server struct {
+type (
-	*fiber.App
+	Server struct {
-	conf      *Config
+		Base   *srv.Server
-	log       *fluentd.Logger
+		Config *common.Config
-	db        *pgxpool.Pool
+
-	cache     *redis.Client
+		Cache    *redis.Client
-	ebCh      *amqp.Channel
+		Database *pgxpool.Pool
-	discovery *discovery.Service
+		Eventbus *amqp.Channel
-	name      string
+		Logger   *fluentd.Logger
-	addr      string
+		Registry *consul.Service
+
 		kvNmspc string
+	}
+
+	OptionFn func(*Server) error
+)
+
+func New(c *common.Config, opts ...OptionFn) *Server {
+	svr := &Server{
+		Base: srv.New(c.Base),
+	}
+
+	for _, opt := range opts {
+		if err := opt(svr); err != nil {
+			log.Fatalf("Failed to start HTTP Server. Err: %v\n", err)
+		}
+	}
+
+	SetupMiddleware(svr)
+	SetupRouter(svr)
+
+	return svr
 }
 
-type Headers struct {
+func WithCache(c *common.Config) OptionFn {
-	RequestID string `reqHeader:"x-request-id"`
+	redis := redis.NewClient(&redis.Options{
+		Addr:     c.CacheAddr,
+		Password: c.CachePassword,
+		DB:       0,
+	})
+
+	return func(s *Server) error {
+		s.Cache = redis
+
+		return nil
+	}
+	// defer redis.Close()
 }
 
-func NewServer(conf *Config, logger *fluentd.Logger, db *pgxpool.Pool, cache *redis.Client, ebCh *amqp.Channel) *Server {
+func WithDatabase(c *common.Config) OptionFn {
-	consul, err := discovery.NewService(conf.RegistryAddr, conf.AppID, conf.AppName, conf.AppID, conf.AppDomain, conf.PathPrefix, conf.Port)
+	dbConn, err := db.Connect(c.DbURL)
 	if err != nil {
-		logger.Log("Error connecting to %s: %v", conf.RegistryAddr, err)
+		log.Fatalf("Failed to connect to the Database: %s. Err: %v\n", c.DbURL, err)
+		os.Exit(1)
 	}
 
-	logger.Log("Registering service with name: %s, address: %s", consul.Name, consul.Address)
+	return func(s *Server) error {
-	err = consul.Register()
+		s.Database = dbConn
+
+		return nil
+	}
+	// defer dbConn.Close()
+}
+
+func WithEventbus(c *common.Config) OptionFn {
+	conn, err := amqp.Dial(c.EventBusURL)
 	if err != nil {
-		logger.Log("register error: %v", err)
+		log.Fatalf("Failed to connect to the Eventbus: %s. Err: %v\n", c.EventBusURL, err)
 	}
 
-	cnf := fiber.Config{
+	chn, err := conn.Channel()
-		AppName:      conf.AppName,
+	if err != nil {
-		ServerHeader: conf.AppName,
+		log.Fatalf("Failed to open new Eventbus channel. Err: %v\n", err)
-		ReadTimeout:  time.Millisecond * 50,
-		WriteTimeout: time.Millisecond * 50,
-		IdleTimeout:  time.Millisecond * 50,
 	}
-	s := &Server{
+
-		fiber.New(cnf),
+	return func(s *Server) error {
-		conf,
+		s.Eventbus = chn
-		logger,
+
-		db,
+		return nil
-		cache,
-		ebCh,
-		consul,
-		conf.AppName,
-		conf.NetAddr,
-		conf.KVNamespace,
 	}
 
+	// defer ebCh.Close()
+	// defer amqp.Close(ebConn)
+}
+
+func WithLogger(c *common.Config) OptionFn {
+	logHost, logPort, err := fluentd.ParseAddr(c.LoggerAddr)
+	if err != nil {
+		log.Fatalf("Failed to parse Fluentd address: %s. Err: %v", c.LoggerAddr, err)
+	}
+
+	logger, err := fluentd.NewLogger(c.GetAppFullName(), logHost, logPort)
+	if err != nil {
+		log.Fatalf("Failed to connect to the Fluentd on %s:%d. Err: %v", logHost, logPort, err)
+	}
+
+	return func(s *Server) error {
+		s.Logger = logger
+
+		return nil
+	}
+	// defer logger.Close()
+}
+
+func WithRegistry(c *common.Config) OptionFn {
+	// fmt.Printf("WithRegistry constructor: config: %v", c.Base)
+	port, _ := strconv.Atoi(c.Base.NetAddr[1:]) // FIXME: can be IP:PORT which now will cause error
+	registry, err := consul.NewService(c.RegistryAddr, c.Base.AppID, c.Base.AppName, c.Base.AppID, c.Base.AppName, c.Base.PathPrefix, port)
+	if err != nil {
+		log.Fatalf("Failed to connect to the Consul on: %s. Err: %v", c.RegistryAddr, err)
+	}
+
+	err = registry.Register()
+	if err != nil {
+		log.Fatalf("Failed to register in the Consul service. Err: %v", err)
+	}
+
+	return func(s *Server) error {
+		s.Registry = registry
+
 		go func(s *Server) { // Consul KV updater
-		interval := time.Second * 15
+			ticker := time.NewTicker(time.Second * 15)
-		ticker := time.NewTicker(interval)
 			for range ticker.C {
 				s.updateKVConfig()
 			}
@@ -83,98 +157,105 @@ func NewServer(conf *Config, logger *fluentd.Logger, db *pgxpool.Pool, cache *re
 			}
 		}(s)
 
-	SetupMiddlewares(s)
+		return nil
-	SetupRoutes(s)
+	}
-
-	return s
 }
 
-// func (s *Server) Start() {
+// REFACTOR IN PROGRESS
-// 	err := s.Listen(s.addr)
+// func (s *Server) Shutdown() error {
-// 	s.log.Log("Starting error: %v", err)
+// 	s.Logger.Log("Server is going down... Unregistering service: %s", s.Discovery.GetID())
+// 	s.Discovery.Unregister()
+// 	s.clearMetadataCache()
+
+// 	s.Cache.Close()
+// 	s.Database.Close()
+// 	s.Eventbus.Close()
+// 	s.Logger.Close()
+
+// 	return nil
 // }
 
-func (s *Server) StartWithGracefulShutdown(forever chan struct{}) {
+func (s *Server) Shutdown() srv.PurgeFn {
-	go func() {
+	return func(srv *srv.Server) error {
-		sigint := make(chan os.Signal, 1)
+		fmt.Printf("%v", s.Base)
-		signal.Notify(sigint, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
+		// s.Logger.Log("Server is going down... Unregistering service: %s", s.Base.AppID)
-		<-sigint
+		s.Logger.Log("Server is going down... Unregistering service...")
 
-		if err := s.gracefulShutdown(); err != nil {
+		s.Registry.Unregister()
-			s.log.Log("Server is not shutting down! Reason: %v", err)
+		s.clearMetadataCache()
+		s.Eventbus.Close()
+		s.Database.Close()
+		s.Logger.Close()
+
+		return s.Base.Shutdown()
 	}
-
-		close(forever)
-	}()
-
-	if err := s.Listen(s.addr); err != nil {
-		s.log.Log("Server is not running! Reason: %v", err)
-	}
-
-	<-forever
 }
 
-func (s *Server) GetRequestID(c *fiber.Ctx) (string, error) {
+// END: REFACTOR IN PROGRESS
-	var hdr = new(Headers)
-	if err := c.ReqHeaderParser(hdr); err != nil {
-		return "", err
-	}
 
-	return hdr.RequestID, nil
+// @CHECK: merge s.Config and s.Base.Config to display all config as one array/map
-}
+func (s *Server) updateKVConfig() {
-
+	config, _, err := s.Registry.KV().Get(s.kvNmspc, nil)
-func (s *Server) Error400(c *fiber.Ctx, msg string) error {
-	return c.Status(fiber.StatusBadRequest).JSON(&def.ErrorResponse{Error: msg})
-}
-
-func (s *Server) Error404(c *fiber.Ctx, msg string) error {
-	return c.Status(fiber.StatusNotFound).JSON(&def.ErrorResponse{Error: msg})
-}
-
-func (s *Server) updateKVConfig() { // FIXME: duplicated in cmd/worker/main.go
-	config, _, err := s.discovery.KV().Get(s.kvNmspc, nil)
 	if err != nil || config == nil {
 		return
 	}
 
 	kvCnf := bytes.NewBuffer(config.Value)
 	decoder := json.NewDecoder(kvCnf)
-	if err := decoder.Decode(&s.conf); err != nil {
+	if err := decoder.Decode(&s.Config); err != nil {
 		return
 	}
 }
 
 func (s *Server) cacheMetadata() {
-	ctx := context.Background()
+	ctx := context.TODO()
-	key, address := s.getMetadataIPsKey(), s.conf.AppID
+	key, address := s.getMetadataIPsKey(), s.Base.Config.AppID
 
-	pos := s.cache.LPos(ctx, key, address, redis.LPosArgs{}).Val()
+	pos := s.Cache.LPos(ctx, key, address, redis.LPosArgs{}).Val()
 	if pos >= 0 {
-		s.cache.LRem(ctx, key, 0, address)
+		s.Cache.LRem(ctx, key, 0, address)
 	}
 
-	s.cache.LPush(ctx, key, address).Err()
+	s.Cache.LPush(ctx, key, address).Err()
 }
 
 func (s *Server) clearMetadataCache() {
-	ctx := context.Background()
+	ctx := context.TODO()
-	key, address := s.getMetadataIPsKey(), s.conf.AppID
+	fmt.Printf("metadata: %v", s.Config.Base)
+	key, address := s.getMetadataIPsKey(), s.Config.Base.AppID
 
-	s.cache.LRem(ctx, key, 0, address)
+	s.Cache.LRem(ctx, key, 0, address)
 }
 
 func (s *Server) getMetadataIPsKey() string {
-	return "internal__" + s.conf.AppName + "__ips"
+	return "internal__" + s.Base.Config.AppName + "__ips"
 }
 
-func (s *Server) gracefulShutdown() error {
+//
-	s.log.Log("Server is going down... Unregistering service: %s", s.discovery.GetID())
+//
-	s.discovery.Unregister()
+//
-	s.clearMetadataCache()
+//// OLD CODE TO BE REMOVED
+// func NewServer(conf *Config, logger *fluentd.Logger, db *pgxpool.Pool, cache *redis.Client, ebCh *amqp.Channel) *Server {
 
-	s.ebCh.Close()
+// cnf := fiber.Config{
-	s.db.Close()
+// 	AppName:      conf.AppName,
-	s.log.Close()
+// 	ServerHeader: conf.AppName,
+// 	ReadTimeout:  conf.ReadTimeout * time.Millisecond,
+// 	WriteTimeout: conf.WriteTimeout * time.Millisecond,
+// 	IdleTimeout:  conf.IdleTimeout * time.Millisecond,
+// }
+// s := &Server{
+// 	fiber.New(cnf),
+// 	conf,
+// 	logger,
+// 	db,
+// 	cache,
+// 	ebCh,
+// 	consul,
+// 	conf.AppName,
+// 	conf.NetAddr,
+// 	conf.KVNamespace,
+// }
 
-	return s.Shutdown()
+// return s
-}
+// }

src/internal/app/service/basket.go

@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	SERVICE_USER_AGENT = "basket-httpclient"
+	ServiceUserAgent = "basket-httpclient"
 )
 
 type BasketService struct {
@@ -82,7 +82,7 @@ func (s *BasketService) FetchItem(ctx context.Context, basketID string, productI
 
 func (s *BasketService) AddItem(ctx context.Context, itemID int, basketID string, qty int) error {
 	var price float64 = 0
-	pricingAPI := api.NewPricingAPI(SERVICE_USER_AGENT, s.redis)
+	pricingAPI := api.NewPricingAPI(ServiceUserAgent, s.redis)
 
 	productPrice, err := pricingAPI.GetProductPrice(itemID)
 	if err == nil {
@@ -112,7 +112,7 @@ func (s *BasketService) RemoveItem(ctx context.Context, itemID int, basketID str
 
 func (s *BasketService) UpdateItem(ctx context.Context, item *model.BasketItemModel, qty int) error {
 	var price float64 = 0
-	pricingAPI := api.NewPricingAPI(SERVICE_USER_AGENT, s.redis)
+	pricingAPI := api.NewPricingAPI(ServiceUserAgent, s.redis)
 
 	productPrice, err := pricingAPI.GetProductPrice(item.ProductID)
 	if err == nil {

src/internal/common/config.go

@@ -0,0 +1,84 @@
+package common
+
+import (
+	"fmt"
+	"os"
+
+	cnf "git.pbiernat.dev/egommerce/basket-service/pkg/config"
+	srv "git.pbiernat.dev/egommerce/basket-service/pkg/server"
+)
+
+const (
+	// defAppDomain     = "basket-svc"
+	defAppName          = "basket-svc"
+	defCacheAddr        = "api-cache:6379"
+	defCachePassword    = "12345678"
+	defDbURL            = "postgres://postgres:12345678@postgres-db:5432/egommerce"
+	defEventBusURL      = "amqp://guest:guest@api-eventbus:56721"
+	defKVNmspc          = "dev.egommerce/service/basket-svc"
+	defLoggerAddr       = "api-logger:24224"
+	defNetAddr          = ":80"
+	defMongoDbURL       = "mongodb://mongodb:12345678@mongo-db:27017"
+	defPathPrefix       = "/basket"
+	defRegistryAddr     = "api-registry:8500"
+	defEbEventsExchange = "api-events"
+	defEbEventsQueue    = "basket-svc"
+)
+
+type Config struct {
+	Base *srv.Config
+	// AppID      string
+	// AppName    string
+	// NetAddr    string
+	// PathPrefix string
+
+	// IdleTimeout  time.Duration `json:"idle_timeout"`  // miliseconds
+	// ReadTimeout  time.Duration `json:"read_timeout"`  // miliseconds
+	// WriteTimeout time.Duration `json:"write_timeout"` // miliseconds
+
+	DbURL            string `json:"db_url"`
+	CacheAddr        string `json:"cache_addr"`
+	CachePassword    string `json:"cache_password"`
+	EventBusExchange string `json:"eventbus_exchange"`
+	EventBusQueue    string `json:"eventbus_queue"`
+	EventBusURL      string `json:"eventbus_url"`
+	LoggerAddr       string `json:"logger_addr"`
+	RegistryAddr     string
+
+	// Fields with JSON mappings are available through Consul KV storage
+
+	// 	Port             int
+	// 	KVNamespace      string
+	// 	MongoDbUrl       string `json:"mongodb_url"`
+	// 	HttpReadTimeout  int    `json:"http_read_timeout"`
+	// 	HttpWriteTimeout int    `json:"http_write_timeout"`
+	// 	HttpIdleTimeout  int    `json:"http_idle_timeout"`
+}
+
+func NewConfig() *Config {
+	c := new(Config)
+	c.Base = new(srv.Config)
+
+	c.Base.AppID, _ = os.Hostname()
+	c.Base.AppName = cnf.GetEnv("APP_NAME", defAppName)
+	c.Base.NetAddr = cnf.GetEnv("SERVER_ADDR", defNetAddr)
+	c.Base.PathPrefix = cnf.GetEnv("APP_PATH_PREFIX", defPathPrefix)
+
+	c.CacheAddr = cnf.GetEnv("CACHE_ADDR", defCacheAddr)
+	c.CachePassword = cnf.GetEnv("CACHE_PASSWORD", defCachePassword)
+	c.DbURL = cnf.GetEnv("DATABASE_URL", defDbURL)
+	c.EventBusExchange = defEbEventsExchange
+	c.EventBusURL = cnf.GetEnv("EVENTBUS_URL", defEventBusURL)
+	c.LoggerAddr = cnf.GetEnv("LOGGER_ADDR", defLoggerAddr)
+	c.RegistryAddr = cnf.GetEnv("REGISTRY_ADDR", defRegistryAddr)
+
+	return c
+}
+
+func (c *Config) GetAppFullName() string {
+	return fmt.Sprintf("%s_%s", c.Base.AppName, c.Base.AppID) // @TODO check if Base prop can be private
+}
+
+func (c *Config) GetListenAddr() string {
+	return "" // @TODO: Implement me!
+}

src/pkg/config/config.go

@@ -12,7 +12,7 @@ func init() {
 	ErrLoadingEnvs = godotenv.Load()
 }
 
-func GetEnv(name string, defVal string) string { // FIXME defVal and return types
+func GetEnv(name string, defVal string) string {
 	env := os.Getenv(name)
 	if env == "" {
 		return defVal

src/pkg/server/config.go

@@ -0,0 +1,21 @@
+package server
+
+import (
+	"fmt"
+	"time"
+)
+
+type Config struct {
+	AppID      string
+	AppName    string
+	NetAddr    string
+	PathPrefix string
+
+	IdleTimeout  time.Duration // miliseconds
+	ReadTimeout  time.Duration // miliseconds
+	WriteTimeout time.Duration // miliseconds
+}
+
+func (c *Config) GetAppFullName() string {
+	return fmt.Sprintf("%s_%s", c.AppName, c.AppID)
+}

src/pkg/server/server.go

@@ -0,0 +1,101 @@
+package server
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+
+	"git.pbiernat.dev/egommerce/api-entities/http"
+)
+
+type (
+	HeaderRequestID struct {
+		RequestID string `reqHeader:"x-request-id"`
+	}
+	Server struct {
+		*fiber.App
+		*Config
+
+		addr string // e.g. "127.0.0.1:8080"
+
+		// name string // e.g. "awesome-rest-api"
+		// kvNmspc   string
+		// cache     *redis.Client
+		// db        *pgxpool.Pool
+		// discovery *discovery.Service
+		// ebCh      *amqp.Channel
+		// log       *fluentd.Logger
+	}
+	PurgeFn func(*Server) error
+)
+
+func New(conf *Config) *Server {
+	return &Server{
+		App: fiber.New(fiber.Config{
+			AppName:      conf.AppID,
+			ServerHeader: conf.AppName,
+			ReadTimeout:  conf.ReadTimeout * time.Millisecond,
+			WriteTimeout: conf.WriteTimeout * time.Millisecond,
+			IdleTimeout:  conf.IdleTimeout * time.Millisecond,
+		}),
+		addr: conf.NetAddr,
+	}
+}
+
+func (s *Server) GetRequestID(c *fiber.Ctx) (string, error) {
+	var hdr = new(HeaderRequestID)
+	if err := c.ReqHeaderParser(hdr); err != nil {
+		return "", err
+	}
+
+	return hdr.RequestID, nil
+}
+
+// @Refactor make single func with error message and optional http status code...
+func (s *Server) Error400(c *fiber.Ctx, msg string) error {
+	return c.Status(fiber.StatusBadRequest).JSON(http.ErrorResponse{Error: msg})
+	// test with &(reference) before http.ErrorMessage, but probably it's gonna be erroneous
+}
+
+func (s *Server) Error401(c *fiber.Ctx, msg string) error {
+	return c.Status(fiber.StatusUnauthorized).JSON(http.ErrorResponse{Error: msg})
+}
+
+func (s *Server) Error403(c *fiber.Ctx, msg string) error {
+	return c.Status(fiber.StatusForbidden).JSON(http.ErrorResponse{Error: msg})
+}
+
+func (s *Server) Error404(c *fiber.Ctx, msg string) error {
+	return c.Status(fiber.StatusNotFound).JSON(http.ErrorResponse{Error: msg})
+}
+
+// @EndRefactor
+
+func (s *Server) Start(forever chan struct{}, prgFn PurgeFn) error {
+	go func() {
+		fmt.Println("Starting...")
+		sigint := make(chan os.Signal, 1)
+		signal.Notify(sigint, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
+		<-sigint
+
+		fmt.Println("shutting down: after term signal.")
+		if err := prgFn(s); err != nil {
+			log.Fatalf("Failed to shutdown server. Reason: %v\n", err)
+		}
+
+		close(forever)
+	}()
+
+	err := s.Listen(s.addr)
+	<-forever
+	// if err := s.Listen(s.addr); err != nil {
+	// 	s.logger.Log("Failed to start server! Reason: %v\n", err)
+	// }
+
+	return err
+}