Skip to content

[ENG-10788] add nodes and preprints files reinding on account merging #11727

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
mkovalua wants to merge 2 commits into
base: feature/pbs-26-9
Choose a base branch
from
+24 −0
Open

[ENG-10788] add nodes and preprints files reinding on account merging #11727

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd79388
add nodes and preprints files reinding on account merging
mkovalua May 5, 2026
de26575
resolve CR
mkovalua May 8, 2026
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
24 changes: 24 additions & 0 deletions osf/models/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager
from django.contrib.auth.hashers import check_password
from django.contrib.auth.models import PermissionsMixin
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import FieldDoesNotExist
from django.dispatch import receiver
from django.db import models
Expand Down Expand Up @@ -877,6 +878,29 @@ def merge_user(self, user):
except Exception as e:
logger.exception(f'Failed to SHARE reindex preprint {preprint._id} during user merge: {e}')

from osf.models import AbstractNode, Preprint
from addons.osfstorage.models import OsfStorageFile
Copy link
Copy Markdown
Contributor

@antkryt antkryt May 8, 2026

Choose a reason for hiding this comment

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

You can move django and addon imports to the top of the file. Circular import error should not occur in this case I think

Copy link
Copy Markdown
Contributor Author

@mkovalua mkovalua May 8, 2026

Choose a reason for hiding this comment

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

Circular import errors exist from my side for

  from django.contrib.contenttypes.models import ContentType
  from osf.models import AbstractNode, Preprint
image image

node_ctype = ContentType.objects.get_for_model(AbstractNode)
preprint_ctype = ContentType.objects.get_for_model(Preprint)
nodes_files_to_reindex = OsfStorageFile.objects.filter(
target_object_id__in=user.contributed.values_list('id', flat=True), target_content_type=node_ctype,
guids__isnull=False
)
preprints_files_to_reindex = OsfStorageFile.objects.filter(
target_object_id__in=user.preprints.values_list('id', flat=True), target_content_type=preprint_ctype,
guids__isnull=False
)
for file in nodes_files_to_reindex.iterator(chunk_size=100):
try:
update_share(file)
except Exception as e:
logger.exception(f'Failed to SHARE reindex file {file._id} during user merge: {e}')
for file in preprints_files_to_reindex.iterator(chunk_size=100):
try:
update_share(file)
except Exception as e:
logger.exception(f'Failed to SHARE reindex preprints file {file._id} during user merge: {e}')

def _merge_users_preprints(self, user):
"""
Preprints use guardian. The PreprintContributor table stores order and bibliographic information.
Expand Down