move local auth models into courseware, remove courseware migrations

auth/models.py

-import uuid
-
-from django.db import models
-from django.contrib.auth.models import User
-
-class UserProfile(models.Model):
-    ## CRITICAL TODO/SECURITY
-    # Sanitize all fields. 
-    # This is not visible to other users, but could introduce holes later
-    user = models.ForeignKey(User, unique=True, db_index=True)
-    name = models.TextField(blank=True)
-    language = models.TextField(blank=True)
-    location = models.TextField(blank=True)
-    meta = models.TextField(blank=True) # JSON dictionary for future expansion
-    courseware = models.TextField(blank=True, default='course.xml')
-
-class Registration(models.Model):
-    ''' Allows us to wait for e-mail before user is registered. A
-        registration profile is created when the user creates an 
-        account, but that account is inactive. Once the user clicks
-        on the activation key, it becomes active. '''
-    user = models.ForeignKey(User, unique=True)
-    activation_key = models.CharField(('activation key'), max_length=32, unique=True, db_index=True)
-
-    def register(self, user):
-        # MINOR TODO: Switch to crypto-secure key
-        self.activation_key=uuid.uuid4().hex
-        self.user=user
-        self.save()
-
-    def activate(self):
-        self.user.is_active = True
-        self.user.save()
-        self.delete()
-

auth/views.py

@@ -13,7 +13,7 @@ from django.db import connection
 from django.http import HttpResponse, Http404
 from django.shortcuts import redirect
 from mitxmako.shortcuts import render_to_response, render_to_string
-from models import Registration, UserProfile
+from courseware.models import Registration, UserProfile
 
 log = logging.getLogger("mitx.auth")
 

courseware/content_parser.py

@@ -6,7 +6,7 @@ from mako.template import Template
 
 try: # This lets us do __name__ == ='__main__'
     from django.conf import settings
-    from auth.models import UserProfile
+    from models import UserProfile
 except: 
     settings = None 
 

courseware/migrations/0001_initial.py

-# 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):
-        
-        # Adding model 'StudentModule'
-        db.create_table('courseware_studentmodule', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('module_type', self.gf('django.db.models.fields.CharField')(default='problem', max_length=32)),
-            ('module_id', self.gf('django.db.models.fields.CharField')(max_length=255)),
-            ('student', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
-            ('state', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
-            ('grade', self.gf('django.db.models.fields.FloatField')(null=True, blank=True)),
-            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-            ('modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
-        ))
-        db.send_create_signal('courseware', ['StudentModule'])
-
-        # Adding unique constraint on 'StudentModule', fields ['student', 'module_id', 'module_type']
-        db.create_unique('courseware_studentmodule', ['student_id', 'module_id', 'module_type'])
-
-
-    def backwards(self, orm):
-        
-        # Removing unique constraint on 'StudentModule', fields ['student', 'module_id', 'module_type']
-        db.delete_unique('courseware_studentmodule', ['student_id', 'module_id', 'module_type'])
-
-        # Deleting model 'StudentModule'
-        db.delete_table('courseware_studentmodule')
-
-
-    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'},
-            'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}),
-            'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
-            'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}),
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
-            'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': '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'}),
-            'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
-            'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
-            'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),
-            'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}),
-            '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'}),
-            'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
-        },
-        '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'})
-        },
-        'courseware.studentmodule': {
-            'Meta': {'unique_together': "(('student', 'module_id', 'module_type'),)", 'object_name': 'StudentModule'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'grade': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'module_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
-            'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32'}),
-            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['courseware']

courseware/migrations/0002_add_indexes.py

