Update master to be inline with 1.33

client/aap/mission_report/controllers/MissionReportController.js

@@ -5,7 +5,6 @@ MissionReportController.$inject = [
     'savedReports',
     'notify',
     'lodash',
-    'searchReport',
     '$q',
     'missionReportChart',
     'reportConfigs',
@@ -19,7 +18,6 @@ MissionReportController.$inject = [
  * @requires savedReports
  * @requires notify
  * @requires lodash
- * @requires searchReport
  * @requires $q
  * @requires missionReportChart
  * @requires reportConfigs
@@ -30,7 +28,6 @@ export function MissionReportController(
     savedReports,
     notify,
     _,
-    searchReport,
     $q,
     missionReportChart,
     reportConfigs

client/aap/sms_report/controllers/SMSReportController.js

@@ -2,19 +2,18 @@ import {getErrorMessage, getUtcOffsetInMinutes} from 'superdesk-analytics/client
 import {DATE_FILTERS} from 'superdesk-analytics/client/search/common';
 import {CHART_FIELDS, CHART_TYPES} from 'superdesk-analytics/client/charts/directives/ChartOptions';
 import {SDChart} from 'superdesk-analytics/client/charts/SDChart';
+import {searchReportService} from 'superdesk-analytics/client/search/services/SearchReport';
+import {appConfig} from 'superdesk-core/scripts/appConfig';
 
 SMSReportController.$inject = [
     '$scope',
     'savedReports',
     'chartConfig',
     'lodash',
-    'searchReport',
     'moment',
     'notify',
     'gettext',
     '$q',
-    'config',
-    'deployConfig',
     'reportConfigs',
 ];
 
@@ -24,13 +23,10 @@ export function SMSReportController(
     savedReports,
     chartConfig,
     _,
-    searchReport,
     moment,
     notify,
     gettext,
     $q,
-    config,
-    deployConfig,
     reportConfigs
 ) {
     const reportName = 'sms_report';
@@ -57,7 +53,7 @@ export function SMSReportController(
     };
 
     this.initDefaultParams = () => {
-        $scope.item_states = searchReport.filterItemStates(
+        $scope.item_states = searchReportService.filterItemStates(
             ['published', 'killed', 'corrected', 'recalled']
         );
 
@@ -79,8 +75,8 @@ export function SMSReportController(
                     filter: DATE_FILTERS.RANGE,
                     start: moment()
                         .subtract(30, 'days')
-                        .format(config.model.dateformat),
-                    end: moment().format(config.model.dateformat),
+                        .format(appConfig.model.dateformat),
+                    end: moment().format(appConfig.model.dateformat),
                 },
                 must: {},
                 must_not: {},
@@ -206,16 +202,15 @@ export function SMSReportController(
         // Any data after the daylight savings change will be 1 hour out
         const utcOffset = getUtcOffsetInMinutes(
             report['start'],
-            config.defaultTimezone,
-            moment
+            appConfig.defaultTimezone
         );
 
         const chart = new SDChart.Chart({
             id: reportName,
             chartType: 'highcharts',
             title: $scope.generateTitle(),
             subtitle: $scope.generateSubtitle(),
-            startOfWeek: deployConfig.getSync('start_of_week', 0),
+            startOfWeek: appConfig.start_of_week || appConfig.startingDay || 0,
             timezoneOffset: utcOffset,
             useUTC: false,
             fullHeight: true,

client/index.js

@@ -0,0 +1,12 @@
+import {startApp} from 'superdesk-core/scripts/index';
+import planningExtension from 'superdesk-planning/client/planning-extension/dist/extension';
+import './aap/index.js';
+
+setTimeout(() => {
+    startApp(
+        [planningExtension],
+        {},
+    );
+});
+
+export default angular.module('main.superdesk', []);

client/package.json

@@ -2,8 +2,8 @@
     "name": "superdesk",
     "license": "GPL-3.0",
     "dependencies": {
-        "superdesk-core": "superdesk/superdesk-client-core#1.31",
-        "superdesk-planning": "superdesk/superdesk-planning#master",
-        "superdesk-analytics": "superdesk/superdesk-analytics#master"
+        "superdesk-core": "1.33.5",
+        "superdesk-planning": "1.33.1",
+        "superdesk-analytics": "1.33.4"
     }
 }

client/superdesk.config.js

@@ -1,7 +1,7 @@
-module.exports = function() {
+module.exports = function(grunt) {
     return {
         apps: ['superdesk-planning', 'superdesk.analytics', 'aap.apps'],
-        importApps: ['superdesk-planning', 'superdesk-analytics', '../aap'],
+        importApps: ['superdesk-planning', 'superdesk-analytics', '../index.js'],
         defaultRoute: '/workspace',
         workspace: {
             ingest: 1,
@@ -19,15 +19,6 @@ module.exports = function() {
             change_profile: 1
         },
 
-        editor: {
-            toolbar: false,
-            embeds: false,
-            paste: {
-                forcePlainText: true,
-                cleanPastedHTML: false
-            }
-        },
-
         features: {
             elasticHighlight: 1,
             swimlane: {defaultNumberOfColumns: 4},
@@ -45,6 +36,11 @@ module.exports = function() {
             editorInlineComments: false,
             editorSuggestions: false,
             validatePointOfInterestForImages: true,
+            customAuthoringTopbar: {
+                toDesk: false,
+                publish: false,
+                publishAndContinue: false,
+            }
         },
 
         activity: {

server/Procfile

@@ -4,6 +4,7 @@ work: celery -A worker -Q default  worker
 expiry: celery -A worker -Q expiry  worker
 legal: celery -A worker -Q legal  worker
 publish: celery -A worker -Q publish  worker
+ingest: celery -A worker -Q ingest  worker
 beat: celery -A worker beat --pid=
 capi: gunicorn -b 0.0.0.0:5400 -c gunicorn_config.py content_api.wsgi
 highcharts: python3 -u -m analytics.reports.highcharts_server

server/aap/commands/fulfill_image_assignments.py

@@ -13,13 +13,17 @@
 from superdesk.utc import utcnow, utc_to_local
 from datetime import timedelta
 from planning.common import ASSIGNMENT_WORKFLOW_STATE
+from planning.assignments.assignments_history import ASSIGNMENT_HISTORY_ACTIONS
 from eve.utils import ParsedRequest
 from flask import json
 from flask import current_app as app
 import requests
 from lxml import etree
 from superdesk.celery_task_utils import get_lock_id
 from superdesk.lock import lock, unlock
+from copy import deepcopy
+from eve.utils import config
+from bson import ObjectId
 
 logger = logging.getLogger(__name__)
 
@@ -110,8 +114,8 @@ def _get_dc_images_by_field(self, archive, value):
                     logger.error('DC login failed')
                 retries += 1
         if retries == 3:
+            logger.error('Failed to get image by field from DC {}'.format(id))
             return None
-        logger.error('Failed to get image by field from DC {}'.format(id))
         return etree.fromstring(response.content)
 
     def _get_outstanding_photo_assignments(self):
@@ -120,10 +124,43 @@ def _get_outstanding_photo_assignments(self):
         :return: The Id of any sheduled picure assignments
         """
         service = superdesk.get_resource_service('assignments')
-        assignments = service.find(where={"assigned_to.state": ASSIGNMENT_WORKFLOW_STATE.ASSIGNED,
-                                          "planning.g2_content_type": "picture",
-                                          "planning.scheduled": {"$gte": utcnow() - timedelta(days=2)},
-                                          "lock_user": None})
+        query = {
+            'query': {
+                'bool': {
+                    'must': [
+                        {
+                            'terms': {
+                                'assigned_to.state': [
+                                    ASSIGNMENT_WORKFLOW_STATE.ASSIGNED,
+                                    ASSIGNMENT_WORKFLOW_STATE.IN_PROGRESS
+                                ]
+                            }
+                        },
+                        {
+                            'term': {
+                                'planning.g2_content_type': 'picture'
+                            }
+                        },
+                        {
+                            'range': {
+                                'planning.scheduled': {
+                                    'gte': 'now-2d'
+                                }
+                            }
+                        }
+                    ],
+                    'must_not': {
+                        'exists': {
+                            'field': 'lock_user'
+                        }
+                    }
+                }
+            }
+        }
+        req = ParsedRequest()
+        req.args = {'source': json.dumps(query)}
+
+        assignments = service.get(req=req, lookup=None)
         if assignments.count() > 0:
             logger.warning('Found {} outstanding assignments in planning'.format(assignments.count()))
         else:
@@ -183,28 +220,80 @@ def _get_image_modifier(self, assignment):
         # return the assignor user or the assignor desk, if nothing else available
         return {'proxy_user': assigned_to.get('assignor_user', assigned_to.get('assignor_desk'))}
 
-    def _check_in_progress(self, assignments):
+    def _extract_user(self, image):
+        """
+        Given an image dossier extract the user that modified it
+        :param image:
+        :return:
+        """
+        dossier = image.find('./dc_rest_docs/dc_rest_doc/dcdossier')
+        if dossier is not None:
+            modified_by = dossier.attrib.get('modified_by')
+        if modified_by is not None and not modified_by == 'system':
+            user_service = superdesk.get_resource_service('users')
+            user = user_service.find_one(req=None, username=modified_by)
+            if user:
+                return user
+        return None
+
+    def _check_in_progress(self, assignments, complete):
         """
         Check the AAP Image Pool for any assignments that may be in progress
         :param assignments:
         :return:
         """
         in_progress_assignments = list()
+        in_list = set()
         for assignment in assignments:
-            # look in the AAP Image pool
-            dc_images = self._get_dc_images_by_field('aapimage', assignment.get('_id'))
-            if dc_images:
-                count = dc_images.find('./doc_count')
-                if count and int(count.text) > 0:
-                    in_progress_assignments.append(assignment)
+            # If we have marked the assignment complete ignore it
+            if assignment.get('_id') in complete:
+                continue
+            if assignment.get('assigned_to', {}).get('state') == ASSIGNMENT_WORKFLOW_STATE.ASSIGNED:
+                # look in the AAP Image pool
+                dc_images = self._get_dc_images_by_field('aapimage', assignment.get('_id'))
+                if dc_images is not None:
+                    count = dc_images.find('./doc_count')
+                    if count is not None and int(count.text) > 0:
+                        logger.info('Found in progress items in aapimage for {}'.format(assignment.get('_id')))
+                        user = self._extract_user(dc_images)
+                        in_list.add(assignment.get('_id'))
+                        in_progress_assignments.append({'assignment': assignment, 'user': user})
+                        continue
+                # look in the picedit pool
+                dc_images = self._get_dc_images_by_field('picedit', assignment.get('_id'))
+                if dc_images is not None:
+                    count = dc_images.find('./doc_count')
+                    if count is not None and int(count.text) > 0:
+                        logger.info('Found in progress items in picedit for {}'.format(assignment.get('_id')))
+                        user = self._extract_user(dc_images)
+                        if assignment.get('_id') not in in_list:
+                            in_list.add(assignment.get('_id'))
+                            in_progress_assignments.append({'assignment': assignment, 'user': user})
+        return in_progress_assignments
 
     def _mark_as_in_progress(self, assignments):
         """
-        TODO
+        Set the assignment state for that passed assignments to in progress
         :param assignments:
         :return:
         """
-        pass
+        service = superdesk.get_resource_service('assignments')
+        for assignment in assignments:
+            logger.warning('Marking assignment {} in progress'.format(assignment.get('assignment').get('_id')))
+            assignment.get('assignment')[config.ID_FIELD] = ObjectId(assignment.get('assignment')[config.ID_FIELD])
+            assigned_to = assignment.get('assignment').get('assigned_to')
+            updates = {'assigned_to': deepcopy(assigned_to)}
+            updates['assigned_to']['state'] = ASSIGNMENT_WORKFLOW_STATE.IN_PROGRESS
+            try:
+                service.patch(assignment.get('assignment')[config.ID_FIELD], updates)
+                if assignment.get('user') is None:
+                    updates['proxy_user'] = assigned_to.get('assignor_user', assigned_to.get('assignor_desk'))
+                else:
+                    updates['proxy_user'] = assignment.get('user').get(config.ID_FIELD)
+                superdesk.get_resource_service('assignments_history').on_item_updated(
+                    updates, assignment.get('assignment'), ASSIGNMENT_HISTORY_ACTIONS.START_WORKING)
+            except Exception as ex:
+                logger.exception(ex)
 
     def _mark_as_complete(self, assignments):
         """
@@ -216,8 +305,8 @@ def _mark_as_complete(self, assignments):
         for assignment in assignments:
             user = self._get_image_modifier(assignment)
             try:
-                logger.info('Marking assignment {} as complete'.format(assignment.get('assignment').get('_id')))
-                service.patch(assignment.get('assignment').get('_id'), user)
+                logger.warning('Marking assignment {} as complete'.format(assignment.get('assignment').get('_id')))
+                service.patch(ObjectId(assignment.get('assignment').get('_id')), user)
             except Exception as ex:
                 logger.exception(ex)
 
@@ -230,15 +319,19 @@ def run(self, ):
             return
 
         # Get a list of the outstanding photo assignments
-        assignments = self._get_outstanding_photo_assignments()
+        assignments = list(self._get_outstanding_photo_assignments())
 
         # query for any images available from the image site API with those assigment id's
         completed_assignments = self._check_complete(assignments)
 
         self._mark_as_complete(completed_assignments)
 
-        # assignments.rewind()
-        # in_progress_assignments = self._check_in_progress(assignments)
+        complete = [c.get('assignment').get('_id') for c in completed_assignments]
+
+        # check if any of the outstanding assignments are in either the picedit or aapimage pools
+        in_progress_assignments = self._check_in_progress(assignments, complete)
+
+        self._mark_as_in_progress(in_progress_assignments)
 
         unlock(lock_name)
         logger.info('Finished fulfilling assignments')

server/aap/io/data/aap_subject_codes.json

@@ -74,11 +74,12 @@
   "15072008":"69 kg - wrestling",
   "15072009":"63 kg - wrestling",
   "15077008":"freestyle - flying disc",
+  "15008001": "NBA",
   "01028000":"history - arts, culture and entertainment",
   "04002001":"biotechnology - chemicals",
   "04007003":"food - consumer goods",
   "04008002":"consumer issue - macro economics",
   "04013002":"food - process industry",
   "04016034":"privatisation - company information",
   "08003000":"people - human interest"
-}
+}

server/aap/io/feed_parsers/aap_sportsfixtures.py

@@ -396,7 +396,7 @@ def _set_location(self, item, location_string):
         location['original_source'] = 'AAP Sports Results'
         location['position'] = {'longitude': stadium.point.longitude, 'latitude': stadium.point.latitude,
                                 'altitude': stadium.point.altitude}
-        localities = [l for l in self.localityHierarchy if stadium.raw.get('address', {}).get(l)]
+        localities = [local for local in self.localityHierarchy if stadium.raw.get('address', {}).get(local)]
         areas = [a for a in self.areaHierarchy if stadium.raw.get('address', {}).get(a)]
         line = stadium.raw.get('address', {}).get('house_number', '')
         line = stadium.raw.get('address', {}).get('road', '') if line == '' else \