From 4cd7c3b7bcee5a287b6e052beeaf7ed35e969f07 Mon Sep 17 00:00:00 2001 From: Mubbshar Anwar <78487564+mubbsharanwar@users.noreply.github.com> Date: Wed, 19 Jul 2023 14:59:05 +0500 Subject: [PATCH] revert: Removing save_far_later app directory (#32713) This is the third phase of removing save_for_later app in which app directory would be removed from code. VAN-1451 --- .github/workflows/pylint-checks.yml | 2 +- .github/workflows/unit-test-shards.json | 1 - lms/djangoapps/save_for_later/__init__.py | 0 lms/djangoapps/save_for_later/apps.py | 14 ---- .../save_for_later/migrations/0001_initial.py | 48 -------------- .../migrations/0002_auto_20220322_1621.py | 66 ------------------- .../migrations/0003_auto_20230711_1431.py | 19 ------ .../save_for_later/migrations/__init__.py | 0 lms/djangoapps/save_for_later/models.py | 0 lms/envs/common.py | 3 - 10 files changed, 1 insertion(+), 152 deletions(-) delete mode 100644 lms/djangoapps/save_for_later/__init__.py delete mode 100644 lms/djangoapps/save_for_later/apps.py delete mode 100644 lms/djangoapps/save_for_later/migrations/0001_initial.py delete mode 100644 lms/djangoapps/save_for_later/migrations/0002_auto_20220322_1621.py delete mode 100644 lms/djangoapps/save_for_later/migrations/0003_auto_20230711_1431.py delete mode 100644 lms/djangoapps/save_for_later/migrations/__init__.py delete mode 100644 lms/djangoapps/save_for_later/models.py diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index 3a9dadfeea..3c10098e4d 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -14,7 +14,7 @@ jobs: matrix: include: - module-name: lms-1 - path: "--django-settings-module=lms.envs.test lms/djangoapps/badges/ lms/djangoapps/branding/ lms/djangoapps/bulk_email/ lms/djangoapps/bulk_enroll/ lms/djangoapps/bulk_user_retirement/ lms/djangoapps/ccx/ lms/djangoapps/certificates/ lms/djangoapps/commerce/ lms/djangoapps/course_api/ lms/djangoapps/course_blocks/ lms/djangoapps/course_home_api/ lms/djangoapps/course_wiki/ lms/djangoapps/coursewarehistoryextended/ lms/djangoapps/debug/ lms/djangoapps/courseware/ lms/djangoapps/course_goals/ lms/djangoapps/rss_proxy/ lms/djangoapps/save_for_later/" + path: "--django-settings-module=lms.envs.test lms/djangoapps/badges/ lms/djangoapps/branding/ lms/djangoapps/bulk_email/ lms/djangoapps/bulk_enroll/ lms/djangoapps/bulk_user_retirement/ lms/djangoapps/ccx/ lms/djangoapps/certificates/ lms/djangoapps/commerce/ lms/djangoapps/course_api/ lms/djangoapps/course_blocks/ lms/djangoapps/course_home_api/ lms/djangoapps/course_wiki/ lms/djangoapps/coursewarehistoryextended/ lms/djangoapps/debug/ lms/djangoapps/courseware/ lms/djangoapps/course_goals/ lms/djangoapps/rss_proxy/" - module-name: lms-2 path: "--django-settings-module=lms.envs.test lms/djangoapps/gating/ lms/djangoapps/grades/ lms/djangoapps/instructor/ lms/djangoapps/instructor_analytics/ lms/djangoapps/discussion/ lms/djangoapps/edxnotes/ lms/djangoapps/email_marketing/ lms/djangoapps/experiments/ lms/djangoapps/instructor_task/ lms/djangoapps/learner_dashboard/ lms/djangoapps/learner_recommendations/ lms/djangoapps/learner_home/ lms/djangoapps/lms_initialization/ lms/djangoapps/lms_xblock/ lms/djangoapps/lti_provider/ lms/djangoapps/mailing/ lms/djangoapps/mobile_api/ lms/djangoapps/monitoring/ lms/djangoapps/ora_staff_grader/ lms/djangoapps/program_enrollments/ lms/djangoapps/rss_proxy lms/djangoapps/static_template_view/ lms/djangoapps/staticbook/ lms/djangoapps/support/ lms/djangoapps/survey/ lms/djangoapps/teams/ lms/djangoapps/tests/ lms/djangoapps/user_tours/ lms/djangoapps/verify_student/ lms/djangoapps/mfe_config_api/ lms/envs/ lms/lib/ lms/tests.py" - module-name: openedx-1 diff --git a/.github/workflows/unit-test-shards.json b/.github/workflows/unit-test-shards.json index c71bf4557a..fffb216bc6 100644 --- a/.github/workflows/unit-test-shards.json +++ b/.github/workflows/unit-test-shards.json @@ -64,7 +64,6 @@ "lms/djangoapps/ora_staff_grader/", "lms/djangoapps/program_enrollments/", "lms/djangoapps/rss_proxy/", - "lms/djangoapps/save_for_later/", "lms/djangoapps/static_template_view/", "lms/djangoapps/staticbook/", "lms/djangoapps/support/", diff --git a/lms/djangoapps/save_for_later/__init__.py b/lms/djangoapps/save_for_later/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lms/djangoapps/save_for_later/apps.py b/lms/djangoapps/save_for_later/apps.py deleted file mode 100644 index e927019a34..0000000000 --- a/lms/djangoapps/save_for_later/apps.py +++ /dev/null @@ -1,14 +0,0 @@ -""" -save_for_later Application Configuration -""" - - -from django.apps import AppConfig - - -class SaveForLaterConfig(AppConfig): - """ - Application Configuration for save_for_later. - """ - default_auto_field = 'django.db.models.BigAutoField' - name = 'lms.djangoapps.save_for_later' diff --git a/lms/djangoapps/save_for_later/migrations/0001_initial.py b/lms/djangoapps/save_for_later/migrations/0001_initial.py deleted file mode 100644 index 5214b8e8ce..0000000000 --- a/lms/djangoapps/save_for_later/migrations/0001_initial.py +++ /dev/null @@ -1,48 +0,0 @@ -# Generated by Django 3.2.8 on 2021-11-15 09:01 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone -import model_utils.fields -import opaque_keys.edx.django.models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='SavedProgram', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), - ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), - ('email', models.EmailField(db_index=True, max_length=254)), - ('program_uuid', models.UUIDField()), - ('user_id', models.IntegerField(blank=True, null=True)), - ], - options={ - 'abstract': False, - }, - ), - migrations.CreateModel( - name='SavedCourse', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')), - ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')), - ('email', models.EmailField(db_index=True, max_length=254)), - ('course_id', opaque_keys.edx.django.models.CourseKeyField(db_index=True, max_length=255)), - ('user_id', models.IntegerField(blank=True, null=True)), - ], - options={ - 'abstract': False, - }, - ), - ] diff --git a/lms/djangoapps/save_for_later/migrations/0002_auto_20220322_1621.py b/lms/djangoapps/save_for_later/migrations/0002_auto_20220322_1621.py deleted file mode 100644 index 318fe56c84..0000000000 --- a/lms/djangoapps/save_for_later/migrations/0002_auto_20220322_1621.py +++ /dev/null @@ -1,66 +0,0 @@ -# Generated by Django 3.2.12 on 2022-03-22 16:21 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('save_for_later', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='savedcourse', - name='marketing_url', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='savedcourse', - name='max_effort', - field=models.IntegerField(null=True), - ), - migrations.AddField( - model_name='savedcourse', - name='min_effort', - field=models.IntegerField(null=True), - ), - migrations.AddField( - model_name='savedcourse', - name='org_img_url', - field=models.CharField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='savedcourse', - name='weeks_to_complete', - field=models.IntegerField(null=True), - ), - migrations.AddField( - model_name='savedcourse', - name='email_sent_count', - field=models.IntegerField(default=0, null=True), - ), - migrations.AlterUniqueTogether( - name='savedcourse', - unique_together={('email', 'course_id')}, - ), - migrations.AddField( - model_name='savedprogram', - name='email_sent_count', - field=models.IntegerField(default=0, null=True), - ), - migrations.AlterUniqueTogether( - name='savedprogram', - unique_together={('email', 'program_uuid')}, - ), - migrations.AddField( - model_name='savedcourse', - name='reminder_email_sent', - field=models.BooleanField(default=False, null=True), - ), - migrations.AddField( - model_name='savedprogram', - name='reminder_email_sent', - field=models.BooleanField(default=False, null=True), - ), - ] diff --git a/lms/djangoapps/save_for_later/migrations/0003_auto_20230711_1431.py b/lms/djangoapps/save_for_later/migrations/0003_auto_20230711_1431.py deleted file mode 100644 index 41e076ca85..0000000000 --- a/lms/djangoapps/save_for_later/migrations/0003_auto_20230711_1431.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.20 on 2023-07-11 14:31 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('save_for_later', '0002_auto_20220322_1621'), - ] - - operations = [ - migrations.DeleteModel( - name='SavedCourse', - ), - migrations.DeleteModel( - name='SavedProgram', - ), - ] diff --git a/lms/djangoapps/save_for_later/migrations/__init__.py b/lms/djangoapps/save_for_later/migrations/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lms/djangoapps/save_for_later/models.py b/lms/djangoapps/save_for_later/models.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lms/envs/common.py b/lms/envs/common.py index a9b5f0203f..95bfc26c10 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3266,9 +3266,6 @@ INSTALLED_APPS = [ # For edx ace template tags 'edx_ace', - # For save for later - 'lms.djangoapps.save_for_later', - # Blockstore 'blockstore.apps.bundles',