Site model changed bool to status field

ulope · Jul 31, 2011 · 2dab464 · 2dab464
1 parent d863227
commit 2dab464
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 2 deletions.
diff --git a/.../main/migrations/0004_auto__del_field_site_verified__add_field_site_verification_state.py b/.../main/migrations/0004_auto__del_field_site_verified__add_field_site_verification_state.py
@@ -0,0 +1,86 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Deleting field 'Site.verified'
+        db.delete_column('main_site', 'verified')
+
+        # Adding field 'Site.verification_state'
+        db.add_column('main_site', 'verification_state', self.gf('django.db.models.fields.CharField')(default='new', max_length=10), keep_default=False)
+
+
+    def backwards(self, orm):
+
+        # Adding field 'Site.verified'
+        db.add_column('main_site', 'verified', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Deleting field 'Site.verification_state'
+        db.delete_column('main_site', 'verification_state')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        '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'}),
+            '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'})
+        },
+        'main.account': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Account'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'delegates': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'authorized_for'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '300'}),
+            'owner': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'account'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'main.site': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Site'},
+            'allow_wild_subdomain': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'belongs_to': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sites'", 'to': "orm['main.Account']"}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'domain': ('django.db.models.fields.CharField', [], {'max_length': '300'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '300'}),
+            'verification_state': ('django.db.models.fields.CharField', [], {'default': "'new'", 'max_length': '10'})
+        }
+    }
+
+    complete_apps = ['main']
diff --git a/guardhouse/main/models.py b/guardhouse/main/models.py
@@ -35,6 +35,17 @@ class Meta(object):
     def __unicode__(self):
         return self.name
 
+class VERIFY_STATE(object):
+    NEW = "new"
+    FAILED = "failed"
+    VERIFIED = "verified"
+
+VERIFICATION_STATE_CHOICES = (
+    (VERIFY_STATE.NEW, _("New")),
+    (VERIFY_STATE.FAILED, _("Failed")),
+    (VERIFY_STATE.VERIFIED, _("Verified")),
+)
+
 class Site(BaseModel):
     """
     A site for which messages are accepted. Has to be verified before it can be
@@ -48,7 +59,10 @@ class Site(BaseModel):
     )
     belongs_to = models.ForeignKey(Account, verbose_name=_("Account"),
                                    related_name="sites")
-    verified = models.BooleanField(_("Verified"), default=False)
+    verification_state = models.CharField(
+        _("Verified"), default=VERIFY_STATE.NEW,
+        choices=VERIFICATION_STATE_CHOICES, max_length=10
+    )
 
     class Meta(object):
         verbose_name = _("Site")
@@ -64,5 +78,9 @@ def get_verification_key(self):
         """Returns a hexdigest of an hmac calculated from the domain name"""
         return hmac.new(settings.SECRET_KEY, self.domain).hexdigest()
 
+    @property
+    def verified(self):
+        return self.verification_state == VERIFY_STATE.VERIFIED
+
     def verify(self):
         return verify_site.delay(self.pk)
diff --git a/guardhouse/main/tasks.py b/guardhouse/main/tasks.py
@@ -50,7 +50,8 @@ def verify_site(site_id):
             pass
 
     if valid:
-        site.verified = True
+        from .models import VERIFY_STATE
+        site.verification_state = VERIFY_STATE.VERIFIED
         site.save()
         return True
     # Fall trough - retry