From 7b45df8612d2c25953cd60af0c98ce2da0ddafce Mon Sep 17 00:00:00 2001 From: Mark Pittaway Date: Wed, 8 May 2019 17:04:55 +1000 Subject: [PATCH] [SDESK-3998] Include updates for featuremedia stats --- .../directives/FeaturemediaUpdatesTable.js | 11 +- .../views/featuremedia-updates-table.html | 6 +- client/views/renditions-preview.html | 7 +- server/analytics/base_report/__init__.py | 30 +- .../featuremedia_updates_report.py | 25 + server/analytics/stats/__init__.py | 1 + .../analytics/stats/featuremedia_updates.py | 452 ++++++++++++------ .../analytics/stats/gen_archive_statistics.py | 34 +- .../analytics/stats/stats_report_service.py | 9 + .../featuremedia_update_stats.feature | 151 ++++++ 10 files changed, 548 insertions(+), 178 deletions(-) diff --git a/client/featuremedia_updates_report/directives/FeaturemediaUpdatesTable.js b/client/featuremedia_updates_report/directives/FeaturemediaUpdatesTable.js index 234502dfb..a745f4d56 100644 --- a/client/featuremedia_updates_report/directives/FeaturemediaUpdatesTable.js +++ b/client/featuremedia_updates_report/directives/FeaturemediaUpdatesTable.js @@ -96,6 +96,7 @@ export function FeaturemediaUpdatesTable( user: _.get(scope.users, _.get(update, 'user'), {}).display_name, operation: _.get(operations, _.get(update, 'operation')), update: _.get(update, 'update'), + clickable: _.get(update, 'operation') !== 'remove_featuremedia', })); scope.itemUpdates.push({ @@ -147,10 +148,12 @@ export function FeaturemediaUpdatesTable( * @description Opens the preview that will load the snapshot renditions and preview them */ scope.onUpdateClicked = (item, update) => { - scope.openPreview({ - item: item, - update: update, - }, 'renditions-preview'); + if (_.get(update, 'clickable')) { + scope.openPreview({ + item: item, + update: update, + }, 'renditions-preview'); + } }; init(); diff --git a/client/featuremedia_updates_report/views/featuremedia-updates-table.html b/client/featuremedia_updates_report/views/featuremedia-updates-table.html index 417c88c62..5c3834c1a 100644 --- a/client/featuremedia_updates_report/views/featuremedia-updates-table.html +++ b/client/featuremedia_updates_report/views/featuremedia-updates-table.html @@ -37,10 +37,12 @@ diff --git a/client/views/renditions-preview.html b/client/views/renditions-preview.html index d7beeff1a..749e360f9 100644 --- a/client/views/renditions-preview.html +++ b/client/views/renditions-preview.html @@ -1,4 +1,4 @@ -
+
@@ -17,7 +17,10 @@
-
+
+ This version does not have any featuremedia attached! +
+
0: + es_query['source']['query']['filtered']['filter']['bool']['should'] = \ + query['should'] + + if 'minimum_should_match' in query_keys: + es_query['source']['query']['filtered']['filter']['bool']['minimum_should_match'] = \ + query['minimum_should_match'] + + if 'size' in query_keys: es_query['source']['size'] = query['size'] page = query.get('page') or 1 @@ -564,7 +578,7 @@ def generate_elastic_query(self, args): es_query['page'] = query.get('page') or 1 es_query['max_results'] = query['size'] - if 'sort' in query.keys(): + if 'sort' in query_keys: es_query['source']['sort'] = query['sort'] if len(query['repo']) > 0: diff --git a/server/analytics/featuremedia_updates_report/featuremedia_updates_report.py b/server/analytics/featuremedia_updates_report/featuremedia_updates_report.py index fcad9a2cf..9fab6f57c 100644 --- a/server/analytics/featuremedia_updates_report/featuremedia_updates_report.py +++ b/server/analytics/featuremedia_updates_report/featuremedia_updates_report.py @@ -46,6 +46,31 @@ def get_request_aggregations(self, params, args): """Disable generating aggregations""" return None + def get_es_stats_type(self, query, params): + # Check the rewrites filter is include|exclude|only + # then modify this query to reflect the filter + if (params.get('rewrites') or 'include') == 'include': + query['should'] += [{ + 'bool': { + 'must': {'term': {'stats_type': 'archive'}}, + 'must_not': [ + {'exists': {'field': 'rewritten_by'}}, + {'exists': {'field': 'rewrite_of'}} + ] + } + }, { + 'bool': { + 'must': [ + {'term': {'stats_type': 'archive_family'}}, + {'exists': {'field': 'rewritten_by'}} + ], + } + }] + + query['minimum_should_match'] = 1 + else: + query['must'].append({'term': {'stats_type': 'archive'}}) + def _es_set_size(self, query, params): """Disable setting the size""" query['size'] = 200 diff --git a/server/analytics/stats/__init__.py b/server/analytics/stats/__init__.py index d5d3a77ad..71507174e 100644 --- a/server/analytics/stats/__init__.py +++ b/server/analytics/stats/__init__.py @@ -15,6 +15,7 @@ from .archive_statistics import ArchiveStatisticsResource, ArchiveStatisticsService from .gen_archive_statistics import GenArchiveStatistics +from .featuremedia_updates import * # noqa def init_app(app): diff --git a/server/analytics/stats/featuremedia_updates.py b/server/analytics/stats/featuremedia_updates.py index a1dde55c8..ae82acc51 100644 --- a/server/analytics/stats/featuremedia_updates.py +++ b/server/analytics/stats/featuremedia_updates.py @@ -8,197 +8,347 @@ # AUTHORS and LICENSE files distributed with this source code, or # at https://www.sourcefabric.org/superdesk/license +from superdesk import get_resource_service from superdesk.metadata.item import ASSOCIATIONS, CONTENT_TYPE +from superdesk.logging import logger from analytics.stats.common import STAT_TYPE, OPERATION, FEATUREMEDIA_OPERATIONS +from analytics.stats.gen_archive_statistics import connect_stats_signals from copy import deepcopy from flask import current_app as app +from eve.utils import config -def init(stats): - # Clear the featuremedia stats as we'll recalculate them here - stats[STAT_TYPE.FEATUREMEDIA_UPDATES] = [] +class FeaturemediaUpdates: + def __init__(self, sender=None): + self.rewrite_ids = set() + def store_update_fields(self, sender, entry, update): + if entry.get('operation') not in FEATUREMEDIA_OPERATIONS: + return -def store_update_fields(entry, new_update): - # Store the featuremedia updates for use during future iterations - if entry.get('operation') in FEATUREMEDIA_OPERATIONS: - new_update.update({ + # Store the featuremedia updates for use during future iterations + update.update({ ASSOCIATIONS: (entry.get('update') or {}).get(ASSOCIATIONS) or None }) + def init(self, sender, stats): + # Clear the featuremedia stats as we'll recalculate them here + stats[STAT_TYPE.FEATUREMEDIA_UPDATES] = [] -def process(entry, new_timeline, updates, update, stats): - # Generating stats with PUBLISH_ASSOCIATED_ITEMS=True is currently not supported - if app.config.get('PUBLISH_ASSOCIATED_ITEMS', False): - return - - operation = entry.get('operation') - - updates.setdefault('_featuremedia', None) - updates.setdefault('_published', False) - - item_type = updates.get('type') or 'text' - - if entry.get('_auto_generated', False): - entry['update'] = update - - # If this is the initial publish operation and featuremedia has been added already - # Then add this operation as the first in the featuremedia changes - if operation == OPERATION.PUBLISH and updates.get('_featuremedia'): - add_media_operation( - entry, - operation, - new_timeline, - updates, - stats, - OPERATION.PUBLISH, - updates.get('_featuremedia') - ) - # return - elif item_type == CONTENT_TYPE.TEXT: - # Calculate featuremedia stats - associations = update.get(ASSOCIATIONS) or None - - media = None if associations is None else associations.get('featuremedia') or None - - if updates['_featuremedia'] is not None and \ - operation in [OPERATION.UPDATE, OPERATION.CORRECT] and \ - (associations is None or media is None or not media.get('_id')): - # If featuremedia is removed - updates['_featuremedia'] = None - add_media_operation( - entry, - operation, - new_timeline, - updates, - stats, - OPERATION.REMOVE_FEATUREMEDIA, - media - ) - - return - - # If there are no associations in this update, then media has not changed - if associations is None: - return - - # If there is no featuremedia, then don't calculate any timeline entries - if media is None and updates['_featuremedia'] is None: + def process(self, sender, entry, new_timeline, updates, update, stats): + # Generating stats with PUBLISH_ASSOCIATED_ITEMS=True is currently not supported + if app.config.get('PUBLISH_ASSOCIATED_ITEMS', False): return - if updates['_featuremedia'] is None: - updates['_featuremedia'] = media + operation = entry.get('operation') - add_media_operation( - entry, - operation, - new_timeline, - updates, - stats, - OPERATION.ADD_FEATUREMEDIA, - media - ) - elif media.get('_id') != updates['_featuremedia'].get('_id'): - updates['_featuremedia'] = media - - add_media_operation( - entry, - operation, - new_timeline, - updates, - stats, - OPERATION.UPDATE_FEATUREMEDIA_IMAGE, - media - ) + updates.setdefault('_featuremedia', None) + updates.setdefault('_published', False) - elif renditions_changed(updates['_featuremedia'], media): - updates['_featuremedia'] = media + item_type = updates.get('type') or 'text' - add_media_operation( - entry, - operation, - new_timeline, - updates, - stats, - OPERATION.UPDATE_FEATUREMEDIA_POI, - media - ) - elif item_type == CONTENT_TYPE.PICTURE: - if updates['_featuremedia'] is None: - updates['_featuremedia'] = deepcopy(update) - elif renditions_changed(updates['_featuremedia'], update): - updates['_featuremedia'] = update + if entry.get('_auto_generated', False): + entry['update'] = update - add_media_operation( + # If this is the initial publish operation and featuremedia has been added already + # Then add this operation as the first in the featuremedia changes + if operation == OPERATION.PUBLISH and updates.get('_featuremedia'): + self._add_media_operation( entry, operation, new_timeline, updates, stats, - OPERATION.CHANGE_IMAGE_POI, - update + OPERATION.PUBLISH, + updates.get('_featuremedia') ) + # return + elif item_type == CONTENT_TYPE.TEXT: + # Calculate featuremedia stats + associations = update.get(ASSOCIATIONS) or None + + media = None if associations is None else associations.get('featuremedia') or None + + # If there are no associations in this update, then media has not changed + if associations is None: + return + + if updates['_featuremedia'] is not None and \ + operation in [OPERATION.UPDATE, OPERATION.CORRECT] and \ + (associations is None or media is None or not media.get('_id')): + # If featuremedia is removed + updates['_featuremedia'] = None + self._add_media_operation( + entry, + operation, + new_timeline, + updates, + stats, + OPERATION.REMOVE_FEATUREMEDIA, + media + ) + + return + + # If there is no featuremedia, then don't calculate any timeline entries + if media is None and updates['_featuremedia'] is None: + return + + if updates['_featuremedia'] is None: + updates['_featuremedia'] = media + + self._add_media_operation( + entry, + operation, + new_timeline, + updates, + stats, + OPERATION.ADD_FEATUREMEDIA, + media + ) + elif media is not None: + if media.get('_id') != updates['_featuremedia'].get('_id'): + updates['_featuremedia'] = media + + self._add_media_operation( + entry, + operation, + new_timeline, + updates, + stats, + OPERATION.UPDATE_FEATUREMEDIA_IMAGE, + media + ) + elif self._renditions_changed(updates['_featuremedia'], media): + updates['_featuremedia'] = media + + self._add_media_operation( + entry, + operation, + new_timeline, + updates, + stats, + OPERATION.UPDATE_FEATUREMEDIA_POI, + media + ) + elif item_type == CONTENT_TYPE.PICTURE: + if updates['_featuremedia'] is None: + updates['_featuremedia'] = deepcopy(update) + elif self._renditions_changed(updates['_featuremedia'], update): + updates['_featuremedia'] = update + + self._add_media_operation( + entry, + operation, + new_timeline, + updates, + stats, + OPERATION.CHANGE_IMAGE_POI, + update + ) + + def _add_media_operation(self, entry, operation, new_timeline, updates, stats, name, media=None): + media_operation = deepcopy(entry) + media_operation['_auto_generated'] = True + media_operation['operation'] = name + + if media is not None: + media_operation['update'] = { + ASSOCIATIONS: { + 'featuremedia': media + } + } + if operation != name and not entry.get('_processed', False): # and name != OPERATION.PUBLISH: + new_timeline.append(media_operation) -def add_media_operation(entry, operation, new_timeline, updates, stats, name, media=None): - media_operation = deepcopy(entry) - media_operation['_auto_generated'] = True - media_operation['operation'] = name - - if media is not None: - media_operation['update'] = { - ASSOCIATIONS: { - 'featuremedia': media - } - } + if updates['_published']: # and not operation == OPERATION.PUBLISH: + stats[STAT_TYPE.FEATUREMEDIA_UPDATES].append(media_operation) - if operation != name and not entry.get('_processed', False): # and name != OPERATION.PUBLISH: - new_timeline.append(media_operation) + def _renditions_changed(self, original, updates): + def poi_changed(original_poi, updated_poi): + if original_poi.get('x') != updated_poi.get('x') or \ + original_poi.get('y') != updated_poi.get('y'): + return True + return False - if updates['_published']: # and not operation == OPERATION.PUBLISH: - stats[STAT_TYPE.FEATUREMEDIA_UPDATES].append(media_operation) + if poi_changed(original.get('poi') or {}, updates.get('poi') or {}): + return True + original_renditions = original.get('renditions') or {} + updated_renditions = updates.get('renditions') or {} -def renditions_changed(original, updates): - def poi_changed(original_poi, updated_poi): - if original_poi.get('x') != updated_poi.get('x') or \ - original_poi.get('y') != updated_poi.get('y'): + if original_renditions.keys() != updated_renditions.keys(): return True - return False - if poi_changed(original.get('poi') or {}, updates.get('poi') or {}): - return True + attribs = ['width', 'height', 'media', 'CropLeft', 'CropRight', 'CropTop', 'CropBottom'] - original_renditions = original.get('renditions') or {} - updated_renditions = updates.get('renditions') or {} + for key, original_rendition in original_renditions.items(): + updated_rendition = updated_renditions[key] - if original_renditions.keys() != updated_renditions.keys(): - return True + if poi_changed( + original_rendition.get('poi') or {}, + updated_rendition.get('poi') or {} + ): + return True - attribs = ['width', 'height', 'media', 'CropLeft', 'CropRight', 'CropTop', 'CropBottom'] + for attrib in attribs: + if original_rendition.get(attrib) != updated_rendition.get(attrib): + return True - for key, original_rendition in original_renditions.items(): - updated_rendition = updated_renditions[key] + return False - if poi_changed( - original_rendition.get('poi') or {}, - updated_rendition.get('poi') or {} - ): - return True + def complete(self, sender, stats, orig, updates): + num_featuremedia_updates = len(stats.get(STAT_TYPE.FEATUREMEDIA_UPDATES) or []) + if num_featuremedia_updates < 1: + stats[STAT_TYPE.FEATUREMEDIA_UPDATES] = None + updates['num_featuremedia_updates'] = 0 + else: + updates['num_featuremedia_updates'] = num_featuremedia_updates - for attrib in attribs: - if original_rendition.get(attrib) != updated_rendition.get(attrib): - return True + if updates.get('rewrite_of'): + self.rewrite_ids.add(updates.get('rewrite_of')) + self.rewrite_ids.add(orig['_id']) - return False + def _get_featuremedia(self, entry): + return None if entry is None else ((entry.get('update') or {}).get('associations') or {}).get('featuremedia') + def finish(self, sender): + service = get_resource_service('archive_statistics') + + query = {'query': {'bool': {'must': {'terms': {'_id': list(self.rewrite_ids)}}}}} + docs = { + doc['_id']: doc + for doc in service.search(query) + } -def complete(stats, updates): - num_featuremedia_updates = len(stats.get(STAT_TYPE.FEATUREMEDIA_UPDATES) or []) - if num_featuremedia_updates < 1: - stats[STAT_TYPE.FEATUREMEDIA_UPDATES] = None - updates['num_featuremedia_updates'] = 0 - else: - updates['num_featuremedia_updates'] = num_featuremedia_updates + def get_parent_id(doc): + if 'rewrite_of' not in doc: + return doc[config.ID_FIELD] + elif doc['rewrite_of'] not in docs: + # If the parent item was not part of this stats iteration + # then load it now + parent = service.find_one(req=None, _id=doc['rewrite_of']) + + if not parent: + # Stats entry for the parent item was not found + logger.warn('Failed to get parent item {}'.format(doc['rewrite_of'])) + return None + else: + docs[doc['rewrite_of']] = parent + + return get_parent_id(docs[doc['rewrite_of']]) + + parent_docs = {} + for doc_id in list(docs.keys()): + doc = docs[doc_id] + parent_id = get_parent_id(doc) + + if parent_id is None: + # If we failed to find the parent id + # Then the stats do not exist for the parent + # So we ignore this entry + continue + + updates = (doc.get('stats') or {}).get('featuremedia_updates') or [] + + if len(updates) < 1: + # This would indicate that there are no featuremedia updates recorded for this single item + # find the previous featuremedia operation before the publish operation + # and use that as the basis for the featuremedia updates + last_entry = next(( + entry for entry in reversed((doc.get('stats') or {}).get('timeline') or []) + if entry.get('operation') in FEATUREMEDIA_OPERATIONS + ), None) + + if last_entry is not None: + updates = [last_entry] + + if len(updates) > 0: + if parent_id not in parent_docs: + parent_docs[parent_id] = updates + else: + parent_docs[parent_id] += updates + + for doc_id, stats in parent_docs.items(): + # get the archive_family stats item (if it exists) + merged_id = '{}_family'.format(doc_id) + original = service.find_one(req=None, _id=merged_id) + is_new = False + + if not original: + # If the archive_family stats item doesn't exist + # then get the stats for the archive item itself + is_new = True + original = service.find_one(req=None, _id=doc_id) or {} + + sorted_entries = sorted(stats, key=lambda k: (k['operation_created'], k['history_id'])) + + last_stat = sorted_entries[0] + merged_stats = [sorted_entries[0]] if self._get_featuremedia(last_stat) else [] + + for entry in sorted_entries[1:]: + current_media = self._get_featuremedia(last_stat) + next_media = self._get_featuremedia(entry) + + if current_media and not next_media: + # previous entry has featuremedia + # current entry does not + entry['operation'] = OPERATION.REMOVE_FEATUREMEDIA + merged_stats.append(entry) + elif next_media and not current_media: + # previous entry does not have featuremedia + # current entry does + entry['operation'] = OPERATION.ADD_FEATUREMEDIA + merged_stats.append(entry) + elif current_media.get('_id') != next_media.get('_id'): + # previous entry has different featuremedia id to the current entry + entry['operation'] = OPERATION.UPDATE_FEATUREMEDIA_IMAGE + merged_stats.append(entry) + elif self._renditions_changed(current_media, next_media): + # previous entry has different poi + entry['operation'] = OPERATION.UPDATE_FEATUREMEDIA_POI + merged_stats.append(entry) + + last_stat = entry + + updates = deepcopy(original) + updates['stats_type'] = 'archive_family' + + num_featuremedia_updates = len(merged_stats) + if num_featuremedia_updates < 1: + merged_stats = None + updates['num_featuremedia_updates'] = 0 + else: + updates['num_featuremedia_updates'] = num_featuremedia_updates + + if 'stats' not in updates: + updates['stats'] = {} + + updates['stats']['featuremedia_updates'] = merged_stats + + if is_new: + updates['_id'] = merged_id + service.post([updates]) + else: + service.patch( + merged_id, + { + 'stats': updates['stats'], + 'num_featuremedia_updates': updates['num_featuremedia_updates'] + } + ) + + +featuremedia_updates = FeaturemediaUpdates() + +connect_stats_signals( + on_start=featuremedia_updates.__init__, + on_generate=featuremedia_updates.store_update_fields, + on_init_timeline=featuremedia_updates.init, + on_process=featuremedia_updates.process, + on_complete=featuremedia_updates.complete, + on_finish=featuremedia_updates.finish +) diff --git a/server/analytics/stats/gen_archive_statistics.py b/server/analytics/stats/gen_archive_statistics.py index db054a181..e91263f86 100644 --- a/server/analytics/stats/gen_archive_statistics.py +++ b/server/analytics/stats/gen_archive_statistics.py @@ -18,28 +18,42 @@ from superdesk.lock import lock, unlock from analytics.stats.common import STAT_TYPE, OPERATION -from analytics.stats import featuremedia_updates, desk_transitions +from analytics.stats import desk_transitions from eve.utils import config from copy import deepcopy from datetime import timedelta gen_stats_signals = { + 'start': signals.signal('gen_archive_statistics:start'), 'generate': signals.signal('gen_archive_statistics:generate'), 'init_timeline': signals.signal('gen_archive_statistics:init_timeline'), 'process': signals.signal('gen_archive_statistics:process'), 'complete': signals.signal('gen_archive_statistics:complete'), + 'finish': signals.signal('gen_archive_statistics:finish'), } -def connect_stats_signals(on_generate=None, on_init_timeline=None, on_process=None, on_complete=None): +def connect_stats_signals( + on_start=None, + on_generate=None, + on_init_timeline=None, + on_process=None, + on_complete=None, + on_finish=None +): """Connect functions to the gen_stats_signals + :param on_start: Callback for start signal :param on_generate: Callback for generate signal :param on_init_timeline: Callback for init_timeline signal :param on_process: Callback for process signal :param on_complete: Callback for complete signal + :param on_finish: Callback for finish signal """ + if on_start: + gen_stats_signals['start'].connect(on_start) + if on_generate: gen_stats_signals['generate'].connect(on_generate) @@ -52,6 +66,9 @@ def connect_stats_signals(on_generate=None, on_init_timeline=None, on_process=No if on_complete: gen_stats_signals['complete'].connect(on_complete) + if on_finish: + gen_stats_signals['finish'].connect(on_finish) + class GenArchiveStatistics(Command): """Generate statistics for archive documents based on archive_history documents @@ -197,6 +214,8 @@ def generate_stats(self, item_id, gte, chunk_size): logger.info('No more history records to process') break + gen_stats_signals['start'].send(self) + num_history_items += len(history_items) last_entry_id = history_items[-1].get(config.ID_FIELD) @@ -213,6 +232,7 @@ def generate_stats(self, item_id, gte, chunk_size): int(time_diff) )) + gen_stats_signals['finish'].send(self) iterated_started = utcnow() # Don't store the last processed id if we're generating stats for a single item @@ -445,8 +465,6 @@ def _store_update_fields(self, entry): update = entry.get('update') or {} desk_transitions.store_update_fields(entry, update) - featuremedia_updates.store_update_fields(entry, update) - gen_stats_signals['generate'].send(self, entry=entry, update=update) if update: @@ -466,8 +484,6 @@ def gen_stats_from_timeline(self, item): new_timeline = [] desk_transitions.init(stats) - featuremedia_updates.init(stats) - gen_stats_signals['init_timeline'].send(self, stats=stats) try: @@ -520,8 +536,6 @@ def gen_stats_from_timeline(self, item): updates['firstcreated'] = operation_created desk_transitions.process(entry, new_timeline, updates, update, stats) - featuremedia_updates.process(entry, new_timeline, updates, update, stats) - gen_stats_signals['process'].send( self, entry=entry, @@ -532,9 +546,7 @@ def gen_stats_from_timeline(self, item): ) desk_transitions.complete(stats, updates) - featuremedia_updates.complete(stats, updates) - - gen_stats_signals['complete'].send(self, stats=stats, updates=updates) + gen_stats_signals['complete'].send(self, stats=stats, orig=item, updates=updates) if updates.get('firstpublished') and updates.get('firstcreated'): updates['time_to_first_publish'] = ( diff --git a/server/analytics/stats/stats_report_service.py b/server/analytics/stats/stats_report_service.py index 98ee969a9..324407130 100644 --- a/server/analytics/stats/stats_report_service.py +++ b/server/analytics/stats/stats_report_service.py @@ -18,6 +18,15 @@ class StatsReportService(BaseReportService): def get_elastic_index(self, types): return app.config.get('STATISTICS_ELASTIC_INDEX') or app.config.get('STATISTICS_MONGO_DBNAME') or 'statistics' + def get_es_stats_type(self, query, params): + query['must'].append({ + 'term': {'stats_type': 'archive'} + }) + + def _es_base_query(self, query, params): + super()._es_base_query(query, params) + self.get_es_stats_type(query, params) + def _get_filters(self, repos, invisible_stages): return None diff --git a/server/features/archive_history_stats/featuremedia_update_stats.feature b/server/features/archive_history_stats/featuremedia_update_stats.feature index 120affeda..33f80da9e 100644 --- a/server/features/archive_history_stats/featuremedia_update_stats.feature +++ b/server/features/archive_history_stats/featuremedia_update_stats.feature @@ -884,3 +884,154 @@ Feature: Featuremedia Stats ] } """ + + @auth @wip + Scenario: Changes to featuremedia in updates are recorded as well + When we post to "/archive" with success + """ + { + "_id": "item1", "guid": "item1", + "type": "text", "headline": "show my content", "version": 0, + "task": {"desk": "#desks._id#", "stage": "#desks.incoming_stage#", "user": "#CONTEXT_USER_ID#"} + } + """ + When we patch "/archive/item1" + """ + { + "associations": { + "featuremedia": { + "_id": "bike", + "poi": {"x": 0.75, "y": 0.4} + } + }, + "state": "in_progress" + } + """ + Then we get OK response + When we publish "item1" with "publish" type and "published" state + Then we get OK response + When we generate stats from archive history + When we get "/archive_statistics/item1" + Then we get stats + """ + { + "timeline": [ + {"operation": "create"}, + {"operation": "update"}, + {"operation": "add_featuremedia"}, + {"operation": "publish"} + ], + "featuremedia_updates": [ + {"operation": "publish"} + ] + } + """ + When we rewrite "item1" + """ + {"desk_id": "#desks._id#"} + """ + Then we get OK response + Then we store "rewrite1" with value "#REWRITE_ID#" to context + When we patch "/archive/#rewrite1#" + """ + { + "associations": { + "featuremedia": { + "_id": "bike", + "poi": {"x": 0.751, "y": 0.45}, + "headline": "bike vroom", + "alt_text": "bike", + "description_text": "a nice motor-bike" + } + } + } + """ + Then we get OK response + When we publish "#rewrite1#" with "publish" type and "published" state + When we generate stats from archive history + When we get "/archive_statistics/item1" + Then we get stats + """ + { + "timeline": [ + {"operation": "create"}, + {"operation": "update"}, + {"operation": "add_featuremedia"}, + {"operation": "publish"}, + {"operation": "rewrite"} + ], + "featuremedia_updates": [ + {"operation": "publish"} + ] + } + """ + When we get "/archive_statistics/#rewrite1#" + Then we get stats + """ + { + "timeline": [ + {"operation": "create"}, + {"operation": "add_featuremedia"}, + {"operation": "link"}, + {"operation": "update"}, + {"operation": "update_featuremedia_poi"}, + {"operation": "publish"} + ], + "featuremedia_updates": [ + {"operation": "publish"} + ] + } + """ + When we get "/archive_statistics/item1_family" + Then we get stats + """ + { + "featuremedia_updates": [ + {"operation": "publish"}, + {"operation": "update_featuremedia_poi"} + ] + } + """ + When we rewrite "#rewrite1#" + """ + {"desk_id": "#desks._id#"} + """ + Then we get OK response + Then we store "rewrite2" with value "#REWRITE_ID#" to context + When we patch "/archive/#rewrite2#" + """ + { + "associations": { + "featuremedia": null + } + } + """ + Then we get OK response + When we publish "#rewrite2#" with "publish" type and "published" state + When we generate stats from archive history + When we get "/archive_statistics/#rewrite2#" + Then we get stats + """ + { + "timeline": [ + {"operation": "create"}, + {"operation": "add_featuremedia"}, + {"operation": "link"}, + {"operation": "update"}, + {"operation": "remove_featuremedia"}, + {"operation": "publish"} + ], + "featuremedia_updates": null + } + """ + When we get "/archive_statistics/item1_family" + Then we get stats + """ + { + "featuremedia_updates": [ + {"operation": "publish"}, + {"operation": "update_featuremedia_poi"}, + {"operation": "remove_featuremedia"} + ] + } + """