gemma: pkg/controllers/importqueue.go annotate

annotate pkg/controllers/importqueue.go @ 5028:d727641911a5

Moved import desision logic to import queue (where it belongs). Major change: StageDone of the import job is executed by the original user who does the import.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Wed, 18 Mar 2020 17:52:00 +0100
parents	1fef4679b07a
children	66270586031a

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"
4791 1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	19 "encoding/csv"
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	20 "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	21 "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	22 "log"
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	23 "net/http"
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	24 "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	25 "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	26 "time"
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	27
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	28 "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	29
1194 7db850de0952 Added a signer who makes the final decison on an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1193 diff changeset	30 "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	31 "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	32 "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	33 "gemma.intevation.de/gemma/pkg/models"
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	34
4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	35 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	36 )
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	37
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	38 const (
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	39 selectImportsCountSQL = `
2682 9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	40 SELECT count(*)
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	41 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	42 WHERE
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	43 `
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	44 selectImportsSQL = `
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	45 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	46 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	47 state::varchar,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	48 enqueued,
4748 47922c1a088d Added a 'changed' column to the import.imports table. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4244 diff changeset	49 changed,
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	50 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	51 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	52 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	53 summary IS NOT NULL AS has_summary,
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	54 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	55 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	56 EXISTS(SELECT 1 FROM import.import_logs
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	57 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	58 FROM import.imports
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	59 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	60 `
4791 1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	61 selectExportSQL = `
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	62 SELECT
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	63 imports.id AS id,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	64 state::varchar,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	65 enqueued,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	66 changed,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	67 kind,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	68 username,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	69 (SELECT country FROM users.list_users lu
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	70 WHERE lu.username = import.imports.username) AS country,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	71 signer,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	72 EXISTS(SELECT 1 FROM import.import_logs
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	73 WHERE kind = 'warn'::log_type and import_id = imports.id) AS has_warnings,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	74 data
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	75 FROM import.imports
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	76 WHERE
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	77 `
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	78 selectEnqueuedSQL = `
2672 b997e1fd1d3d Fixed warning SQL prefix for selection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2671 diff changeset	79 SELECT enqueued FROM import.imports
b997e1fd1d3d Fixed warning SQL prefix for selection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2671 diff changeset	80 WHERE
b997e1fd1d3d Fixed warning SQL prefix for selection. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2671 diff changeset	81 `
2795 241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	82 selectImportSummarySQL = `
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	83 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	84
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	85 selectHasNoRunningImportSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	86 SELECT true FROM import.imports
59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	87 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	88
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	89 selectImportLogsSQL = `
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	90 SELECT
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	91 time,
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	92 kind::varchar,
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	93 msg
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	94 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	95 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	96 ORDER BY time`
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	97
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	98 deleteLogsSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	99 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	100
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	101 deleteImportSQL = `
1995 59055c8301df Move import queue to its own database namespace Tom Gottfried <tom@intevation.de> parents: 1693 diff changeset	102 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	103 )
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	104
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	105 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	106 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	107 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	108 }
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	109
4791 1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	110 func buildFilters(projection string, req http.Request) (filledStmt, filledStmt, filledStmt, error) {
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	111
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	112 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	113
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	114 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	115
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	116 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	117 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	118 l = append(l, term)
4195 ad13c581de7c Fixed building filters for listing import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4187 diff changeset	119 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	120 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	121 }
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
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	123 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	124 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	125 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	126 `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	127 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	128 }
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	129
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	130 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	131 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	132 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	133 "(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	134 "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	135 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	136 }
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	137
2667 5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	138 if st := req.FormValue("states"); st != "" {
5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	139 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	140 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	141 }
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	142
2667 5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	143 if ks := req.FormValue("kinds"); ks != "" {
5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	144 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	145 cond(" kind = ANY($%d) ", kinds)
1655 34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	146 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	147
2667 5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	148 if idss := req.FormValue("ids"); idss != "" {
5ece2c51d1f0 More filter simplification. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2665 diff changeset	149 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	150 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	151 }
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	152
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	153 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	154 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	155 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	156 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	157 }
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	158 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	159 b = append(b, buildFilterTerm("enqueued < $%d", fromTime))
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	160 } else {
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	161 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	162 }
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	163
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	164 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	165 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	166 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	167 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	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 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	170 a = append(a, buildFilterTerm("enqueued > $%d", toTime))
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	171 } else {
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	172 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	173 }
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	174
2665 fea12fc850d2 Simplified warnings filtering. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2663 diff changeset	175 switch warn := strings.ToLower(req.FormValue("warnings")); warn {
fea12fc850d2 Simplified warnings filtering. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2663 diff changeset	176 case "1", "t", "true":
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	177 cond(` EXISTS(SELECT 1 FROM import.import_logs
65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	178 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	179 }
fea12fc850d2 Simplified warnings filtering. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2663 diff changeset	180
4196 948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	181 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	182 case "1", "t", "true":
948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	183 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	184 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	185 }
948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	186
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	187 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	188 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	189 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	190
4187 65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	191 fa.stmt.WriteString(selectEnqueuedSQL)
65a5501dc13d Enable faster access to import logs Tom Gottfried <tom@intevation.de> parents: 4148 diff changeset	192 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	193
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 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	195
4791 1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	196 if projection != "" {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	197 fl.stmt.WriteString(projection)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	198 } else {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	199 switch count := strings.ToLower(req.FormValue("count")); count {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	200 case "1", "t", "true":
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	201 counting = true
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	202 fl.stmt.WriteString(selectImportsCountSQL)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	203 default:
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	204 fl.stmt.WriteString(selectImportsSQL)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	205 }
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	206 }
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	207
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	208 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	209 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	210 } 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	211 l.serialize(&fl.stmt, &fl.args)
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	212 }
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	213
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 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	215 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	216 } 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	217 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	218 }
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	219
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 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	221 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	222 } 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	223 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	224 }
34315277f2d6 Added ids filter to importqueue listing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1495 diff changeset	225
2682 9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	226 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	227 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	228 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	229 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	230 }
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	231
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	232 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	233 fb = nil
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	234 }
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	235 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	236 fa = nil
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	237 }
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	238
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	239 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	240 }
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	241
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	242 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	243
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	244 var when time.Time
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	245 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	246 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	247 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	248 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	249 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	250 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	251 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	252 }
4084 350a24c92848 Deliver times from import queue in UTC. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4078 diff changeset	253 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	254 }
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	255
4791 1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	256 func exportImports(rw http.ResponseWriter, req *http.Request) {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	257
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	258 list, _, _, err := buildFilters(selectExportSQL, req)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	259 if err != nil {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	260 http.Error(rw, "error: "+err.Error(), http.StatusBadRequest)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	261 return
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	262 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	263
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	264 rw.Header().Add("Content-Type", "text/csv")
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	265 out := csv.NewWriter(rw)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	266
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	267 record := []string{
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	268 "#id",
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	269 "#kind",
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	270 "#enqueued",
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	271 "#changed",
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	272 "#user",
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	273 "#country",
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	274 "#signer",
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	275 "#state",
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	276 "#warnings",
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	277 "#source",
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	278 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	279
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	280 if err := out.Write(record); err != nil {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	281 // Too late for HTTP status message.
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	282 log.Printf("error: %v\n", err)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	283 return
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	284 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	285
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	286 conn := mw.GetDBConn(req)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	287 ctx := req.Context()
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	288 var rows *sql.Rows
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	289 if rows, err = conn.QueryContext(ctx, list.stmt.String(), list.args...); err != nil {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	290 log.Printf("error: %v\n", err)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	291 return
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	292 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	293 defer rows.Close()
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	294
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	295 stringString := func(s sql.NullString) string {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	296 if s.Valid {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	297 return s.String
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	298 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	299 return ""
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	300 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	301
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	302 // Extract some meta infos from the import.
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	303 type Description interface {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	304 Description() (string, error)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	305 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	306
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	307 for rows.Next() {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	308 var (
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	309 id int64
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	310 state string
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	311 enqueued time.Time
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	312 changed time.Time
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	313 kind string
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	314 user string
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	315 country string
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	316 signer sql.NullString
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	317 warnings bool
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	318 data string
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	319 description string
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	320 )
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	321 if err = rows.Scan(
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	322 &id,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	323 &state,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	324 &enqueued,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	325 &changed,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	326 &kind,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	327 &user,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	328 &country,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	329 &signer,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	330 &warnings,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	331 &data,
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	332 ); err != nil {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	333 return
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	334 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	335
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	336 // Do some introspection on the job to be more verbose.
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	337 if jc := imports.FindJobCreator(imports.JobKind(kind)); jc != nil {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	338 job := jc.Create()
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	339 if err := common.FromJSONString(data, job); err != nil {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	340 log.Printf("error: %v\n", err)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	341 } else if desc, ok := job.(Description); ok {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	342 if description, err = desc.Description(); err != nil {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	343 log.Printf("error: %v\n", err)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	344 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	345 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	346 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	347
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	348 record[0] = strconv.FormatInt(id, 10)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	349 record[1] = kind
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	350 record[2] = enqueued.UTC().Format(common.TimeFormat)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	351 record[3] = changed.UTC().Format(common.TimeFormat)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	352 record[4] = user
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	353 record[5] = country
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	354 record[6] = stringString(signer)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	355 record[7] = state
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	356 record[8] = strconv.FormatBool(warnings)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	357 record[9] = strings.Replace(description, ",", "\|", -1)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	358
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	359 if err := out.Write(record); err != nil {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	360 log.Printf("error: %v\n", err)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	361 return
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	362 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	363 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	364
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	365 out.Flush()
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	366 if err := out.Error(); err != nil {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	367 log.Printf("error: %v\n", err)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	368 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	369
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	370 if err = rows.Err(); err != nil {
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	371 log.Printf("error: %v\n", err)
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	372 return
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	373 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	374 }
1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	375
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	376 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	377
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	378 var list, before, after *filledStmt
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	379
4791 1fef4679b07a Added an endpoint GET api/imports/export to export imports. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4748 diff changeset	380 if list, before, after, err = buildFilters("", req); err != nil {
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	381 return
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	382 }
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	383
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	384 ctx := req.Context()
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	385
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	386 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	387
2682 9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	388 // 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	389
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	390 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	391 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	392 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	393 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	394 switch {
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	395 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	396 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	397 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	398 return
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	399 }
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	400 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	401 return
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	402 }
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	403
9a493d27bf3f Added /api/imports?count=true to only count the results. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2681 diff changeset	404 // 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	405
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	406 var rows *sql.Rows
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	407 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	408 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	409 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	410 defer rows.Close()
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	411
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	412 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	413
2662 f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	414 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	415
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	416 for rows.Next() {
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	417 var it models.Import
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	418 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	419 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	420 if err = rows.Scan(
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	421 &it.ID,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	422 &it.State,
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	423 &enqueued,
4748 47922c1a088d Added a 'changed' column to the import.imports table. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4244 diff changeset	424 &changed,
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	425 &it.Kind,
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	426 &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	427 &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	428 &it.Summary,
4196 948e312e87bc Add flag and filter for imports having errors Tom Gottfried <tom@intevation.de> parents: 4195 diff changeset	429 &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	430 &it.Warnings,
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	431 ); err != nil {
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	432 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	433 }
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	434 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	435 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	436 }
4084 350a24c92848 Deliver times from import queue in UTC. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4078 diff changeset	437 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	438 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	439 imports = append(imports, &it)
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	440 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	441
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	442 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	443 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	444 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	445
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	446 var prev, next *models.ImportTime
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	447
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	448 if before != nil {
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	449 prev = neighbored(ctx, conn, before)
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	450 }
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	451
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	452 if after != nil {
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	453 next = neighbored(ctx, conn, after)
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	454 }
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	455
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	456 jr = mw.JSONResult{
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	457 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	458 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	459 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	460 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	461 }{
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	462 Imports: imports,
2671 8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	463 Prev: prev,
8f3facf902dd Filter prev/next, too. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2670 diff changeset	464 Next: next,
1023 337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	465 },
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	466 }
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	467 return
337a7f4c8a16 Add endpoint to list all or some import jobs. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	468 }
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	469
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	470 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	471
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	472 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	473
1026 3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	474 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	475
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	476 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	477
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	478 // 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	479 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	480 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	481 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	482 &summary,
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	483 &enqueued,
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	484 )
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	485 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	486 case err == sql.ErrNoRows:
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	487 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	488 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	489 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	490 }
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	491 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	492 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	493 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	494 }
4084 350a24c92848 Deliver times from import queue in UTC. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4078 diff changeset	495 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	496
2662 f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	497 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	498 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	499 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	500 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	501 return
f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	502 }
f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	503 }
f90557a8c960 Moved summary from /api/imports overview to /api/imports/{id} details. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2627 diff changeset	504
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	505 // 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	506 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	507 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	508 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	509 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	510 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	511 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	512
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	513 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	514
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	515 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	516 var entry models.ImportLogEntry
4084 350a24c92848 Deliver times from import queue in UTC. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4078 diff changeset	517 var t time.Time
350a24c92848 Deliver times from import queue in UTC. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4078 diff changeset	518 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	519 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	520 }
4148 1b1218bbd414 Made 'go vet' happy with controllers again. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4084 diff changeset	521 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	522 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	523 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	524
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	525 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	526 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	527 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	528
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	529 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	530 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	531 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	532 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	533 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	534 }{
3089 813309225e35 Made 'go vet' happy again. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2954 diff changeset	535 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	536 Summary: sum,
241e7f05a538 /api/imports/{id} result now also contains the 'enqueued' time. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2772 diff changeset	537 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	538 },
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	539 }
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	540 return
3de54d7b7d30 Added endpoint to show the detail logs of an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1023 diff changeset	541 }
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	542
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	543 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	544
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	545 ctx := req.Context()
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	546 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	547
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	548 var tx *sql.Tx
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	549 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	550 if err != nil {
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	551 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	552 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	553 defer tx.Rollback()
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	554
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	555 // 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	556 var dummy bool
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	557 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	558 switch {
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	559 case err == sql.ErrNoRows:
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	560 err = mw.JSONError{
1037 a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	561 Code: http.StatusNotFound,
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	562 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	563 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	564 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	565 case err != nil:
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	566 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	567 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	568
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	569 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	570 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	571 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	572
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	573 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	574 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	575 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	576
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	577 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	578 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	579 }
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	580
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	581 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	582
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	583 return
a04126989d91 Added endpoint to delete job from import queue. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1031 diff changeset	584 }
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	585
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	586 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	587
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	588 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	589
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	590 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	591 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	592 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	593 Error string `json:"error,omitempty"`
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	594 }
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	595
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	596 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	597
1472 702671b76eae Import bulk review: Use an slice of models.Review as input. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1471 diff changeset	598 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	599 rev := &rs[i]
5028 d727641911a5 Moved import desision logic to import queue (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4791 diff changeset	600 msg, err := decideImport(req, rev.ID, string(rev.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	601 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	602 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	603 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	604 }
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	605 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	606 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	607 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	608 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	609 }
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	610 }
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	611
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	612 return mw.JSONResult{Result: results}, nil
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	613 }
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	614
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	615 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	616
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	617 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	618 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	619 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	620
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	621 var msg string
5028 d727641911a5 Moved import desision logic to import queue (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4791 diff changeset	622 if msg, err = decideImport(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	623 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	624 }
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	625
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	626 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	627 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	628 }{
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	629 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	630 }
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	631
4244 4394daeea96a Moved JSONHandler into middleware package. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4243 diff changeset	632 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	633 return
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	634 }
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	635
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	636 func decideImport(
1468 5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	637 req *http.Request,
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	638 id int64,
5e1218b5a123 proof of concept Thomas Junk <thomas.junk@intevation.de> parents: 1392 diff changeset	639 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	640 ) (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	641 ctx := req.Context()
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	642
5028 d727641911a5 Moved import desision logic to import queue (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4791 diff changeset	643 accepted := state == "accepted"
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	644
5028 d727641911a5 Moved import desision logic to import queue (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4791 diff changeset	645 session, _ := auth.GetSession(req)
d727641911a5 Moved import desision logic to import queue (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4791 diff changeset	646 reviewer := session.User
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	647
5028 d727641911a5 Moved import desision logic to import queue (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4791 diff changeset	648 if err = imports.DecideImport(ctx, id, accepted, reviewer); err != nil {
d727641911a5 Moved import desision logic to import queue (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4791 diff changeset	649 err = mw.JSONError{
d727641911a5 Moved import desision logic to import queue (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4791 diff changeset	650 Code: http.StatusBadRequest,
d727641911a5 Moved import desision logic to import queue (where it belongs). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 4791 diff changeset	651 Message: err.Error(),
1193 58acc343b1b6 Implemented the db stuff of the review process. Needs testing. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1192 diff changeset	652 }
1355 b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	653 return
b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	654 }
b0ebb77f4ab0 Return nice JSON result if import was accepted or declined. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1351 diff changeset	655
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	656 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	657 "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	658
1192 3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	659 return
3afa71405b87 Added REST endpoint to accept or decline an import. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1189 diff changeset	660 }

Mercurial > gemma

annotate pkg/controllers/importqueue.go @ 5028:d727641911a5