-# 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):
-        
-        # Adding index on 'StudentModule', fields ['created']
-        db.create_index('courseware_studentmodule', ['created'])
-
-        # Adding index on 'StudentModule', fields ['grade']
-        db.create_index('courseware_studentmodule', ['grade'])
-
-        # Adding index on 'StudentModule', fields ['modified']
-        db.create_index('courseware_studentmodule', ['modified'])
-
-        # Adding index on 'StudentModule', fields ['module_type']
-        db.create_index('courseware_studentmodule', ['module_type'])
-
-        # Adding index on 'StudentModule', fields ['module_id']
-        db.create_index('courseware_studentmodule', ['module_id'])
-
-
-    def backwards(self, orm):
-        
-        # Removing index on 'StudentModule', fields ['module_id']
-        db.delete_index('courseware_studentmodule', ['module_id'])
-
-        # Removing index on 'StudentModule', fields ['module_type']
-        db.delete_index('courseware_studentmodule', ['module_type'])
-
-        # Removing index on 'StudentModule', fields ['modified']
-        db.delete_index('courseware_studentmodule', ['modified'])
-
-        # Removing index on 'StudentModule', fields ['grade']
-        db.delete_index('courseware_studentmodule', ['grade'])
-
-        # Removing index on 'StudentModule', fields ['created']
-        db.delete_index('courseware_studentmodule', ['created'])
-
-
-    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'},
-            'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}),
-            'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
-            'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}),
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
-            'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
-            'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': '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'}),
-            'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
-            'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
-            'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),
-            'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
-            'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}),
-            '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'}),
-            'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
-        },
-        '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'})
-        },
-        'courseware.studentmodule': {
-            'Meta': {'unique_together': "(('student', 'module_id', 'module_type'),)", 'object_name': 'StudentModule'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'grade': ('django.db.models.fields.FloatField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'module_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'module_type': ('django.db.models.fields.CharField', [], {'default': "'problem'", 'max_length': '32', 'db_index': 'True'}),
-            'state': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            'student': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['courseware']

courseware/models.py

@@ -9,8 +9,8 @@ class StudentModule(models.Model):
                     ('html','html'),
                     )
     ## These three are the key for the object
-    module_type = models.CharField(max_length=32, choices=MODULE_TYPES, default='problem', db_index=True)
-    module_id = models.CharField(max_length=255, db_index=True) # Filename for homeworks, etc. 
+    module_type = models.CharField(max_length=32, choices=MODULE_TYPES, default='problem')
+    module_id = models.CharField(max_length=255) # Filename for homeworks, etc. 
     student = models.ForeignKey(User)
     class Meta:
         unique_together = (('student', 'module_id', 'module_type'),)
@@ -19,7 +19,7 @@ class StudentModule(models.Model):
     state = models.TextField(null=True, blank=True)
 
     ## Grade, and are we done? 
-    grade = models.FloatField(null=True, blank=True, db_index=True)
+    grade = models.FloatField(null=True, blank=True)
     #max_grade = models.FloatField(null=True, blank=True)
     
     # DONE_TYPES = (('done','DONE'),          # Finished
@@ -27,8 +27,48 @@ class StudentModule(models.Model):
     #               ('na','NA'))              # Not applicable (e.g. vertical)
     # done = models.CharField(max_length=16, choices=DONE_TYPES)
 
-    created = models.DateTimeField(auto_now_add=True, db_index=True)
-    modified = models.DateTimeField(auto_now=True, db_index=True)
+    created = models.DateTimeField(auto_now_add=True)
+    modified = models.DateTimeField(auto_now=True)
 
     def __unicode__(self):
         return self.module_type+'/'+self.student.username+"/"+self.module_id+'/'+str(self.state)[:20]
+
+
+class UserProfile(models.Model):
+    class Meta:
+        db_table = "auth_userprofile"
+
+    ## CRITICAL TODO/SECURITY
+    # Sanitize all fields. 
+    # This is not visible to other users, but could introduce holes later
+    user = models.ForeignKey(User, unique=True, db_index=True)
+    name = models.TextField(blank=True)
+    language = models.TextField(blank=True)
+    location = models.TextField(blank=True)
+    meta = models.TextField(blank=True) # JSON dictionary for future expansion
+    courseware = models.TextField(blank=True, default='course.xml')
+
+
+class Registration(models.Model):
+    ''' Allows us to wait for e-mail before user is registered. A
+        registration profile is created when the user creates an 
+        account, but that account is inactive. Once the user clicks
+        on the activation key, it becomes active. '''
+
+    class Meta:
+        db_table = "auth_userprofile"
+
+    user = models.ForeignKey(User, unique=True)
+    activation_key = models.CharField(('activation key'), max_length=32, unique=True, db_index=True)
+
+    def register(self, user):
+        # MINOR TODO: Switch to crypto-secure key
+        self.activation_key=uuid.uuid4().hex
+        self.user=user
+        self.save()
+
+    def activate(self):
+        self.user.is_active = True
+        self.user.save()
+        self.delete()
+

courseware/module_render.py

@@ -19,8 +19,7 @@ from django.template import Context
 from django.template import Context, loader
 from mitxmako.shortcuts import render_to_response, render_to_string
 
-from auth.models import UserProfile
-from models import StudentModule
+from models import StudentModule, UserProfile
 import track.views
 
 import courseware.content_parser as content_parser

courseware/views.py

@@ -17,8 +17,7 @@ from django.db import connection
 
 from lxml import etree
 
-from auth.models import UserProfile
-from models import StudentModule
+from models import StudentModule, UserProfile
 from module_render import render_module, modx_dispatch
 import courseware.content_parser as content_parser
 import courseware.modules.capa_module