gemma: pkg/controllers/importqueue.go annotate

annotate pkg/controllers/importqueue.go @ 4748:47922c1a088d

Added a 'changed' column to the import.imports table. Changed is update each time the state changes (TODO: solve this with a trigger). The update script takes as approximation the time of the last log entry connected with the particular import.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Fri, 18 Oct 2019 15:34:34 +0200
parents	4394daeea96a
children	1fef4679b07a

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 (
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	17 "context"
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	18 "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	19 "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	20 "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	21 "log"
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	22 "net/http"
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	23 "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	24 "strings"
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	25 "time"
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	26
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	27 "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	28
1194 7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	29 "gemma.intevation.de/gemma/pkg/auth"
4078 80bdcd137a1d Parse timezones from time inputs and send timezones in results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3776 diff changeset	30 "gemma.intevation.de/gemma/pkg/common"
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	31 "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	32 "gemma.intevation.de/gemma/pkg/models"
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	33
4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	34 mw "gemma.intevation.de/gemma/pkg/middleware"
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	35 )
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	36
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	37 const (
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	38 selectImportsCountSQL = `
2682 9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	39 SELECT count(*)
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	40 FROM import.imports
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	41 WHERE
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	42 `
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	43 selectImportsSQL = `
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	44 SELECT
2627 3a242e6aa56d Import log: Add filter for log entries with warnings only: GET /api/imports?warnings=true Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2179 diff changeset	45 imports.id AS id,
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	46 state::varchar,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	47 enqueued,
4748 47922c1a088d Added a 'changed' column to the import.imports table. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4244 diff changeset	48 changed,
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	49 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	50 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	51 signer,
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	52 summary IS NOT NULL AS has_summary,
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	53 EXISTS(SELECT 1 FROM import.import_logs
4196 948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	54 WHERE kind = 'error'::log_type and import_id = imports.id) AS has_errors,
948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	55 EXISTS(SELECT 1 FROM import.import_logs
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	56 WHERE kind = 'warn'::log_type and import_id = imports.id) AS has_warnings
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	57 FROM import.imports
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	58 WHERE
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	59 `
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	60 selectEnqueuedSQL = `
2672 b997e1fd1d3d Fixed warning SQL prefix for selection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2671 diff changeset	61 SELECT enqueued FROM import.imports
b997e1fd1d3d Fixed warning SQL prefix for selection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2671 diff changeset	62 WHERE
b997e1fd1d3d Fixed warning SQL prefix for selection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2671 diff changeset	63 `
2795 241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	64 selectImportSummarySQL = `
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	65 SELECT summary, enqueued 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	66
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	67 selectHasNoRunningImportSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	68 SELECT true FROM import.imports
59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	69 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	70
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	71 selectImportLogsSQL = `
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	72 SELECT
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	73 time,
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	74 kind::varchar,
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	75 msg
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	76 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	77 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	78 ORDER BY time`
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	79
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	80 deleteLogsSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	81 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	82
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	83 deleteImportSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	84 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	85 )
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	86
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	87 type filledStmt struct {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	88 stmt strings.Builder
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	89 args []interface{}
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	90 }
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	91
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	92 func buildFilters(req http.Request) (filledStmt, filledStmt, filledStmt, error) {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	93
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	94 var l, a, b filterAnd
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	95
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	96 var noBefore, noAfter bool
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	97
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	98 cond := func(format string, args ...interface{}) {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	99 term := &filterTerm{format: format, args: args}
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	100 l = append(l, term)
4195 ad13c581de7c Fixed building filters for listing import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4187 diff changeset	101 a = append(a, term)
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	102 b = append(b, term)
2677 fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	103 }
fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	104
fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	105 if query := req.FormValue("query"); query != "" {
fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	106 query = "%" + query + "%"
fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	107 cond(` (kind ILIKE $%d OR username ILIKE $%d OR signer ILIKE $%d OR `+
fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	108 `id IN (SELECT import_id FROM import.import_logs WHERE msg ILIKE $%d)) `,
fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	109 query, query, query, query)
fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	110 }
fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	111
3776 6521c962a7b6 Add 'cc' parameter to search imports for a comma separated list of country codes for the the importing person. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3217 diff changeset	112 if cc := req.FormValue("cc"); cc != "" {
6521c962a7b6 Add 'cc' parameter to search imports for a comma separated list of country codes for the the importing person. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3217 diff changeset	113 codes := sliceToTextArray(splitUpper(cc))
6521c962a7b6 Add 'cc' parameter to search imports for a comma separated list of country codes for the the importing person. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3217 diff changeset	114 cond(" username IN "+
6521c962a7b6 Add 'cc' parameter to search imports for a comma separated list of country codes for the the importing person. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3217 diff changeset	115 "(SELECT username FROM internal.user_profiles "+
6521c962a7b6 Add 'cc' parameter to search imports for a comma separated list of country codes for the the importing person. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3217 diff changeset	116 "WHERE country = ANY($%d)) ",
6521c962a7b6 Add 'cc' parameter to search imports for a comma separated list of country codes for the the importing person. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3217 diff changeset	117 codes)
6521c962a7b6 Add 'cc' parameter to search imports for a comma separated list of country codes for the the importing person. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3217 diff changeset	118 }
6521c962a7b6 Add 'cc' parameter to search imports for a comma separated list of country codes for the the importing person. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3217 diff changeset	119
2667 5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	120 if st := req.FormValue("states"); st != "" {
5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	121 states := toTextArray(st, imports.ImportStateNames)
2677 fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	122 cond(" 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	123 }
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
2667 5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	125 if ks := req.FormValue("kinds"); ks != "" {
5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	126 kinds := toTextArray(ks, imports.ImportKindNames())
2677 fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	127 cond(" kind = ANY($%d) ", kinds)
1655 34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	128 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	129
2667 5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	130 if idss := req.FormValue("ids"); idss != "" {
5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	131 ids := toInt8Array(idss)
2677 fe93c48f76c9 Add /api/imports?query=TXT to search TXT in kind, username, signer or logs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2673 diff changeset	132 cond(" id = ANY($%d) ", ids)
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	133 }
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	134
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	135 if from := req.FormValue("from"); from != "" {
4078 80bdcd137a1d Parse timezones from time inputs and send timezones in results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3776 diff changeset	136 fromTime, err := common.ParseTime(from)
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	137 if err != nil {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	138 return nil, nil, nil, err
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	139 }
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	140 l = append(l, buildFilterTerm("enqueued >= $%d", fromTime))
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	141 b = append(b, buildFilterTerm("enqueued < $%d", fromTime))
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	142 } else {
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	143 noBefore = true
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	144 }
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	145
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	146 if to := req.FormValue("to"); to != "" {
4078 80bdcd137a1d Parse timezones from time inputs and send timezones in results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3776 diff changeset	147 toTime, err := common.ParseTime(to)
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	148 if err != nil {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	149 return nil, nil, nil, err
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	150 }
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	151 l = append(l, buildFilterTerm("enqueued <= $%d", toTime))
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	152 a = append(a, buildFilterTerm("enqueued > $%d", toTime))
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	153 } else {
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	154 noAfter = true
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	155 }
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	156
2665 fea12fc850d2 Simplified warnings filtering. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2663 diff changeset	157 switch warn := strings.ToLower(req.FormValue("warnings")); warn {
fea12fc850d2 Simplified warnings filtering. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2663 diff changeset	158 case "1", "t", "true":
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	159 cond(` EXISTS(SELECT 1 FROM import.import_logs
65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	160 WHERE kind = 'warn'::log_type and import_id = imports.id)`)
2665 fea12fc850d2 Simplified warnings filtering. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2663 diff changeset	161 }
fea12fc850d2 Simplified warnings filtering. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2663 diff changeset	162
4196 948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	163 switch errors := strings.ToLower(req.FormValue("errors")); errors {
948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	164 case "1", "t", "true":
948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	165 cond(` EXISTS(SELECT 1 FROM import.import_logs
948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	166 WHERE kind = 'error'::log_type and import_id = imports.id)`)
948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	167 }
948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	168
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	169 fl := &filledStmt{}
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	170 fa := &filledStmt{}
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	171 fb := &filledStmt{}
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	172
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	173 fa.stmt.WriteString(selectEnqueuedSQL)
65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	174 fb.stmt.WriteString(selectEnqueuedSQL)
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	175
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	176 var counting bool
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	177
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	178 switch count := strings.ToLower(req.FormValue("count")); count {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	179 case "1", "t", "true":
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	180 counting = true
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	181 fl.stmt.WriteString(selectImportsCountSQL)
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	182 default:
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	183 fl.stmt.WriteString(selectImportsSQL)
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	184 }
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	185
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	186 if len(l) == 0 {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	187 fl.stmt.WriteString(" TRUE ")
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	188 } else {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	189 l.serialize(&fl.stmt, &fl.args)
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	190 }
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	191
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	192 if len(b) == 0 {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	193 fb.stmt.WriteString(" TRUE ")
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	194 } else {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	195 b.serialize(&fb.stmt, &fb.args)
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	196 }
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	197
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	198 if len(a) == 0 {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	199 fa.stmt.WriteString(" TRUE ")
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	200 } else {
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	201 a.serialize(&fa.stmt, &fa.args)
1655 34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	202 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	203
2682 9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	204 if !counting {
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	205 fl.stmt.WriteString(" ORDER BY enqueued DESC ")
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	206 fa.stmt.WriteString(" ORDER BY enqueued LIMIT 1")
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	207 fb.stmt.WriteString(" ORDER BY enqueued DESC LIMIT 1")
2682 9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	208 }
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	209
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	210 if noBefore {
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	211 fb = nil
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	212 }
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	213 if noAfter {
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	214 fa = nil
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	215 }
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	216
eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	217 return fl, fb, fa, nil
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	218 }
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	219
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	220 func neighbored(ctx context.Context, conn sql.Conn, fb filledStmt) *models.ImportTime {
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	221
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	222 var when time.Time
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	223 err := conn.QueryRowContext(ctx, fb.stmt.String(), fb.args...).Scan(&when)
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	224 switch {
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	225 case err == sql.ErrNoRows:
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	226 return nil
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	227 case err != nil:
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	228 log.Printf("warn: %v\n", err)
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	229 return 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	230 }
4084 350a24c92848 Deliver times from import queue in UTC. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4078 diff changeset	231 return &models.ImportTime{Time: when.UTC()}
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	232 }
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	233
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	234 func listImports(req *http.Request) (jr mw.JSONResult, err error) {
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	235
3194 eeff2cc4ff9d controllers: re-factored the SQL filter to a tree like structure to be of more general use. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 3190 diff changeset	236 var list, before, after *filledStmt
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	237
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	238 if list, before, after, err = buildFilters(req); err != nil {
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	239 return
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	240 }
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	241
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	242 ctx := req.Context()
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	243
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	244 conn := mw.JSONConn(req)
4242 1458c9b0fdaa Made the sql.Conn in function accessible via the context of the request. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4196 diff changeset	245
2682 9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	246 // Fast path for counting
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	247
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	248 switch count := strings.ToLower(req.FormValue("count")); count {
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	249 case "1", "t", "true":
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	250 var count int64
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	251 err = conn.QueryRowContext(ctx, list.stmt.String(), list.args...).Scan(&count)
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	252 switch {
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	253 case err == sql.ErrNoRows:
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	254 count, err = 0, nil
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	255 case err != nil:
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	256 return
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	257 }
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	258 jr = mw.JSONResult{Result: count}
2682 9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	259 return
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	260 }
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	261
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	262 // Generate the list
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	263
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	264 var rows *sql.Rows
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	265 if rows, err = conn.QueryContext(ctx, list.stmt.String(), list.args...); err != nil {
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	266 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	267 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	268 defer rows.Close()
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	269
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	270 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	271
2662 f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	272 var signer 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	273
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	274 for rows.Next() {
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	275 var it models.Import
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	276 var enqueued time.Time
4748 47922c1a088d Added a 'changed' column to the import.imports table. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4244 diff changeset	277 var changed time.Time
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	278 if err = rows.Scan(
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	279 &it.ID,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	280 &it.State,
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	281 &enqueued,
4748 47922c1a088d Added a 'changed' column to the import.imports table. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4244 diff changeset	282 &changed,
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	283 &it.Kind,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	284 &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	285 &signer,
2662 f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	286 &it.Summary,
4196 948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	287 &it.Errors,
2179 20d9b71f4125 Import queue listing: Add another column 'warnings' (bool) to listing output which indicates if an import has warnings or not. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1995 diff changeset	288 &it.Warnings,
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	289 ); err != nil {
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	290 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	291 }
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	292 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	293 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	294 }
4084 350a24c92848 Deliver times from import queue in UTC. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4078 diff changeset	295 it.Enqueued = models.ImportTime{Time: enqueued.UTC()}
4748 47922c1a088d Added a 'changed' column to the import.imports table. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4244 diff changeset	296 it.Changed = models.ImportTime{Time: changed.UTC()}
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	297 imports = append(imports, &it)
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	298 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	299
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	300 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	301 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	302 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	303
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	304 var prev, next *models.ImportTime
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	305
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	306 if before != nil {
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	307 prev = neighbored(ctx, conn, before)
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	308 }
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	309
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	310 if after != nil {
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	311 next = neighbored(ctx, conn, after)
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	312 }
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	313
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	314 jr = mw.JSONResult{
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	315 Result: struct {
2663 386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	316 Prev *models.ImportTime `json:"prev,omitempty"`
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	317 Next *models.ImportTime `json:"next,omitempty"`
386ff766dfcd Replaced limit/offset filters with from/to as timestamps (format '2006-01-02T15:04:05.000').The output document also contains 'prev' and 'next' fields (if there is any matching data) from the times before and after 'from' and 'to'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2662 diff changeset	318 Imports []*models.Import `json:"imports"`
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	319 }{
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	320 Imports: imports,
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	321 Prev: prev,
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	322 Next: next,
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	323 },
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	324 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	325 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	326 }
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	327
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	328 func importLogs(req *http.Request) (jr mw.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	329
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	330 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	331
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	332 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	333
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	334 conn := mw.JSONConn(req)
4242 1458c9b0fdaa Made the sql.Conn in function accessible via the context of the request. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4196 diff changeset	335
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	336 // Check if he have such a import job first.
2662 f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	337 var summary sql.NullString
2795 241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	338 var enqueued time.Time
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	339 err = conn.QueryRowContext(ctx, selectImportSummarySQL, id).Scan(
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	340 &summary,
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	341 &enqueued,
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	342 )
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	343 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	344 case err == sql.ErrNoRows:
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	345 err = mw.JSONError{
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	346 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	347 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	348 }
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	349 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	350 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	351 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	352 }
4084 350a24c92848 Deliver times from import queue in UTC. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4078 diff changeset	353 enqueued = enqueued.UTC()
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	354
2662 f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	355 var sum interface{}
f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	356 if summary.Valid {
f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	357 if err = json.NewDecoder(
f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	358 strings.NewReader(summary.String)).Decode(&sum); err != nil {
f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	359 return
f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	360 }
f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	361 }
f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	362
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	363 // 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	364 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	365 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	366 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	367 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	368 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	369 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	370
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	371 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	372
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	373 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	374 var entry models.ImportLogEntry
4084 350a24c92848 Deliver times from import queue in UTC. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4078 diff changeset	375 var t time.Time
350a24c92848 Deliver times from import queue in UTC. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4078 diff changeset	376 if err = rows.Scan(&t, &entry.Kind, &entry.Message); err != nil {
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	377 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	378 }
4148 1b1218bbd414 Made 'go vet' happy with controllers again. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4084 diff changeset	379 entry.Time = models.ImportTime{Time: t.UTC()}
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	380 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	381 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	382
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	383 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	384 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	385 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	386
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	387 jr = mw.JSONResult{
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	388 Result: struct {
2795 241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	389 Enqueued models.ImportTime `json:"enqueued"`
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	390 Summary interface{} `json:"summary,omitempty"`
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	391 Entries []*models.ImportLogEntry `json:"entries"`
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	392 }{
3089 813309225e35 Made 'go vet' happy again. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2954 diff changeset	393 Enqueued: models.ImportTime{Time: enqueued},
2795 241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	394 Summary: sum,
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	395 Entries: entries,
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	396 },
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	397 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	398 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	399 }
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	400
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	401 func deleteImport(req *http.Request) (jr mw.JSONResult, err error) {
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	402
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	403 ctx := req.Context()
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	404 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	405
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	406 var tx *sql.Tx
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	407 tx, err = mw.JSONConn(req).BeginTx(ctx, nil)
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	408 if err != nil {
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	409 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	410 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	411 defer tx.Rollback()
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	412
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	413 // 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	414 var dummy bool
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	415 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	416 switch {
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	417 case err == sql.ErrNoRows:
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	418 err = mw.JSONError{
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	419 Code: http.StatusNotFound,
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	420 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	421 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	422 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	423 case err != nil:
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	424 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	425 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	426
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	427 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	428 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	429 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	430
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	431 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	432 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	433 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	434
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	435 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	436 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	437 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	438
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	439 jr = mw.JSONResult{Code: http.StatusNoContent}
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	440
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	441 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	442 }
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	443
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	444 const (
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	445 isPendingSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	446 SELECT state = 'pending'::import_state, kind
59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	447 FROM import.imports
1351 89d013d55ec9 Fixed SQL in accepting/declining imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1328 diff changeset	448 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	449
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	450 reviewSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	451 UPDATE import.imports SET
59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	452 state = $1::import_state,
4748 47922c1a088d Added a 'changed' column to the import.imports table. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4244 diff changeset	453 changed = CURRENT_TIMESTAMP,
1194 7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	454 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	455 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	456
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	457 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	458
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	459 deleteImportTrackSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	460 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	461
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	462 logDecisionSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	463 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	464 )
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	465
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	466 func reviewImports(req *http.Request) (mw.JSONResult, error) {
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	467
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	468 rs := mw.JSONInput(req).([]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	469
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	470 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	471 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	472 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	473 Error string `json:"error,omitempty"`
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	474 }
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	475
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	476 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	477
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	478 conn := mw.JSONConn(req)
4242 1458c9b0fdaa Made the sql.Conn in function accessible via the context of the request. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4196 diff changeset	479
1472 702671b76eae Import bulk review: Use an slice of models.Review as input. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1471 diff changeset	480 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	481 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	482 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	483 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	484 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	485 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	486 }
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	487 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	488 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	489 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	490 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	491 }
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	492 }
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	493
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	494 return mw.JSONResult{Result: results}, nil
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	495 }
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	496
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	497 func reviewImport(req *http.Request) (jr mw.JSONResult, err error) {
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	498
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	499 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	500 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	501 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	502
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	503 var msg string
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	504 if msg, err = decideImport(req, mw.JSONConn(req), id, state); err != nil {
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	505 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	506 }
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	507
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	508 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	509 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	510 }{
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	511 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	512 }
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	513
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	514 jr = mw.JSONResult{Result: &result}
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	515 return
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	516 }
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	517
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	518 func decideImport(
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	519 req *http.Request,
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	520 conn *sql.Conn,
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	521 id int64,
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	522 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	523 ) (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	524 ctx := req.Context()
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	525 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	526 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	527 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	528 }
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	529 defer tx.Rollback()
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	530
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	531 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	532 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	533
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	534 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	535 switch {
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	536 case err == sql.ErrNoRows:
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	537 err = mw.JSONError{
2954 972400e56e4a Do not report client errors as server error Tom Gottfried <tom@intevation.de> parents: 2795 diff changeset	538 Code: http.StatusNotFound,
972400e56e4a Do not report client errors as server error Tom Gottfried <tom@intevation.de> parents: 2795 diff changeset	539 Message: fmt.Sprintf("cannot find import #%d", id),
972400e56e4a Do not report client errors as server error Tom Gottfried <tom@intevation.de> parents: 2795 diff changeset	540 }
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	541 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	542 case err != nil:
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	543 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	544 case !pending:
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	545 err = mw.JSONError{
2954 972400e56e4a Do not report client errors as server error Tom Gottfried <tom@intevation.de> parents: 2795 diff changeset	546 Code: http.StatusConflict,
972400e56e4a Do not report client errors as server error Tom Gottfried <tom@intevation.de> parents: 2795 diff changeset	547 Message: fmt.Sprintf("import #%d is not pending", id),
972400e56e4a Do not report client errors as server error Tom Gottfried <tom@intevation.de> parents: 2795 diff changeset	548 }
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	549 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	550 }
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	551
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	552 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	553 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	554 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	555 return
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	556 }
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	557 }
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	558
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	559 } else {
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	560 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	561 return
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	562 }
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	563 }
58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	564
1359 3ff916e853d4 Remove the import track in both cases accepted/declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1355 diff changeset	565 // 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	566 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	567 return
3ff916e853d4 Remove the import track in both cases accepted/declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1355 diff changeset	568 }
3ff916e853d4 Remove the import track in both cases accepted/declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1355 diff changeset	569
1194 7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	570 // 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	571 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	572 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	573
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	574 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	575 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	576 return
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	577 }
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	578
7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	579 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	580 return
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	581 }
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	582
1355 b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	583 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	584 return
b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	585 }
b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	586
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	587 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	588 "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	589
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	590 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	591 }

Mercurial > gemma

annotate pkg/controllers/importqueue.go @ 4748:47922c1a088d