From ed02d9cc5c3765dbe0cb0f054a3156bc36fa6b79 Mon Sep 17 00:00:00 2001
From: Awais <awais.qureshi@arbisoft.com>
Date: Wed, 3 Jun 2015 15:43:53 +0500
Subject: [PATCH] ECOM-1494 removing models only.
---
common/djangoapps/reverification/models.py | 57 ---------
common/djangoapps/student/views.py | 2 +-
lms/djangoapps/verify_student/admin.py | 1 -
...hotoverification_window_id_default_none.py | 119 ++++++++++++++++++
lms/djangoapps/verify_student/models.py | 11 +-
5 files changed, 122 insertions(+), 68 deletions(-)
create mode 100644 lms/djangoapps/verify_student/migrations/0009_auto__change_softwaresecurephotoverification_window_id_default_none.py
diff --git a/common/djangoapps/reverification/models.py b/common/djangoapps/reverification/models.py
index 9f98c4f2927..e69de29bb2d 100644
--- a/common/djangoapps/reverification/models.py
+++ b/common/djangoapps/reverification/models.py
@@ -1,57 +0,0 @@
-"""
-Models for reverification features common to both lms and studio
-"""
-from datetime import datetime
-import pytz
-
-from django.core.exceptions import ValidationError
-from django.db import models
-from util.validate_on_save import ValidateOnSaveMixin
-from xmodule_django.models import CourseKeyField
-
-
-class MidcourseReverificationWindow(ValidateOnSaveMixin, models.Model): # TODO (ECOM-1494): Delete this model.
- """
- This model has been deprecated and will be removed in a future release.
-
- Defines the start and end times for midcourse reverification for a particular course.
-
- There can be many MidcourseReverificationWindows per course, but they cannot have
- overlapping time ranges. This is enforced by this class's clean() method.
- """
- # the course that this window is attached to
- course_id = CourseKeyField(max_length=255, db_index=True)
- start_date = models.DateTimeField(default=None, null=True, blank=True)
- end_date = models.DateTimeField(default=None, null=True, blank=True)
-
- def clean(self):
- """
- Gives custom validation for the MidcourseReverificationWindow model.
- Prevents overlapping windows for any particular course.
- """
- query = MidcourseReverificationWindow.objects.filter(
- course_id=self.course_id,
- end_date__gte=self.start_date,
- start_date__lte=self.end_date
- )
- if query.count() > 0:
- raise ValidationError('Reverification windows cannot overlap for a given course.')
-
- @classmethod
- def window_open_for_course(cls, course_id):
- """
- Returns a boolean, True if the course is currently asking for reverification, else False.
- """
- now = datetime.now(pytz.UTC)
- return cls.get_window(course_id, now) is not None
-
- @classmethod
- def get_window(cls, course_id, date):
- """
- Returns the window that is open for a particular course for a particular date.
- If no such window is open, or if more than one window is open, returns None.
- """
- try:
- return cls.objects.get(course_id=course_id, start_date__lte=date, end_date__gte=date)
- except cls.DoesNotExist:
- return None
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 4337d7b2789..b6766109a60 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -57,7 +57,7 @@ from student.models import (
DashboardConfiguration, LinkedInAddToProfileConfiguration, ManualEnrollmentAudit, ALLOWEDTOENROLL_TO_ENROLLED)
from student.forms import AccountCreationForm, PasswordResetFormNoActive
-from verify_student.models import SoftwareSecurePhotoVerification, MidcourseReverificationWindow
+from verify_student.models import SoftwareSecurePhotoVerification # pylint: disable=import-error
from certificates.models import CertificateStatuses, certificate_status_for_student
from certificates.api import get_certificate_url, get_active_web_certificate # pylint: disable=import-error
from dark_lang.models import DarkLangConfig
diff --git a/lms/djangoapps/verify_student/admin.py b/lms/djangoapps/verify_student/admin.py
index 241bcea17ab..6a7c69b9e26 100644
--- a/lms/djangoapps/verify_student/admin.py
+++ b/lms/djangoapps/verify_student/admin.py
@@ -13,7 +13,6 @@ class SoftwareSecurePhotoVerificationAdmin(admin.ModelAdmin):
Admin for the SoftwareSecurePhotoVerification table.
"""
list_display = ('id', 'user', 'status', 'receipt_id', 'submitted_at', 'updated_at')
- exclude = ('window',) # TODO: Remove after deleting this field from the model.
raw_id_fields = ('user', 'reviewing_user')
search_fields = (
'receipt_id',
diff --git a/lms/djangoapps/verify_student/migrations/0009_auto__change_softwaresecurephotoverification_window_id_default_none.py b/lms/djangoapps/verify_student/migrations/0009_auto__change_softwaresecurephotoverification_window_id_default_none.py
new file mode 100644
index 00000000000..9d5433196a3
--- /dev/null
+++ b/lms/djangoapps/verify_student/migrations/0009_auto__change_softwaresecurephotoverification_window_id_default_none.py
@@ -0,0 +1,119 @@
+# -*- coding: utf-8 -*-
+from south.db import db
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self):
+
+ # Changing field 'SoftwareSecurePhotoVerification.window'. Setting its default value to None
+ if db.backend_name == 'mysql':
+ db.execute('ALTER TABLE verify_student_softwaresecurephotoverification CHANGE `window_id` `window_id` int(11) DEFAULT NULL;')
+
+ def backwards(self, orm):
+
+ # Changing field 'SoftwareSecurePhotoVerification.window'
+ db.alter_column('verify_student_softwaresecurephotoverification', 'window_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['reverification.MidcourseReverificationWindow']))
+
+ 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'})
+ },
+ 'reverification.midcoursereverificationwindow': {
+ 'Meta': {'object_name': 'MidcourseReverificationWindow'},
+ 'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+ 'end_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'start_date': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'})
+ },
+ 'verify_student.incoursereverificationconfiguration': {
+ 'Meta': {'ordering': "('-change_date',)", 'object_name': 'InCourseReverificationConfiguration'},
+ 'change_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'changed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.PROTECT'}),
+ 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'verify_student.skippedreverification': {
+ 'Meta': {'unique_together': "(('user', 'course_id'),)", 'object_name': 'SkippedReverification'},
+ 'checkpoint': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'skipped_checkpoint'", 'to': "orm['verify_student.VerificationCheckpoint']"}),
+ 'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+ 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ 'verify_student.softwaresecurephotoverification': {
+ 'Meta': {'ordering': "['-created_at']", 'object_name': 'SoftwareSecurePhotoVerification'},
+ 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'display': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
+ 'error_code': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
+ 'error_msg': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'face_image_url': ('django.db.models.fields.URLField', [], {'max_length': '255', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'photo_id_image_url': ('django.db.models.fields.URLField', [], {'max_length': '255', 'blank': 'True'}),
+ 'photo_id_key': ('django.db.models.fields.TextField', [], {'max_length': '1024'}),
+ 'receipt_id': ('django.db.models.fields.CharField', [], {'default': "'42ae367f-f6eb-456b-84c8-a3fd2baf4208'", 'max_length': '255', 'db_index': 'True'}),
+ 'reviewing_service': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+ 'reviewing_user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'photo_verifications_reviewed'", 'null': 'True', 'to': "orm['auth.User']"}),
+ 'status': ('model_utils.fields.StatusField', [], {'default': "'created'", 'max_length': '100', u'no_check_for_status': 'True'}),
+ 'status_changed': ('model_utils.fields.MonitorField', [], {'default': 'datetime.datetime.now', u'monitor': "u'status'"}),
+ 'submitted_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_index': 'True'}),
+ 'updated_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+ 'window': ('django.db.models.fields.related.ForeignKey', [], {'null': 'True', 'to': "orm['reverification.MidcourseReverificationWindow']"})
+ },
+ 'verify_student.verificationcheckpoint': {
+ 'Meta': {'unique_together': "(('course_id', 'checkpoint_location'),)", 'object_name': 'VerificationCheckpoint'},
+ 'checkpoint_location': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+ 'course_id': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'photo_verification': ('django.db.models.fields.related.ManyToManyField', [], {'null': 'True', 'to': "orm['verify_student.SoftwareSecurePhotoVerification']"})
+ },
+ 'verify_student.verificationstatus': {
+ 'Meta': {'object_name': 'VerificationStatus'},
+ 'checkpoint': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'checkpoint_status'", 'to': "orm['verify_student.VerificationCheckpoint']"}),
+ 'error': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'response': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+ 'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ }
+ }
+
+ complete_apps = ['verify_student']
+
diff --git a/lms/djangoapps/verify_student/models.py b/lms/djangoapps/verify_student/models.py
index 53e394967dd..ec7b50dd4b3 100644
--- a/lms/djangoapps/verify_student/models.py
+++ b/lms/djangoapps/verify_student/models.py
@@ -33,7 +33,6 @@ from config_models.models import ConfigurationModel
from course_modes.models import CourseMode
from model_utils.models import StatusModel
from model_utils import Choices
-from reverification.models import MidcourseReverificationWindow
from verify_student.ssencrypt import (
random_aes_key, encrypt_and_encode,
generate_signed_message, rsa_encrypt
@@ -576,11 +575,8 @@ class SoftwareSecurePhotoVerification(PhotoVerification):
3. The encrypted photos are base64 encoded and stored in an S3 bucket that
edx-platform does not have read access to.
- Note: this model handles both *inital* verifications (which you must perform
- at the time you register for a verified cert), and *midcourse reverifications*.
- To distinguish between the two, check the value of the property window:
- intial verifications of a window of None, whereas midcourse reverifications
- * must always be linked to a specific window*.
+ Note: this model handles *inital* verifications (which you must perform
+ at the time you register for a verified cert).
"""
# This is a base64.urlsafe_encode(rsa_encrypt(photo_id_aes_key), ss_pub_key)
# So first we generate a random AES-256 key to encrypt our photo ID with.
@@ -590,9 +586,6 @@ class SoftwareSecurePhotoVerification(PhotoVerification):
IMAGE_LINK_DURATION = 5 * 60 * 60 * 24 # 5 days in seconds
- # This field has been deprecated and will be removed in a future release.
- window = models.ForeignKey(MidcourseReverificationWindow, db_index=True, null=True) # TODO(ECOM-1494):Remove this.
-
@classmethod
def original_verification(cls, user):
"""
--
GitLab