Feature/custom user model#57

Open

msolomon wants to merge 85 commits intodevelopfrom

feature/customUserModel

Commits on Dec 6, 2012

test for batched events. currently fails on NotImplementedError
Tom Hoddes
committed
refactored event view to use create_event_from_sendgrid_params for less code duplication with batched events coming up
Tom Hoddes
committed
updating SendGridBatchedEventTest with "event" param and event count assertion
Tom Hoddes
committed
batched events view
Tom Hoddes
committed
updated batched event test to follow send grids format
Tom Hoddes
committed
updated batched event view to pass new test for send grid format
Tom Hoddes
committed
added \r to split in batched event view
Tom Hoddes
committed
#49; Refactored event separator into constants
RyanBalfanz
committed
added new line at end of body for batch event test
Tom Hoddes
committed
for batch events parsing use split lines instead of split('\r\n')
Tom Hoddes
committed
Minor cleanup
RyanBalfanz
committed
Merge branch 'feature/batch_sendgrid_events' of github.com:RyanBalfanz/django-sendgrid into feature/batch_sendgrid_events
Tom Hoddes
committed
Merge branch 'feature/batch_sendgrid_events' of github.com:RyanBalfanz/django-sendgrid into feature/batch_sendgrid_events
Tom Hoddes
committed
#49; More cleanup
RyanBalfanz
committed
Merge branch 'feature/batch_sendgrid_events' of github.com:RyanBalfanz/django-sendgrid into feature/batch_sendgrid_events
RyanBalfanz
committed
#49; Use request.body (for django 1.4) and warn about future dependency
RyanBalfanz
committed
#49; Fixed bad merge /cc @hoddez
RyanBalfanz
committed

Commits on Dec 7, 2012

Commits on Dec 10, 2012

added convert_dict_to_urlencoded_string
Tom Hoddes
committed

Commits on Dec 11, 2012

new formatutils for converting between flat and nested dicts
Tom Hoddes
committed
refactored event tests, added some new ones for newsletters
Tom Hoddes
committed
refactored from_event to expect only one type of format
Tom Hoddes
committed
new setting SENDGRID_CREATE_MISSING_EMAILS_FOR_EVENTS_WITH_MESSAGE_ID
Tom Hoddes
committed
refactored handle_event views to convert single event style to batched event at top level
Tom Hoddes
committed

Commits on Dec 17, 2012

create changed to get_or_create for EmailMessage in from_event
Tom Hoddes
committed

Commits on Dec 18, 2012

Merge branch 'develop' into feature/batch_sendgrid_events
Tom Hoddes
committed
back to get for emailMessage in from_event
Tom Hoddes
committed
check for single categories
Tom Hoddes
committed
Revert "back to get for emailMessage in from_event"
Tom Hoddes
committed
emailMessage get_or_create changed back to create
Tom Hoddes
committed
some temporary logging to debug race condition
Tom Hoddes
committed
fixed logging
Tom Hoddes
committed
trying manual transactions to beat race condition
Tom Hoddes
committed

Commits on Dec 19, 2012

flush_transaction
Tom Hoddes
committed
removed some flush_transactions which I think are not necessary
Tom Hoddes
committed
added another flush_transaction to events view
Tom Hoddes
committed
Revert "removed some flush_transactions which I think are not necessary"
Tom Hoddes
committed
refactored flush_transaction to a dbutil
Tom Hoddes
committed

Commits on Dec 29, 2012

store events in bulk insert
Tom Hoddes
committed

Commits on Dec 31, 2012

added a test for getting events from multiple newsletters in one batch
hoddez
committed
[WIP] dump of bulk insert refactor for email events
hoddez
committed
typos
hoddez
committed
still [WIP] adding categories and arguments
hoddez
committed
test_batch_create_events passes
Tom Hoddes
committed
refactoring category and uniquearg building into functions for more readability
Tom Hoddes
committed
switched handle_batched_events_request to user batch_create_events
Tom Hoddes
committed
fixed multiple email creation on newsletter events for the same to_email
Tom Hoddes
committed
only create categories/unique args once per email
Tom Hoddes
committed
batching category and unique arg creation
Tom Hoddes
committed
eventTypes refactored to get only once
Tom Hoddes
committed
removed old commented lines
Tom Hoddes
committed
refactored event lists for batching a bit
Tom Hoddes
committed
Revert "refactored event lists for batching a bit"
Tom Hoddes
committed

Commits on Jan 1, 2013

added batching for events with message_ids
Tom Hoddes
committed
altered batched test to include some events with message ids for which an email message does not exists
Tom Hoddes
committed
added in batching for emails with message_ids, tests pass
Tom Hoddes
committed
added checks for None eventToCreate to fix 500 error on repeat/non-unique events
Tom Hoddes
committed
derp
Tom Hoddes
committed

Commits on Jan 2, 2013

refactoring events tests for cleanliness and more DRY
Tom Hoddes
committed
moved transaction to whole batch_create_events, they should either all fail or all succeed
Tom Hoddes
committed
fixed bug with events that have extra params
Tom Hoddes
committed
fixed bad test for case when newsletter events are off
Tom Hoddes
committed
added response to delivered event test in batched
Tom Hoddes
committed

Commits on Jan 3, 2013

refactored bulk_create_emails_with_manual_ids to a general manager
Tom Hoddes
committed
added manual post_save signals to send grid events
Tom Hoddes
committed
use new BulkCreate manager for events to get the post_save
Tom Hoddes
committed
refactoring constants
Tom Hoddes
committed
added batched option to post_test_event
Tom Hoddes
committed
added post_save checking to a batched events test
Tom Hoddes
committed
import json
Tom Hoddes
committed
oops
Tom Hoddes
committed
added using='default' to events bulk post_save
Tom Hoddes
committed
changed id to pk in bulk_create_with_manual_ids
Tom Hoddes
committed
added initial eventObj
Tom Hoddes
committed

Commits on Jan 16, 2013

removed flush_transaction from save_email_message
Tom Hoddes
committed
removed flush_transaction from sendgrid events view
Tom Hoddes
committed

Commits on Feb 28, 2013

new way of getting id for bulk_create_with_manual_ids that will lock the transaction to avoid race conditions
Tom Hoddes
committed

Commits on Mar 1, 2013

bulk_create_with_post_save refactor
Tom Hoddes
committed

Commits on Mar 6, 2013

bulk_create_with_manual_ids_retry
Tom Hoddes
committed
use bulk_create_with_manual_ids_retry for batched events
Tom Hoddes
committed
Tom Hoddes
committed

Commits on Mar 8, 2013

Swapped out User for AUTH_USER_MODEL
Mike Solomon
committed