Skip to content

refactor: modified the imports to use openedx-events library #29930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asadazam93 merged 3 commits into from
Mar 7, 2022
Merged

refactor: modified the imports to use openedx-events library #29930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dae038a
refactor: modified the imports to use openedx-events library
JuanDavidBuitrago Feb 15, 2022
4ed0c65
chore: upgrade openedx-events to latest version
mariajgrimaldi Mar 3, 2022
5dcaa62
fix: ran isort to avoid style errors
mariajgrimaldi Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 0 additions & 46 deletions openedx/core/djangoapps/discussions/data.py
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions openedx/core/djangoapps/discussions/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

from django.db import transaction

from openedx.core.djangoapps.discussions.data import CourseDiscussionConfigurationData
from openedx_events.learning.data import CourseDiscussionConfigurationData
from openedx_events.learning.signals import COURSE_DISCUSSIONS_CHANGED
from openedx.core.djangoapps.discussions.models import (
DEFAULT_PROVIDER_TYPE,
DiscussionTopicLink,
DiscussionsConfiguration,
)
from openedx.core.djangoapps.discussions.signals import COURSE_DISCUSSIONS_UPDATED

log = logging.getLogger(__name__)

Expand Down Expand Up @@ -98,4 +98,4 @@ def update_course_discussion_config(configuration: CourseDiscussionConfiguration
).save()


COURSE_DISCUSSIONS_UPDATED.connect(handle_course_discussion_config_update)
COURSE_DISCUSSIONS_CHANGED.connect(handle_course_discussion_config_update)
18 changes: 0 additions & 18 deletions openedx/core/djangoapps/discussions/signals.py
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions openedx/core/djangoapps/discussions/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
from celery import shared_task
from edx_django_utils.monitoring import set_code_owner_attribute
from opaque_keys.edx.keys import CourseKey

from openedx_events.learning.data import CourseDiscussionConfigurationData, DiscussionTopicContext
from openedx_events.learning.signals import COURSE_DISCUSSIONS_CHANGED
from xmodule.modulestore import ModuleStoreEnum
from xmodule.modulestore.django import modulestore
from .data import CourseDiscussionConfigurationData, DiscussionTopicContext

from .models import DiscussionsConfiguration
from .signals import COURSE_DISCUSSIONS_UPDATED

log = logging.getLogger(__name__)

Expand All @@ -27,7 +27,7 @@ def update_discussions_settings_from_course_task(course_key_str: str):
"""
course_key = CourseKey.from_string(course_key_str)
config_data = update_discussions_settings_from_course(course_key)
COURSE_DISCUSSIONS_UPDATED.send_event(configuration=config_data)
COURSE_DISCUSSIONS_CHANGED.send_event(configuration=config_data)


def update_discussions_settings_from_course(course_key: CourseKey) -> CourseDiscussionConfigurationData:
Expand Down
2 changes: 1 addition & 1 deletion openedx/core/djangoapps/discussions/tests/test_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from django.test import TestCase
from opaque_keys.edx.keys import CourseKey

from openedx.core.djangoapps.discussions.data import CourseDiscussionConfigurationData, DiscussionTopicContext
from openedx_events.learning.data import CourseDiscussionConfigurationData, DiscussionTopicContext
from openedx.core.djangoapps.discussions.handlers import update_course_discussion_config
from openedx.core.djangoapps.discussions.models import DiscussionTopicLink, DiscussionsConfiguration

Expand Down
2 changes: 1 addition & 1 deletion openedx/core/djangoapps/discussions/tests/test_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from xmodule.modulestore.tests.django_utils import TEST_DATA_MONGO_AMNESTY_MODULESTORE, ModuleStoreTestCase
from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory

from openedx.core.djangoapps.discussions.data import DiscussionTopicContext
from openedx_events.learning.data import DiscussionTopicContext
from openedx.core.djangoapps.discussions.tasks import update_discussions_settings_from_course


Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ oauthlib==3.0.1
# social-auth-core
openedx-calc==3.0.1
# via -r requirements/edx/base.in
openedx-events==0.8.0
openedx-events==0.8.1
# via -r requirements/edx/base.in
openedx-filters==0.5.0
# via -r requirements/edx/base.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ oauthlib==3.0.1
# social-auth-core
openedx-calc==3.0.1
# via -r requirements/edx/testing.txt
openedx-events==0.8.0
openedx-events==0.8.1
# via -r requirements/edx/testing.txt
openedx-filters==0.5.0
# via -r requirements/edx/testing.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ oauthlib==3.0.1
# social-auth-core
openedx-calc==3.0.1
# via -r requirements/edx/base.txt
openedx-events==0.8.0
openedx-events==0.8.1
# via -r requirements/edx/base.txt
openedx-filters==0.5.0
# via -r requirements/edx/base.txt
Expand Down