gemma: pkg/controllers/importqueue.go annotate

annotate pkg/controllers/importqueue.go @ 1995:59055c8301df

Move import queue to its own database namespace Authorisation of the import queue has to be handled differently from the waterway-related data in the waterway schema. This is easier to handle, if both are in their own schema/namespace.

author	Tom Gottfried <tom@intevation.de>
date	Thu, 24 Jan 2019 12:56:31 +0100
parents	cdc8933949f2
children	20d9b71f4125

rev	line source
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	1 // This is Free Software under GNU Affero General Public License v >= 3.0
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	2 // without warranty, see README.md and license for details.
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	3 //
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	4 // SPDX-License-Identifier: AGPL-3.0-or-later
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	5 // License-Filename: LICENSES/AGPL-3.0.txt
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	6 //
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	7 // Copyright (C) 2018 by via donau
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	8 // – Österreichische Wasserstraßen-Gesellschaft mbH
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	9 // Software engineering by Intevation GmbH
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	10 //
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	11 // Author(s):
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	12 // * Sascha L. Teichmann <sascha.teichmann@intevation.de>
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	13
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	14 package controllers
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	15
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	16 import (
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	17 "database/sql"
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	18 "encoding/json"
1031 c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	19 "fmt"
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	20 "log"
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	21 "net/http"
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	22 "strconv"
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	23 "strings"
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	24
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	25 "github.com/gorilla/mux"
0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	26 "github.com/jackc/pgx/pgtype"
0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	27
1194 7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	28 "gemma.intevation.de/gemma/pkg/auth"
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	29 "gemma.intevation.de/gemma/pkg/imports"
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	30 "gemma.intevation.de/gemma/pkg/models"
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	31 )
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	32
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	33 const (
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	34 selectImportsSQL = `
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	35 SELECT
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	36 id,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	37 state::varchar,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	38 enqueued,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	39 kind,
1194 7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	40 username,
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	41 signer,
0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	42 summary
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	43 FROM import.imports
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	44 `
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	45
1031 c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	46 selectHasImportSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	47 SELECT true FROM import.imports WHERE id = $1`
1031 c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	48
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	49 selectHasNoRunningImportSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	50 SELECT true FROM import.imports
59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	51 WHERE id = $1 AND state <> 'running'::import_state`
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	52
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	53 selectImportLogsSQL = `
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	54 SELECT
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	55 time,
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	56 kind::varchar,
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	57 msg
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	58 FROM import.import_logs
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	59 WHERE import_id = $1
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	60 ORDER BY time`
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	61
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	62 deleteLogsSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	63 DELETE FROM import.import_logs WHERE import_id = $1`
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	64
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	65 deleteImportSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	66 DELETE FROM import.imports WHERE id = $1`
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	67 )
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	68
1655 34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	69 func toInt8Array(txt string) *pgtype.Int8Array {
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	70 parts := strings.Split(txt, ",")
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	71 var ints []int64
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	72 for _, part := range parts {
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	73 part = strings.TrimSpace(part)
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	74 v, err := strconv.ParseInt(part, 10, 64)
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	75 if err != nil {
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	76 continue
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	77 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	78 ints = append(ints, v)
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	79 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	80 var ia pgtype.Int8Array
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	81 if err := ia.Set(ints); err != nil {
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	82 log.Printf("warn: %v\n", err)
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	83 return nil
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	84 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	85 return &ia
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	86 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	87
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	88 func toTextArray(txt string, allowed []string) *pgtype.TextArray {
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	89 parts := strings.Split(txt, ",")
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	90 var accepted []string
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	91 for _, part := range parts {
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	92 if part = strings.ToLower(strings.TrimSpace(part)); len(part) == 0 {
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	93 continue
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	94 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	95 for _, a := range allowed {
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	96 if part == a {
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	97 accepted = append(accepted, part)
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	98 break
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	99 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	100 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	101 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	102 if len(accepted) == 0 {
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	103 return nil
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	104 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	105 var ta pgtype.TextArray
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	106 if err := ta.Set(accepted); err != nil {
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	107 log.Printf("warn: %v\n", err)
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	108 return nil
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	109 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	110 return &ta
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	111 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	112
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	113 func queryImportListStmt(
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	114 conn *sql.Conn,
1315 24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	115 req *http.Request,
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	116 ) (*sql.Rows, error) {
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	117
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	118 var (
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	119 stmt strings.Builder
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	120 args []interface{}
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	121 states *pgtype.TextArray
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	122 kinds *pgtype.TextArray
1655 34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	123 ids *pgtype.Int8Array
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	124 )
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	125
1315 24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	126 arg := func(format string, v interface{}) {
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	127 fmt.Fprintf(&stmt, format, len(args)+1)
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	128 args = append(args, v)
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	129 }
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	130
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	131 if st := req.FormValue("states"); st != "" {
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	132 states = toTextArray(st, imports.ImportStateNames)
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	133 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	134
1315 24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	135 if ks := req.FormValue("kinds"); ks != "" {
1495 d26e3e1fcff1 The global import queue already knows which kinds of imports it supports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1473 diff changeset	136 kinds = toTextArray(ks, imports.ImportKindNames())
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	137 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	138
1655 34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	139 if idss := req.FormValue("ids"); idss != "" {
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	140 ids = toInt8Array(idss)
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	141 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	142
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	143 stmt.WriteString(selectImportsSQL)
1655 34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	144 if states != nil \|\| kinds != nil \|\| ids != nil {
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	145 stmt.WriteString(" WHERE ")
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	146 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	147
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	148 if states != nil {
1315 24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	149 arg(" state = ANY($%d) ", states)
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	150 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	151
1655 34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	152 if states != nil && (kinds != nil \|\| ids != nil) {
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	153 stmt.WriteString("AND")
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	154 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	155
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	156 if kinds != nil {
1315 24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	157 arg(" kind = ANY($%d) ", kinds)
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	158 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	159
1655 34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	160 if (states != nil \|\| kinds != nil) && ids != nil {
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	161 stmt.WriteString("AND")
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	162 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	163
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	164 if ids != nil {
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	165 arg(" id = ANY($%d) ", ids)
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	166 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	167
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	168 stmt.WriteString(" ORDER BY enqueued DESC ")
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	169
1315 24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	170 if lim := req.FormValue("limit"); lim != "" {
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	171 limit, err := strconv.ParseInt(lim, 10, 64)
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	172 if err != nil {
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	173 return nil, err
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	174 }
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	175 arg(" LIMIT $%d ", limit)
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	176 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	177
1315 24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	178 if ofs := req.FormValue("offset"); ofs != "" {
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	179 offset, err := strconv.ParseInt(ofs, 10, 64)
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	180 if err != nil {
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	181 return nil, err
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	182 }
24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	183 arg(" OFFSET $%d ", offset)
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	184 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	185
1315 24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	186 return conn.QueryContext(req.Context(), stmt.String(), args...)
1189 3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	187 }
3d50f558870c REST GET call to /imports now has the ability to be filtered by kinds or states. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1037 diff changeset	188
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	189 func listImports(
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	190 _ interface{},
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	191 req *http.Request,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	192 conn *sql.Conn,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	193 ) (jr JSONResult, err error) {
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	194
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	195 var rows *sql.Rows
1315 24e4c60c2606 Simplified and fixed filtering of import queue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1195 diff changeset	196 rows, err = queryImportListStmt(conn, req)
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	197 if err != nil {
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	198 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	199 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	200 defer rows.Close()
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	201
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	202 imports := make([]*models.Import, 0, 20)
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	203
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	204 var signer, summary sql.NullString
1195 486d66a9565c Be aware that the signer is null till the final decision is made about an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1194 diff changeset	205
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	206 for rows.Next() {
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	207 var it models.Import
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	208 if err = rows.Scan(
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	209 &it.ID,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	210 &it.State,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	211 &it.Enqueued,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	212 &it.Kind,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	213 &it.User,
1195 486d66a9565c Be aware that the signer is null till the final decision is made about an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1194 diff changeset	214 &signer,
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	215 &summary,
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	216 ); err != nil {
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	217 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	218 }
1195 486d66a9565c Be aware that the signer is null till the final decision is made about an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1194 diff changeset	219 if signer.Valid {
486d66a9565c Be aware that the signer is null till the final decision is made about an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1194 diff changeset	220 it.Signer = signer.String
486d66a9565c Be aware that the signer is null till the final decision is made about an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1194 diff changeset	221 }
1392 0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	222 if summary.Valid {
0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	223 if err = json.NewDecoder(
0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	224 strings.NewReader(summary.String)).Decode(&it.Summary); err != nil {
0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	225 return
0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	226 }
0e1d89241cda Imports: An Import (e.g. a sounding result import) can now write a 'summary' of a successful import. This is done if the import switches to to state 'pending'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1359 diff changeset	227 }
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	228 imports = append(imports, &it)
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	229 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	230
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	231 if err = rows.Err(); err != nil {
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	232 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	233 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	234
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	235 jr = JSONResult{
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	236 Result: struct {
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	237 Imports []*models.Import `json:"imports"`
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	238 }{
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	239 Imports: imports,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	240 },
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	241 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	242 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	243 }
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	244
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	245 func importLogs(
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	246 _ interface{},
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	247 req *http.Request,
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	248 conn *sql.Conn,
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	249 ) (jr JSONResult, err error) {
1031 c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	250
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	251 ctx := req.Context()
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	252
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	253 id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64)
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	254
1031 c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	255 // Check if he have such a import job first.
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	256 var dummy bool
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	257 err = conn.QueryRowContext(ctx, selectHasImportSQL, id).Scan(&dummy)
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	258 switch {
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	259 case err == sql.ErrNoRows:
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	260 err = JSONError{
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	261 Code: http.StatusNotFound,
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	262 Message: fmt.Sprintf("Cannot find import #%d.", id),
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	263 }
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	264 return
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	265 case err != nil:
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	266 return
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	267 }
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	268
1031 c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	269 // We have it -> generate log entries.
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	270 var rows *sql.Rows
c0f5dedf5753 Check first if we have a import before generating log import entries list. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1026 diff changeset	271 rows, err = conn.QueryContext(ctx, selectImportLogsSQL, id)
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	272 if err != nil {
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	273 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	274 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	275 defer rows.Close()
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	276
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	277 entries := make([]*models.ImportLogEntry, 0, 10)
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	278
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	279 for rows.Next() {
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	280 var entry models.ImportLogEntry
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	281 if err = rows.Scan(&entry.Time, &entry.Kind, &entry.Message); err != nil {
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	282 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	283 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	284 entries = append(entries, &entry)
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	285 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	286
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	287 if err = rows.Err(); err != nil {
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	288 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	289 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	290
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	291 jr = JSONResult{
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	292 Result: struct {
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	293 Entries []*models.ImportLogEntry `json:"entries"`
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	294 }{
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	295 Entries: entries,
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	296 },
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	297 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	298 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	299 }
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	300
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	301 func deleteImport(
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	302 _ interface{},
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	303 req *http.Request,
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	304 conn *sql.Conn,
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	305 ) (jr JSONResult, err error) {
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	306
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	307 ctx := req.Context()
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	308 id, _ := strconv.ParseInt(mux.Vars(req)["id"], 10, 64)
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	309
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	310 var tx *sql.Tx
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	311 tx, err = conn.BeginTx(ctx, nil)
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	312 if err != nil {
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	313 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	314 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	315 defer tx.Rollback()
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	316
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	317 // Check if he have such a import job first.
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	318 var dummy bool
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	319 err = tx.QueryRowContext(ctx, selectHasNoRunningImportSQL, id).Scan(&dummy)
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	320 switch {
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	321 case err == sql.ErrNoRows:
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	322 err = JSONError{
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	323 Code: http.StatusNotFound,
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	324 Message: fmt.Sprintf("Cannot find import #%d.", id),
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	325 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	326 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	327 case err != nil:
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	328 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	329 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	330
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	331 if _, err = tx.ExecContext(ctx, deleteLogsSQL, id); err != nil {
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	332 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	333 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	334
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	335 if _, err = tx.ExecContext(ctx, deleteImportSQL, id); err != nil {
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	336 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	337 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	338
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	339 if err = tx.Commit(); err != nil {
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	340 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	341 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	342
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	343 jr = JSONResult{Code: http.StatusNoContent}
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	344
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	345 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	346 }
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	347
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	348 const (
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	349 isPendingSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	350 SELECT state = 'pending'::import_state, kind
59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	351 FROM import.imports
1351 89d013d55ec9 Fixed SQL in accepting/declining imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1328 diff changeset	352 WHERE id = $1`
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	353
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	354 reviewSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	355 UPDATE import.imports SET
59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	356 state = $1::import_state,
1194 7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	357 signer = $2
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	358 WHERE id = $3`
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	359
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	360 deleteImportDataSQL = `SELECT import.del_import($1)`
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	361
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	362 deleteImportTrackSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	363 DELETE FROM import.track_imports WHERE import_id = $1`
1194 7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	364
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	365 logDecisionSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	366 INSERT INTO import.import_logs (import_id, msg) VALUES ($1, $2)`
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	367 )
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	368
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	369 func reviewImports(
1469 286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	370 reviews interface{},
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	371 req *http.Request,
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	372 conn *sql.Conn,
1469 286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	373 ) (JSONResult, error) {
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	374
1473 d349618c6b50 Import bulk review: Fixed handling of input document. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1472 diff changeset	375 rs := reviews.([]models.Review)
1469 286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	376
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	377 type reviewResult struct {
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	378 ID int64 `json:"id"`
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	379 Message string `json:"message,omitempty"`
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	380 Error string `json:"error,omitempty"`
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	381 }
1469 286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	382
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	383 results := make([]reviewResult, len(rs))
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	384
1472 702671b76eae Import bulk review: Use an slice of models.Review as input. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1471 diff changeset	385 for i := range rs {
702671b76eae Import bulk review: Use an slice of models.Review as input. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1471 diff changeset	386 rev := &rs[i]
1469 286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	387 msg, err := decideImport(req, conn, rev.ID, string(rev.State))
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	388 var errString string
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	389 if err != nil {
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	390 errString = err.Error()
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	391 }
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	392 results[i] = reviewResult{
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	393 ID: rev.ID,
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	394 Message: msg,
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	395 Error: errString,
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	396 }
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	397 }
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	398
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	399 return JSONResult{Result: results}, nil
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	400 }
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	401
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	402 func reviewImport(
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	403 _ interface{},
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	404 req *http.Request,
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	405 conn *sql.Conn,
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	406 ) (jr JSONResult, err error) {
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	407
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	408 vars := mux.Vars(req)
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	409 id, _ := strconv.ParseInt(vars["id"], 10, 64)
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	410 state := vars["state"]
1469 286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	411
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	412 var msg string
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	413 if msg, err = decideImport(req, conn, id, state); err != nil {
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	414 return
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	415 }
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	416
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	417 result := struct {
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	418 Message string `json:"message"`
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	419 }{
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	420 Message: msg,
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	421 }
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	422
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	423 jr = JSONResult{Result: &result}
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	424 return
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	425 }
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	426
1469 286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	427 func decideImport(
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	428 req *http.Request,
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	429 conn *sql.Conn,
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	430 id int64,
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	431 state string,
1469 286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	432 ) (message string, err error) {
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	433 ctx := req.Context()
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	434 var tx *sql.Tx
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	435 if tx, err = conn.BeginTx(ctx, nil); err != nil {
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	436 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	437 }
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	438 defer tx.Rollback()
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	439
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	440 var pending bool
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	441 var kind string
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	442
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	443 err = tx.QueryRowContext(ctx, isPendingSQL, id).Scan(&pending, &kind)
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	444 switch {
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	445 case err == sql.ErrNoRows:
1693 cdc8933949f2 Controllers: Resolved the remaining golint issues with this package. Sascha L. Teichmann <teichmann@intevation.de> parents: 1655 diff changeset	446 err = fmt.Errorf("cannot find import #%d", id)
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	447 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	448 case err != nil:
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	449 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	450 case !pending:
1693 cdc8933949f2 Controllers: Resolved the remaining golint issues with this package. Sascha L. Teichmann <teichmann@intevation.de> parents: 1655 diff changeset	451 err = fmt.Errorf("import %d is not pending", id)
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	452 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	453 }
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	454
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	455 if state == "accepted" {
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	456 if jc := imports.FindJobCreator(imports.JobKind(kind)); jc != nil {
1328 d753ce6cf588 To make golint happier made context.Context to be the first argument in all calls. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1315 diff changeset	457 if err = jc.StageDone(ctx, tx, id); err != nil {
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	458 return
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	459 }
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	460 }
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	461
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	462 } else {
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	463 if _, err = tx.ExecContext(ctx, deleteImportDataSQL, id); err != nil {
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	464 return
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	465 }
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	466 }
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	467
1359 3ff916e853d4 Remove the import track in both cases accepted/declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1355 diff changeset	468 // Remove the import track
3ff916e853d4 Remove the import track in both cases accepted/declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1355 diff changeset	469 if _, err = tx.ExecContext(ctx, deleteImportTrackSQL, id); err != nil {
3ff916e853d4 Remove the import track in both cases accepted/declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1355 diff changeset	470 return
3ff916e853d4 Remove the import track in both cases accepted/declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1355 diff changeset	471 }
3ff916e853d4 Remove the import track in both cases accepted/declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1355 diff changeset	472
1194 7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	473 // Log the decision and set the final state.
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	474 session, _ := auth.GetSession(req)
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	475 who := session.User
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	476
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	477 if _, err = tx.ExecContext(ctx, logDecisionSQL, id,
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	478 fmt.Sprintf("User '%s' %s import %d.", who, state, id)); err != nil {
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	479 return
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	480 }
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	481
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	482 if _, err = tx.ExecContext(ctx, reviewSQL, state, who, id); err != nil {
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	483 return
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	484 }
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	485
1355 b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	486 if err = tx.Commit(); err != nil {
b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	487 return
b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	488 }
b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	489
1469 286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	490 message = fmt.Sprintf(
286a3306f6bf Import bulk review: Cleaned up input JSON document handling. Added proper error handling. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1468 diff changeset	491 "Import #%d successfully changed to state '%s'.", id, state)
1355 b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	492
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	493 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	494 }

Mercurial > gemma

annotate pkg/controllers/importqueue.go @ 1995:59055c8301df