genofire/hs_monolith
genofire
/
hs_monolith
Archived
1
0
Fork 0

format by linter

This commit is contained in:
Martin Geno 2017-06-22 20:36:11 +02:00
parent 99d62fcb47
commit 1e84ad95d6
No known key found for this signature in database
GPG Key ID: F0D39A37E925E941
11 changed files with 31 additions and 29 deletions

View File

@ -21,7 +21,7 @@ func tempPercent(value, max int) int {
// Function to calculate a partial radius, depending on a percentage value // Function to calculate a partial radius, depending on a percentage value
func tempProcessRadius(value, max, radius int) float64 { func tempProcessRadius(value, max, radius int) float64 {
return (1 - float64(value) / float64(max)) * float64(radius) * 2 * 3.14 return (1 - float64(value)/float64(max)) * float64(radius) * 2 * 3.14
} }
// Function to get the SVG, that shows the availability with a traffic light food labeling system for a given good // Function to get the SVG, that shows the availability with a traffic light food labeling system for a given good

View File

@ -24,13 +24,13 @@ var (
// Configuration of the database connection // Configuration of the database connection
type Config struct { type Config struct {
// Type of the database (currently supports sqlite and postgres) // Type of the database (currently supports sqlite and postgres)
Type string Type string
// Connection configuration // Connection configuration
Connection string Connection string
// Create another connection for reading only // Create another connection for reading only
ReadConnection string ReadConnection string
// Enable logging of the generated sql string // Enable logging of the generated sql string
Logging bool Logging bool
} }
// Function to open a database and set the given configuration // Function to open a database and set the given configuration

View File

@ -22,7 +22,7 @@ func Read(r *http.Request, to interface{}) (err error) {
func Write(w http.ResponseWriter, data interface{}) { func Write(w http.ResponseWriter, data interface{}) {
js, err := json.Marshal(data) js, err := json.Marshal(data)
if err != nil { if err != nil {
http.Error(w, "failed to encode response: " + err.Error(), http.StatusInternalServerError) http.Error(w, "failed to encode response: "+err.Error(), http.StatusInternalServerError)
return return
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")

View File

@ -14,7 +14,7 @@ func TestWorker(t *testing.T) {
runtime := 0 runtime := 0
w := NewWorker(time.Duration(5) * time.Millisecond, func() { w := NewWorker(time.Duration(5)*time.Millisecond, func() {
runtime = runtime + 1 runtime = runtime + 1
}) })
go w.Start() go w.Start()

View File

@ -13,27 +13,27 @@ import (
// Config file for this daemon (more information at the config_example.conf in this git repository) // Config file for this daemon (more information at the config_example.conf in this git repository)
type Config struct { type Config struct {
// address under which the api and static content of the webserver runs // address under which the api and static content of the webserver runs
WebserverBind string `toml:"webserver_bind"` WebserverBind string `toml:"webserver_bind"`
// path to deliver static content // path to deliver static content
Webroot string `toml:"webroot"` Webroot string `toml:"webroot"`
Database database.Config `toml:"database"` Database database.Config `toml:"database"`
GoodRelease GoodReleaseConfig `toml:"good_release"` GoodRelease GoodReleaseConfig `toml:"good_release"`
CacheClean CacheWorkerConfig `toml:"cache_clean"` CacheClean CacheWorkerConfig `toml:"cache_clean"`
// path to the SVG image templates to show the availability and freshness // path to the SVG image templates to show the availability and freshness
// of a given good with a traffic light food labeling system // of a given good with a traffic light food labeling system
GoodAvailabilityTemplate string `toml:"good_availablity_template"` GoodAvailabilityTemplate string `toml:"good_availablity_template"`
GoodFreshnessTemplate string `toml:"good_freshness_template"` GoodFreshnessTemplate string `toml:"good_freshness_template"`
FouledDeleter Duration `toml:"fouled_deleted"` FouledDeleter Duration `toml:"fouled_deleted"`
// URLs to other microservices, which this service uses // URLs to other microservices, which this service uses
MicroserviceDependencies struct { MicroserviceDependencies struct {
Product string `toml:"product"` Product string `toml:"product"`
Permission string `toml:"permission"` Permission string `toml:"permission"`
} `toml:"microservice_dependencies"` } `toml:"microservice_dependencies"`
} }
// Configuration of the Worker to clean the cache from values of other microservice // Configuration of the Worker to clean the cache from values of other microservice

View File

@ -28,8 +28,8 @@ func (d *Duration) UnmarshalTOML(dataInterface interface{}) error {
return fmt.Errorf("invalid duration: \"%s\"", data) return fmt.Errorf("invalid duration: \"%s\"", data)
} }
unit := data[len(data) - 1] unit := data[len(data)-1]
value, err := strconv.Atoi(string(data[:len(data) - 1])) value, err := strconv.Atoi(string(data[:len(data)-1]))
if err != nil { if err != nil {
return fmt.Errorf("unable to parse duration %s: %s", data, err) return fmt.Errorf("unable to parse duration %s: %s", data, err)
} }

View File

@ -8,7 +8,6 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
// Function to test UnmarshalTOML() // Function to test UnmarshalTOML()
func TestDuration(t *testing.T) { func TestDuration(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)

View File

@ -12,16 +12,16 @@ import (
// Type of goods managed in this stock microservice // Type of goods managed in this stock microservice
type Good struct { type Good struct {
ID int64 `json:"id"` ID int64 `json:"id"`
ProductID int64 `json:"product_id"` ProductID int64 `json:"product_id"`
Position string `json:"position"` Position string `json:"position"`
Comment string `json:"comment"` Comment string `json:"comment"`
FouledAt *time.Time `json:"fouled_at"` FouledAt *time.Time `json:"fouled_at"`
RecievedAt *time.Time `sql:"default:current_timestamp" json:"recieved_at"` RecievedAt *time.Time `sql:"default:current_timestamp" json:"recieved_at"`
// Make it temporary unusable // Make it temporary unusable
LockedAt *time.Time `json:"-"` LockedAt *time.Time `json:"-"`
LockedSecret string `json:"-"` LockedSecret string `json:"-"`
// Make it unusable // Make it unusable
DeletedAt *time.Time `json:"-"` DeletedAt *time.Time `json:"-"`
ManuelleDelete bool `json:"-"` ManuelleDelete bool `json:"-"`

View File

@ -1 +1,2 @@
blub invalid structur of a config file
(should not be able unmarshal to the config struct )

View File

@ -6,8 +6,9 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/genofire/hs_master-kss-monolith/lib/log"
"sync" "sync"
"github.com/genofire/hs_master-kss-monolith/lib/log"
) )
// URL to the microservice, which manages permissions // URL to the microservice, which manages permissions

View File

@ -6,8 +6,9 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/genofire/hs_master-kss-monolith/lib/log"
"sync" "sync"
"github.com/genofire/hs_master-kss-monolith/lib/log"
) )
// URL to the microservice which manages the products (product catalogue) // URL to the microservice which manages the products (product catalogue)