Commit Graph

51 Commits

Author SHA1 Message Date
Juliana Kang
51d538cbe7 fix: Remove B2C Subscriptions (#35303)
REV-3697
2024-09-04 14:01:45 -04:00
Diana Huang
282b934299 fix: Add code owner to celery task. (#33238)
Ensures that the code owner attribute is set
on celery task run for entitlements.
2023-09-13 12:01:58 -04:00
Mohammad Ahtasham ul Hassan
df197837cb fix: remove extras and enhance existing subs logging (#32919) 2023-08-07 18:01:50 +05:00
Mohammad Ahtasham ul Hassan
06923c7948 feat: use username for course completion API instead of lms_user_id (#32761) 2023-07-17 20:17:12 +05:00
Mohammad Ahtasham ul Hassan
34766474c0 fix: fix entitlement revocation task (#32750) 2023-07-14 20:12:59 +05:00
Mohammad Ahtasham ul Hassan
024096a589 temp: add temporary logging for entitlement revocation (#32746)
* temp: add temporary logging for entitlement revocation
2023-07-14 16:04:17 +05:00
Mohammad Ahtasham ul Hassan
7fe5229bbb feat: Add new entitlement expiration endpoint (#32677)
* feat: add new entitlements expiration endpoint
2023-07-13 13:38:20 +05:00
Muhammad Zubair
2d0a8b44b7 feat: fixed failing checks related to linting and tests 2023-06-26 19:46:25 +05:00
Muhammad Zubair
3f84b14b92 feat: removed unnecessary ignore-liting message 2023-06-26 18:59:25 +05:00
Muhammad Zubair
4519ca405e chore: added standard logging and removed celery logging 2023-06-26 18:47:17 +05:00
Phillip Shiu
82338bd375 fix: SyntaxError: use CourseEntitlement.objects, not .object 2023-06-25 22:12:10 -04:00
Phillip Shiu
2af47c7128 temp: remove celery ignore_result=True
We are lacking information in Flower about our Celery tasks that are
marked as successful but are actually failing.

Attempt to remove ignore_result=True to see if this is suppressing
valuable debugging information.
2023-06-25 22:11:08 -04:00
Phillip Shiu
fb9bf9325e temp: fix use len(list) not list.count() in expire_and_create_entitlements (#32565) 2023-06-23 21:05:49 +00:00
Phillip Shiu
886227c88b temp: fix EncodeError for username in expire_and_create_entitlements (#32564)
On running the management command, we get the folowing error:

    kombu.exceptions.EncodeError: Object of type User is not JSON serializable

Pass a string of the username instead in the parameters of the tasks
created by the expire_and_create_entitlements management command.
2023-06-23 18:08:51 +00:00
Phillip Shiu
5996ae098b temp: fix EncodeError & correct EntitlementSupportDetail action name in expire_and_create_entitlements (#32562)
* fix: EntitlementSupportDetail.action is EXPIRE, not EXPIRED

* fix: pass list of entitlement ids, not QuerySet subset for Celery json parser

On running the management command, we get the folowing error:

    kombu.exceptions.EncodeError: Object of type CourseEntitlement is not JSON serializable

Pass a list of ints instead of a QuerySet object in the parameters of
the tasks created by the expire_and_create_entitlements management
command.
2023-06-23 14:31:12 +00:00
Phillip Shiu
5dfe83d154 chore: quality 2023-06-22 22:52:10 -04:00
Phillip Shiu
d4ae7bfa06 fix: use newly created (not expired) entitlement id in logs and support records 2023-06-22 22:37:45 -04:00
Phillip Shiu
c973059ae7 feat: add start/end/length log information at beginning of each expire_and_create_entitlements task 2023-06-22 22:37:17 -04:00
Muhammad Zubair
43ea99e3a6 feat: skipped linting check 2023-06-22 18:52:20 -04:00
Muhammad Zubair
3e9038efcc feat: removed extra comma 2023-06-22 18:52:20 -04:00
Muhammad Zubair
ee968a1431 feat: fixed linting issues 2023-06-22 18:52:20 -04:00
Muhammad Zubair
825d161d1a feat: fixeid linting issues 2023-06-22 18:52:20 -04:00
Muhammad Zubair
f674e35d1b feat: fixed linting issues 2023-06-22 18:52:20 -04:00
Muhammad Zubair
aefdc750a6 feat: incorporated feedback comments 2023-06-22 18:52:20 -04:00
Muhammad Zubair
3133628007 feat: incorporated feedback comments 2023-06-22 18:52:20 -04:00
Muhammad Zubair
a9afb4fb5b feat: added user in support_details object 2023-06-22 18:52:20 -04:00
Muhammad Zubair
a0d3c21295 feat: incorporated feedback comments 2023-06-22 18:52:20 -04:00
Muhammad Zubair
8e2612358d feat: resolved linting issues 2023-06-22 18:52:20 -04:00
Muhammad Zubair
33bc48b8de feat: resolved linting issues 2023-06-22 18:52:20 -04:00
Muhammad Zubair
2887e8967e feat: resolved linting issues 2023-06-22 18:52:20 -04:00
Muhammad Zubair
b88a34d3f5 feat: update logic and modified code 2023-06-22 18:52:20 -04:00
Muhammad Zubair
4d4f1cd1b5 chore: added a django management command to expire old entitlements and create new one against them 2023-06-22 18:52:20 -04:00
Kyle McCormick
9aefd6f986 style: django-not-configured is not a sensible lint-amnesty value (#26862)
django-not-configured is an error raised by pylint (with
the pylint-django plugin) when it's not correctly configured.

We should not be applying lint amnesty for such a violation.
2021-03-05 08:11:58 -05:00
usamasadiq
e1ed3211c1 Applied pylint-amnesty to common/djangoapps/entitlements 2021-02-04 15:33:25 +05:00
Kyle McCormick
b626a43fa1 fix: Rename some tasks to match new import paths (#26236)
Several tasks are explicitly named as (or like)
their old, deprecated import path.

The issue here is that django-user-tasks listens for task
invocations, and attempts to import the task based on its name.
If the task name is completely wrong, user-tasks will catch
the ImportError and move on.
If the task is a valid *deprecated* import, though, then
user-tasks will choke on the raised `DeprecatedEdxPlatformImportError`.

Thus, we must rename three tasks to their new full path:
1. entitlements.expire_old_enrollments
2. third_party_auth.fetch_saml_metadata
3. student.send_activation_email

The first two are run daily, and so are safe to be
renamed in place.

The third task must be renamed using an expand-contract
pattern; otherwise, we would drop hundreds of tasks
during the App vs. Worker out-of-sync version window
that happens at deployments.
This commit is the expand phase.
2021-02-02 10:26:08 -05:00
Muhammad Soban Javed
d26a59eb67 import task decorator from celery APP instance in CMS (#25953)
* import task decorator from celery APP instance instead of celery package in CMS

* replaced task decorator with shared_task in cms and common

* Fixed import of shared_task

* Fixed import
2021-01-27 18:35:11 +05:00
Muhammad Soban Javed
bd601cf3a6 Update celery routing for celery 4+ (#25567)
* Update celery routing

- Used routing function instead of class
- Move task queues dictionary to Django settings
- Removed routing_key parameter
- Refactored routing for singleton celery instantiation

Co-authored-by: Awais Qureshi <awais.qureshi@arbisoft.com>
2020-12-16 13:40:47 +05:00
Robert Raposa
8eef18710d set code_owner for celery tasks
ARCHBOM-1260

Co-authored-by: Tim McCormack <tmccormack@edx.org>
2020-11-17 15:33:33 -05:00
Kyle McCormick
73739189c5 Undo renames of common.djangoapps tasks (#25566)
When rolling out #25477, we dropped hundreds of email activation
tasks due to the renaming of student.send_activation_email
to common.djangoapps.student.send_activation_email,
and lost more when we rolled that PR back.
This happens because of blue/green deployment:
old workers are still online for a while after deploying,
so there is a period of time when the task names are mismatched.

To prevent this from happening again, this will make
it so the import changes don't change the names of
any of the Celery tasks.
2020-11-10 16:31:48 -05:00
Awais Qureshi
7201edb11d Revert "Update routing config" (#25536)" (#25549)" (#25553)" (#25561)
This reverts commit db4c3b1210.
2020-11-11 00:13:47 +05:00
Awais Qureshi
db4c3b1210 Revert "Revert ""Update routing config" (#25536)" (#25549)" (#25553)
This reverts commit c1fe3c3a93.
2020-11-10 23:23:09 +05:00
Kyle McCormick
151bd13666 Use full names for common.djangoapps imports; warn when using old style (#25477)
* Generate common/djangoapps import shims for LMS
* Generate common/djangoapps import shims for Studio
* Stop appending project root to sys.path
* Stop appending common/djangoapps to sys.path
* Import from common.djangoapps.course_action_state instead of course_action_state
* Import from common.djangoapps.course_modes instead of course_modes
* Import from common.djangoapps.database_fixups instead of database_fixups
* Import from common.djangoapps.edxmako instead of edxmako
* Import from common.djangoapps.entitlements instead of entitlements
* Import from common.djangoapps.pipline_mako instead of pipeline_mako
* Import from common.djangoapps.static_replace instead of static_replace
* Import from common.djangoapps.student instead of student
* Import from common.djangoapps.terrain instead of terrain
* Import from common.djangoapps.third_party_auth instead of third_party_auth
* Import from common.djangoapps.track instead of track
* Import from common.djangoapps.util instead of util
* Import from common.djangoapps.xblock_django instead of xblock_django
* Add empty common/djangoapps/__init__.py to fix pytest collection
* Fix pylint formatting violations
* Exclude import_shims/ directory tree from linting
2020-11-10 07:02:01 -05:00
Muhammad Soban Javed
c1fe3c3a93 Revert ""Update routing config" (#25536)" (#25549)
This reverts commit 39a22734c1.
2020-11-09 23:43:47 +05:00
Awais Qureshi
39a22734c1 "Update routing config" (#25536)
* Revert "Revert "Update routing config"

* Removed settings from lms/celery.py and cms/celery.py

* Moved settings import from top-level to function's scopes

Co-authored-by: Soban Javed <iamsobanjaved@gmail.com>
2020-11-09 19:06:55 +05:00
Muhammad Soban Javed
5a2ea1f954 Revert "Update routing config" 2020-11-06 02:05:48 +05:00
Soban Javed
3206d9cb9a Update celery routing
- Used routing function istead of class
- Move task queues to Djano settings
- Removed routing_key parameter
2020-11-02 15:03:53 +05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
2019-12-30 10:35:30 -05:00
Amit
a10fbd682c INCR-231: Run python-modernize and isort at common/djangoapps/entitlements (#20515) 2019-05-10 11:14:18 -04:00
Albert (AJ) St. Aubin
d47d22a9bb updating the import for entitlement tasks 2019-03-25 10:28:30 -04:00