CHANGELOG.md: Move unreleased changes to 1.1.1

CHANGELOG.md: Add unreleased changes
Sort imports with isort
2025-05-10 23:26:02 +02:00 · 2019-11-27 12:32:54 +02:00 · 2019-11-27 12:32:16 +02:00 · 2019-11-27 12:31:04 +02:00 · 2019-11-27 12:30:06 +02:00 · 2019-11-27 12:26:55 +02:00
20 changed files with 78206 additions and 199 deletions
--- a/.build.yml
+++ b/.build.yml
@ -0,0 +1,24 @@
+image: archlinux
+packages:
+  - python-pipenv
+  - postgresql
+sources:
+  - https://git.sr.ht/~alanorth/dspace-statistics-api
+tasks:
+  - setup: |
+      id
+      psql --version
+      sudo su - postgres -c "initdb --locale en_US.UTF-8 -E UTF8 -D '/var/lib/postgres/data'"
+      sudo systemctl start postgresql
+      createuser -U postgres dspacestatistics
+      psql -U postgres -c "ALTER USER dspacestatistics WITH PASSWORD 'dspacestatistics'"
+      createdb -U postgres -O dspacestatistics --encoding=UNICODE dspacestatistics
+      cd dspace-statistics-api
+      psql -U postgres -d dspacestatistics < tests/dspacestatistics.sql
+      pipenv install --dev
+  - test: |
+      cd dspace-statistics-api
+      pipenv run pytest
+environment:
+  PIPENV_NOSPIN: 'True'
+  PIPENV_HIDE_EMOJIS: 'True'
--- a/.flake8
+++ b/.flake8
@ -0,0 +1,2 @@
+[flake8]
+ignore = E501
--- a/.hound.yml
+++ b/.hound.yml
@ -0,0 +1,4 @@
+flake8:
+    enabled: true
+    config_file: .flake8
+    fail_on_violations: true
--- a/.travis.yml
+++ b/.travis.yml
@ -1,11 +1,21 @@
+dist: bionic
 language: python
 python:
  - "3.5"
  - "3.6"
