Skip to content

Commit b2d3acc

Browse files
authored
Fix people usage (#393)
1 parent e0ac575 commit b2d3acc

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

gramps_webapi/api/resources/objects.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
get_db_handle,
3838
get_search_indexer,
3939
get_tree_from_jwt,
40+
update_usage_people,
4041
)
4142
from . import ProtectedResource
4243
from .util import add_object, fix_object_dict, transaction_to_json, validate_object_dict
@@ -82,6 +83,8 @@ def post(self) -> Response:
8283
except ValueError:
8384
abort_with_message(400, "Error while adding object")
8485
trans_dict = transaction_to_json(trans)
86+
if number_new_people:
87+
update_usage_people()
8588
# update search index
8689
tree = get_tree_from_jwt()
8790
indexer: SearchIndexer = get_search_indexer(tree)

gramps_webapi/api/resources/transactions.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
get_db_handle,
4141
get_search_indexer,
4242
get_tree_from_jwt,
43+
update_usage_people,
4344
use_args,
4445
)
4546
from . import ProtectedResource
@@ -98,6 +99,8 @@ def post(self, args) -> Response:
9899
except (KeyError, UnicodeDecodeError, json.JSONDecodeError, TypeError):
99100
abort_with_message(400, "Error while processing transaction")
100101
trans_dict = transaction_to_json(trans)
102+
if num_people_new:
103+
update_usage_people()
101104
# update search index
102105
tree = get_tree_from_jwt()
103106
indexer: SearchIndexer = get_search_indexer(tree)

gramps_webapi/api/tasks.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
get_db_outside_request,
4141
get_search_indexer,
4242
send_email,
43+
update_usage_people,
4344
)
4445

4546

@@ -135,6 +136,7 @@ def import_file(tree: str, file_name: str, extension: str, delete: bool = True):
135136
extension=extension.lower(),
136137
delete=delete,
137138
)
139+
update_usage_people(tree=tree)
138140
_search_reindex_incremental(tree)
139141

140142

@@ -206,7 +208,6 @@ def export_media(tree: str, view_private: bool) -> Dict[str, Union[str, int]]:
206208
@shared_task()
207209
def import_media_archive(tree: str, file_name: str, delete: bool = True):
208210
"""Import a media archive."""
209-
# check_quota_people(to_add=object_counts["people"], tree=tree)
210211
db_handle = get_db_outside_request(tree=tree, view_private=True, readonly=True)
211212
result = run_import_media_archive(
212213
tree=tree,

0 commit comments

Comments
 (0)