From eeadf5759d7fefc26784642f0fe7c4b37089d118 Mon Sep 17 00:00:00 2001 From: Davide Alberani Date: Sat, 9 Jul 2016 14:20:48 +0200 Subject: [PATCH] fixes #145: remove Person collection --- angular_app/event-edit.html | 2 +- angular_app/event-main.html | 8 +-- angular_app/event-tickets.html | 24 +++---- angular_app/events-list.html | 6 +- angular_app/index.html | 4 +- angular_app/js/controllers.js | 126 ++++++++++++++++---------------- angular_app/js/filters.js | 31 ++------ angular_app/js/services.js | 14 ++-- angular_app/person-edit.html | 69 ------------------ angular_app/person-info.html | 50 ------------- angular_app/person-main.html | 2 - backend.py | 2 +- eventman_server.py | 128 ++++++++++++++++----------------- 13 files changed, 156 insertions(+), 310 deletions(-) delete mode 100644 angular_app/person-edit.html delete mode 100644 angular_app/person-info.html delete mode 100644 angular_app/person-main.html diff --git a/angular_app/event-edit.html b/angular_app/event-edit.html index ed8baa6..946f50c 100644 --- a/angular_app/event-edit.html +++ b/angular_app/event-edit.html @@ -3,7 +3,7 @@

- diff --git a/angular_app/event-main.html b/angular_app/event-main.html index f112ed9..692b0c3 100644 --- a/angular_app/event-main.html +++ b/angular_app/event-main.html @@ -1,8 +1,2 @@ - -
- +
diff --git a/angular_app/event-tickets.html b/angular_app/event-tickets.html index fc15f00..62c0cb2 100644 --- a/angular_app/event-tickets.html +++ b/angular_app/event-tickets.html @@ -19,7 +19,7 @@ -->
-

{{'Registered:' | translate}} {{((event.persons || []) | registeredFilter).length}}

+

{{'Registered:' | translate}} {{((event.tickets || []) | registeredFilter).length}}

{{'Attendees:' | translate}} {{countAttendees}}

@@ -33,12 +33,12 @@
-
{{'Persons' | translate}}
+
{{'tickets' | translate}}
- - + +
@@ -54,30 +54,30 @@ - + diff --git a/angular_app/events-list.html b/angular_app/events-list.html index 8029053..cbc2ad0 100644 --- a/angular_app/events-list.html +++ b/angular_app/events-list.html @@ -46,12 +46,12 @@

{{'Begins:' | translate}} {{event['begin-date'] | date:'fullDate'}} {{event['begin-time'] | date:'HH:mm'}}
{{'Ends:' | translate}} {{event['end-date'] | date:'fullDate' }} {{event['end-time'] | date:'HH:mm'}}

