Skip to content

fix: point to new models in channel_migrations app #37654

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −10
Open

fix: point to new models in channel_migrations app #37654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from consent.models import DataSharingConsent
from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user
from django.contrib.sites.models import Site
from django.conf import settings
from django.core import mail
from django.core.cache import cache
from django.test import TestCase
Expand All @@ -21,7 +22,6 @@
EnterpriseCustomerUser,
PendingEnterpriseCustomerUser
)
from integrated_channels.sap_success_factors.models import SapSuccessFactorsLearnerDataTransmissionAudit
from opaque_keys.edx.keys import CourseKey
from rest_framework import status
from social_django.models import UserSocialAuth
Expand Down Expand Up @@ -87,6 +87,12 @@
setup_retirement_states
)

# This is a temporary import path while we transition from integrated_channels to channel_integrations
Copy link
Member

@deborahgu deborahgu Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you add a timeline or link to a publicly available ticket to this comment?

Copy link
Member Author

@sameenfatima78 sameenfatima78 Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't have a publicly available ticket but this will be done as soon as we can test the changes on edx/edx-platform repo and confirm everything is working.

Copy link
Member

@kdmccormick kdmccormick Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add this to the core settings file opened/envs/common.py and add a full toggle annotation? By keeping all of our settings in the central envs/ files, it helps us keep track of them and document them. And as Deborah mentioned pleased create an edx-platform GitHub issue and include a link to it in the .. toggle_tickets. You can declare the default as True there.

Furthermore, please access the setting directly (settings.ENABLE_LEGACY_INTEGRATED_CHANNELS) in all places instead of using getattr. This way, we will get a helpful exception if the setting name is misspelled or if any setting references are accidentally left behind once the definition is removed.

if getattr(settings, 'ENABLE_LEGACY_INTEGRATED_CHANNELS', True):
from integrated_channels.sap_success_factors.models import SapSuccessFactorsLearnerDataTransmissionAudit
else:
from channel_integrations.sap_success_factors.models import SapSuccessFactorsLearnerDataTransmissionAudit


def build_jwt_headers(user):
"""
Expand Down
11 changes: 9 additions & 2 deletions openedx/core/djangoapps/user_api/accounts/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
from enterprise.models import EnterpriseCourseEnrollment, EnterpriseCustomerUser, PendingEnterpriseCustomerUser
from integrated_channels.degreed.models import DegreedLearnerDataTransmissionAudit
from integrated_channels.sap_success_factors.models import SapSuccessFactorsLearnerDataTransmissionAudit
from rest_framework import permissions, status
from rest_framework.authentication import SessionAuthentication
from rest_framework.exceptions import UnsupportedMediaType
Expand Down Expand Up @@ -97,6 +95,15 @@
from .signals import USER_RETIRE_LMS_CRITICAL, USER_RETIRE_LMS_MISC, USER_RETIRE_MAILINGS
from .utils import create_retirement_request_and_deactivate_account, username_suffix_generator

# This is a temporary import path while we transition from integrated_channels to channel_integrations
Copy link
Member

@deborahgu deborahgu Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment as above.

Copy link
Member Author

@sameenfatima78 sameenfatima78 Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same reply as above.

if getattr(settings, 'ENABLE_LEGACY_INTEGRATED_CHANNELS', True):
from integrated_channels.degreed.models import DegreedLearnerDataTransmissionAudit
from integrated_channels.sap_success_factors.models import SapSuccessFactorsLearnerDataTransmissionAudit
else:
from channel_integrations.degreed2.models import Degreed2LearnerDataTransmissionAudit \
as DegreedLearnerDataTransmissionAudit
from channel_integrations.sap_success_factors.models import SapSuccessFactorsLearnerDataTransmissionAudit

log = logging.getLogger(__name__)

USER_PROFILE_PII = {
Expand Down
8 changes: 7 additions & 1 deletion openedx/core/djangoapps/user_api/management/commands/create_user_gdpr_testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@

from consent.models import DataSharingConsent
from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user
from django.conf import settings
from django.core.management.base import BaseCommand
from enterprise.models import (
EnterpriseCourseEnrollment,
EnterpriseCustomer,
EnterpriseCustomerUser,
PendingEnterpriseCustomerUser
)
from integrated_channels.sap_success_factors.models import SapSuccessFactorsLearnerDataTransmissionAudit
from opaque_keys.edx.keys import CourseKey
from zoneinfo import ZoneInfo

Expand All @@ -31,6 +31,12 @@

from ...models import UserOrgTag

# This is a temporary import path while we transition from integrated_channels to channel_integrations
Copy link
Member

@deborahgu deborahgu Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

if getattr(settings, 'ENABLE_LEGACY_INTEGRATED_CHANNELS', True):
from integrated_channels.sap_success_factors.models import SapSuccessFactorsLearnerDataTransmissionAudit
else:
from channel_integrations.sap_success_factors.models import SapSuccessFactorsLearnerDataTransmissionAudit


class Command(BaseCommand):
"""
Expand Down
16 changes: 12 additions & 4 deletions openedx/features/enterprise_support/signals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
from django.db.models.signals import post_save, pre_save
from django.dispatch import receiver
from enterprise.models import EnterpriseCourseEnrollment, EnterpriseCustomer
from integrated_channels.integrated_channel.tasks import (
transmit_single_learner_data,
transmit_single_subsection_learner_data
)
from slumber.exceptions import HttpClientError

