Merge branch 'KKGo-Software-engineering:main' into main

.env.template

@@ -1,6 +1,6 @@
 ENV=LOCAL
-LOCAL_DATABASE_POSTGRES_URI=postgres://postgres:password@db:5432/hongjot?sslmode=disable
+LOCAL_DATABASE_POSTGRES_URI=postgres://postgres:password@localhost:5432/hongjot?sslmode=disable
 LOCAL_SERVER_PORT=8080
 
 # Features Flags
-LOCAL_ENABLE_CREATE_SPENDER=false
+LOCAL_ENABLE_CREATE_SPENDER=false

api/config/config.go

@@ -21,7 +21,7 @@ func (c Config) PostgresURI() string {
 }
 
 type Server struct {
-	Port string `env:"SERVER_PORT"`
+	Port string `env:"SERVER_PORT" envDefault:"3000"`
 }
 
 type Database struct {
@@ -61,31 +61,25 @@ func parse(envPrefix string) (Config, error) {
 		Prefix: prefix(envPrefix),
 	}
 
-	dbconf := &Database{}
-	if err := env.ParseWithOptions(dbconf, opts); err != nil {
+	dbconf := Database{}
+	if err := env.ParseWithOptions(&dbconf, opts); err != nil {
 		return Config{}, errors.New("failed to parse database config:" + err.Error())
 	}
 
-	feats := &FeatureFlag{}
-	if err := env.ParseWithOptions(feats, opts); err != nil {
+	feats := FeatureFlag{}
+	if err := env.ParseWithOptions(&feats, opts); err != nil {
 		return Config{}, errors.New("failed to parse feature flag config:" + err.Error())
 	}
 
-	port := Env("SERVER_PORT")
-	if port == "" {
-		port = "8080"
+	sev := Server{}
+	if err := env.ParseWithOptions(&sev, opts); err != nil {
+		return Config{}, errors.New("failed to parse server config:" + err.Error())
 	}
 
 	return Config{
-		Database: Database{
-			PostgresURI: dbconf.PostgresURI,
-		},
-		Server: Server{
-			Port: port,
-		},
-		FeatureFlag: FeatureFlag{
-			EnableCreateSpender: feats.EnableCreateSpender,
-		},
+		Database:    dbconf,
+		Server:      sev,
+		FeatureFlag: feats,
 	}, nil
 }
 

infra/iac/main.tf

@@ -20,7 +20,7 @@ module "eks" {
   min_size             = 2
   subdomains           = var.cf_subdomains
   batch_no             = var.workshop_batch_no
-  capacity_type        = "SPOT"
+  capacity_type        = "ON_DEMAND"
   vpc_id               = module.vpc.vpc_id
   igw_id               = module.vpc.igw_id
   nat_id               = module.vpc.nat_id

makefile

@@ -13,6 +13,13 @@ test-it:
 	@echo "Running integration tests..."
 	go test -v -run "Test.*IT" -tags=integration ./...
 
+.PHONY: test-cover
+test-cover:
+	@echo "Running tests with coverage..."
+	go test -v ./... -coverprofile=coverage.out ./...
+	@echo "Open Html report"
+	go tool cover -html=coverage.out
+
 .PHONY: test-it-docker
 test-it-docker:
 	docker-compose -f docker-compose.it.test.yaml down && \