- diff --git a/angular_app/index.html b/angular_app/index.html index 4046451..f091851 100644 --- a/angular_app/index.html +++ b/angular_app/index.html @@ -80,8 +80,8 @@
    -
  • - {{info.user.username}} +
  • + {{info.user.username}}  {{'logout' | translate}} diff --git a/angular_app/js/controllers.js b/angular_app/js/controllers.js index b5050fc..9764b4a 100644 --- a/angular_app/js/controllers.js +++ b/angular_app/js/controllers.js @@ -72,7 +72,7 @@ eventManControllers.controller('EventsListCtrl', ['$scope', 'Event', '$uibModal' $scope.events = Event.all(function(events) { if (events && $state.is('tickets')) { angular.forEach(events, function(evt, idx) { - var evt_tickets = (evt.persons || []).slice(0); + var evt_tickets = (evt.tickets || []).slice(0); angular.forEach(evt_tickets, function(obj, obj_idx) { obj.event_title = evt.title; obj.event_id = evt._id; @@ -133,7 +133,7 @@ eventManControllers.controller('EventsListCtrl', ['$scope', 'Event', '$uibModal' eventManControllers.controller('EventDetailsCtrl', ['$scope', '$state', 'Event', '$log', '$translate', '$rootScope', function ($scope, $state, Event, $log, $translate, $rootScope) { $scope.event = {}; - $scope.event.persons = []; + $scope.event.tickets = []; $scope.event.formSchema = {}; $scope.eventFormDisabled = false; @@ -146,10 +146,10 @@ eventManControllers.controller('EventDetailsCtrl', ['$scope', '$state', 'Event', // store a new Event or update an existing one $scope.save = function() { - // avoid override of event.persons list. + // avoid override of event.tickets list. var this_event = angular.copy($scope.event); - if (this_event.persons) { - delete this_event.persons; + if (this_event.tickets) { + delete this_event.tickets; } if (this_event._id === undefined) { $scope.event = Event.save(this_event); @@ -169,7 +169,7 @@ eventManControllers.controller('EventDetailsCtrl', ['$scope', '$state', 'Event', eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', 'EventTicket', 'Setting', '$log', '$translate', '$rootScope', 'EventUpdates', '$uibModal', function ($scope, $state, Event, EventTicket, Setting, $log, $translate, $rootScope, EventUpdates, $uibModal) { - $scope.personsOrder = ["name", "surname"]; + $scope.ticketsOrder = ["name", "surname"]; $scope.countAttendees = 0; $scope.message = {}; $scope.event = {}; @@ -178,7 +178,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', $scope.formSchema = {}; $scope.formData = {}; $scope.guiOptions = {dangerousActionsEnabled: false}; - $scope.customFields = Setting.query({setting: 'person_custom_field', in_event_details: true}); + $scope.customFields = Setting.query({setting: 'ticket_custom_field', in_event_details: true}); $scope.formFieldsMap = {}; $scope.formFieldsMapRev = {}; @@ -186,7 +186,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', if ($state.params.id) { $scope.event = Event.get({id: $state.params.id}, function(data) { $scope.$watchCollection(function() { - return $scope.event.persons; + return $scope.event.tickets; }, function(prev, old) { $scope.calcAttendees(); } @@ -215,7 +215,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', if ($state.is('event.tickets')) { $scope.allPersons = Event.group_persons({id: $state.params.id}); - // Handle WebSocket connection used to update the list of persons. + // Handle WebSocket connection used to update the list of tickets. $scope.EventUpdates = EventUpdates; $scope.EventUpdates.open(); $scope.$watchCollection(function() { @@ -230,23 +230,23 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', $log.debug('do not process our own message'); return false; } - if (!$scope.event.persons) { - $scope.event.persons = []; + if (!$scope.event.tickets) { + $scope.event.tickets = []; } - var person_idx = $scope.event.persons.findIndex(function(el, idx, array) { + var ticket_idx = $scope.event.tickets.findIndex(function(el, idx, array) { return data._id == el._id; }); - if (person_idx != -1) { + if (ticket_idx != -1) { $log.debug('_id ' + data._id + ' found'); } else { $log.debug('_id ' + data._id + ' not found'); } - if (data.action == 'update' && person_idx != -1 && $scope.event.persons[person_idx] != data.person) { - $scope.event.persons[person_idx] = data.person; - } else if (data.action == 'add' && person_idx == -1) { - $scope._localAddTicket(data.person); - } else if (data.action == 'delete' && person_idx != -1) { + if (data.action == 'update' && ticket_idx != -1 && $scope.event.tickets[ticket_idx] != data.ticket) { + $scope.event.tickets[ticket_idx] = data.ticket; + } else if (data.action == 'add' && ticket_idx == -1) { + $scope._localAddTicket(data.ticket); + } else if (data.action == 'delete' && ticket_idx != -1) { $scope._localRemoveTicket({_id: data._id}); } } @@ -257,12 +257,12 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', } $scope.calcAttendees = function() { - if (!($scope.event && $scope.event.persons)) { + if (!($scope.event && $scope.event.tickets)) { $scope.countAttendees = 0; return; } var attendees = 0; - angular.forEach($scope.event.persons, function(value, key) { + angular.forEach($scope.event.tickets, function(value, key) { if (value.attended && !value.cancelled) { attendees += 1; } @@ -272,30 +272,30 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', /* Stuff to do when a ticket is added, modified or removed locally. */ - $scope._localAddTicket = function(ticket, original_person) { + $scope._localAddTicket = function(ticket, original_ticket) { if (!$state.is('event.tickets')) { return true; } var ret = true; - if (!$scope.event.persons) { - $scope.event.persons = []; + if (!$scope.event.tickets) { + $scope.event.tickets = []; } - var ticket_idx = $scope.event.persons.findIndex(function(el, idx, array) { + var ticket_idx = $scope.event.tickets.findIndex(function(el, idx, array) { return ticket._id == el._id; }); if (ticket_idx != -1) { $log.warn('ticket already present: not added'); ret = false; } else { - $scope.event.persons.push(ticket); + $scope.event.tickets.push(ticket); } // Try to remove this person from the allPersons list using ID or email. var field = null; var field_value = null; - if (original_person && original_person._id) { + if (original_ticket && original_ticket._id) { field = '_id'; - field_value = original_person._id; + field_value = original_ticket._id; } else if (ticket.email) { field = 'email'; field_value = ticket.email; @@ -312,34 +312,36 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', }; $scope._localUpdateTicket = function(ticket) { - if (!$scope.event.persons) { - $scope.event.persons = []; + if (!$scope.event.tickets) { + $scope.event.tickets = []; } - var ticket_idx = $scope.event.persons.findIndex(function(el, idx, array) { + var ticket_idx = $scope.event.tickets.findIndex(function(el, idx, array) { return ticket._id == el._id; }); if (ticket_idx == -1) { $log.warn('ticket not present: not updated'); return false; } - $scope.event.persons[ticket_idx] = ticket; + $scope.event.tickets[ticket_idx] = ticket; }; - $scope._localRemoveTicket = function(person) { - if (!(person && person._id && $scope.event.persons)) { + $scope._localRemoveTicket = function(ticket) { + if (!(ticket && ticket._id && $scope.event.tickets)) { return; } - var person_idx = $scope.event.persons.findIndex(function(el, idx, array) { - return person._id == el._id; + var ticket_idx = $scope.event.tickets.findIndex(function(el, idx, array) { + return ticket._id == el._id; }); - if (person_idx == -1) { - $log.warn('unable to find and delete ticket _id ' + person._id); + if (ticket_idx == -1) { + $log.warn('unable to find and delete ticket _id ' + ticket._id); return; } - var removed_person = $scope.event.persons.splice(person_idx, 1); + var removed_person = $scope.event.tickets.splice(ticket_idx, 1); // to be used to populate allPersons, if needed. if (removed_person.length) { person = removed_person[0]; + } else { + return; } if (!$scope.allPersons) { $scope.allPersons = []; @@ -352,23 +354,23 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', } }; - $scope.setTicketAttribute = function(person, key, value, callback, hideMessage) { - $log.debug('setTicketAttribute for _id ' + person._id + ' key: ' + key + ' value: ' + value); - var newData = {event_id: $state.params.id, _id: person._id}; + $scope.setTicketAttribute = function(ticket, key, value, callback, hideMessage) { + $log.debug('setTicketAttribute for _id ' + ticket._id + ' key: ' + key + ' value: ' + value); + var newData = {event_id: $state.params.id, _id: ticket._id}; newData[key] = value; EventTicket.update(newData, function(data) { - if (!(data && data._id && data.person)) { + if (!(data && data._id && data.ticket)) { return; } - var person_idx = $scope.event.persons.findIndex(function(el, idx, array) { + var ticket_idx = $scope.event.tickets.findIndex(function(el, idx, array) { return data._id == el._id; }); - if (person_idx == -1) { + if (ticket_idx == -1) { $log.warn('unable to find ticket _id ' + _id); return; } - if ($scope.event.persons[person_idx] != data.person) { - $scope.event.persons[person_idx] = data.person; + if ($scope.event.tickets[ticket_idx] != data.ticket) { + $scope.event.tickets[ticket_idx] = data.ticket; } if (callback) { callback(data); @@ -376,9 +378,9 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', if (key === 'attended' && !hideMessage) { var msg = {}; if (value) { - msg.message = '' + person.name + ' ' + person.surname + ' successfully added to event ' + $scope.event.title; + msg.message = '' + ticket.name + ' ' + ticket.surname + ' successfully added to event ' + $scope.event.title; } else { - msg.message = '' + person.name + ' ' + person.surname + ' successfully removed from event ' + $scope.event.title; + msg.message = '' + ticket.name + ' ' + ticket.surname + ' successfully removed from event ' + $scope.event.title; msg.isError = true; } $scope.showMessage(msg); @@ -386,30 +388,30 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', }); }; - $scope.setTicketAttributeAndRefocus = function(person, key, value) { - $scope.setTicketAttribute(person, key, value); + $scope.setTicketAttributeAndRefocus = function(ticket, key, value) { + $scope.setTicketAttribute(ticket, key, value); $scope.query = ''; }; - $scope._setAttended = function(person) { - $scope.setTicketAttribute(person, 'attended', true, null, true); + $scope._setAttended = function(ticket) { + $scope.setTicketAttribute(ticket, 'attended', true, null, true); }; - $scope.deleteTicket = function(person) { + $scope.deleteTicket = function(ticket) { EventTicket.delete({ event_id: $state.params.id, - ticket_id: person._id + ticket_id: ticket._id }, function() { - $scope._localRemoveTicket(person); + $scope._localRemoveTicket(ticket); }); }; - $scope.addTicket = function(person) { - person.event_id = $state.params.id; - EventTicket.add(person, function(ticket) { + $scope.addTicket = function(ticket) { + ticket.event_id = $state.params.id; + EventTicket.add(ticket, function(ticket) { $log.debug('addTicket'); $log.debug(ticket); - $scope._localAddTicket(ticket, person); + $scope._localAddTicket(ticket, ticket); if (!$state.is('event.tickets')) { $state.go('event.ticket.edit', {id: $scope.event._id, ticket_id: ticket._id}); } else { @@ -425,7 +427,7 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', $scope.updateTicket = function(ticket, cb) { ticket.event_id = $state.params.id; EventTicket.update(ticket, function(t) { - $scope._localUpdateTicket(t.person); + $scope._localUpdateTicket(t.ticket); if (cb) { cb(t); } @@ -499,14 +501,14 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event', } else { inv_key = '-' + key; } - angular.forEach($scope.personsOrder, + angular.forEach($scope.ticketsOrder, function(value, idx) { if (value !== key && value !== inv_key) { new_order.push(value); } } ); - $scope.personsOrder = new_order; + $scope.ticketsOrder = new_order; }; $scope.showMessage = function(cfg) { diff --git a/angular_app/js/filters.js b/angular_app/js/filters.js index 2c79f76..d415bf7 100644 --- a/angular_app/js/filters.js +++ b/angular_app/js/filters.js @@ -2,27 +2,6 @@ /* Filters for EventMan(ager) lists of objects. */ -/* Filter for events that have (or not) information about a registered person. */ -eventManApp.filter('eventWithPersonData', ['$filter', - function($filter) { - return function(inputArray, mustBePresent) { - if (mustBePresent === undefined) { - mustBePresent = true; - } - inputArray = inputArray || []; - var returnArray = []; - for (var x=0; x < inputArray.length; x++) { - var found = inputArray[x].person_data && inputArray[x].person_data.person_id; - if ((found && mustBePresent) || (!found && !mustBePresent)) { - returnArray.push(inputArray[x]); - } - } - return returnArray; - }; - }] -); - - /* Filter for persons (not) registered for a given event. */ eventManApp.filter('personRegistered', ['$filter', function($filter) { @@ -33,14 +12,14 @@ eventManApp.filter('personRegistered', ['$filter', inputArray = inputArray || []; var returnArray = []; var registeredIDs = []; - if (!(data.event && data.event.persons && data.event.persons.length)) { + if (!(data.event && data.event.tickets && data.event.tickets.length)) { return inputArray; } - for (var x=0; x < data.event.persons.length; x++) { - if (!data.includeCancelled && data.event.persons[x].cancelled) { + for (var x=0; x < data.event.tickets.length; x++) { + if (!data.includeCancelled && data.event.tickets[x].cancelled) { continue; } - registeredIDs.push(data.event.persons[x].person_id); + registeredIDs.push(data.event.tickets[x]._id); } for (var x=0; x < inputArray.length; x++) { var found = registeredIDs.indexOf(inputArray[x]._id) != -1; @@ -68,7 +47,7 @@ eventManApp.filter('splittedFilter', ['$filter', ); -/* Filter that returns only the (not) registered persons at an event. */ +/* Filter that returns only the (not) registered tickets at an event. */ eventManApp.filter('registeredFilter', ['$filter', function($filter) { return function(inputArray, data) { diff --git a/angular_app/js/services.js b/angular_app/js/services.js index 232d956..0239786 100644 --- a/angular_app/js/services.js +++ b/angular_app/js/services.js @@ -44,10 +44,10 @@ eventManServices.factory('Event', ['$resource', '$rootScope', data = angular.fromJson(data); convert_dates(data); // strip empty keys. - angular.forEach(data.persons || [], function(person, person_idx) { - angular.forEach(person, function(value, key) { + angular.forEach(data.tickets || [], function(ticket, ticket_idx) { + angular.forEach(ticket, function(value, key) { if (value === "") { - delete person[key]; + delete ticket[key]; } }); }); @@ -84,7 +84,7 @@ eventManServices.factory('EventTicket', ['$resource', '$rootScope', interceptor : {responseError: $rootScope.errorHandler}, transformResponse: function(data, headers) { data = angular.fromJson(data); - return data.person; + return data.ticket; } }, @@ -98,7 +98,7 @@ eventManServices.factory('EventTicket', ['$resource', '$rootScope', if (data.error) { return data; } - return data.persons; + return data.tickets; } }, @@ -110,7 +110,7 @@ eventManServices.factory('EventTicket', ['$resource', '$rootScope', params: {uuid: $rootScope.app_uuid}, transformResponse: function(data, headers) { data = angular.fromJson(data); - return data.person; + return data.ticket; } }, @@ -236,7 +236,7 @@ eventManServices.factory('User', ['$resource', '$rootScope', ); -/* WebSocket collection used to update the list of persons of an Event. */ +/* WebSocket collection used to update the list of tickets of an Event. */ eventManApp.factory('EventUpdates', ['$websocket', '$location', '$log', function($websocket, $location, $log) { diff --git a/angular_app/person-edit.html b/angular_app/person-edit.html deleted file mode 100644 index d28328c..0000000 --- a/angular_app/person-edit.html +++ /dev/null @@ -1,69 +0,0 @@ - -
    -
    -
    -

    - -  {{'New person' | translate}}{{person.name}} {{person.surname}} -

    -
    -
    - -
    -
    - -
    - -
    - {{'Name' | translate}} - -
    - -
    - {{'Surname' | translate}} - -
    - -
    - {{'Email' | translate}} - -
    - -
    - {{'Company' | translate}} - -
    - -
    - {{'Job' | translate}} - -
    - -
    - - -
- - -
-
- - - - - - - diff --git a/angular_app/person-info.html b/angular_app/person-info.html deleted file mode 100644 index 5328193..0000000 --- a/angular_app/person-info.html +++ /dev/null @@ -1,50 +0,0 @@ - -
-

{{person.name}} {{person.surname}} - -

-
-
Events
-
-
-
- - -
-
- - -
- -
{{$index+1}} - {{person.name}} {{person.surname}} + {{ticket.name}} {{ticket.surname}} -  <{{person.email}}> -

{{person.job_title}} @ {{person.company}}

+  <{{ticket.email}}> +

{{ticket.job_title}} @ {{ticket.company}}

 - + - + - {{person[col.key]}} + {{ticket[col.key]}} - +
-

{{attendeesNr}} / {{((event.persons || []) | registeredFilter).length}} ({{((attendeesNr / ((event.persons || []) | registeredFilter).length * 100) || 0).toFixed()}}%)

+ 		+

{{attendeesNr}} / {{((event.tickets || []) | registeredFilter).length}} ({{((attendeesNr / ((event.tickets || []) | registeredFilter).length * 100) || 0).toFixed()}}%)

 - +
- - - - - - - - - - - - - - -
{{'Event' | translate}}{{'Registered' | translate}}{{'Attended' | translate}}
{{event.title}} - - - -
-
-
-
- diff --git a/angular_app/person-main.html b/angular_app/person-main.html deleted file mode 100644 index 3f0abfb..0000000 --- a/angular_app/person-main.html +++ /dev/null @@ -1,2 +0,0 @@ - -
diff --git a/backend.py b/backend.py index 1c7e71b..1d22ae8 100644 --- a/backend.py +++ b/backend.py @@ -24,7 +24,7 @@ re_objectid = re.compile(r'[0-9a-f]{24}') _force_conversion = { 'seq_hex': str, - 'persons.seq_hex': str + 'tickets.seq_hex': str } diff --git a/eventman_server.py b/eventman_server.py index e0b32f2..a9793a0 100755 --- a/eventman_server.py +++ b/eventman_server.py @@ -88,7 +88,6 @@ class BaseHandler(tornado.web.RequestHandler): 'event:tickets|all': True, 'event:tickets-all|create': True, 'events|read': True, - 'persons|create': True, 'users|create': True } @@ -556,16 +555,16 @@ class EventsHandler(CollectionHandler): collection = 'events' def filter_get(self, output): - if not self.has_permission('persons-all|read'): - if 'persons' in output: - output['persons'] = [] + if not self.has_permission('tckets-all|read'): + if 'tickets' in output: + output['tickets'] = [] return output def filter_get_all(self, output): - if not self.has_permission('persons-all|read'): + if not self.has_permission('tickets-all|read'): for event in output.get('events') or []: - if 'persons' in event: - event['persons'] = [] + if 'tickets' in event: + event['tickets'] = [] return output def filter_input_post(self, data): @@ -592,56 +591,56 @@ class EventsHandler(CollectionHandler): group_id = this_event.get('group_id') if group_id is None: return {'persons': persons} - this_persons = [p for p in (this_event.get('persons') or []) if not p.get('cancelled')] + this_persons = [p for p in (this_event.get('tickets') or []) if not p.get('cancelled')] this_emails = filter(None, [p.get('email') for p in this_persons]) all_query = {'group_id': group_id} events = self.db.query('events', all_query) for event in events: if id_ is not None and str(event.get('_id')) == id_: continue - persons += [p for p in (event.get('persons') or []) if p.get('email') and p.get('email') not in this_emails] + persons += [p for p in (event.get('tickets') or []) if p.get('email') and p.get('email') not in this_emails] return {'persons': persons} - def _get_person_data(self, person_id_or_query, persons): - """Filter a list of persons returning the first item with a given person_id + def _get_ticket_data(self, ticket_id_or_query, tickets): + """Filter a list of tickets returning the first item with a given _id or which set of keys specified in a dictionary match their respective values.""" - for person in persons: - if isinstance(person_id_or_query, dict): - if all(person.get(k) == v for k, v in person_id_or_query.iteritems()): - return person + for ticket in tickets: + if isinstance(ticket_id_or_query, dict): + if all(ticket.get(k) == v for k, v in ticket_id_or_query.iteritems()): + return ticket else: - if str(person.get('_id')) == person_id_or_query: - return person + if str(ticket.get('_id')) == ticket_id_or_query: + return ticket return {} - def handle_get_persons(self, id_, resource_id=None, match_query=None): - # Return every person registered at this event, or the information - # about a specific person. + def handle_get_tickets(self, id_, resource_id=None, match_query=None): + # Return every ticket registered at this event, or the information + # about a specific ticket. query = {'_id': id_} event = self.db.query('events', query)[0] if match_query is None: match_query = resource_id if resource_id: - return {'person': self._get_person_data(match_query, event.get('persons') or [])} - persons = self._filter_results(event.get('persons') or [], self.arguments) - return {'persons': persons} + return {'ticket': self._get_ticket_data(match_query, event.get('tickets') or [])} + tickets = self._filter_results(event.get('tickets') or [], self.arguments) + return {'tickets': tickets} - def handle_get_tickets(self, id_, resource_id=None): + def __handle_get_tickets_REMOVE(self, id_, resource_id=None): if resource_id is None and not self.has_permission('event:tickets|all'): return self.build_error(status=401, message='insufficient permissions: event:tickets|all') return self.handle_get_persons(id_, resource_id, {'_id': resource_id}) - def handle_post_persons(self, id_, person_id, data): - # Add a person to the list of persons registered at this event. + def handle_post_tickets(self, id_, ticket_id, data): + # Add a ticket to the list of tickets registered at this event. uuid, arguments = self.uuid_arguments self._clean_dict(data) - data['seq'] = self.get_next_seq('event_%s_persons' % id_) + data['seq'] = self.get_next_seq('event_%s_tickets' % id_) data['seq_hex'] = '%06X' % data['seq'] - if person_id is None: + if ticket_id is None: doc = {} else: - doc = self.db.query('events', {'_id': id_, 'persons._id': person_id}) - ret = {'action': 'add', '_id': person_id, 'person': data, 'uuid': uuid} + doc = self.db.query('events', {'_id': id_, 'tickets._id': ticket_id}) + ret = {'action': 'add', '_id': ticket_id, 'ticket': data, 'uuid': uuid} if '_id' in data: del data['_id'] self.send_ws_message('event/%s/tickets/updates' % id_, json.dumps(ret)) @@ -649,78 +648,71 @@ class EventsHandler(CollectionHandler): data['_id'] = self.gen_id() merged, doc = self.db.update('events', {'_id': id_}, - {'persons': data}, + {'tickets': data}, operation='appendUnique', create=False) return ret - handle_post_tickets = handle_post_persons - - def handle_put_persons(self, id_, person_id, data, ticket=False): - # Update an existing entry for a person registered at this event. + def handle_put_tickets(self, id_, ticket_id, data, ticket=True): + # Update an existing entry for a ticket registered at this event. self._clean_dict(data) uuid, arguments = self.uuid_arguments - query = dict([('persons.%s' % k, v) for k, v in arguments.iteritems()]) + query = dict([('tickets.%s' % k, v) for k, v in arguments.iteritems()]) query['_id'] = id_ - if person_id is not None: - query['persons._id'] = person_id - person_query = {'_id': person_id} + if ticket_id is not None: + query['tickets._id'] = ticket_id + ticket_query = {'_id': ticket_id} else: - person_query = self.arguments - old_person_data = {} + ticket_query = self.arguments + old_ticket_data = {} current_event = self.db.query(self.collection, query) if current_event: current_event = current_event[0] else: current_event = {} - old_person_data = self._get_person_data(person_query, - current_event.get('persons') or []) + old_ticket_data = self._get_ticket_data(ticket_query, + current_event.get('tickets') or []) merged, doc = self.db.update('events', query, - data, updateList='persons', create=False) - new_person_data = self._get_person_data(person_query, - doc.get('persons') or []) - env = self._dict2env(new_person_data) - # always takes the person_id from the new person (it may have + data, updateList='tickets', create=False) + new_ticket_data = self._get_ticket_data(ticket_query, + doc.get('tickets') or []) + env = self._dict2env(new_ticket_data) + # always takes the ticket_id from the new ticket (it may have # been a ticket_id). - ticket_id = str(new_person_data.get('_id')) + ticket_id = str(new_ticket_data.get('_id')) env.update({'PERSON_ID': ticket_id, 'TICKED_ID': ticket_id, 'EVENT_ID': id_, 'EVENT_TITLE': doc.get('title', ''), 'WEB_USER': self.current_user, 'WEB_REMOTE_IP': self.request.remote_ip}) - stdin_data = {'old': old_person_data, - 'new': new_person_data, + stdin_data = {'old': old_ticket_data, + 'new': new_ticket_data, 'event': doc, 'merged': merged } - self.run_triggers('update_person_in_event', stdin_data=stdin_data, env=env) - if old_person_data and old_person_data.get('attended') != new_person_data.get('attended'): - if new_person_data.get('attended'): + self.run_triggers('update_ticket_in_event', stdin_data=stdin_data, env=env) + if old_ticket_data and old_ticket_data.get('attended') != new_ticket_data.get('attended'): + if new_ticket_data.get('attended'): self.run_triggers('attends', stdin_data=stdin_data, env=env) - ret = {'action': 'update', '_id': ticket_id, 'person': new_person_data, 'uuid': uuid} - if old_person_data != new_person_data: + ret = {'action': 'update', '_id': ticket_id, 'ticket': new_ticket_data, 'uuid': uuid} + if old_ticket_data != new_ticket_data: self.send_ws_message('event/%s/tickets/updates' % id_, json.dumps(ret)) return ret - def handle_put_tickets(self, id_, person_id, data): - return self.handle_put_persons(id_, person_id, data, True) - - def handle_delete_persons(self, id_, person_id): - # Remove a specific person from the list of persons registered at this event. + def handle_delete_tickets(self, id_, ticket_id): + # Remove a specific ticket from the list of tickets registered at this event. uuid, arguments = self.uuid_arguments doc = self.db.query('events', - {'_id': id_, 'persons._id': person_id}) - ret = {'action': 'delete', '_id': person_id, 'uuid': uuid} + {'_id': id_, 'tickets._id': ticket_id}) + ret = {'action': 'delete', '_id': ticket_id, 'uuid': uuid} if doc: merged, doc = self.db.update('events', {'_id': id_}, - {'persons': {'_id': person_id}}, + {'tickets': {'_id': ticket_id}}, operation='delete', create=False) self.send_ws_message('event/%s/tickets/updates' % id_, json.dumps(ret)) return ret - handle_delete_tickets = handle_delete_persons - class UsersHandler(CollectionHandler): """Handle requests for Users.""" @@ -732,11 +724,11 @@ class UsersHandler(CollectionHandler): del data['password'] if '_id' in data: tickets = [] - events = self.db.query('events', {'persons.created_by': data['_id']}) + events = self.db.query('events', {'tickets.created_by': data['_id']}) for event in events: event_title = event.get('title') or '' event_id = str(event.get('_id')) - evt_tickets = self._filter_results(event.get('persons') or [], {'created_by': data['_id']}) + evt_tickets = self._filter_results(event.get('tickets') or [], {'created_by': data['_id']}) for evt_ticket in evt_tickets: evt_ticket['event_title'] = event_title evt_ticket['event_id'] = event_id