infrastructure/extensions-website
4
8
Fork 10
Code Issues 20 Pull Requests 2 Projects Releases Wiki Activity

Refactor Extension and Version: explicit constructors from File #191

Merged
Oleg-Komarov merged 6 commits from refactor-models into main 2024-06-20 14:40:41 +02:00
Conversation 0 Commits 6 Files Changed 25 +11 -6
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1df59f7a10 - Show all commits

2
common/tests/factories/extensions.py
View File

@ -65,7 +65,7 @@ def create_version(**kwargs) -> 'Version':
file = FileFactory(**kwargs) file = FileFactory(**kwargs)
if not extension: if not extension:
extension = Extension.create_from_file(file, file.user) extension = Extension.create_from_file(file)
return extension.create_version_from_file(file) return extension.create_version_from_file(file)

4
extensions/models.py
View File

@ -186,11 +186,11 @@ class Extension(CreatedModifiedMixin, TrackChangesMixin, models.Model):
ordering = ['-average_score', '-date_created', 'name'] ordering = ['-average_score', '-date_created', 'name']
@classmethod @classmethod
def create_from_file(cls, file: File, author: User) -> 'Extension': def create_from_file(cls, file: File) -> 'Extension':
extension = cls(**file.parsed_extension_fields) extension = cls(**file.parsed_extension_fields)
with transaction.atomic(): with transaction.atomic():
extension.save() extension.save()
extension.authors.add(author) extension.authors.add(file.user)
return extension return extension
def create_version_from_file(self, file: File, release_notes='') -> 'Version': def create_version_from_file(self, file: File, release_notes='') -> 'Version':

11
extensions/views/submit.py
View File

@ -36,8 +36,13 @@ class UploadFileView(LoginRequiredMixin, CreateView):
def form_valid(self, form): def form_valid(self, form):
"""Create an extension and a version already, associated with the user.""" """Create an extension and a version already, associated with the user."""
file = form.save() file = form.save()
# TODO understand if file.user can ever be different from self.request.user if file.user != self.request.user:
# e.g. if reusing an already uploaded file? # this must never happen, but checking here to prevent misattributing the extension
self.extension = Extension.create_from_file(file, self.request.user) # to a wrong user
raise Exception(
f'user {self.request.user} uploaded a file hash={file.hash} owned by {file.user}, '
f'this must never happen'
)
self.extension = Extension.create_from_file(file)
self.extension.create_version_from_file(file) self.extension.create_version_from_file(file)
return super().form_valid(form) return super().form_valid(form)