-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from wesleykendall/develop
Small fixes, mark seen logic, and porting of some old code
- Loading branch information
Showing
6 changed files
with
458 additions
and
26 deletions.
There are no files selected for viewing
106 changes: 106 additions & 0 deletions
106
entity_event/migrations/0002_auto__add_unique_eventseen_event_medium.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| # -*- coding: utf-8 -*- | ||
| from south.utils import datetime_utils as datetime | ||
| from south.db import db | ||
| from south.v2 import SchemaMigration | ||
| from django.db import models | ||
|
|
||
|
|
||
| class Migration(SchemaMigration): | ||
|
|
||
| def forwards(self, orm): | ||
| # Adding unique constraint on 'EventSeen', fields ['event', 'medium'] | ||
| db.create_unique(u'entity_event_eventseen', ['event_id', 'medium_id']) | ||
|
|
||
|
|
||
| def backwards(self, orm): | ||
| # Removing unique constraint on 'EventSeen', fields ['event', 'medium'] | ||
| db.delete_unique(u'entity_event_eventseen', ['event_id', 'medium_id']) | ||
|
|
||
|
|
||
| models = { | ||
| u'contenttypes.contenttype': { | ||
| 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
| 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
| }, | ||
| u'entity.entity': { | ||
| 'Meta': {'unique_together': "(('entity_id', 'entity_type', 'entity_kind'),)", 'object_name': 'Entity'}, | ||
| 'display_name': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}), | ||
| 'entity_id': ('django.db.models.fields.IntegerField', [], {}), | ||
| 'entity_kind': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity.EntityKind']", 'on_delete': 'models.PROTECT'}), | ||
| 'entity_meta': ('jsonfield.fields.JSONField', [], {'null': 'True'}), | ||
| 'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']", 'on_delete': 'models.PROTECT'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}) | ||
| }, | ||
| u'entity.entitykind': { | ||
| 'Meta': {'object_name': 'EntityKind'}, | ||
| 'display_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256', 'db_index': 'True'}) | ||
| }, | ||
| u'entity_event.event': { | ||
| 'Meta': {'object_name': 'Event'}, | ||
| 'context': ('jsonfield.fields.JSONField', [], {}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Source']"}), | ||
| 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| 'time_expires': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
| 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}) | ||
| }, | ||
| u'entity_event.eventactor': { | ||
| 'Meta': {'object_name': 'EventActor'}, | ||
| 'entity': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity.Entity']"}), | ||
| 'event': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Event']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) | ||
| }, | ||
| u'entity_event.eventseen': { | ||
| 'Meta': {'unique_together': "(('event', 'medium'),)", 'object_name': 'EventSeen'}, | ||
| 'event': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Event']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'medium': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Medium']"}), | ||
| 'time_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'}) | ||
| }, | ||
| u'entity_event.medium': { | ||
| 'Meta': {'object_name': 'Medium'}, | ||
| 'description': ('django.db.models.fields.TextField', [], {}), | ||
| 'display_name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) | ||
| }, | ||
| u'entity_event.source': { | ||
| 'Meta': {'object_name': 'Source'}, | ||
| 'description': ('django.db.models.fields.TextField', [], {}), | ||
| 'display_name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), | ||
| 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.SourceGroup']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) | ||
| }, | ||
| u'entity_event.sourcegroup': { | ||
| 'Meta': {'object_name': 'SourceGroup'}, | ||
| 'description': ('django.db.models.fields.TextField', [], {}), | ||
| 'display_name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) | ||
| }, | ||
| u'entity_event.subscription': { | ||
| 'Meta': {'object_name': 'Subscription'}, | ||
| 'entity': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['entity.Entity']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'medium': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Medium']"}), | ||
| 'only_following': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Source']"}), | ||
| 'sub_entity_kind': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'to': u"orm['entity.EntityKind']"}) | ||
| }, | ||
| u'entity_event.unsubscription': { | ||
| 'Meta': {'object_name': 'Unsubscription'}, | ||
| 'entity': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity.Entity']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'medium': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Medium']"}), | ||
| 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Source']"}) | ||
| } | ||
| } | ||
|
|
||
| complete_apps = ['entity_event'] |
109 changes: 109 additions & 0 deletions
109
entity_event/migrations/0003_auto__add_field_source_context_loader.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| # -*- coding: utf-8 -*- | ||
| from south.utils import datetime_utils as datetime | ||
| from south.db import db | ||
| from south.v2 import SchemaMigration | ||
| from django.db import models | ||
|
|
||
|
|
||
| class Migration(SchemaMigration): | ||
|
|
||
| def forwards(self, orm): | ||
| # Adding field 'Source.context_loader' | ||
| db.add_column(u'entity_event_source', 'context_loader', | ||
| self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True), | ||
| keep_default=False) | ||
|
|
||
|
|
||
| def backwards(self, orm): | ||
| # Deleting field 'Source.context_loader' | ||
| db.delete_column(u'entity_event_source', 'context_loader') | ||
|
|
||
|
|
||
| models = { | ||
| u'contenttypes.contenttype': { | ||
| 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
| 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
| }, | ||
| u'entity.entity': { | ||
| 'Meta': {'unique_together': "(('entity_id', 'entity_type', 'entity_kind'),)", 'object_name': 'Entity'}, | ||
| 'display_name': ('django.db.models.fields.TextField', [], {'db_index': 'True', 'blank': 'True'}), | ||
| 'entity_id': ('django.db.models.fields.IntegerField', [], {}), | ||
| 'entity_kind': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity.EntityKind']", 'on_delete': 'models.PROTECT'}), | ||
| 'entity_meta': ('jsonfield.fields.JSONField', [], {'null': 'True'}), | ||
| 'entity_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']", 'on_delete': 'models.PROTECT'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}) | ||
| }, | ||
| u'entity.entitykind': { | ||
| 'Meta': {'object_name': 'EntityKind'}, | ||
| 'display_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256', 'db_index': 'True'}) | ||
| }, | ||
| u'entity_event.event': { | ||
| 'Meta': {'object_name': 'Event'}, | ||
| 'context': ('jsonfield.fields.JSONField', [], {}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Source']"}), | ||
| 'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| 'time_expires': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True'}), | ||
| 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}) | ||
| }, | ||
| u'entity_event.eventactor': { | ||
| 'Meta': {'object_name': 'EventActor'}, | ||
| 'entity': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity.Entity']"}), | ||
| 'event': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Event']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) | ||
| }, | ||
| u'entity_event.eventseen': { | ||
| 'Meta': {'unique_together': "(('event', 'medium'),)", 'object_name': 'EventSeen'}, | ||
| 'event': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Event']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'medium': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Medium']"}), | ||
| 'time_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'}) | ||
| }, | ||
| u'entity_event.medium': { | ||
| 'Meta': {'object_name': 'Medium'}, | ||
| 'description': ('django.db.models.fields.TextField', [], {}), | ||
| 'display_name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) | ||
| }, | ||
| u'entity_event.source': { | ||
| 'Meta': {'object_name': 'Source'}, | ||
| 'context_loader': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}), | ||
| 'description': ('django.db.models.fields.TextField', [], {}), | ||
| 'display_name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), | ||
| 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.SourceGroup']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) | ||
| }, | ||
| u'entity_event.sourcegroup': { | ||
| 'Meta': {'object_name': 'SourceGroup'}, | ||
| 'description': ('django.db.models.fields.TextField', [], {}), | ||
| 'display_name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) | ||
| }, | ||
| u'entity_event.subscription': { | ||
| 'Meta': {'object_name': 'Subscription'}, | ||
| 'entity': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': u"orm['entity.Entity']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'medium': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Medium']"}), | ||
| 'only_following': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Source']"}), | ||
| 'sub_entity_kind': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'to': u"orm['entity.EntityKind']"}) | ||
| }, | ||
| u'entity_event.unsubscription': { | ||
| 'Meta': {'object_name': 'Unsubscription'}, | ||
| 'entity': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity.Entity']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'medium': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Medium']"}), | ||
| 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['entity_event.Source']"}) | ||
| } | ||
| } | ||
|
|
||
| complete_apps = ['entity_event'] |
Oops, something went wrong.