from common.djangoapps.student.signals import UNENROLL_DONE
Expand All @@ -22,6 +18,18 @@
from openedx.features.enterprise_support.tasks import clear_enterprise_customer_data_consent_share_cache
from openedx.features.enterprise_support.utils import clear_data_consent_share_cache, is_enterprise_learner

# This is a temporary import path while we transition from integrated_channels to channel_integrations
Copy link
Member

@deborahgu deborahgu Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

if getattr(settings, 'ENABLE_LEGACY_INTEGRATED_CHANNELS', True):
from integrated_channels.integrated_channel.tasks import (
transmit_single_learner_data,
transmit_single_subsection_learner_data
)
else:
from channel_integrations.integrated_channel.tasks import (
transmit_single_learner_data,
transmit_single_subsection_learner_data
)

log = logging.getLogger(__name__)


Expand Down
9 changes: 7 additions & 2 deletions openedx/features/enterprise_support/tests/test_signals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from unittest.mock import patch

import ddt
from django.conf import settings
from django.test.utils import override_settings
from django.utils.timezone import now
from edx_django_utils.cache import TieredCache
Expand Down Expand Up @@ -196,7 +197,9 @@ def test_handle_enterprise_learner_passing_grade(self):
Test to assert transmit_single_learner_data is called when COURSE_GRADE_NOW_PASSED signal is fired
"""
with patch(
'integrated_channels.integrated_channel.tasks.transmit_single_learner_data.apply_async',
'integrated_channels.integrated_channel.tasks.transmit_single_learner_data.apply_async'
if getattr(settings, 'ENABLE_LEGACY_INTEGRATED_CHANNELS', True) else
'channel_integrations.integrated_channel.tasks.transmit_single_learner_data.apply_async',
return_value=None
) as mock_task_apply:
course_key = CourseKey.from_string(self.course_id)
Expand All @@ -218,7 +221,9 @@ def test_handle_enterprise_learner_subsection(self):
Test to assert transmit_subsection_learner_data is called when COURSE_ASSESSMENT_GRADE_CHANGED signal is fired.
"""
with patch(
'integrated_channels.integrated_channel.tasks.transmit_single_subsection_learner_data.apply_async',
'integrated_channels.integrated_channel.tasks.transmit_single_subsection_learner_data.apply_async'
if getattr(settings, 'ENABLE_LEGACY_INTEGRATED_CHANNELS', True) else
'channel_integrations.integrated_channel.tasks.transmit_single_subsection_learner_data.apply_async',
return_value=None
) as mock_task_apply:
course_key = CourseKey.from_string(self.course_id)
Expand Down
Loading