2018-09-18 13:03:15 +02:00
|
|
|
|
import falcon
|
2020-12-18 21:42:06 +01:00
|
|
|
|
import psycopg2.extras
|
2018-09-18 13:03:15 +02:00
|
|
|
|
|
2019-11-27 11:31:04 +01:00
|
|
|
|
from .database import DatabaseManager
|
2020-10-06 14:12:13 +02:00
|
|
|
|
from .items import get_downloads, get_views
|
2020-09-26 17:37:14 +02:00
|
|
|
|
from .util import validate_items_post_parameters
|
2019-11-27 11:31:04 +01:00
|
|
|
|
|
2018-11-03 22:55:23 +01:00
|
|
|
|
|
2018-10-31 23:19:39 +01:00
|
|
|
|
class RootResource:
|
|
|
|
|
def on_get(self, req, resp):
|
|
|
|
|
resp.status = falcon.HTTP_200
|
2019-11-27 11:30:06 +01:00
|
|
|
|
resp.content_type = "text/html"
|
|
|
|
|
with open("dspace_statistics_api/docs/index.html", "r") as f:
|
2018-10-31 23:19:39 +01:00
|
|
|
|
resp.body = f.read()
|
|
|
|
|
|
2018-11-03 22:55:23 +01:00
|
|
|
|
|
2018-09-24 15:07:26 +02:00
|
|
|
|
class AllItemsResource:
|
|
|
|
|
def on_get(self, req, resp):
|
|
|
|
|
"""Handles GET requests"""
|
|
|
|
|
# Return HTTPBadRequest if id parameter is not present and valid
|
2020-11-02 20:59:20 +01:00
|
|
|
|
limit = req.get_param_as_int("limit", min_value=1, max_value=100) or 100
|
2019-03-17 22:23:23 +01:00
|
|
|
|
page = req.get_param_as_int("page", min_value=0) or 0
|
2018-09-24 15:07:26 +02:00
|
|
|
|
offset = limit * page
|
|
|
|
|
|
2018-11-07 16:41:21 +01:00
|
|
|
|
with DatabaseManager() as db:
|
|
|
|
|
db.set_session(readonly=True)
|
2018-09-24 15:07:26 +02:00
|
|
|
|
|
2018-11-07 16:41:21 +01:00
|
|
|
|
with db.cursor() as cursor:
|
|
|
|
|
# get total number of items so we can estimate the pages
|
2019-11-27 11:30:06 +01:00
|
|
|
|
cursor.execute("SELECT COUNT(id) FROM items")
|
2018-11-07 16:41:21 +01:00
|
|
|
|
pages = round(cursor.fetchone()[0] / limit)
|
2018-09-24 15:07:26 +02:00
|
|
|
|
|
2020-03-02 10:06:27 +01:00
|
|
|
|
# get statistics and use limit and offset to page through results
|
2019-11-27 11:30:06 +01:00
|
|
|
|
cursor.execute(
|
2020-12-17 09:10:40 +01:00
|
|
|
|
"SELECT id, views, downloads FROM items ORDER BY id LIMIT %s OFFSET %s",
|
2020-03-02 10:16:05 +01:00
|
|
|
|
[limit, offset],
|
2019-11-27 11:30:06 +01:00
|
|
|
|
)
|
2018-09-24 15:07:26 +02:00
|
|
|
|
|
2018-11-07 16:41:21 +01:00
|
|
|
|
# create a list to hold dicts of item stats
|
|
|
|
|
statistics = list()
|
2018-09-24 15:07:26 +02:00
|
|
|
|
|
2018-11-07 16:41:21 +01:00
|
|
|
|
# iterate over results and build statistics object
|
|
|
|
|
for item in cursor:
|
2019-11-27 11:30:06 +01:00
|
|
|
|
statistics.append(
|
|
|
|
|
{
|
2020-03-02 10:06:27 +01:00
|
|
|
|
"id": str(item["id"]),
|
2019-11-27 11:30:06 +01:00
|
|
|
|
"views": item["views"],
|
|
|
|
|
"downloads": item["downloads"],
|
|
|
|
|
}
|
|
|
|
|
)
|
2018-09-27 10:03:44 +02:00
|
|
|
|
|
2018-09-24 15:07:26 +02:00
|
|
|
|
message = {
|
2019-11-27 11:30:06 +01:00
|
|
|
|
"currentPage": page,
|
|
|
|
|
"totalPages": pages,
|
|
|
|
|
"limit": limit,
|
|
|
|
|
"statistics": statistics,
|
2018-09-24 15:07:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
resp.media = message
|
|
|
|
|
|
2020-09-26 17:37:14 +02:00
|
|
|
|
@falcon.before(validate_items_post_parameters)
|
dspace_statistics_api: Add support for date ranges to /items
You can now POST a JSON request to /items with a list of items and
a date range. This allows the possibility to get view and download
statistics for arbitrary items and arbitrary date ranges.
The JSON request should be in the following format:
{
"limit": 100,
"page": 0,
"dateFrom": "2020-01-01T00:00:00Z",
"dateTo": "2020-09-09T00:00:00Z",
"items": [
"f44cf173-2344-4eb2-8f00-ee55df32c76f",
"2324aa41-e9de-4a2b-bc36-16241464683e",
"8542f9da-9ce1-4614-abf4-f2e3fdb4b305",
"0fe573e7-042a-4240-a4d9-753b61233908"
]
}
The limit, page, and date parameters are all optional. By default
it will use a limit of 100, page 0, and [* TO *] Solr date range.
2020-09-25 11:21:11 +02:00
|
|
|
|
def on_post(self, req, resp):
|
|
|
|
|
"""Handles POST requests"""
|
|
|
|
|
|
|
|
|
|
# Build the Solr date string, ie: [* TO *]
|
2020-09-26 17:37:14 +02:00
|
|
|
|
if req.context.dateFrom and req.context.dateTo:
|
|
|
|
|
solr_date_string = f"[{req.context.dateFrom} TO {req.context.dateTo}]"
|
|
|
|
|
elif not req.context.dateFrom and req.context.dateTo:
|
|
|
|
|
solr_date_string = f"[* TO {req.context.dateTo}]"
|
|
|
|
|
elif req.context.dateFrom and not req.context.dateTo:
|
|
|
|
|
solr_date_string = f"[{req.context.dateFrom} TO *]"
|
dspace_statistics_api: Add support for date ranges to /items
You can now POST a JSON request to /items with a list of items and
a date range. This allows the possibility to get view and download
statistics for arbitrary items and arbitrary date ranges.
The JSON request should be in the following format:
{
"limit": 100,
"page": 0,
"dateFrom": "2020-01-01T00:00:00Z",
"dateTo": "2020-09-09T00:00:00Z",
"items": [
"f44cf173-2344-4eb2-8f00-ee55df32c76f",
"2324aa41-e9de-4a2b-bc36-16241464683e",
"8542f9da-9ce1-4614-abf4-f2e3fdb4b305",
"0fe573e7-042a-4240-a4d9-753b61233908"
]
}
The limit, page, and date parameters are all optional. By default
it will use a limit of 100, page 0, and [* TO *] Solr date range.
2020-09-25 11:21:11 +02:00
|
|
|
|
else:
|
|
|
|
|
solr_date_string = "[* TO *]"
|
|
|
|
|
|
|
|
|
|
# Helper variables to make working with pages/items/results easier and
|
|
|
|
|
# to make the code easier to understand
|
2020-09-26 17:37:14 +02:00
|
|
|
|
number_of_items: int = len(req.context.items)
|
|
|
|
|
pages: int = int(number_of_items / req.context.limit)
|
|
|
|
|
first_item: int = req.context.page * req.context.limit
|
|
|
|
|
last_item: int = first_item + req.context.limit
|
dspace_statistics_api: Add support for date ranges to /items
You can now POST a JSON request to /items with a list of items and
a date range. This allows the possibility to get view and download
statistics for arbitrary items and arbitrary date ranges.
The JSON request should be in the following format:
{
"limit": 100,
"page": 0,
"dateFrom": "2020-01-01T00:00:00Z",
"dateTo": "2020-09-09T00:00:00Z",
"items": [
"f44cf173-2344-4eb2-8f00-ee55df32c76f",
"2324aa41-e9de-4a2b-bc36-16241464683e",
"8542f9da-9ce1-4614-abf4-f2e3fdb4b305",
"0fe573e7-042a-4240-a4d9-753b61233908"
]
}
The limit, page, and date parameters are all optional. By default
it will use a limit of 100, page 0, and [* TO *] Solr date range.
2020-09-25 11:21:11 +02:00
|
|
|
|
# Get a subset of the POSTed items based on our limit. Note that Python
|
|
|
|
|
# list slicing and indexing are both zero based, but the first and last
|
|
|
|
|
# items in a slice can be confusing. See this ASCII diagram:
|
|
|
|
|
#
|
|
|
|
|
# +---+---+---+---+---+---+
|
|
|
|
|
# | P | y | t | h | o | n |
|
|
|
|
|
# +---+---+---+---+---+---+
|
|
|
|
|
# Slice position: 0 1 2 3 4 5 6
|
|
|
|
|
# Index position: 0 1 2 3 4 5
|
|
|
|
|
#
|
2020-09-26 17:37:14 +02:00
|
|
|
|
# So if we have a list items with 240 items:
|
dspace_statistics_api: Add support for date ranges to /items
You can now POST a JSON request to /items with a list of items and
a date range. This allows the possibility to get view and download
statistics for arbitrary items and arbitrary date ranges.
The JSON request should be in the following format:
{
"limit": 100,
"page": 0,
"dateFrom": "2020-01-01T00:00:00Z",
"dateTo": "2020-09-09T00:00:00Z",
"items": [
"f44cf173-2344-4eb2-8f00-ee55df32c76f",
"2324aa41-e9de-4a2b-bc36-16241464683e",
"8542f9da-9ce1-4614-abf4-f2e3fdb4b305",
"0fe573e7-042a-4240-a4d9-753b61233908"
]
}
The limit, page, and date parameters are all optional. By default
it will use a limit of 100, page 0, and [* TO *] Solr date range.
2020-09-25 11:21:11 +02:00
|
|
|
|
#
|
2020-09-26 17:37:14 +02:00
|
|
|
|
# 1st set: items[0:100] would give items at indexes 0 to 99
|
|
|
|
|
# 2nd set: items[100:200] would give items at indexes 100 to 199
|
|
|
|
|
# 3rd set: items[200:300] would give items at indexes 200 to 239
|
|
|
|
|
items_subset: list = req.context.items[first_item:last_item]
|
dspace_statistics_api: Add support for date ranges to /items
You can now POST a JSON request to /items with a list of items and
a date range. This allows the possibility to get view and download
statistics for arbitrary items and arbitrary date ranges.
The JSON request should be in the following format:
{
"limit": 100,
"page": 0,
"dateFrom": "2020-01-01T00:00:00Z",
"dateTo": "2020-09-09T00:00:00Z",
"items": [
"f44cf173-2344-4eb2-8f00-ee55df32c76f",
"2324aa41-e9de-4a2b-bc36-16241464683e",
"8542f9da-9ce1-4614-abf4-f2e3fdb4b305",
"0fe573e7-042a-4240-a4d9-753b61233908"
]
}
The limit, page, and date parameters are all optional. By default
it will use a limit of 100, page 0, and [* TO *] Solr date range.
2020-09-25 11:21:11 +02:00
|
|
|
|
|
|
|
|
|
views: dict = get_views(solr_date_string, items_subset)
|
|
|
|
|
downloads: dict = get_downloads(solr_date_string, items_subset)
|
|
|
|
|
|
|
|
|
|
# create a list to hold dicts of item stats
|
|
|
|
|
statistics = list()
|
|
|
|
|
|
|
|
|
|
# iterate over views dict to extract views and use the item id as an
|
|
|
|
|
# index to the downloads dict to extract downloads.
|
|
|
|
|
for k, v in views.items():
|
|
|
|
|
statistics.append({"id": k, "views": v, "downloads": downloads[k]})
|
|
|
|
|
|
|
|
|
|
message = {
|
2020-09-26 17:37:14 +02:00
|
|
|
|
"currentPage": req.context.page,
|
dspace_statistics_api: Add support for date ranges to /items
You can now POST a JSON request to /items with a list of items and
a date range. This allows the possibility to get view and download
statistics for arbitrary items and arbitrary date ranges.
The JSON request should be in the following format:
{
"limit": 100,
"page": 0,
"dateFrom": "2020-01-01T00:00:00Z",
"dateTo": "2020-09-09T00:00:00Z",
"items": [
"f44cf173-2344-4eb2-8f00-ee55df32c76f",
"2324aa41-e9de-4a2b-bc36-16241464683e",
"8542f9da-9ce1-4614-abf4-f2e3fdb4b305",
"0fe573e7-042a-4240-a4d9-753b61233908"
]
}
The limit, page, and date parameters are all optional. By default
it will use a limit of 100, page 0, and [* TO *] Solr date range.
2020-09-25 11:21:11 +02:00
|
|
|
|
"totalPages": pages,
|
2020-09-26 17:37:14 +02:00
|
|
|
|
"limit": req.context.limit,
|
dspace_statistics_api: Add support for date ranges to /items
You can now POST a JSON request to /items with a list of items and
a date range. This allows the possibility to get view and download
statistics for arbitrary items and arbitrary date ranges.
The JSON request should be in the following format:
{
"limit": 100,
"page": 0,
"dateFrom": "2020-01-01T00:00:00Z",
"dateTo": "2020-09-09T00:00:00Z",
"items": [
"f44cf173-2344-4eb2-8f00-ee55df32c76f",
"2324aa41-e9de-4a2b-bc36-16241464683e",
"8542f9da-9ce1-4614-abf4-f2e3fdb4b305",
"0fe573e7-042a-4240-a4d9-753b61233908"
]
}
The limit, page, and date parameters are all optional. By default
it will use a limit of 100, page 0, and [* TO *] Solr date range.
2020-09-25 11:21:11 +02:00
|
|
|
|
"statistics": statistics,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
resp.status = falcon.HTTP_200
|
|
|
|
|
resp.media = message
|
|
|
|
|
|
2018-11-03 22:55:23 +01:00
|
|
|
|
|
2018-09-18 13:03:15 +02:00
|
|
|
|
class ItemResource:
|
2018-09-23 15:23:33 +02:00
|
|
|
|
def on_get(self, req, resp, item_id):
|
2018-09-18 13:03:15 +02:00
|
|
|
|
"""Handles GET requests"""
|
|
|
|
|
|
2020-03-02 10:06:27 +01:00
|
|
|
|
# Adapt Python’s uuid.UUID type to PostgreSQL’s uuid
|
|
|
|
|
# See: https://www.psycopg.org/docs/extras.html
|
|
|
|
|
psycopg2.extras.register_uuid()
|
|
|
|
|
|
2018-11-07 16:41:21 +01:00
|
|
|
|
with DatabaseManager() as db:
|
|
|
|
|
db.set_session(readonly=True)
|
|
|
|
|
|
|
|
|
|
with db.cursor() as cursor:
|
|
|
|
|
cursor = db.cursor()
|
2019-11-27 11:30:06 +01:00
|
|
|
|
cursor.execute(
|
2020-03-02 10:06:27 +01:00
|
|
|
|
"SELECT views, downloads FROM items WHERE id=%s", [str(item_id)]
|
2019-11-27 11:30:06 +01:00
|
|
|
|
)
|
2018-11-07 16:41:21 +01:00
|
|
|
|
if cursor.rowcount == 0:
|
|
|
|
|
raise falcon.HTTPNotFound(
|
2019-11-27 11:30:06 +01:00
|
|
|
|
title="Item not found",
|
2020-03-02 10:24:29 +01:00
|
|
|
|
description=f'The item with id "{str(item_id)}" was not found.',
|
2018-11-07 16:41:21 +01:00
|
|
|
|
)
|
|
|
|
|
else:
|
|
|
|
|
results = cursor.fetchone()
|
|
|
|
|
|
|
|
|
|
statistics = {
|
2020-03-02 10:06:27 +01:00
|
|
|
|
"id": str(item_id),
|
2019-11-27 11:30:06 +01:00
|
|
|
|
"views": results["views"],
|
|
|
|
|
"downloads": results["downloads"],
|
2018-11-07 16:41:21 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
resp.media = statistics
|
2018-09-18 13:03:15 +02:00
|
|
|
|
|
2018-11-03 22:55:23 +01:00
|
|
|
|
|
2018-10-26 18:21:27 +02:00
|
|
|
|
api = application = falcon.API()
|
2019-11-27 11:30:06 +01:00
|
|
|
|
api.add_route("/", RootResource())
|
|
|
|
|
api.add_route("/items", AllItemsResource())
|
2020-03-02 10:06:27 +01:00
|
|
|
|
api.add_route("/item/{item_id:uuid}", ItemResource())
|
2018-09-23 10:33:26 +02:00
|
|
|
|
|
|
|
|
|
# vim: set sw=4 ts=4 expandtab:
|