Skip to content
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

[Django Upgrade] [Reference PR] The rest of the fixes #10048

Closed
wants to merge 85 commits into from
+3,704 −17,348
Closed

[Django Upgrade] [Reference PR] The rest of the fixes #10048

Changes from 1 commit
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
7c3b9ad
remove post-migrate signals from migration stream (#9964)
Johnetordoff Jun 24, 2022
4a8bd61
move createcachetable to post migrate signal (#9944)
Johnetordoff Jun 27, 2022
bf7eb21
[ENG-3836] Investigate waffle flags (#9950)
Johnetordoff Jul 1, 2022
15f15e9
[ENG-3865] Create Licenses using post-migrate signal (#9961)
Johnetordoff Jul 12, 2022
5746a84
[ENG-3863] Move schema ensuring and schema blocks update to post-migr…
cslzchen Jul 13, 2022
c2c5e4e
[ENG-3868] Move blocked email domains to post-migrate signal (#9958)
Johnetordoff Jul 13, 2022
f22e531
[ENG-3866] Move citation style population out of migration stream (#9…
Johnetordoff Jul 15, 2022
250b832
[ENG-3867] Create Storage Regions on post migration signal (#9965)
Johnetordoff Jul 19, 2022
8052ea4
[ENG-3836] Follow-up: Add PyYAML to Requirements (#9993)
cslzchen Jul 27, 2022
65b344b
[ENG-3862] Move post-migrate signal out of migration stream for defau…
Johnetordoff Jul 28, 2022
205e560
Remove unused password change view/route (#9985)
Johnetordoff Aug 11, 2022
1675f6f
Update import paths and fix deprecated modules for Django 3 (#9983)
Johnetordoff Aug 11, 2022
391af60
Update postgres backend and remove failover router for Django 3 (#10011)
Johnetordoff Aug 11, 2022
c9c7f44
Move file metadata population to unit test fixtures (#9994)
Johnetordoff Aug 11, 2022
721ef90
Remove password_reset from installed apps
cslzchen Aug 11, 2022
75ffbb0
Merge remote-tracking branch 'upstream/develop' into feature/django_u…
cslzchen Aug 16, 2022
285d9a6
[Django Upgrade] Fix one sub-query slicing issue (#10012)
Johnetordoff Aug 17, 2022
06f6fe9
[Django Upgrade] Upgrade django-elasticsearch-metrics (#10021)
Johnetordoff Aug 17, 2022
724f59a
[Django Upgrade] Replace M2M direct assignment (#10010)
Johnetordoff Aug 17, 2022
afa62a7
[Django Upgrade] Upgrade markdown and mdx_del_ins (#9984)
Johnetordoff Aug 17, 2022
d15c88f
[Django Upgrade] Move schema activeness/visibility update to pytest f…
cslzchen Aug 18, 2022
3f162f1
Remove osf migrations
cslzchen Aug 17, 2022
f971149
Remove addon migrations
cslzchen Aug 17, 2022
f41eb8a
Init migrations - osf
cslzchen Aug 17, 2022
dab1bbc
Init migrations - addons
cslzchen Aug 17, 2022
994fcfd
Fix migration for NotableEmailDomain
cslzchen Aug 17, 2022
a54bbbe
Fix circular import with built-in admin migrations
cslzchen Aug 17, 2022
699fc1c
Add a RunSQL migration to update indexes
cslzchen Aug 22, 2022
0dc9220
Merge pull request #10028 from cslzchen/feature/clean_squash
mfraezz Aug 23, 2022
cfb012e
Merge remote-tracking branch 'upstream/develop' into feature/django_u…
cslzchen Sep 1, 2022
cb25d71
Upgrade django to 3.2.15 (and related dependencies)
cslzchen Aug 31, 2022
720b6ec
Make fields defined on typedmodels subclasses nullable
cslzchen Aug 31, 2022
6b7ce7f
Add required on_delete=CASCADE (default) to FKs missing it
cslzchen Aug 31, 2022
0192907
Fix django CORS whitelist settings due to orgin definition update
cslzchen Sep 1, 2022
51f4f48
Add/Enable missing templates and middlewares in api settings
cslzchen Sep 1, 2022
41d4b50
Comment out admin permissions that clash with built-in "view" ones
cslzchen Sep 1, 2022
65f39c8
Add migrations for django upgrade base fixes
cslzchen Sep 1, 2022
0ad3f7c
Fix system check warnings for django admin
cslzchen Sep 1, 2022
a2dc7ba
Merge branch 'longze/django3-upgrade-base' into feature/django_upgrade
cslzchen Sep 1, 2022
2a0aa6e
Fix django cache table creation
cslzchen Sep 2, 2022
66edda0
Enable django.contrib.sessions.middleware.SessionMiddleware
cslzchen Sep 7, 2022
37bd4e4
Use default truthy and falsy values from upgraded DRF 3.13.1
cslzchen Sep 7, 2022
bcd2c6e
Use JsonField from django.db.models and django.forms
cslzchen Sep 7, 2022
88c057e
Merge branch 'longze/django3-json-field-update' into feature/django_u…
cslzchen Sep 7, 2022
0ce6496
Fix session cookie encoding/decoding by using ensure_str()
cslzchen Sep 7, 2022
fc0d032
Merge branch 'fix-django-session-issues' into feature/django_upgrade
cslzchen Sep 8, 2022
2fbc057
Use prefetch instead of Django include
Aug 29, 2022
eb93348
Merge branch 'replace-django-include-with-prefetch' into feature/djan…
cslzchen Sep 9, 2022
07ee7e6
Fix CORS for ORIGINS_WHITELIST
cslzchen Sep 9, 2022
9e9c487
Merge branch 'django-3-update-cors' into feature/django_upgrade
cslzchen Sep 9, 2022
4e19413
Rename auto generated migration for django3 upgrade fixes
cslzchen Sep 12, 2022
d10824f
Remove QuickFile check from get_serializer_class for FileDetail view
cslzchen Sep 12, 2022
4e56c87
Merge remote-tracking branch 'upstream/develop' into feature/django_u…
cslzchen Sep 12, 2022
68acb17
clear cached property for storage region.
Sep 13, 2022
57e81a6
turn off notify emails for tests in Django 3 upgrade
Sep 13, 2022
0bc3d5c
upgrade Django factory models for Django 3
Sep 13, 2022
7d3c644
remove update_version_metadata with tests
Sep 13, 2022
51a6b1b
remove django-include and other unused egap backfill tests
Sep 13, 2022
e21b460
Make DFR serializer fixes
Sep 13, 2022
1a70f61
make registration metadata use real schema
Sep 13, 2022
f30f1ce
Fix changed test due to DRF upgrade issues
Sep 13, 2022
fca9e81
fix duplication of 'view_node' for admin app
Sep 13, 2022
dffad34
fix test issues by reloading refferents
Sep 13, 2022
db10898
add DEFAULT_AUTO_FIELD to end warnings for Django 3 upgrade
Sep 13, 2022
0c1cc03
fix DRF issue
Sep 13, 2022
494e396
Fix an issue where get_node() is not avaialbe from context view
cslzchen Sep 12, 2022
6548110
Add registration_schema to DraftRegistrationDetailSerializer
cslzchen Sep 12, 2022
0bb5fc5
Add id to DraftRegistrationDetailSerializer
cslzchen Sep 13, 2022
d69128c
Merge branch 'fix-draft-registration-serializers' into feature/django…
cslzchen Sep 13, 2022
7f6219b
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
Sep 13, 2022
3f97cd6
sort out query issue for `visible_contributor_to` for Django 3 upgrade
Sep 13, 2022
ec4da2f
update schema code
Sep 14, 2022
6f64b38
skip test_validate_social_profile_website_many_different due to it br…
Sep 14, 2022
6dcb706
fix more draft registrations mro problems
Sep 14, 2022
b1845e4
refactor url to re_path for django 3 update to avoid annoying depreci…
Sep 14, 2022
95c9c83
Fix middleware order and replace deprecated staticfiles with static
Sep 14, 2022
ba02936
remove nullboolean fields to prevent depreciation warning
Sep 14, 2022
fd42db4
fix admin app depreciating staticfiles for Django 3 upgrade
Sep 14, 2022
dd377cc
Fix and rework from_db_value & to_python for EncryptedJSONField
cslzchen Sep 14, 2022
5f7fd3b
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
Sep 15, 2022
b57c74e
fix admin login failure for django upgrade
Sep 15, 2022
93081d4
Fix admin login failure for django upgrade
Sep 15, 2022
b58c17f
upgrade to end dependabot warnings
Johnetordoff Sep 19, 2022
5a24b8f
Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…
Sep 19, 2022
3f6a665
more dependabot updates
Sep 19, 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
2 changes: 1 addition & 1 deletion osf/models/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ def visible_contributor_to(self):
"""
Nodes where user is a bibliographic contributor (group membership not factored in)
"""
return self.nodes.filter(is_deleted=False, contributor__visible=True, type__in=['osf.node', 'osf.registration'])
return self.nodes.filter(is_deleted=False, contributor__visible=True, contributor__user=self, type__in=['osf.node', 'osf.registration'])
Copy link
Collaborator

Choose a reason for hiding this comment

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

The fix make sense since we need to make sure that the invisible contributor on the project must be the self user.

Without it, visible_contributor_to returns two projects (in unit tests) with the following contributor set for each.

<QuerySet [<Contributor([email protected], visible=True, permission=admin)>]>

<QuerySet [<Contributor([email protected], visible=True, permission=admin)>, <Contributor([email protected], visible=False, permission=write)>]>

Apparently, if we only have contributor__visible=True, the query find nodes as long as one of the contributor is visible. I am not sure why this happens after the upgrade, might be an issue with the related manager.

In [7]: user.nodes
Out[7]: <django.db.models.fields.related_descriptors.create_forward_many_to_many_manager.<locals>.ManyRelatedManager at 0x7fcbb4a19898>

Copy link
Collaborator

@cslzchen cslzchen Sep 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Update/Example:

We have user 7773344 and 8079719; we have Project 9qnbu and x8jc3
Project 9qnbu has contributor 7773344 as visible
Project x8jc3 has contributor 7773344 & 8079719 as visible

return self.nodes.filter(is_deleted=False, contributor__visible=True, type__in=['osf.node', 'osf.registration'])

The above returns 3 items instead of 2. Apparently, contributor__visible=True is looped on each contributor.

<AbstractNodeQuerySet [
    (title='Visionary radical matrix', category='project') with guid 'x8jc3',
    (title='Adaptive modular access', category='project') with guid '9qnbu',
    (title='Adaptive modular access', category='project') with guid '9qnbu'
]>

My concern is, even with contributor__user=self, it still loops each contributor on every project ... this makes sense why adding it fix the tests but it might be too costly?


@property
def all_nodes(self):
Expand Down