-  - "3.7-dev"
-script: pip install -r requirements.txt
-branches:
-  only:
-    - master
+  - "3.7"
+  - "3.8"
+addons:
+  postgresql: "9.6"
+before_script:
+  - psql --version
+  - createuser -U postgres dspacestatistics
+  - psql -U postgres -c "ALTER USER dspacestatistics WITH PASSWORD 'dspacestatistics'"
+  - createdb -U postgres -O dspacestatistics --encoding=UNICODE dspacestatistics
+  - psql -U postgres -d dspacestatistics < tests/dspacestatistics.sql
+install:
+  - "pip install -r requirements.txt"
+  - "pip install -r requirements-dev.txt"
+script: pytest

 # vim: ts=2 sw=2 et
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,34 +4,97 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-### [0.6.1] - 2018-10-31
-## Added
+## [1.1.1] - 2019-11-27
+### Added
+- Configuration for automatic sorting of imports with isort
+- Configuration for automatic code formatting with black
+
+### Updated
+- Run pipenv update, bringing psycogpg 2.8.3, requests 2.22.0, pytest 5.3.1,
+and gunicorn 20.0.4
+
+### Changed
+- Use Ubuntu 18.04 "Bionic" for TravisCI builds
+- Use Python 3.8.0 for pipenv
+- Minor syntax issues highlighted by flake8
+
+## [1.1.0] - 2019-05-05
+## Updated
+- Falcon 2.0.0 (@alanorth)
+
+## [1.0.0] - 2019-04-15
+### Added
+- Build configuration for build.sr.ht
+
+### Updated
+- Run pipenv update, bringing pytest version 4.4.0, psycopg-binary 2.8.2, etc
+- sr.ht and TravisCI configuration to disable emojis and animation to keep logs clean
+
+### Changed
+- Use vanilla requests library instead of SolrClient
+- Use one-based paging in indexer output (for human readability)
+
+## [0.9.0] - 2019-01-22
+### Updated
+- pytest version 4.0.0
+- Fix indexing of sharded statistics cores ([#10))
+- Handle case of missing views/downloads gracefully
+
+## [0.8.1] - 2018-11-14
+### Changed
+- README.md to recommend using vanilla Python virtual environments and pip instead of pipenv
+- Regenerate pipenv environment to capture only direct dependencies
+
+### Added
+- `requirements-dev.txt` for installing development packages with pip
+
+## [0.8.0] - 2018-11-11
+### Changed
+- Properly handle database connection errors
+
+### Added
+- API tests with pytest
+
+## [0.7.0] - 2018-11-07
+### Added
+- Ability to configure PostgreSQL database port with DATABASE_PORT environment variable (defaults to 5432)
+- Hound CI configuration to validate pull requests against PEP 8 code style with Flake8
+- Configuration for [pipenv](https://pipenv.readthedocs.io/en/latest/)
+
+### Changed
+- Use a database management class with Python context management to automatically open/close connections and cursors
+
+### Changed
+- Validate code against PEP 8 style guide with Flake8
+
+## [0.6.1] - 2018-10-31
+### Added
 - API documentation at root path (/)

-### [0.6.0] - 2018-10-31
-## Changed
+## [0.6.0] - 2018-10-31
+### Changed
 - Refactor project structure (note breaking changes to API and indexing invocation, see contrib and README.md)

-### [0.5.2] - 2018-10-28
-## Changed
+## [0.5.2] - 2018-10-28
+### Changed
 - Update library versions in requirements.txt

-### [0.5.1] - 2018-10-24
-## Changed
+## [0.5.1] - 2018-10-24
+### Changed
 - Use Python's native json instead of ujson

-### [0.5.0] - 2018-10-24
-## Added
+## [0.5.0] - 2018-10-24
+### Added
 - Example nginx configuration to README.md

-## Changed
+### Changed
 - Don't initialize Solr connection in API

-### [0.4.3] - 2018-10-17
-## Changed
+## [0.4.3] - 2018-10-17
+### Changed
 - Use pip install as script for Travis CI

-## Improved
+### Improved
 - Documentation for deployment and testing

 ## [0.4.2] - 2018-10-04
@ -45,7 +108,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [0.4.1] - 2018-09-26
 ### Changed
- Use execute_values() to batch insert records to PostgreSQL
+- Use `execute_values()` to batch insert records to PostgreSQL

 ## [0.4.0] - 2018-09-25
 ### Fixed
--- a/20
+++ b/20
@ -0,0 +1,20 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+gunicorn = "*"
+falcon = "==2.0.0"
+"psycopg2-binary" = "*"
+requests = "*"
+
+[dev-packages]
+ipython = "*"
+"flake8" = "*"
+pytest = "*"
+isort = "*"
+black = "*"
+
+[requires]
+python_version = "3.8"
--- a/Pipfile.lock
+++ b/Pipfile.lock
@ -0,0 +1,397 @@
+{
+    "_meta": {
+        "hash": {
+            "sha256": "5e3f3e80bd92780ab66a80a83156001e50362a0d6195b1a304a15dc0c645c562"
+        },
+        "pipfile-spec": 6,
+        "requires": {
+            "python_version": "3.8"
+        },
+        "sources": [
+            {
+                "name": "pypi",
+                "url": "https://pypi.org/simple",
+                "verify_ssl": true
+            }
+        ]
+    },
+    "default": {
+        "certifi": {
+            "hashes": [
+                "sha256:e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50",
+                "sha256:fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef"
+            ],
+            "version": "==2019.9.11"
+        },
+        "chardet": {
+            "hashes": [
+                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
+                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+            ],
+            "version": "==3.0.4"
+        },
+        "falcon": {
+            "hashes": [
+                "sha256:18157af2a4fc3feedf2b5dcc6196f448639acf01c68bc33d4d5a04c3ef87f494",
+                "sha256:24adcd2b29a8ffa9d552dc79638cd21736a3fb04eda7d102c6cebafdaadb88ad",
+                "sha256:54f2cb4b687035b2a03206dbfc538055cc48b59a953187b0458aa1b574d47b53",
+                "sha256:59d1e8c993b9a37ea06df9d72cf907a46cc8063b30717cdac2f34d1658b6f936",
+                "sha256:733033ec80c896e30a43ab3e776856096836787197a44eb21022320a61311983",
+                "sha256:74cf1d18207381c665b9e6292d65100ce146d958707793174b03869dc6e614f4",
+                "sha256:95bf6ce986c1119aef12c9b348f4dee9c6dcc58391bdd0bc2b0bf353c2b15986",
+                "sha256:9712975adcf8c6e12876239085ad757b8fdeba223d46d23daef82b47658f83a9",
+                "sha256:a5ebb22a04c9cc65081938ee7651b4e3b4d2a28522ea8ec04c7bdd2b3e9e8cd8",
+                "sha256:aa184895d1ad4573fbfaaf803563d02f019ebdf4790e41cc568a330607eae439",
+                "sha256:e3782b7b92fefd46a6ad1fd8fe63fe6c6f1b7740a95ca56957f48d1aee34b357",
+                "sha256:e9efa0791b5d9f9dd9689015ea6bce0a27fcd5ecbcd30e6d940bffa4f7f03389",
+                "sha256:eea593cf466b9c126ce667f6d30503624ef24459f118c75594a69353b6c3d5fc",
+                "sha256:f93351459f110b4c1ee28556aef9a791832df6f910bea7b3f616109d534df06b"
+            ],
+            "index": "pypi",
+            "version": "==2.0.0"
+        },
+        "gunicorn": {
+            "hashes": [
+                "sha256:1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626",
+                "sha256:cd4a810dd51bf497552cf3f863b575dabd73d6ad6a91075b65936b151cbf4f9c"
+            ],
+            "index": "pypi",
+            "version": "==20.0.4"
+        },
+        "idna": {
+            "hashes": [
+                "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
+                "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
+            ],
+            "version": "==2.8"
+        },
+        "psycopg2-binary": {
+            "hashes": [
+                "sha256:040234f8a4a8dfd692662a8308d78f63f31a97e1c42d2480e5e6810c48966a29",
+                "sha256:086f7e89ec85a6704db51f68f0dcae432eff9300809723a6e8782c41c2f48e03",
+                "sha256:18ca813fdb17bc1db73fe61b196b05dd1ca2165b884dd5ec5568877cabf9b039",
+                "sha256:19dc39616850342a2a6db70559af55b22955f86667b5f652f40c0e99253d9881",
+                "sha256:2166e770cb98f02ed5ee2b0b569d40db26788e0bf2ec3ae1a0d864ea6f1d8309",
+                "sha256:3a2522b1d9178575acee4adf8fd9f979f9c0449b00b4164bb63c3475ea6528ed",
+                "sha256:3aa773580f85a28ffdf6f862e59cb5a3cc7ef6885121f2de3fca8d6ada4dbf3b",
+                "sha256:3b5deaa3ee7180585a296af33e14c9b18c218d148e735c7accf78130765a47e3",
+                "sha256:407af6d7e46593415f216c7f56ba087a9a42bd6dc2ecb86028760aa45b802bd7",
+                "sha256:4c3c09fb674401f630626310bcaf6cd6285daf0d5e4c26d6e55ca26a2734e39b",
+                "sha256:4c6717962247445b4f9e21c962ea61d2e884fc17df5ddf5e35863b016f8a1f03",
+                "sha256:50446fae5681fc99f87e505d4e77c9407e683ab60c555ec302f9ac9bffa61103",
+                "sha256:5057669b6a66aa9ca118a2a860159f0ee3acf837eda937bdd2a64f3431361a2d",
+                "sha256:5dd90c5438b4f935c9d01fcbad3620253da89d19c1f5fca9158646407ed7df35",
+                "sha256:659c815b5b8e2a55193ede2795c1e2349b8011497310bb936da7d4745652823b",
+                "sha256:69b13fdf12878b10dc6003acc8d0abf3ad93e79813fd5f3812497c1c9fb9be49",
+                "sha256:7a1cb80e35e1ccea3e11a48afe65d38744a0e0bde88795cc56a4d05b6e4f9d70",
+                "sha256:7e6e3c52e6732c219c07bd97fff6c088f8df4dae3b79752ee3a817e6f32e177e",
+                "sha256:7f42a8490c4fe854325504ce7a6e4796b207960dabb2cbafe3c3959cb00d1d7e",
+                "sha256:84156313f258eafff716b2961644a4483a9be44a5d43551d554844d15d4d224e",
+                "sha256:8578d6b8192e4c805e85f187bc530d0f52ba86c39172e61cd51f68fddd648103",
+                "sha256:890167d5091279a27e2505ff0e1fb273f8c48c41d35c5b92adbf4af80e6b2ed6",
+                "sha256:98e10634792ac0e9e7a92a76b4991b44c2325d3e7798270a808407355e7bb0a1",
+                "sha256:9aadff9032e967865f9778485571e93908d27dab21d0fdfdec0ca779bb6f8ad9",
+                "sha256:9f24f383a298a0c0f9b3113b982e21751a8ecde6615494a3f1470eb4a9d70e9e",
+                "sha256:a73021b44813b5c84eda4a3af5826dd72356a900bac9bd9dd1f0f81ee1c22c2f",
+                "sha256:afd96845e12638d2c44d213d4810a08f4dc4a563f9a98204b7428e567014b1cd",
+                "sha256:b73ddf033d8cd4cc9dfed6324b1ad2a89ba52c410ef6877998422fcb9c23e3a8",
+                "sha256:b8f490f5fad1767a1331df1259763b3bad7d7af12a75b950c2843ba319b2415f",
+                "sha256:dbc5cd56fff1a6152ca59445178652756f4e509f672e49ccdf3d79c1043113a4",
+                "sha256:eac8a3499754790187bb00574ab980df13e754777d346f85e0ff6df929bcd964",
+                "sha256:eaed1c65f461a959284649e37b5051224f4db6ebdc84e40b5e65f2986f101a08"
+            ],
+            "index": "pypi",
+            "version": "==2.8.4"
+        },
+        "requests": {
+            "hashes": [
+                "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4",
+                "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"
+            ],
+            "index": "pypi",
+            "version": "==2.22.0"
+        },
+        "urllib3": {
+            "hashes": [
+                "sha256:a8a318824cc77d1fd4b2bec2ded92646630d7fe8619497b142c84a9e6f5a7293",
+                "sha256:f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745"
+            ],
+            "version": "==1.25.7"
+        }
+    },
+    "develop": {
+        "appdirs": {
+            "hashes": [
+                "sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92",
+                "sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e"
+            ],
+            "version": "==1.4.3"
+        },
+        "attrs": {
+            "hashes": [
+                "sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c",
+                "sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"
+            ],
+            "version": "==19.3.0"
+        },
+        "backcall": {
+            "hashes": [
+                "sha256:38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4",
+                "sha256:bbbf4b1e5cd2bdb08f915895b51081c041bac22394fdfcfdfbe9f14b77c08bf2"
+            ],
+            "version": "==0.1.0"
+        },
+        "black": {
+            "hashes": [
+                "sha256:1b30e59be925fafc1ee4565e5e08abef6b03fe455102883820fe5ee2e4734e0b",
+                "sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539"
+            ],
+            "index": "pypi",
+            "version": "==19.10b0"
+        },
+        "click": {
+            "hashes": [
+                "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13",
+                "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"
+            ],
+            "version": "==7.0"
+        },
+        "decorator": {
+            "hashes": [
+                "sha256:54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce",
+                "sha256:5d19b92a3c8f7f101c8dd86afd86b0f061a8ce4540ab8cd401fa2542756bce6d"
+            ],
+            "version": "==4.4.1"
+        },
+        "entrypoints": {
+            "hashes": [
+                "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19",
+                "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"
+            ],
+            "version": "==0.3"
+        },
+        "flake8": {
+            "hashes": [
+                "sha256:45681a117ecc81e870cbf1262835ae4af5e7a8b08e40b944a8a6e6b895914cfb",
+                "sha256:49356e766643ad15072a789a20915d3c91dc89fd313ccd71802303fd67e4deca"
+            ],
+            "index": "pypi",
+            "version": "==3.7.9"
+        },
+        "ipython": {
+            "hashes": [
+                "sha256:dfd303b270b7b5232b3d08bd30ec6fd685d8a58cabd54055e3d69d8f029f7280",
+                "sha256:ed7ebe1cba899c1c3ccad6f7f1c2d2369464cc77dba8eebc65e2043e19cda995"
+            ],
+            "index": "pypi",
+            "version": "==7.9.0"
+        },
+        "ipython-genutils": {
+            "hashes": [
+                "sha256:72dd37233799e619666c9f639a9da83c34013a73e8bbc79a7a6348d93c61fab8",
+                "sha256:eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"
+            ],
+            "version": "==0.2.0"
+        },
+        "isort": {
+            "hashes": [
+                "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1",
+                "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd"
+            ],
+            "index": "pypi",
+            "version": "==4.3.21"
+        },
+        "jedi": {
+            "hashes": [
+                "sha256:786b6c3d80e2f06fd77162a07fed81b8baa22dde5d62896a790a331d6ac21a27",
+                "sha256:ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e"
+            ],
+            "version": "==0.15.1"
+        },
+        "mccabe": {
+            "hashes": [
+                "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
+                "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
+            ],
+            "version": "==0.6.1"
+        },
+        "more-itertools": {
+            "hashes": [
+                "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832",
+                "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"
+            ],
+            "version": "==7.2.0"
+        },
+        "packaging": {
+            "hashes": [
+                "sha256:28b924174df7a2fa32c1953825ff29c61e2f5e082343165438812f00d3a7fc47",
+                "sha256:d9551545c6d761f3def1677baf08ab2a3ca17c56879e70fecba2fc4dde4ed108"
+            ],
+            "version": "==19.2"
+        },
+        "parso": {
+            "hashes": [
+                "sha256:63854233e1fadb5da97f2744b6b24346d2750b85965e7e399bec1620232797dc",
+                "sha256:666b0ee4a7a1220f65d367617f2cd3ffddff3e205f3f16a0284df30e774c2a9c"
+            ],
+            "version": "==0.5.1"
+        },
+        "pathspec": {
+            "hashes": [
+                "sha256:e285ccc8b0785beadd4c18e5708b12bb8fcf529a1e61215b3feff1d1e559ea5c"
+            ],
+            "version": "==0.6.0"
+        },
+        "pexpect": {
+            "hashes": [
+                "sha256:2094eefdfcf37a1fdbfb9aa090862c1a4878e5c7e0e7e7088bdb511c558e5cd1",
+                "sha256:9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb"
+            ],
+            "markers": "sys_platform != 'win32'",
+            "version": "==4.7.0"
+        },
+        "pickleshare": {
+            "hashes": [
+                "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca",
+                "sha256:9649af414d74d4df115d5d718f82acb59c9d418196b7b4290ed47a12ce62df56"
+            ],
+            "version": "==0.7.5"
+        },
+        "pluggy": {
+            "hashes": [
+                "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0",
+                "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"
+            ],
+            "version": "==0.13.1"
+        },
+        "prompt-toolkit": {
+            "hashes": [
+                "sha256:46642344ce457641f28fc9d1c9ca939b63dadf8df128b86f1b9860e59c73a5e4",
+                "sha256:e7f8af9e3d70f514373bf41aa51bc33af12a6db3f71461ea47fea985defb2c31",
+                "sha256:f15af68f66e664eaa559d4ac8a928111eebd5feda0c11738b5998045224829db"
+            ],
+            "version": "==2.0.10"
+        },
+        "ptyprocess": {
+            "hashes": [
+                "sha256:923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0",
+                "sha256:d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f"
+            ],
+            "version": "==0.6.0"
+        },
+        "py": {
+            "hashes": [
+                "sha256:64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa",
+                "sha256:dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53"
+            ],
+            "version": "==1.8.0"
+        },
+        "pycodestyle": {
+            "hashes": [
+                "sha256:95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56",
+                "sha256:e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"
+            ],
+            "version": "==2.5.0"
+        },
+        "pyflakes": {
+            "hashes": [
+                "sha256:17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0",
+                "sha256:d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"
+            ],
+            "version": "==2.1.1"
+        },
+        "pygments": {
+            "hashes": [
+                "sha256:83ec6c6133ca6b529b7ff5aa826328fd14b5bb02a58c37f4f06384e96a0f94ab",
+                "sha256:b7949de3d396836085fea596998b135a22610bbcc4f2abfe9e448e44cbc58388"
+            ],
+            "version": "==2.5.1"
+        },
+        "pyparsing": {
+            "hashes": [
+                "sha256:20f995ecd72f2a1f4bf6b072b63b22e2eb457836601e76d6e5dfcd75436acc1f",
+                "sha256:4ca62001be367f01bd3e92ecbb79070272a9d4964dce6a48a82ff0b8bc7e683a"
+            ],
+            "version": "==2.4.5"
+        },
+        "pytest": {
+            "hashes": [
+                "sha256:63344a2e3bce2e4d522fd62b4fdebb647c019f1f9e4ca075debbd13219db4418",
+                "sha256:f67403f33b2b1d25a6756184077394167fe5e2f9d8bdaab30707d19ccec35427"
+            ],
+            "index": "pypi",
+            "version": "==5.3.1"
+        },
+        "regex": {
+            "hashes": [
+                "sha256:15454b37c5a278f46f7aa2d9339bda450c300617ca2fca6558d05d870245edc7",
+                "sha256:1ad40708c255943a227e778b022c6497c129ad614bb7a2a2f916e12e8a359ee7",
+                "sha256:5e00f65cc507d13ab4dfa92c1232d004fa202c1d43a32a13940ab8a5afe2fb96",
+                "sha256:604dc563a02a74d70ae1f55208ddc9bfb6d9f470f6d1a5054c4bd5ae58744ab1",
+                "sha256:720e34a539a76a1fedcebe4397290604cc2bdf6f81eca44adb9fb2ea071c0c69",
+                "sha256:7caf47e4a9ac6ef08cabd3442cc4ca3386db141fb3c8b2a7e202d0470028e910",
+                "sha256:7faf534c1841c09d8fefa60ccde7b9903c9b528853ecf41628689793290ca143",
+                "sha256:b4e0406d822aa4993ac45072a584d57aa4931cf8288b5455bbf30c1d59dbad59",
+                "sha256:c31eaf28c6fe75ea329add0022efeed249e37861c19681960f99bbc7db981fb2",
+                "sha256:c7393597191fc2043c744db021643549061e12abe0b3ff5c429d806de7b93b66",
+                "sha256:d2b302f8cdd82c8f48e9de749d1d17f85ce9a0f082880b9a4859f66b07037dc6",
+                "sha256:e3d8dd0ec0ea280cf89026b0898971f5750a7bd92cb62c51af5a52abd020054a",
+                "sha256:ec032cbfed59bd5a4b8eab943c310acfaaa81394e14f44454ad5c9eba4f24a74"
+            ],
+            "version": "==2019.11.1"
+        },
+        "six": {
+            "hashes": [
+                "sha256:1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd",
+                "sha256:30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66"
+            ],
+            "version": "==1.13.0"
+        },
+        "toml": {
+            "hashes": [
+                "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c",
+                "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e"
+            ],
+            "version": "==0.10.0"
+        },
+        "traitlets": {
+            "hashes": [
+                "sha256:70b4c6a1d9019d7b4f6846832288f86998aa3b9207c6821f3578a6a6a467fe44",
+                "sha256:d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7"
+            ],
+            "version": "==4.3.3"
+        },
+        "typed-ast": {
+            "hashes": [
+                "sha256:1170afa46a3799e18b4c977777ce137bb53c7485379d9706af8a59f2ea1aa161",
+                "sha256:18511a0b3e7922276346bcb47e2ef9f38fb90fd31cb9223eed42c85d1312344e",
+                "sha256:262c247a82d005e43b5b7f69aff746370538e176131c32dda9cb0f324d27141e",
+                "sha256:2b907eb046d049bcd9892e3076c7a6456c93a25bebfe554e931620c90e6a25b0",
+                "sha256:354c16e5babd09f5cb0ee000d54cfa38401d8b8891eefa878ac772f827181a3c",
+                "sha256:48e5b1e71f25cfdef98b013263a88d7145879fbb2d5185f2a0c79fa7ebbeae47",
+                "sha256:4e0b70c6fc4d010f8107726af5fd37921b666f5b31d9331f0bd24ad9a088e631",
+                "sha256:630968c5cdee51a11c05a30453f8cd65e0cc1d2ad0d9192819df9978984529f4",
+                "sha256:66480f95b8167c9c5c5c87f32cf437d585937970f3fc24386f313a4c97b44e34",
+                "sha256:71211d26ffd12d63a83e079ff258ac9d56a1376a25bc80b1cdcdf601b855b90b",
+                "sha256:7954560051331d003b4e2b3eb822d9dd2e376fa4f6d98fee32f452f52dd6ebb2",
+                "sha256:838997f4310012cf2e1ad3803bce2f3402e9ffb71ded61b5ee22617b3a7f6b6e",
+                "sha256:95bd11af7eafc16e829af2d3df510cecfd4387f6453355188342c3e79a2ec87a",
+                "sha256:bc6c7d3fa1325a0c6613512a093bc2a2a15aeec350451cbdf9e1d4bffe3e3233",
+                "sha256:cc34a6f5b426748a507dd5d1de4c1978f2eb5626d51326e43280941206c209e1",
+                "sha256:d755f03c1e4a51e9b24d899561fec4ccaf51f210d52abdf8c07ee2849b212a36",
+                "sha256:d7c45933b1bdfaf9f36c579671fec15d25b06c8398f113dab64c18ed1adda01d",
+                "sha256:d896919306dd0aa22d0132f62a1b78d11aaf4c9fc5b3410d3c666b818191630a",
+                "sha256:fdc1c9bbf79510b76408840e009ed65958feba92a88833cdceecff93ae8fff66",
+                "sha256:ffde2fbfad571af120fcbfbbc61c72469e72f550d676c3342492a9dfdefb8f12"
+            ],
+            "version": "==1.4.0"
+        },
+        "wcwidth": {
+            "hashes": [
+                "sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e",
+                "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"
+            ],
+            "version": "==0.1.7"
+        }
+    }
+}
--- a/README.md
+++ b/README.md
@ -1,21 +1,27 @@
-# DSpace Statistics API [![Build Status](https://travis-ci.org/ilri/dspace-statistics-api.svg?branch=master)](https://travis-ci.org/ilri/dspace-statistics-api)
-DSpace versions 4.0 and up include a [REST API](https://wiki.duraspace.org/display/DSDOC5x/REST+API) that allows the repository to be queried programmatically. The API exposes information about communities, collections, items, and bitstreams, but not item views or downloads. This project contains a lightweight indexer and a web application to make the view and download statistics available via a simple REST API that can be deployed simultaneously with DSpace's own.
+# DSpace Statistics API [![Build Status](https://travis-ci.org/ilri/dspace-statistics-api.svg?branch=master)](https://travis-ci.org/ilri/dspace-statistics-api) [![builds.sr.ht status](https://builds.sr.ht/~alanorth/dspace-statistics-api.svg)](https://builds.sr.ht/~alanorth/dspace-statistics-api?)
+DSpace stores item view and download events in a Solr "statistics" core. This information is available for use in the various DSpace user interfaces, but is not exposed externally via any APIs. The DSpace 4/5 [REST API](https://wiki.duraspace.org/display/DSDOC5x/REST+API), for example, only exposes information about communities, collections, item metadata, and bitstreams.

-You can read more about the Solr queries used to gather the item view and download statistics on the [DSpace wiki](https://wiki.duraspace.org/display/DSPACE/Solr).
+This project contains an indexer and a [Falcon-based](https://falcon.readthedocs.io/) web application to make the statistics available via a simple REST API. You can read more about the Solr queries used to gather the item view and download statistics on the [DSpace wiki](https://wiki.duraspace.org/display/DSPACE/Solr).
+
+If you use the DSpace Statistics API please cite:
+
+*Orth, A. 2018. DSpace statistics API. Nairobi, Kenya: ILRI. https://hdl.handle.net/10568/99143.*

 ## Requirements

 - Python 3.5+
 - PostgreSQL version 9.5+ (due to [`UPSERT` support](https://wiki.postgresql.org/wiki/UPSERT))
- DSpace 4+ with [Solr usage statistics enabled](https://wiki.duraspace.org/display/DSDOC5x/SOLR+Statistics)
+- DSpace with [Solr usage statistics enabled](https://wiki.duraspace.org/display/DSDOC5x/SOLR+Statistics) (tested with 5.x)

-## Installation and Testing
+## Installation
 Create a Python virtual environment and install the dependencies:

-    $ python -m venv venv
-    $ . venv/bin/activate
+    $ python3 -m venv venv
+    $ source venv/bin/activate
    $ pip install -r requirements.txt

+## Running
+
 Set up the environment variables for Solr and PostgreSQL:

    $ export SOLR_SERVER=http://localhost:8080/solr
@ -36,6 +42,15 @@ Test to see if there are any statistics:

    $ curl 'http://localhost:8000/items?limit=1'

+## Testing
+Install development packages using pip:
+
+    $ pip install -r requirements-dev.txt
+
+Run tests:
+
+    $ pytest
+
 ## Deployment
 There are example systemd service and timer units in the `contrib` directory. The API service listens on localhost by default so you will need to expose it publicly using a web server like nginx.

@ -71,13 +86,16 @@ The item id is the *internal* id for an item. You can get these from the standar

 ## Todo

- Close DB connection when gunicorn shuts down gracefully
 - Better logging
- Tests
- Check if database exists (try/except)
 - Version API
 - Use JSON in PostgreSQL
+- Add top items endpoint, perhaps `/top/items` or `/items/top`?
+- Make community and collection stats available
+- Support [DSpace 6 UUIDs](https://jira.duraspace.org/browse/DS-1782)
 - Switch to [Python 3.6+ f-string syntax](https://realpython.com/python-f-strings/)
+- Check IDs in database to see if they are deleted...

 ## License
 This work is licensed under the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
+
+The license allows you to use and modify the work for personal and commercial purposes, but if you distribute the work you must provide users with a means to access the source code for the version you are distributing. Read more about the [GPLv3 at TL;DR Legal](https://tldrlegal.com/license/gnu-general-public-license-v3-(gpl-3)).
--- a/dspace_statistics_api/app.py
+++ b/dspace_statistics_api/app.py
@ -1,78 +1,96 @@
-from .database import database_connection
 import falcon

-db = database_connection()
-db.set_session(readonly=True)
+from .database import DatabaseManager
+

 class RootResource:
    def on_get(self, req, resp):
        resp.status = falcon.HTTP_200
-        resp.content_type = 'text/html'
-        with open('dspace_statistics_api/docs/index.html', 'r') as f:
+        resp.content_type = "text/html"
+        with open("dspace_statistics_api/docs/index.html", "r") as f:
            resp.body = f.read()

+
 class AllItemsResource:
    def on_get(self, req, resp):
        """Handles GET requests"""
        # Return HTTPBadRequest if id parameter is not present and valid
-        limit = req.get_param_as_int("limit", min=0, max=100) or 100
-        page = req.get_param_as_int("page", min=0) or 0
+        limit = req.get_param_as_int("limit", min_value=0, max_value=100) or 100
+        page = req.get_param_as_int("page", min_value=0) or 0
        offset = limit * page

-        cursor = db.cursor()
+        with DatabaseManager() as db:
+            db.set_session(readonly=True)

-        # get total number of items so we can estimate the pages
-        cursor.execute('SELECT COUNT(id) FROM items')
-        pages = round(cursor.fetchone()[0] / limit)
+            with db.cursor() as cursor:
+                # get total number of items so we can estimate the pages
+                cursor.execute("SELECT COUNT(id) FROM items")
+                pages = round(cursor.fetchone()[0] / limit)

-        # get statistics, ordered by id, and use limit and offset to page through results
-        cursor.execute('SELECT id, views, downloads FROM items ORDER BY id ASC LIMIT {} OFFSET {}'.format(limit, offset))
+                # get statistics, ordered by id, and use limit and offset to page through results
+                cursor.execute(
+                    "SELECT id, views, downloads FROM items ORDER BY id ASC LIMIT {} OFFSET {}".format(
+                        limit, offset
+                    )
+                )

-        # create a list to hold dicts of item stats
-        statistics = list()
+                # create a list to hold dicts of item stats
+                statistics = list()

-        # iterate over results and build statistics object
-        for item in cursor:
-            statistics.append({ 'id': item['id'], 'views': item['views'], 'downloads': item['downloads'] })
-
-        cursor.close()
+                # iterate over results and build statistics object
+                for item in cursor:
+                    statistics.append(
+                        {
+                            "id": item["id"],
+                            "views": item["views"],
+                            "downloads": item["downloads"],
+                        }
+                    )

        message = {
-                'currentPage': page,
-                'totalPages': pages,
-                'limit': limit,
-                'statistics': statistics
+            "currentPage": page,
+            "totalPages": pages,
+            "limit": limit,
+            "statistics": statistics,
        }

        resp.media = message

+
 class ItemResource:
    def on_get(self, req, resp, item_id):
        """Handles GET requests"""

-        cursor = db.cursor()
-        cursor.execute('SELECT views, downloads FROM items WHERE id={}'.format(item_id))
-        if cursor.rowcount == 0:
-            raise falcon.HTTPNotFound(
-                    title='Item not found',
-                    description='The item with id "{}" was not found.'.format(item_id)
-            )
-        else:
-            results = cursor.fetchone()
+        with DatabaseManager() as db:
+            db.set_session(readonly=True)

-            statistics = {
-                'id': item_id,
-                'views': results['views'],
-                'downloads': results['downloads']
-            }
+            with db.cursor() as cursor:
+                cursor = db.cursor()
+                cursor.execute(
+                    "SELECT views, downloads FROM items WHERE id={}".format(item_id)
+                )
+                if cursor.rowcount == 0:
+                    raise falcon.HTTPNotFound(
+                        title="Item not found",
+                        description='The item with id "{}" was not found.'.format(
+                            item_id
+                        ),
+                    )
+                else:
+                    results = cursor.fetchone()

-            resp.media = statistics
+                    statistics = {
+                        "id": item_id,
+                        "views": results["views"],
+                        "downloads": results["downloads"],
+                    }
+
+                    resp.media = statistics

-        cursor.close()

 api = application = falcon.API()
-api.add_route('/', RootResource())
-api.add_route('/items', AllItemsResource())
-api.add_route('/item/{item_id:int}', ItemResource())
+api.add_route("/", RootResource())
+api.add_route("/items", AllItemsResource())
+api.add_route("/item/{item_id:int}", ItemResource())

 # vim: set sw=4 ts=4 expandtab:
--- a/dspace_statistics_api/config.py
+++ b/dspace_statistics_api/config.py
@ -1,11 +1,12 @@
 import os

 # Check if Solr connection information was provided in the environment
-SOLR_SERVER = os.environ.get('SOLR_SERVER', 'http://localhost:8080/solr')
+SOLR_SERVER = os.environ.get("SOLR_SERVER", "http://localhost:8080/solr")

-DATABASE_NAME = os.environ.get('DATABASE_NAME', 'dspacestatistics')
-DATABASE_USER = os.environ.get('DATABASE_USER', 'dspacestatistics')
-DATABASE_PASS = os.environ.get('DATABASE_PASS', 'dspacestatistics')
-DATABASE_HOST = os.environ.get('DATABASE_HOST', 'localhost')
+DATABASE_NAME = os.environ.get("DATABASE_NAME", "dspacestatistics")
+DATABASE_USER = os.environ.get("DATABASE_USER", "dspacestatistics")
+DATABASE_PASS = os.environ.get("DATABASE_PASS", "dspacestatistics")
+DATABASE_HOST = os.environ.get("DATABASE_HOST", "localhost")
+DATABASE_PORT = os.environ.get("DATABASE_PORT", "5432")

 # vim: set sw=4 ts=4 expandtab:
--- a/dspace_statistics_api/database.py
+++ b/dspace_statistics_api/database.py
@ -1,12 +1,38 @@
-from .config import DATABASE_NAME
-from .config import DATABASE_USER
-from .config import DATABASE_PASS
-from .config import DATABASE_HOST
-import psycopg2, psycopg2.extras
+import falcon
+import psycopg2
+import psycopg2.extras

-def database_connection():
-    connection = psycopg2.connect("dbname={} user={} password={} host='{}'".format(DATABASE_NAME, DATABASE_USER, DATABASE_PASS, DATABASE_HOST), cursor_factory=psycopg2.extras.DictCursor)
+from .config import (
+    DATABASE_HOST,
+    DATABASE_NAME,
+    DATABASE_PASS,
+    DATABASE_PORT,
+    DATABASE_USER,
+)
+
+
+class DatabaseManager:
+    """Manage database connection."""
+
+    def __init__(self):
+        self._connection_uri = "dbname={} user={} password={} host={} port={}".format(
+            DATABASE_NAME, DATABASE_USER, DATABASE_PASS, DATABASE_HOST, DATABASE_PORT
+        )
+
+    def __enter__(self):
+        try:
+            self._connection = psycopg2.connect(
+                self._connection_uri, cursor_factory=psycopg2.extras.DictCursor
+            )
+        except psycopg2.OperationalError:
+            title = "500 Internal Server Error"
+            description = "Could not connect to database"
+            raise falcon.HTTPInternalServerError(title, description)
+
+        return self._connection
+
+    def __exit__(self, exc_type, exc_value, exc_traceback):
+        self._connection.close()

-    return connection

 # vim: set sw=4 ts=4 expandtab:
--- a/dspace_statistics_api/indexer.py
+++ b/dspace_statistics_api/indexer.py
@ -29,10 +29,60 @@
 # See: https://solrclient.readthedocs.io/en/latest/SolrClient.html
 # See: https://wiki.duraspace.org/display/DSPACE/Solr

-from .database import database_connection
-import json
+import re
+
 import psycopg2.extras
-from .solr import solr_connection
+import requests
+
+from .config import SOLR_SERVER
+from .database import DatabaseManager
+
+
+# Enumerate the cores in Solr to determine if statistics have been sharded into
+# yearly shards by DSpace's stats-util or not (for example: statistics-2018).
+def get_statistics_shards():
+    # Initialize an empty list for statistics core years
+    statistics_core_years = []
+
+    # URL for Solr status to check active cores
+    solr_query_params = {"action": "STATUS", "wt": "json"}
+    solr_url = SOLR_SERVER + "/admin/cores"
+    res = requests.get(solr_url, params=solr_query_params)
+
+    if res.status_code == requests.codes.ok:
+        data = res.json()
+
+        # Iterate over active cores from Solr's STATUS response (cores are in
+        # the status array of this response).
+        for core in data["status"]:
+            # Pattern to match, for example: statistics-2018
+            pattern = re.compile("^statistics-[0-9]{4}$")
+
+            if not pattern.match(core):
+                continue
+
+            # Append current core to list
+            statistics_core_years.append(core)
+
+    # Initialize a string to hold our shards (may end up being empty if the Solr
+    # core has not been processed by stats-util).
+    shards = str()
+
+    if len(statistics_core_years) > 0:
+        # Begin building a string of shards starting with the default one
+        shards = "{}/statistics".format(SOLR_SERVER)
+
+        for core in statistics_core_years:
+            # Create a comma-separated list of shards to pass to our Solr query
+            #
+            # See: https://wiki.apache.org/solr/DistributedSearch
+            shards += ",{}/{}".format(SOLR_SERVER, core)
+
+    # Return the string of shards, which may actually be empty. Solr doesn't
+    # seem to mind if the shards query parameter is empty and I haven't seen
+    # any negative performance impact so this should be fine.
+    return shards
+

 def index_views():
    # get total number of distinct facets for items with a minimum of 1 view,
@ -41,132 +91,188 @@ def index_views():
    # so we can get the countDistinct summary.
    #
    # see: https://lucene.apache.org/solr/guide/6_6/the-stats-component.html
-    res = solr.query('statistics', {
-        'q':'type:2',
-        'fq':'isBot:false AND statistics_type:view',
-        'facet':True,
-        'facet.field':'id',
-        'facet.mincount':1,
-        'facet.limit':1,
-        'facet.offset':0,
-        'stats':True,
-        'stats.field':'id',
-        'stats.calcdistinct':True
-    }, rows=0)
+    solr_query_params = {
+        "q": "type:2",
+        "fq": "isBot:false AND statistics_type:view",
+        "facet": "true",
+        "facet.field": "id",
+        "facet.mincount": 1,
+        "facet.limit": 1,
+        "facet.offset": 0,
+        "stats": "true",
+        "stats.field": "id",
+        "stats.calcdistinct": "true",
+        "shards": shards,
+        "rows": 0,
+        "wt": "json",
+    }

-    # get total number of distinct facets (countDistinct)
-    results_totalNumFacets = json.loads(res.get_json())['stats']['stats_fields']['id']['countDistinct']
+    solr_url = SOLR_SERVER + "/statistics/select"
+
+    res = requests.get(solr_url, params=solr_query_params)
+
+    try:
+        # get total number of distinct facets (countDistinct)
+        results_totalNumFacets = res.json()["stats"]["stats_fields"]["id"][
+            "countDistinct"
+        ]
+    except TypeError:
+        print("No item views to index, exiting.")
+
+        exit(0)

    # divide results into "pages" (cast to int to effectively round down)
    results_per_page = 100
    results_num_pages = int(results_totalNumFacets / results_per_page)
    results_current_page = 0

-    cursor = db.cursor()
+    with DatabaseManager() as db:
+        with db.cursor() as cursor:
+            # create an empty list to store values for batch insertion
+            data = []

-    # create an empty list to store values for batch insertion
-    data = []
+            while results_current_page <= results_num_pages:
+                # "pages" are zero based, but one based is more human readable
+                print(
+                    "Indexing item views (page {} of {})".format(
+                        results_current_page + 1, results_num_pages + 1
+                    )
+                )

-    while results_current_page <= results_num_pages:
-        print('Indexing item views (page {} of {})'.format(results_current_page, results_num_pages))
+                solr_query_params = {
+                    "q": "type:2",
+                    "fq": "isBot:false AND statistics_type:view",
+                    "facet": "true",
+                    "facet.field": "id",
+                    "facet.mincount": 1,
+                    "facet.limit": results_per_page,
+                    "facet.offset": results_current_page * results_per_page,
+                    "shards": shards,
+                    "rows": 0,
+                    "wt": "json",
+                    "json.nl": "map",  # return facets as a dict instead of a flat list
+                }

-        res = solr.query('statistics', {
-            'q':'type:2',
-            'fq':'isBot:false AND statistics_type:view',
-            'facet':True,
-            'facet.field':'id',
-            'facet.mincount':1,
-            'facet.limit':results_per_page,
-            'facet.offset':results_current_page * results_per_page
-        }, rows=0)
+                solr_url = SOLR_SERVER + "/statistics/select"

-        # SolrClient's get_facets() returns a dict of dicts
-        views = res.get_facets()
-        # in this case iterate over the 'id' dict and get the item ids and views
-        for item_id, item_views in views['id'].items():
-            data.append((item_id, item_views))
+                res = requests.get(solr_url, params=solr_query_params)

-        # do a batch insert of values from the current "page" of results
-        sql = 'INSERT INTO items(id, views) VALUES %s ON CONFLICT(id) DO UPDATE SET views=excluded.views'
-        psycopg2.extras.execute_values(cursor, sql, data, template='(%s, %s)')
-        db.commit()
+                # Solr returns facets as a dict of dicts (see json.nl parameter)
+                views = res.json()["facet_counts"]["facet_fields"]
+                # iterate over the 'id' dict and get the item ids and views
+                for item_id, item_views in views["id"].items():
+                    data.append((item_id, item_views))

-        # clear all items from the list so we can populate it with the next batch
-        data.clear()
+                # do a batch insert of values from the current "page" of results
+                sql = "INSERT INTO items(id, views) VALUES %s ON CONFLICT(id) DO UPDATE SET views=excluded.views"
+                psycopg2.extras.execute_values(cursor, sql, data, template="(%s, %s)")
+                db.commit()

-        results_current_page += 1
+                # clear all items from the list so we can populate it with the next batch
+                data.clear()
+
+                results_current_page += 1

-    cursor.close()

 def index_downloads():
    # get the total number of distinct facets for items with at least 1 download
-    res = solr.query('statistics', {
-        'q':'type:0',
-        'fq':'isBot:false AND statistics_type:view AND bundleName:ORIGINAL',
-        'facet':True,
-        'facet.field':'owningItem',
-        'facet.mincount':1,
-        'facet.limit':1,
-        'facet.offset':0,
-        'stats':True,
-        'stats.field':'owningItem',
-        'stats.calcdistinct':True
-    }, rows=0)
+    solr_query_params = {
+        "q": "type:0",
+        "fq": "isBot:false AND statistics_type:view AND bundleName:ORIGINAL",
+        "facet": "true",
+        "facet.field": "owningItem",
+        "facet.mincount": 1,
+        "facet.limit": 1,
+        "facet.offset": 0,
+        "stats": "true",
+        "stats.field": "owningItem",
+        "stats.calcdistinct": "true",
+        "shards": shards,
+        "rows": 0,
+        "wt": "json",
+    }

-    # get total number of distinct facets (countDistinct)
-    results_totalNumFacets = json.loads(res.get_json())['stats']['stats_fields']['owningItem']['countDistinct']
+    solr_url = SOLR_SERVER + "/statistics/select"
+
+    res = requests.get(solr_url, params=solr_query_params)
+
+    try:
+        # get total number of distinct facets (countDistinct)
+        results_totalNumFacets = res.json()["stats"]["stats_fields"]["owningItem"][
+            "countDistinct"
+        ]
+    except TypeError:
+        print("No item downloads to index, exiting.")
+
+        exit(0)

    # divide results into "pages" (cast to int to effectively round down)
    results_per_page = 100
    results_num_pages = int(results_totalNumFacets / results_per_page)
    results_current_page = 0

-    cursor = db.cursor()
+    with DatabaseManager() as db:
+        with db.cursor() as cursor:
+            # create an empty list to store values for batch insertion
+            data = []

-    # create an empty list to store values for batch insertion
-    data = []
+            while results_current_page <= results_num_pages:
+                # "pages" are zero based, but one based is more human readable
+                print(
+                    "Indexing item downloads (page {} of {})".format(
+                        results_current_page + 1, results_num_pages + 1
+                    )
+                )

-    while results_current_page <= results_num_pages:
-        print('Indexing item downloads (page {} of {})'.format(results_current_page, results_num_pages))
+                solr_query_params = {
+                    "q": "type:0",
+                    "fq": "isBot:false AND statistics_type:view AND bundleName:ORIGINAL",
+                    "facet": "true",
+                    "facet.field": "owningItem",
+                    "facet.mincount": 1,
+                    "facet.limit": results_per_page,
+                    "facet.offset": results_current_page * results_per_page,
+                    "shards": shards,
+                    "rows": 0,
+                    "wt": "json",
+                    "json.nl": "map",  # return facets as a dict instead of a flat list
+                }

-        res = solr.query('statistics', {
-            'q':'type:0',
-            'fq':'isBot:false AND statistics_type:view AND bundleName:ORIGINAL',
-            'facet':True,
-            'facet.field':'owningItem',
-            'facet.mincount':1,
-            'facet.limit':results_per_page,
-            'facet.offset':results_current_page * results_per_page
-        }, rows=0)
+                solr_url = SOLR_SERVER + "/statistics/select"

-        # SolrClient's get_facets() returns a dict of dicts
-        downloads = res.get_facets()
-        # in this case iterate over the 'owningItem' dict and get the item ids and downloads
-        for item_id, item_downloads in downloads['owningItem'].items():
-            data.append((item_id, item_downloads))
+                res = requests.get(solr_url, params=solr_query_params)

-        # do a batch insert of values from the current "page" of results
-        sql = 'INSERT INTO items(id, downloads) VALUES %s ON CONFLICT(id) DO UPDATE SET downloads=excluded.downloads'
-        psycopg2.extras.execute_values(cursor, sql, data, template='(%s, %s)')
-        db.commit()
+                # Solr returns facets as a dict of dicts (see json.nl parameter)
+                downloads = res.json()["facet_counts"]["facet_fields"]
+                # iterate over the 'owningItem' dict and get the item ids and downloads
+                for item_id, item_downloads in downloads["owningItem"].items():
+                    data.append((item_id, item_downloads))

-        # clear all items from the list so we can populate it with the next batch
-        data.clear()
+                # do a batch insert of values from the current "page" of results
+                sql = "INSERT INTO items(id, downloads) VALUES %s ON CONFLICT(id) DO UPDATE SET downloads=excluded.downloads"
+                psycopg2.extras.execute_values(cursor, sql, data, template="(%s, %s)")
+                db.commit()

-        results_current_page += 1
+                # clear all items from the list so we can populate it with the next batch
+                data.clear()

-    cursor.close()
+                results_current_page += 1

-db = database_connection()
-solr = solr_connection()

-# create table to store item views and downloads
-cursor = db.cursor()
-cursor.execute('''CREATE TABLE IF NOT EXISTS items
-                  (id INT PRIMARY KEY, views INT DEFAULT 0, downloads INT DEFAULT 0)''')
+with DatabaseManager() as db:
+    with db.cursor() as cursor:
+        # create table to store item views and downloads
+        cursor.execute(
+            """CREATE TABLE IF NOT EXISTS items
+                  (id INT PRIMARY KEY, views INT DEFAULT 0, downloads INT DEFAULT 0)"""
+        )
+
+    # commit the table creation before closing the database connection
+    db.commit()
+
+shards = get_statistics_shards()
+
 index_views()
 index_downloads()

-db.close()
-
 # vim: set sw=4 ts=4 expandtab:
--- a/dspace_statistics_api/solr.py
+++ b/dspace_statistics_api/solr.py
@ -1,9 +0,0 @@
-from .config import SOLR_SERVER
-from SolrClient import SolrClient
-
-def solr_connection():
-    connection = SolrClient(SOLR_SERVER)
-
-    return connection
-
-# vim: set sw=4 ts=4 expandtab:
--- a/pytest.ini
+++ b/pytest.ini
@ -0,0 +1,4 @@
+[pytest]
+addopts= -rsxX -s -v --strict
+filterwarnings =
+    error::UserWarning
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@ -0,0 +1,27 @@
+-i https://pypi.org/simple
+attrs==19.3.0
+backcall==0.1.0
+decorator==4.4.1
+entrypoints==0.3
+flake8==3.7.9
+ipython-genutils==0.2.0
+ipython==7.9.0
+jedi==0.15.1
+mccabe==0.6.1
+more-itertools==7.2.0
+packaging==19.2
+parso==0.5.1
+pexpect==4.7.0 ; sys_platform != 'win32'
+pickleshare==0.7.5
+pluggy==0.13.1
+prompt-toolkit==2.0.10
+ptyprocess==0.6.0
+py==1.8.0
+pycodestyle==2.5.0
+pyflakes==2.1.1
+pygments==2.5.1
+pyparsing==2.4.5
+pytest==5.3.1
+six==1.13.0
+traitlets==4.3.3
+wcwidth==0.1.7
--- a/requirements.txt
+++ b/requirements.txt
@ -1,12 +1,9 @@
-certifi==2018.10.15
+-i https://pypi.org/simple
+certifi==2019.9.11
 chardet==3.0.4
-falcon==1.4.1
-gunicorn==19.9.0
-idna==2.7
-kazoo==2.5.0
-psycopg2-binary==2.7.5
-python-mimeparse==1.6.0
-requests==2.20.0
-six==1.11.0
-e git://github.com/alanorth/SolrClient.git@c629e3475be37c82770b2be61748be7e29882648#egg=SolrClient
-urllib3==1.24
+falcon==2.0.0
+gunicorn==20.0.4
+idna==2.8
+psycopg2-binary==2.8.4
+requests==2.22.0
+urllib3==1.25.7
--- a/setup.cfg
+++ b/setup.cfg
@ -0,0 +1,6 @@
+[isort]
+multi_line_output=3
+include_trailing_comma=True
+force_grid_wrap=0
+use_parentheses=True
+line_length=88
--- a/tests/init.py
+++ b/tests/init.py
--- a/tests/dspacestatistics.sql
+++ b/tests/dspacestatistics.sql
--- a/tests/test_api.py
+++ b/tests/test_api.py
@ -0,0 +1,67 @@
+from falcon import testing
+import json
+import pytest
+
+from dspace_statistics_api.app import api
+
+
+@pytest.fixture
+def client():
+    return testing.TestClient(api)
+
+
+def test_get_docs(client):
+    '''Test requesting the documentation at the root.'''
+
+    response = client.simulate_get('/')
+
+    assert isinstance(response.content, bytes)
+    assert response.status_code == 200
+
+
+def test_get_item(client):
+    '''Test requesting a single item.'''
+
+    response = client.simulate_get('/item/17')
+    response_doc = json.loads(response.text)
+
+    assert isinstance(response_doc['downloads'], int)
+    assert isinstance(response_doc['id'], int)
+    assert isinstance(response_doc['views'], int)
+    assert response.status_code == 200
+
+
+def test_get_missing_item(client):
+    '''Test requesting a single non-existing item.'''
+
+    response = client.simulate_get('/item/1')
+
+    assert response.status_code == 404
+
+
+def test_get_items(client):
+    '''Test requesting 100 items.'''
+
+    response = client.simulate_get('/items', query_string='limit=100')
+    response_doc = json.loads(response.text)
+
+    assert isinstance(response_doc['currentPage'], int)
+    assert isinstance(response_doc['totalPages'], int)
+    assert isinstance(response_doc['statistics'], list)
+    assert response.status_code == 200
+
+
+def test_get_items_invalid_limit(client):
+    '''Test requesting 100 items with an invalid limit parameter.'''
+
+    response = client.simulate_get('/items', query_string='limit=101')
+
+    assert response.status_code == 400
+
+
+def test_get_items_invalid_page(client):
+    '''Test requesting 100 items with an invalid page parameter.'''
+
+    response = client.simulate_get('/items', query_string='page=-1')
+
+    assert response.status_code == 400
Author	SHA1	Message	Date
Alan Orth	1b394ec50e	CHANGELOG.md: Move unreleased changes to 1.1.1	2019-11-27 12:32:54 +02:00
Alan Orth	3e9753b600	CHANGELOG.md: Add unreleased changes	2019-11-27 12:32:16 +02:00
Alan Orth	cb3c3d37fa	Sort imports with isort	2019-11-27 12:31:04 +02:00
Alan Orth	4ff1fd4a22	Format code with black	2019-11-27 12:30:06 +02:00
Alan Orth	d2fe420a9a	Add configuration for isort and black This does linting and automatic code formatting according to PEP8. See: https://sourcery.ai/blog/python-best-practices/	2019-11-27 12:26:55 +02:00
Alan Orth	3197b79578	CHANGELOG.md: Update unreleased changes	2019-11-27 12:14:49 +02:00
Alan Orth	eeb8e6bba1	dspace_statistics_api/indexer.py: Fix minor issues raised by flake8	2019-11-27 12:12:05 +02:00
Alan Orth	3540ce328b	Update requirements Generated from pipenv with: $ pipenv lock -r > requirements.txt $ pipenv lock -r -d > requirements-dev.txt	2019-11-27 12:08:32 +02:00
Alan Orth	520e04f9be	Pipfile.lock: run pipenv update Brings gunicorn 20.0.4, pytest 5.3.1, and others. I hadn't noticed that gunicorn was bumped from 19.x.x to 20.x.x last week. See: https://docs.gunicorn.org/en/stable/news.html#id6	2019-11-27 12:06:09 +02:00
Alan Orth	8a46a64cfc	CHANGELOG.md: Use Python 3.8 for pipenv	2019-11-27 10:53:38 +02:00
Alan Orth	b8442f8cce	.travis.yml: Remove pipenv-specific environment variables	2019-11-15 00:48:57 +02:00
Alan Orth	95f7871cc1	.travis.yml: Use vanilla pip	2019-11-15 00:46:58 +02:00
Alan Orth	3bc07027e5	.travis.yml: Test with Python 3.8	2019-11-15 00:46:04 +02:00
Alan Orth	afcc445855	Update requirements Generated from pipenv with: $ pipenv lock -r > requirements.txt $ pipenv lock -r -d > requirements-dev.txt	2019-11-15 00:41:12 +02:00
Alan Orth	494548c691	Use Python 3.8.0 for pipenv Python 3.8.0 was released several months ago and has made it into Arch Linux's core repositories so it's time to start moving.	2019-11-15 00:38:45 +02:00
Alan Orth	feb60b6adf	CHANGELOG.md: Update unreleased changes	2019-11-15 00:06:49 +02:00
Alan Orth	1541ae3e3b	.travis.yml: Use Ubuntu 18.04 "Bionic"	2019-11-14 23:57:46 +02:00
Alan Orth	1aedc0ca29	CHANGELOG.md: Add note about Python dependencies	2019-08-29 00:31:31 +03:00
Alan Orth	a648183f35	Update requirements Generated from pipenv with: $ pipenv lock -r > requirements.txt $ pipenv lock -r -d > requirements-dev.txt	2019-08-29 00:31:06 +03:00
Alan Orth	b8f379e7fa	Pipfile.lock: Run pipenv update This brings in, among others, psycogpg 2.8.3, requests 2.22.0, and pytest 5.1.1.	2019-08-29 00:30:06 +03:00
Alan Orth	78f9949ecb	CHANGELOG.md: Release version 1.1.0	2019-05-05 23:38:04 +03:00
Alan Orth	af80c4b447	CHANGELOG.md: Add falcon 2.0.0 to unreleased changes	2019-05-03 16:33:00 +03:00
Alan Orth	edd9e90f59	Update requirements Generated using pipenv: $ pipenv lock -r > requirements.txt $ pipenv lock -r -d > requirements-dev.txt	2019-05-03 16:32:17 +03:00
Alan Orth	1806d50a51	Pipfile: Use falcon 2.0.0 See: https://github.com/falconry/falcon/releases/tag/2.0.0	2019-05-03 16:31:06 +03:00
Alan Orth	a459e66fd9	Use falcon 2.0.0rc2	2019-04-18 10:04:43 +03:00
Alan Orth	5a3b392a1d	dspace_statistics_api/app.py: Fix Falcon 2.0 syntax See: dspace_statistics_api/app.py	2019-04-18 09:57:18 +03:00
Alan Orth	9dcda114c6	Bump Falcon version to 2.0.0b1 See: https://github.com/falconry/falcon/releases/tag/2.0.0b1	2019-04-18 09:57:18 +03:00
Alan Orth	2b8aba5835	CHANGELOG.md: Move unreleased changes to v1.0.0	2019-04-15 10:39:48 +03:00
Alan Orth	9eb30a98e3	Update requirements Generated using pipenv: $ pipenv lock -r > requirements.txt $ pipenv lock -r -d > requirements-dev.txt	2019-04-15 10:31:19 +03:00
Alan Orth	622e9a86f1	CHANGELOG.md: Add notes about Python updates	2019-04-15 10:30:29 +03:00
Alan Orth	2acd08e0ab	Use one-based paging in indexer output It is easier for humans to understand one-based paging output like "page 1 of 3" than "page 0 of 2" in the indexer.	2019-04-15 10:25:54 +03:00
Alan Orth	f75bcf292c	README.md: Remove TODO about SolrClient I switched to using the vanilla requests library.	2019-04-15 10:24:24 +03:00
Alan Orth	8f46ceb8d8	Refactor to use vanilla requests library The SolrClient library is unmaintained, which is starting to cause problems due to the moving Python ecosystem. Switching to requests does not change my code in any meaningful way and makes maintenance easier.	2019-04-15 10:19:50 +03:00
Alan Orth	18e1e1a227	README.md: Add TODO about checking IDs in the database Theoretically some items could be deleted and we should remove them from the database.	2019-04-04 18:33:45 +03:00
Alan Orth	fd46041698	README.md: Add build badge for sourcehut (sr.ht)	2019-03-17 23:45:33 +02:00
Alan Orth	4ce7231ece	CHANGELOG.md: Add unreleased changes	2019-03-17 23:40:51 +02:00
Alan Orth	60689d9014	Disable emojis and animated output in CI Makes for cleaner logs. See: https://docs.travis-ci.com/user/environment-variables/ See: https://man.sr.ht/builds.sr.ht/manifest.md	2019-03-17 23:39:38 +02:00
Alan Orth	7bca32189a	.travis.yml: Use PostgreSQL 9.6 This matches what we're using in production.	2019-03-17 23:28:06 +02:00
Alan Orth	94c5d91d3c	CHANGELOG.md: Add unreleased changes	2019-03-17 22:51:39 +02:00
Alan Orth	a640f734c8	Pipfile.lock: run pipenv update	2019-03-17 22:46:39 +02:00
Alan Orth	d56a3420f7	README.md: Add TODO about SolrClient SolrClient works, but hasn't been updated in some time and this is starting to cause issues with some of its dependencies (kazoo). We can probably get by with using Python requests library and getting JSON directly from Solr.	2019-02-19 13:54:34 -08:00
Alan Orth	7add0d6164	README.md: Add TODO about top items endpoint This might be something useful that would be trivial to provide from the data we already have in PostgreSQL.	2019-02-10 14:20:09 +02:00
Alan Orth	c86bec4d8f	.travis.yml: Use Ubuntu 16.04 xenial image This is a newer userland and allows us to use Python 3.7, for example. See: https://docs.travis-ci.com/user/reference/xenial/	2019-02-07 17:41:36 +02:00
Alan Orth	5429fe5cc8	Update requirements Generated from pipenv with: $ pipenv lock -r > requirements.txt $ pipenv lock -r -d > requirements-dev.txt	2019-02-07 17:39:50 +02:00
Alan Orth	f8a4cfd3da	CHANGELOG.md: Add notes about updated python modules	2019-02-07 17:30:08 +02:00
Alan Orth	be94c94433	Pipfile.lock: Run pipenv update	2019-02-07 17:29:47 +02:00
Alan Orth	ba49b78a25	CHANGELOG.md: Add build configuration for build.sr.ht See: https://man.sr.ht/builds.sr.ht/	2019-02-07 17:28:41 +02:00
Alan Orth	842f80036f	.build.yml: Fix PostgreSQL import When building on sr.ht the default environment is the home directory so we need to change to the source directory before trying to import the SQL file.	2019-02-07 17:25:19 +02:00
Alan Orth	f738b8029b	Rename sr.ht build.yml to .build.yml This means git.sr.ht will trigger builds automatically on push. See: https://man.sr.ht/builds.sr.ht/	2019-02-07 17:09:48 +02:00
Alan Orth	d08c43f3d5	build.yml: Functioning build Finally got this working after testing the manifest manually a few times on the web UI.	2019-02-07 17:09:48 +02:00
Alan Orth	819f8e6b0d	Add build.yml for sr.ht Trying to figure out how to run builds on this new platform. See: https://man.sr.ht/builds.sr.ht/#build-manifests	2019-02-07 17:09:48 +02:00
Alan Orth	c79e50a364	README.md: Add TODO about DSpace 6 UUIDs I'm not sure how this will affect us, especially if we want to keep support for DSpace 4, 5, and 6 in the same code base. At least the REST API endpoint will have to change from an integer, our database schema will have to change depending on whether the repository is using IDs or UUIDs, and maybe even the Solr queries will change.	2019-02-07 16:52:36 +02:00
Alan Orth	71006d8bbf	README.md: Add citation	2019-01-23 16:19:58 +02:00
Alan Orth	b7d723ef7c	README.md: Fix sentence	2019-01-22 14:23:13 +02:00
Alan Orth	914ec52fbb	CHANGELOG.md: Move unrelease changes to 0.9.0	2019-01-22 09:02:29 +02:00
Alan Orth	5524066656	CHANGELOG.md: Add note about catching errors	2019-01-22 09:01:54 +02:00
Alan Orth	043d897cef	dspace_statistics_api/indexer.py: Catch case of no views/downloads Don't fail with an exception when there are no views or downloads, for example on a new DSpace installation.	2019-01-22 09:00:22 +02:00
Alan Orth	bd28353cda	README.md: Remove TODO for fixing querying of shards	2019-01-22 08:41:39 +02:00
Alan Orth	e23d66c2a2	CHANGELOG.md: Add note about fixing querying of sharded cores	2019-01-22 08:41:31 +02:00
Alan Orth	40e284dac0	dspace_statistics_api/indexer.py: Query multiple shards DSpace's stats-util script splits the Solr statistics core into yearly shards. We need to use Solr's `shards` query parameter in order to get the statistics for previous years. This commit adds a helper function to enumerate the active Solr cores to find yearly shards matching the statistics-YYYY pattern and add them to the query.	2019-01-22 08:39:36 +02:00
Alan Orth	934fa9db9b	README.md: Add TODO about sharded statistics cores	2019-01-21 12:55:43 +02:00
Alan Orth	1fabb72b58	Update requirements Generated from pipenv with: $ pipenv lock -r > requirements.txt $ pipenv lock -r -d > requirements-dev.txt	2019-01-16 12:34:50 +02:00
Alan Orth	c7f95f0b60	README.md: Update TODO I think it might be possible to compute community and collection statistics from Solr and make them available at new endpoints: - /communities - /community/id - /collections - /collection/id	2019-01-16 09:59:29 +02:00
Alan Orth	c95a98dd2d	Pipfile.lock: update dependencies Updated with `pipenv update`.	2019-01-15 10:22:46 +02:00
Alan Orth	3f70f94a10	Pipfile.lock: Run pipenv update	2018-11-26 11:53:37 +02:00
Alan Orth	9b8ad9defd	Merge pull request #9 from ilri/pipenv-update Pipenv update	2018-11-19 23:50:44 +02:00
Alan Orth	d69ab20220	CHANGELOG.md: pytest version 4.0.0	2018-11-19 23:46:03 +02:00
Alan Orth	378f56ddc2	Pipfile.lock: Run pipenv update	2018-11-19 23:34:34 +02:00
Alan Orth	5a2a7d684c	CHANGELOG.md: Move unreleased changes to version 0.8.1	2018-11-14 09:37:00 +02:00
Alan Orth	18276e910f	CHANGELOG.md: Add notes about pipenv	2018-11-14 09:36:13 +02:00
Alan Orth	8de8c2765f	Merge pull request #8 from ilri/update-dependencies Update dependencies	2018-11-14 09:34:45 +02:00
Alan Orth	11a1755e59	Update requirements.txt Generated from pipenv with: $ pipenv lock -r > requirements.txt	2018-11-14 09:19:47 +02:00
Alan Orth	a835b0fdc5	Re-create pipenv environment from scratch When I originally created the pipenv environment I used the standard pip requirements.txt that I already had, which captured all the mod- ules and their exact versions at the time. This makes it hard to se- parate the project's actual dependencies from the dependencies' dep- endencies, complicating the Pipfile and making it hard to update mo- dule versions later. I've re-created the environment with the following commands: $ pipenv install gunicorn falcon psycopg2-binary git+https://github.com/alanorth/SolrClient.git@kazoo-2.5.0#egg=SolrClient $ pipenv install --dev ipython flake8 pytest	2018-11-14 09:07:32 +02:00
Alan Orth	a88600c92b	README.md: Add note about GPLv3	2018-11-13 12:34:31 +02:00
Alan Orth	019d9242c9	Merge pull request #7 from ilri/use-pip Rework to use pip instead of pipenv	2018-11-12 09:17:16 +02:00
Alan Orth	f4d7312a3f	CHANGELOG.md: Add unreleased changes	2018-11-12 09:02:04 +02:00
Alan Orth	9c46cfc7e2	Use Python 3.7 for pipenv Now that I'm only using pipenv locally it shouldn't create problems for people. They can still just create a vanilla virtualenv and use pip to install the dependencies.	2018-11-12 08:54:54 +02:00
Alan Orth	c1c2e319ac	README.md: Rework to use pip instead of pipenv Pipenv is great for local development, but I don't think many people are using it yet. I can use it locally and on Travis, but still keep vanilla requirements.txt for use with pip. The requirements.txt file can be generated easily from pipenv itself: $ pipenv lock -r > requirements.txt The same for the development requirements: $ pipenv lock -r -d > requirements-dev.txt	2018-11-12 08:49:02 +02:00
Alan Orth	0895b4f469	Add requirements-dev.txt for pip Generated with pipenv lock -r -d. Will be used for separating the development dependencies.	2018-11-12 08:48:45 +02:00
Alan Orth	dcfef06a65	Pipfile.lock: Run pipenv update	2018-11-12 08:20:47 +02:00
Alan Orth	13736d6359	CHANGELOG.md: Move unreleased changes to verison 0.8.0	2018-11-11 17:16:26 +02:00
Alan Orth	4fc64edeb8	Merge pull request #6 from ilri/pytest Pytest	2018-11-11 17:14:49 +02:00
Alan Orth	2a8901dc4f	CHANGELOG.md: Update notes	2018-11-11 17:10:45 +02:00
Alan Orth	e25c974796	README.md: We have tests now	2018-11-11 17:08:51 +02:00
Alan Orth	ffc62e9ee6	tests/test_api.py: Use response.text for all json.loads() This allows the code to work in Python 3.5 as well as 3.6+.	2018-11-11 17:05:31 +02:00
Alan Orth	556c5ae088	tests/test_api.py: Use response.text instead of content Falcon's response content is raw bytes, while its text is a string. Let's use the latter so we can use json.loads() in Python 3.5, 3.6, and 3.7 with the same code. See: https://falcon.readthedocs.io/en/stable/api/testing.html	2018-11-11 17:01:17 +02:00
Alan Orth	d94134f80a	tests/test_api.py: Try to add workaround for Python 3.5 In Python 3.5 it seems that json.loads() cannot decode a bytes, but it works in Python 3.6 and 3.7. Let's try a workaround to see if we can get it working on both Python 3.5 and 3.6+. See: https://docs.python.org/3.5/library/json.html#json.loads See: https://docs.python.org/3.6/library/json.html#json.loads	2018-11-11 17:00:20 +02:00
Alan Orth	586231eb2d	.travis.yml: Use PostgreSQL 9.5 Default PostgreSQL in Travis CI is 9.2 which is very old, so let's try to use 9.5. See: https://docs.travis-ci.com/user/database-setup/#postgresql	2018-11-11 16:41:35 +02:00
Alan Orth	766b77a3b6	.travis.yml: Use PostgreSQL directly It seems that Travis CI already has a PostgreSQL service running.	2018-11-11 16:35:28 +02:00
Alan Orth	1959e8154e	.travis.yml: Use localhost for Docker's PostgreSQL ports See: https://docs.travis-ci.com/user/docker/	2018-11-11 16:28:18 +02:00
Alan Orth	d40b2f0b2e	Test API using pytest and PostgreSQL on Travis First attempt at getting the Travis Docker setup correct. Inspired by the Travis pipenv setup used in Responder. See: https://docs.travis-ci.com/user/docker/ See: https://github.com/kennethreitz/responder/blob/master/.travis.yml	2018-11-11 16:25:16 +02:00
Alan Orth	061d0a8f5f	CHANGELOG.md: Add API tests to unreleased changes	2018-11-11 16:24:54 +02:00
Alan Orth	e57660ff88	Add initial pytest configuration From: https://github.com/kennethreitz/responder/blob/master/pytest.ini	2018-11-11 16:24:54 +02:00
Alan Orth	5c8756bede	Add pytest to pipenv development packages	2018-11-11 16:24:54 +02:00
Alan Orth	bae9fb80e4	Add initial API tests Test the basic assumptions of the API like response codes and types.	2018-11-11 16:24:54 +02:00
Alan Orth	8a65d99e08	.travis.yml: Don't limit builds to master This is good in theory but it means we can't trigger builds for other branches on the fly from the Travis web interface.	2018-11-11 16:21:48 +02:00
Alan Orth	d479b7dc6c	CHANGELOG.md: Syntax fixes	2018-11-11 00:08:44 +02:00
Alan Orth	40aac8bf89	Merge pull request #5 from ilri/database-error-handling Database error handling	2018-11-11 00:07:25 +02:00
Alan Orth	53ba6f2936	CHANGELOG.md: Add database try/except to unreleased changes	2018-11-11 00:05:49 +02:00
Alan Orth	140cc4cb07	README.md: Remove TODO for database try/except Now database connection errors are properly excepted and raised.	2018-11-11 00:04:28 +02:00
Alan Orth	d5d2d2149b	dspace_statistics_api/database.py: Raise HTTP 500 on error Properly except on database connection error and raise an HTTP 500 instead of spamming the console/log with twenty lines of text.	2018-11-10 23:58:58 +02:00
Alan Orth	4c51d12eb4	CHANGELOG.md: Move unreleased changes to version 0.7.0	2018-11-07 17:55:01 +02:00
Alan Orth	a6ce44e852	Merge pull request #4 from ilri/database-refactor Database refactor	2018-11-07 17:54:04 +02:00
Alan Orth	f6e866a589	dspace_statistics_api/indexer.py: Remove debug code	2018-11-07 17:51:24 +02:00
Alan Orth	eb5c187d41	CHANGELOG.md: Add note about database re-factor	2018-11-07 17:50:46 +02:00
Alan Orth	b06c82bb16	README.md: Remove TODO about closing database connection Now I'm using a database manager class with Python's "with" context blocks to automatically and concisely open and close connections.	2018-11-07 17:47:59 +02:00
Alan Orth	2f342be948	Refactor database code to use a context manager Instead of opening one global persistent database connection when the application I am now abstracting it to a class that I can use in combination with Python's "with" context. Both connections and cursors are kept for the context of each "with" block and closed automatically when exiting. See: https://alysivji.github.io/managing-resources-with-context-managers-pythonic.html See: http://initd.org/psycopg/docs/connection.html#connection.close	2018-11-07 17:41:21 +02:00
Alan Orth	e39f2b260c	Merge pull request #3 from ilri/ipython Add ipython to pipenv dev packages	2018-11-07 17:09:09 +02:00
Alan Orth	60ad474b88	Add ipython to pipenv dev packages This is very useful for debugging Python code interactively.	2018-11-07 17:07:14 +02:00
Alan Orth	888f85d19e	README.md: Adjust installation for pipenv It's nicer to manager module versions using pipenv, and I can still generate a requirements.txt for deploying the exact versions on the production server.	2018-11-04 16:07:27 +02:00
Alan Orth	df7de93964	CHANGELOG.md: Add pipenv to unreleased changes	2018-11-04 15:59:11 +02:00
Alan Orth	7218631cc4	requirements.txt: Regenerate Created from pipenv with the following command: $ pipenv lock -r > requirements.txt	2018-11-04 15:58:31 +02:00
Alan Orth	085e525b2f	Regenerate pipenv Uses 'kazoo-2.5.0' branch name for installing SolrClient instead of the commit hash and adds flake8 as a dev package. This means that I can track dependencies for production and development and still end up with a requirements.txt for produciton.	2018-11-04 15:55:28 +02:00
Alan Orth	e1580df12f	requirements.txt: Update packages Generated from pipenv with: $ pipenv run pip freeze > requirements.txt	2018-11-04 15:39:09 +02:00
Alan Orth	be18779ff9	Add flake8 to pipenv	2018-11-04 15:38:51 +02:00
Alan Orth	60cfd8f23b	Add Pipfile for pipenv Eventually I'd like to be able to use pipenv instead of plain pip. For now I'll just keep using pipenv and generating requirements.txt like this: $ pipenv run pip freeze > requirements.txt Then I can kinda have the best of both worlds, where I use pipenv on my local machine and pip with requirements.txt on the server.	2018-11-04 15:35:47 +02:00
Alan Orth	87fd117d77	.hound.yml: Set pull requests to failed if build fails	2018-11-04 00:53:37 +02:00
Alan Orth	f262ebdca2	CHANGELOG.md: Add unreleased changes	2018-11-04 00:50:46 +02:00
Alan Orth	64d7f1a3b2	Enable Flake8 validation in Hound CI Will check all pull requests in the project to make sure they don't violate PEP 8 style (except the E501 for long lines because I think it makes code hard to read).	2018-11-04 00:48:06 +02:00
Alan Orth	a238a727d2	CHANGELOG.md: Add unreleased changes	2018-11-04 00:05:16 +02:00
Alan Orth	cc5ce3ab98	Correct issues highlighted by Flake8 Flake8 validates code style against PEP 8 in order to encourage the writing of idiomatic Python. For reference, I am currently ignoring errors about line length (E501) because I feel it makes code harder to read. This is the invocation I am using: $ flake8 --ignore E501 dspace_statistics_api	2018-11-04 00:04:27 +02:00
Alan Orth	70dfcb93c5	dspace_statistics_api/database.py: Don't quote host in connect()	2018-11-03 22:43:05 +02:00
Alan Orth	69bcd1b5e4	CHANGELOG.md: Add unreleased changes	2018-11-03 22:42:08 +02:00
Alan Orth	5f3bd61998	Allow configuration of PostgreSQL port Defaults to port 5432, but can be overridden with DATABASE_PORT.	2018-11-03 22:40:45 +02:00
Alan Orth	e54dd8888f	README.md: Update requirements	2018-11-01 16:31:36 +02:00
Alan Orth	2ba09f8693	README.md: Improve introduction Obsessed with the text presentation and line length in GitHub!	2018-11-01 16:28:01 +02:00
Alan Orth	a468a87a5a	README.md: Improve introduction	2018-11-01 15:58:12 +02:00
Alan Orth	6a30b6550d	README.md: Improve introduction	2018-11-01 15:45:53 +02:00
Alan Orth	18f013bfa0	README.md: Add Falcon to introduction	2018-11-01 10:24:37 +02:00