Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

operation logs: use an Elasticsearch only resource #1937

Merged
merged 1 commit into from
May 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion data/operation_logs.json
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
[]
[
{
"record": {
"$ref": "https://ils.rero.ch/api/documents/1"
},
"operation": "update",
"user_name": "system",
"date": "2021-01-21T09:51:52.879533+00:00"
}
]
61 changes: 33 additions & 28 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ invenio-oaiserver = ">=1.2.0,<1.3.0"
invenio-pidstore = ">=1.2.1,<1.3.0"
invenio-records-rest = ">=1.8.0,<1.9.0"
invenio-records-ui= ">=1.2.0,<1.3.0"
invenio-records = ">=1.4.0,<1.6.0"
invenio-records = {version = ">=1.4.0,<1.6.0", allow-prereleases = true}

## Default from Invenio
invenio = {version = ">=3.4.0,<5.4.0", extras = ["base", "postgresql", "auth", "elasticsearch7", "docs", "tests" ]}
Expand Down
6 changes: 3 additions & 3 deletions rero_ils/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -1613,13 +1613,12 @@ def _(x):
action='delete', record=record, cls=TemplatePermission)
),
oplg=dict(
# TODO: useless, but required
pid_type='oplg',
pid_minter='operation_log_id',
pid_minter='recid',
pid_fetcher='operation_log_id',
search_class='rero_ils.modules.operation_logs.api:OperationLogsSearch',
search_index='operation_logs',
search_type=None,
indexer_class='rero_ils.modules.operation_logs.api:OperationLogsIndexer',
record_serializers={
'application/json': (
'rero_ils.modules.serializers:json_v1_response'
Expand All @@ -1638,6 +1637,7 @@ def _(x):
},
record_class='rero_ils.modules.operation_logs.api:OperationLog',
list_route='/operation_logs/',
# TODO: create a converter for es id, not used for the moment.
item_route='/operation_logs/<pid(oplg, record_class='

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I not used, it's better to remove.

'"rero_ils.modules.operation_logs.api:OperationLog"):pid_value>',
default_media_type='application/json',
Expand Down
4 changes: 2 additions & 2 deletions rero_ils/es_templates/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# RERO ILS
# Copyright (C) 2019 RERO
# Copyright (C) 2021 RERO
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
Expand All @@ -19,7 +19,7 @@


def list_es_templates():
"""Elasticsearch Templates path."""
"""Elasticsearch templates path."""
return [
'rero_ils.es_templates'
]
5 changes: 3 additions & 2 deletions rero_ils/modules/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
from .items.cli import create_items, reindex_items
from .loans.cli import create_loans, load_virtua_transactions
from .monitoring import Monitoring
from .operation_logs.cli import migrate_virtua_operation_logs
from .operation_logs.cli import create_operation_logs, dump_operation_logs
from .patrons.cli import import_users, users_validate
from .tasks import process_bulk_queue
from .utils import bulk_load_metadata, bulk_load_pids, bulk_load_pidstore, \
Expand Down Expand Up @@ -110,7 +110,8 @@ def fixtures():
fixtures.add_command(create_patterns)
fixtures.add_command(create_ill_requests)
fixtures.add_command(create_collections)
fixtures.add_command(migrate_virtua_operation_logs)
fixtures.add_command(create_operation_logs)
fixtures.add_command(dump_operation_logs)


@users.command('confirm')
Expand Down
2 changes: 1 addition & 1 deletion rero_ils/modules/fetchers.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@


def id_fetcher(record_uuid, data, provider, pid_key='pid'):
"""Fetch a Organisation record's identifiers.
"""Fetch a record's identifier.

:param record_uuid: The record UUID.
:param data: The record metadata.
Expand Down
2 changes: 2 additions & 0 deletions rero_ils/modules/monitoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,12 @@ def info(cls, with_deleted=False, difference_db_es=False):
).items():
info[doc_type] = {}
count_db = cls.get_db_count(doc_type, with_deleted=with_deleted)
count_db = count_db if isinstance(count_db, int) else 0
info[doc_type]['db'] = count_db
index = endpoint.get('search_index', '')
if index:
count_es = cls.get_es_count(index)
count_es = count_es if isinstance(count_es, int) else 0
db_es = count_db - count_es
info[doc_type]['index'] = index
info[doc_type]['es'] = count_es
Expand Down
Loading