refactor: Fixing golang-ci, fieldalignment and complexity

Signed-off-by: Vincent Boutour <[email protected]>

Author: ViBiOh

pkg/crud/post.go

@@ -49,35 +49,13 @@ func (a *App) Post(w http.ResponseWriter, r *http.Request, request provider.Requ
 	if contentType == "application/x-www-form-urlencoded" {
 		method := r.FormValue("method")
 
-		if r.FormValue("type") == "share" {
-			switch method {
-			case http.MethodPost:
-				a.createShare(w, r, request)
-			case http.MethodDelete:
-				a.deleteShare(w, r, request)
-			default:
-				a.rendererApp.Error(w, model.WrapMethodNotAllowed(fmt.Errorf("unknown share method `%s` for %s", method, r.URL.Path)))
-			}
-		} else if r.FormValue("type") == "webhook" {
-			switch method {
-			case http.MethodPost:
-				a.createWebhook(w, r, request)
-			case http.MethodDelete:
-				a.deleteWebhook(w, r, request)
-			default:
-				a.rendererApp.Error(w, model.WrapMethodNotAllowed(fmt.Errorf("unknown webhook method `%s` for %s", method, r.URL.Path)))
-			}
-		} else {
-			switch method {
-			case http.MethodPatch:
-				a.Rename(w, r, request)
-			case http.MethodPut:
-				a.Create(w, r, request)
-			case http.MethodDelete:
-				a.Delete(w, r, request)
-			default:
-				a.rendererApp.Error(w, model.WrapMethodNotAllowed(fmt.Errorf("unknown method `%s` for %s", method, r.URL.Path)))
-			}
+		switch r.FormValue("type") {
+		case "share":
+			a.handlePostShare(w, r, request, method)
+		case "webhook":
+			a.handlePostWebhook(w, r, request, method)
+		default:
+			a.handlePost(w, r, request, method)
 		}
 
 		return
@@ -101,3 +79,38 @@ func (a *App) Post(w http.ResponseWriter, r *http.Request, request provider.Requ
 
 	a.rendererApp.Error(w, model.WrapMethodNotAllowed(fmt.Errorf("unknown content-type %s", contentType)))
 }
+
+func (a *App) handlePostShare(w http.ResponseWriter, r *http.Request, request provider.Request, method string) {
+	switch method {
+	case http.MethodPost:
+		a.createShare(w, r, request)
+	case http.MethodDelete:
+		a.deleteShare(w, r, request)
+	default:
+		a.rendererApp.Error(w, model.WrapMethodNotAllowed(fmt.Errorf("unknown share method `%s` for %s", method, r.URL.Path)))
+	}
+}
+
+func (a *App) handlePostWebhook(w http.ResponseWriter, r *http.Request, request provider.Request, method string) {
+	switch method {
+	case http.MethodPost:
+		a.createWebhook(w, r, request)
+	case http.MethodDelete:
+		a.deleteWebhook(w, r, request)
+	default:
+		a.rendererApp.Error(w, model.WrapMethodNotAllowed(fmt.Errorf("unknown webhook method `%s` for %s", method, r.URL.Path)))
+	}
+}
+
+func (a *App) handlePost(w http.ResponseWriter, r *http.Request, request provider.Request, method string) {
+	switch method {
+	case http.MethodPatch:
+		a.Rename(w, r, request)
+	case http.MethodPut:
+		a.Create(w, r, request)
+	case http.MethodDelete:
+		a.Delete(w, r, request)
+	default:
+		a.rendererApp.Error(w, model.WrapMethodNotAllowed(fmt.Errorf("unknown method `%s` for %s", method, r.URL.Path)))
+	}
+}

pkg/exif/exif.go

@@ -57,9 +57,8 @@ var (
 type App struct {
 	storageApp provider.Storage
 
-	done           chan struct{}
-	geocodeQueue   chan provider.StorageItem
-	aggregateQueue chan provider.StorageItem
+	done         chan struct{}
+	geocodeQueue chan provider.StorageItem
 
 	metrics map[string]*prometheus.GaugeVec
 

pkg/exif/geocode.go

@@ -161,17 +161,17 @@ func convertDegreeMinuteSecondToDecimal(location string) (string, error) {
 
 	match := matches[0]
 
-	degrees, err := strconv.ParseFloat(match[1], 16)
+	degrees, err := strconv.ParseFloat(match[1], 32)
 	if err != nil {
 		return "", fmt.Errorf("unable to parse GPS degrees: %s", err)
 	}
 
-	minutes, err := strconv.ParseFloat(match[2], 16)
+	minutes, err := strconv.ParseFloat(match[2], 32)
 	if err != nil {
 		return "", fmt.Errorf("unable to parse GPS minutes: %s", err)
 	}
 
-	seconds, err := strconv.ParseFloat(match[3], 16)
+	seconds, err := strconv.ParseFloat(match[3], 32)
 	if err != nil {
 		return "", fmt.Errorf("unable to parse GPS seconds: %s", err)
 	}

pkg/exif/model.go

@@ -20,11 +20,7 @@ func (a locationAggregate) inc(key, value string) {
 	}
 
 	if level, ok := a[key]; ok {
-		if _, ok := level[value]; ok {
-			level[value]++
-		} else {
-			level[value] = 1
-		}
+		level[value]++
 	} else {
 		a[key] = map[string]int64{
 			value: 1,

pkg/provider/event.go

@@ -49,8 +49,8 @@ func (et EventType) MarshalJSON() ([]byte, error) {
 
 // Event describes an event on fibr
 type Event struct {
-	Item StorageItem  `json:"item"`
 	New  *StorageItem `json:"new,omitempty"`
+	Item StorageItem  `json:"item"`
 	Type EventType    `json:"type"`
 }