Initial
This commit is contained in:
106
app/lib/cfg/cfg.go
Normal file
106
app/lib/cfg/cfg.go
Normal file
@ -0,0 +1,106 @@
|
||||
package cfg
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/kelseyhightower/envconfig"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
type ServiceConfig struct {
|
||||
Address string `yaml:"address"`
|
||||
Port int `yaml:"port"`
|
||||
}
|
||||
|
||||
type DatabaseConfig struct {
|
||||
Host string `yaml:"host"`
|
||||
Port string `yaml:"port"`
|
||||
Name string `yaml:"name"`
|
||||
Username string `yaml:"username"`
|
||||
Password string `yaml:"password" json:"-"`
|
||||
DebugSQL bool `yaml:"debugSQL"`
|
||||
}
|
||||
|
||||
type ApplicationConfig struct {
|
||||
LogLevel string `yaml:"logLevel"`
|
||||
LogFile string `yaml:"logFile"`
|
||||
Debug bool `yaml:"debug"`
|
||||
DebugPrint bool `yaml:"debugPrint"`
|
||||
DisableSendMail bool `yaml:"disableSendMail"`
|
||||
IsProduction bool `yaml:"isProduction"`
|
||||
MetricsPrefix string `yaml:"metricsPrefix"`
|
||||
}
|
||||
|
||||
type S3StorageConfig struct {
|
||||
AccessKey string `yaml:"accessKey"`
|
||||
SecretKey string `yaml:"secretKey"`
|
||||
RegionName string `yaml:"regionName"`
|
||||
EndpointUrl string `yaml:"endpointUrl"`
|
||||
BucketName string `yaml:"bucketName"`
|
||||
CertPath string `yaml:"certPath"`
|
||||
}
|
||||
|
||||
type CertConfig struct {
|
||||
FinaDemoCaCert string `yaml:"finaDemoCaCert"`
|
||||
FinaProdCaCert string `yaml:"finaProdCaCert"`
|
||||
DemoCertOib string `yaml:"demoCertOib"`
|
||||
}
|
||||
|
||||
type configStruct struct {
|
||||
Service ServiceConfig `yaml:"service"`
|
||||
Database DatabaseConfig `yaml:"database"`
|
||||
Application ApplicationConfig `yaml:"application"`
|
||||
S3Storage S3StorageConfig `yaml:"s3storage"`
|
||||
Cert CertConfig `yaml:"cert"`
|
||||
}
|
||||
|
||||
const ENV_PREFIX = "FISKALATOR"
|
||||
const ENV_CONFIG = ENV_PREFIX + "_CONFIG"
|
||||
const DEFAULT_CONFIG_FILE = "config.yaml"
|
||||
|
||||
var Config configStruct
|
||||
|
||||
func panicWithError(err error) {
|
||||
panic("Config file error: " + err.Error())
|
||||
}
|
||||
|
||||
func readFile(cfgFile string, cfg *configStruct) {
|
||||
f, err := os.Open(cfgFile)
|
||||
if err != nil {
|
||||
panicWithError(err)
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
decoder := yaml.NewDecoder(f)
|
||||
err = decoder.Decode(cfg)
|
||||
if err != nil {
|
||||
panicWithError(err)
|
||||
}
|
||||
}
|
||||
|
||||
func readEnv(cfg *configStruct) {
|
||||
err := envconfig.Process(ENV_PREFIX, cfg)
|
||||
if err != nil {
|
||||
panicWithError(err)
|
||||
}
|
||||
}
|
||||
|
||||
func Init() {
|
||||
cfgFile := os.Getenv(ENV_CONFIG)
|
||||
if cfgFile == "" {
|
||||
cfgFile = DEFAULT_CONFIG_FILE
|
||||
}
|
||||
|
||||
readFile(cfgFile, &Config)
|
||||
readEnv(&Config)
|
||||
|
||||
maskedCfg := Config
|
||||
maskedCfg.Database.Password = "**password hidden**"
|
||||
maskedCfg.S3Storage.AccessKey = "**access key hidden**"
|
||||
maskedCfg.S3Storage.SecretKey = "**secret key hidden**"
|
||||
|
||||
fmt.Println("--- CONFIG -------------------------------")
|
||||
fmt.Printf("%+v\n", maskedCfg)
|
||||
fmt.Println("------------------------------------------")
|
||||
}
|
||||
65
app/lib/db/db.go
Normal file
65
app/lib/db/db.go
Normal file
@ -0,0 +1,65 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"repo-pattern/app/lib/cfg"
|
||||
"repo-pattern/app/lib/logging"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/gorm"
|
||||
gormLogger "gorm.io/gorm/logger"
|
||||
)
|
||||
|
||||
const CONNECTION_MAX_IDLE_TIME = time.Minute * 1
|
||||
const DB_CONNECTION_TIMEOUT = 5
|
||||
|
||||
var DBConn *gorm.DB
|
||||
|
||||
func ConnectToDb(config *cfg.DatabaseConfig) (*gorm.DB, error) {
|
||||
var connectionString = strings.Join([]string{
|
||||
"postgres://",
|
||||
config.Username, ":",
|
||||
config.Password, "@",
|
||||
config.Host, ":",
|
||||
config.Port, "/",
|
||||
config.Name,
|
||||
"?sslmode=disable",
|
||||
"&TimeZone=UTC",
|
||||
"&connect_timeout=", strconv.Itoa(DB_CONNECTION_TIMEOUT),
|
||||
}, "")
|
||||
|
||||
var logLevel gormLogger.LogLevel
|
||||
if config.DebugSQL {
|
||||
logLevel = gormLogger.Info
|
||||
} else {
|
||||
logLevel = gormLogger.Silent
|
||||
}
|
||||
|
||||
conn, err := gorm.Open(postgres.Open(connectionString), &gorm.Config{
|
||||
Logger: gormLogger.Default.LogMode(logLevel),
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return conn, nil
|
||||
}
|
||||
|
||||
func InitDB() *gorm.DB {
|
||||
var err error
|
||||
DBConn, err = ConnectToDb(&cfg.Config.Database)
|
||||
if err != nil {
|
||||
msg := fmt.Sprintf("Error connecting to database: %s. Terminating!", err)
|
||||
logging.Log.Error(msg)
|
||||
panic(msg)
|
||||
}
|
||||
|
||||
// set connection autodisconnect after idle time
|
||||
db, _ := DBConn.DB()
|
||||
db.SetConnMaxIdleTime(CONNECTION_MAX_IDLE_TIME)
|
||||
|
||||
return DBConn
|
||||
}
|
||||
39
app/lib/helpers/factory.go
Normal file
39
app/lib/helpers/factory.go
Normal file
@ -0,0 +1,39 @@
|
||||
package helpers
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type Factory struct {
|
||||
dbConn *gorm.DB
|
||||
}
|
||||
|
||||
func NewFactory(dbConn *gorm.DB) *Factory {
|
||||
return &Factory{
|
||||
dbConn: dbConn,
|
||||
}
|
||||
}
|
||||
|
||||
func (f *Factory) CreateModel(model interface{}) {
|
||||
if f.dbConn == nil {
|
||||
panic("Factory created without db connection. Unable to create model.")
|
||||
}
|
||||
f.dbConn.Create(model)
|
||||
}
|
||||
|
||||
func MergeValuesToModel(model interface{}, values map[string]any) {
|
||||
st := reflect.ValueOf(model).Elem()
|
||||
|
||||
for key, value := range values {
|
||||
field := st.FieldByName(key)
|
||||
var v reflect.Value
|
||||
if value != nil {
|
||||
v = reflect.ValueOf(value)
|
||||
} else {
|
||||
v = reflect.Zero(field.Type())
|
||||
}
|
||||
field.Set(v)
|
||||
}
|
||||
}
|
||||
27
app/lib/helpers/util.go
Normal file
27
app/lib/helpers/util.go
Normal file
@ -0,0 +1,27 @@
|
||||
package helpers
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
)
|
||||
|
||||
func UTCNow() time.Time {
|
||||
utc, _ := time.LoadLocation("UTC")
|
||||
return time.Now().In(utc)
|
||||
}
|
||||
|
||||
// UNUSED allows unused variables to be included in Go programs
|
||||
func UNUSED(x ...interface{}) {}
|
||||
|
||||
func StructToMap(data interface{}) (map[string]interface{}, error) {
|
||||
dataBytes, err := json.Marshal(data)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
mapData := make(map[string]interface{})
|
||||
err = json.Unmarshal(dataBytes, &mapData)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return mapData, nil
|
||||
}
|
||||
70
app/lib/helpers/util_test.go
Normal file
70
app/lib/helpers/util_test.go
Normal file
@ -0,0 +1,70 @@
|
||||
package helpers
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func Test_StructToMap(t *testing.T) {
|
||||
t.Run("Convert simple struct to map", func(t *testing.T) {
|
||||
type User struct {
|
||||
Name string `json:"name"`
|
||||
Age int `json:"age"`
|
||||
Height float32 `json:"height"`
|
||||
}
|
||||
|
||||
user := &User{
|
||||
Name: "Pero",
|
||||
Age: 66,
|
||||
Height: 187.6,
|
||||
}
|
||||
result, _ := StructToMap(user)
|
||||
|
||||
expected := make(map[string]interface{})
|
||||
expected["name"] = "Pero"
|
||||
expected["age"] = 66
|
||||
expected["height"] = 187.6
|
||||
|
||||
assert.Equal(t, fmt.Sprintf("%v", result), fmt.Sprintf("%v", expected))
|
||||
})
|
||||
|
||||
t.Run("Convert nested struct to map", func(t *testing.T) {
|
||||
type Address struct {
|
||||
City string `json:"city"`
|
||||
PostalCode int `json:"postalCode"`
|
||||
}
|
||||
|
||||
type User struct {
|
||||
Name string `json:"name"`
|
||||
Age int `json:"age"`
|
||||
Height float32 `json:"height"`
|
||||
Address Address `json:"address"`
|
||||
}
|
||||
|
||||
user := &User{
|
||||
Name: "Pero",
|
||||
Age: 66,
|
||||
Height: 187.6,
|
||||
Address: Address{
|
||||
City: "Zagreb",
|
||||
PostalCode: 10020,
|
||||
},
|
||||
}
|
||||
result, _ := StructToMap(user)
|
||||
|
||||
address := make(map[string]interface{})
|
||||
address["city"] = "Zagreb"
|
||||
address["postalCode"] = 10020
|
||||
|
||||
expected := make(map[string]interface{})
|
||||
expected["name"] = "Pero"
|
||||
expected["age"] = 66
|
||||
expected["height"] = 187.6
|
||||
expected["address"] = make(map[string]interface{})
|
||||
expected["address"] = address
|
||||
|
||||
assert.Equal(t, fmt.Sprintf("%v", result), fmt.Sprintf("%v", expected))
|
||||
})
|
||||
}
|
||||
65
app/lib/logging/logging.go
Normal file
65
app/lib/logging/logging.go
Normal file
@ -0,0 +1,65 @@
|
||||
package logging
|
||||
|
||||
import (
|
||||
"repo-pattern/app/lib/cfg"
|
||||
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
var Log *zap.Logger = nil
|
||||
|
||||
func Init() {
|
||||
var err error
|
||||
|
||||
logConfig := zap.NewProductionConfig()
|
||||
logConfig.Level, err = zap.ParseAtomicLevel(cfg.Config.Application.LogLevel)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
logConfig.OutputPaths = []string{
|
||||
cfg.Config.Application.LogFile,
|
||||
"stderr",
|
||||
}
|
||||
|
||||
Log, err = logConfig.Build()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
/*
|
||||
logLevel, err := logrus.ParseLevel(cfg.Config.Application.LogLevel)
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("Invalid configured logLevel: %s\n", cfg.Config.Application.LogLevel))
|
||||
}
|
||||
|
||||
Log.SetLevel(logLevel)
|
||||
|
||||
Log.SetFormatter(&logrus.TextFormatter{
|
||||
FullTimestamp: true,
|
||||
TimestampFormat: "2006-01-02 15:04:05",
|
||||
PadLevelText: true,
|
||||
DisableQuote: true,
|
||||
})
|
||||
|
||||
LogFile := cfg.Config.Application.LogFile
|
||||
file, err := os.OpenFile(
|
||||
LogFile,
|
||||
os.O_CREATE|os.O_WRONLY|os.O_APPEND,
|
||||
0655,
|
||||
)
|
||||
if err != nil {
|
||||
msg := fmt.Sprintf("Failed to log to file %s: %s", cfg.Config.Application.LogFile, err)
|
||||
Log.Warning(msg)
|
||||
panic(msg)
|
||||
}
|
||||
|
||||
mw := io.MultiWriter(os.Stdout, file)
|
||||
Log.SetOutput(mw)
|
||||
|
||||
configJson, err := json.Marshal(cfg.Config)
|
||||
if err == nil {
|
||||
Info(fmt.Sprintf("Using config: %s", configJson))
|
||||
}
|
||||
*/
|
||||
}
|
||||
Reference in New Issue
Block a user