changeset 2048:3c4b8f4815af unify_imports

Imports: Re-enabled /imports/config/{id} DELETE.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 25 Jan 2019 18:27:04 +0100
parents 78002c5e838c
children d1a680be7ae4
files pkg/controllers/importconfig.go
diffstat 1 files changed, 40 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/controllers/importconfig.go	Fri Jan 25 18:24:14 2019 +0100
+++ b/pkg/controllers/importconfig.go	Fri Jan 25 18:27:04 2019 +0100
@@ -15,6 +15,7 @@
 
 import (
 	"database/sql"
+	"errors"
 	"fmt"
 	"net/http"
 	"strconv"
@@ -22,6 +23,7 @@
 	"github.com/gorilla/mux"
 
 	"gemma.intevation.de/gemma/pkg/imports"
+	"gemma.intevation.de/gemma/pkg/scheduler"
 )
 
 const (
@@ -260,58 +262,55 @@
 	conn *sql.Conn,
 ) (jr JSONResult, err error) {
 
-	/*
+	ctx := req.Context()
 
-		ctx := req.Context()
-
-		id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64)
+	id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64)
 
-		var tx *sql.Tx
-		if tx, err = conn.BeginTx(ctx, nil); err != nil {
-			return
-		}
-		defer tx.Rollback()
+	var tx *sql.Tx
+	if tx, err = conn.BeginTx(ctx, nil); err != nil {
+		return
+	}
+	defer tx.Rollback()
 
-		var found bool
-		err = tx.QueryRowContext(ctx, hasImportConfigurationSQL, id).Scan(&found)
-		switch {
-		case err == sql.ErrNoRows:
-			err = JSONError{
-				Code:    http.StatusNotFound,
-				Message: fmt.Sprintf("No schedule %d found", id),
-			}
-			return
-		case err != nil:
-			return
-		case !found:
-			err = errors.New("Unexpected result")
-			return
+	var found bool
+	err = tx.QueryRowContext(ctx, hasImportConfigurationSQL, id).Scan(&found)
+	switch {
+	case err == sql.ErrNoRows:
+		err = JSONError{
+			Code:    http.StatusNotFound,
+			Message: fmt.Sprintf("No schedule %d found", id),
 		}
+		return
+	case err != nil:
+		return
+	case !found:
+		err = errors.New("Unexpected result")
+		return
+	}
 
-		if _, err = tx.ExecContext(ctx, deleteImportConfiguationAttributesSQL, id); err != nil {
-			return
-		}
+	if _, err = tx.ExecContext(ctx, deleteImportConfiguationAttributesSQL, id); err != nil {
+		return
+	}
 
-		if _, err = tx.ExecContext(ctx, deleteImportConfiguationSQL, id); err != nil {
-			return
-		}
+	if _, err = tx.ExecContext(ctx, deleteImportConfiguationSQL, id); err != nil {
+		return
+	}
 
-		// Remove from running scheduler.
-		scheduler.UnbindByID(id)
+	// Remove from running scheduler.
+	scheduler.UnbindByID(id)
 
-		if err = tx.Commit(); err != nil {
-			return
-		}
+	if err = tx.Commit(); err != nil {
+		return
+	}
 
-		var result = struct {
-			ID int64 `json:"id"`
-		}{
-			ID: id,
-		}
+	var result = struct {
+		ID int64 `json:"id"`
+	}{
+		ID: id,
+	}
 
-		jr = JSONResult{Result: &result}
+	jr = JSONResult{Result: &result}
 
-	*/
 	return
 }