Skip to content

Remove UserOrganizationMapping from common; tests for enrollment multi-tenant helpers - #1181

Merged
OmarIthawi merged 3 commits into
mainfrom
use-tahoe-sites-api-patch03
Jul 1, 2022
Merged

Remove UserOrganizationMapping from common; tests for enrollment multi-tenant helpers#1181
OmarIthawi merged 3 commits into
mainfrom
use-tahoe-sites-api-patch03

Conversation

@OmarIthawi

@OmarIthawi OmarIthawi commented Jun 29, 2022

Copy link
Copy Markdown

Fixes merge conflicts for the #1113 PR while adding needed coverage.

Closes #1113.

As a side-effect:

  • Adds tests for a previously untested PR: Fix User leakage in Batch enrollment #435
    • Added tests for get_user_by_username_or_email_inside_organization
    • Consolidated get_user_by_username_or_email_inside_organization inside get_user_by_username_or_email
    • Added tests for CourseEnrollment.enroll_by_email_in_organization
    • Consolidated CourseEnrollment.enroll_by_email_in_organization inside enroll_by_email
    • Renamed TAHOE_MULTITENANT_BULK_ENROLLMENT into APPSEMBLER_MULTI_TENANT_EMAILS
  • Fixed RED-2007 and Multitenant Emails: Add support for cohorts email assignment #903
  • Fixed RED-2009 as well

TODO

  • Test on devstack for the invite by email/username

@github-actions

This comment has been minimized.

@coveralls

coveralls commented Jun 29, 2022

Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 2596538236

  • 93 of 99 (93.94%) changed or added relevant lines in 8 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.02%) to 49.007%

Changes Missing Coverage Covered Lines Changed/Added Lines %
common/djangoapps/student/models.py 22 24 91.67%
openedx/core/djangoapps/appsembler/multi_tenant_emails/tests/test_enroll_by_email.py 30 32 93.75%
openedx/core/djangoapps/appsembler/multi_tenant_emails/tests/test_get_user_by_username_or_email.py 33 35 94.29%
Totals Coverage Status
Change from base Build 2596512026: 0.02%
Covered Lines: 110590
Relevant Lines: 225662

💛 - Coveralls

@OmarIthawi OmarIthawi changed the title Remove UserOrganizationMapping from common Remove UserOrganizationMapping from common; tests for enrollment multi-tenant helpers Jun 29, 2022
@github-actions

This comment has been minimized.

@OmarIthawi
OmarIthawi force-pushed the use-tahoe-sites-api-patch03 branch from c2e9c03 to 1ce8645 Compare June 29, 2022 23:04
@github-actions

This comment has been minimized.

@OmarIthawi
OmarIthawi force-pushed the use-tahoe-sites-api-patch03 branch from 1ce8645 to 723af98 Compare June 29, 2022 23:19
@github-actions

This comment has been minimized.

shadinaif and others added 3 commits July 1, 2022 15:09
…by_username_or_email

 - Added tests for `get_user_by_username_or_email_inside_organization`
 - Consolidated `get_user_by_username_or_email_inside_organization` inside `get_user_by_username_or_email`
 - Added tests for `CourseEnrollment.enroll_by_email_in_organization`
 - Consolidated  `CourseEnrollment.enroll_by_email_in_organization` inside `enroll_by_email`
 - Fixed RED-2007 and #903
 - Fixed RED-2009 as well
@OmarIthawi
OmarIthawi force-pushed the use-tahoe-sites-api-patch03 branch from 723af98 to 506c84f Compare July 1, 2022 12:10
@github-actions

github-actions Bot commented Jul 1, 2022

Copy link
Copy Markdown

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with open-release/koa.master
Benchmark conflicts with main 111
Current conflicts 110
Summary Resolves 1 existing conflicts. Amazing!
Comparing with master
Benchmark conflicts with main 287
Current conflicts 285
Summary Resolves 2 existing conflicts. Amazing!

@OmarIthawi
OmarIthawi enabled auto-merge July 1, 2022 12:31
@OmarIthawi
OmarIthawi merged commit 0836620 into main Jul 1, 2022
@OmarIthawi
OmarIthawi deleted the use-tahoe-sites-api-patch03 branch July 1, 2022 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants