Skip to content
Snippets Groups Projects
Commit decdaf4d authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Fixed broken test cases.

parent 42406f95
No related branches found
No related tags found
1 merge request!71V0.7.0
Pipeline #63679 failed
...@@ -45,12 +45,10 @@ class ScrollIdNotFound(Exception): pass ...@@ -45,12 +45,10 @@ class ScrollIdNotFound(Exception): pass
class User(InnerDoc): class User(InnerDoc):
@classmethod @classmethod
def from_user_id(cls, user_id): def from_user(cls, user):
self = cls(user_id=user_id) self = cls(user_id=user.user_id)
user = datamodel.User.get(user_id=user_id)
self.name = user.name self.name = user.name
self.email = user.email self.email = user.email
self.sort_name = '%s %s' % (user.last_name, user.first_name)
return self return self
...@@ -136,20 +134,21 @@ class Entry(Document, metaclass=WithDomain): ...@@ -136,20 +134,21 @@ class Entry(Document, metaclass=WithDomain):
else: else:
self.files = source.files self.files = source.files
self.uploader = User.from_user_id(source.uploader) if source.uploader is not None else None
self.with_embargo = bool(source.with_embargo) self.with_embargo = bool(source.with_embargo)
self.published = source.published self.published = source.published
self.authors = [User.from_user_id(user_id) for user_id in source.coauthors]
self.owners = [User.from_user_id(user_id) for user_id in source.shared_with] uploader = datamodel.User.get(user_id=source.uploader) if source.uploader is not None else None
if self.uploader is not None: authors = [datamodel.User.get(user_id) for user_id in source.coauthors]
if self.uploader not in self.authors: owners = [datamodel.User.get(user_id) for user_id in source.shared_with]
self.authors.append(self.uploader) if uploader is not None:
if self.uploader not in self.owners: authors.append(uploader)
self.owners.append(self.uploader) owners.append(uploader)
authors.sort(key=lambda user: user.last_name + ' ' + user.first_name)
self.authors.sort(key=lambda user: user.sort_name) owners.sort(key=lambda user: user.last_name + ' ' + user.first_name)
self.owners.sort(key=lambda user: user.sort_name)
self.uploader = User.from_user(uploader)
self.authors = [User.from_user(user) for user in authors]
self.owners = [User.from_user(user) for user in owners]
self.comment = source.comment self.comment = source.comment
self.references = source.references self.references = source.references
......
...@@ -1117,8 +1117,8 @@ class TestEditRepo(): ...@@ -1117,8 +1117,8 @@ class TestEditRepo():
assert self.elastic(1, comment='test_edit_props') assert self.elastic(1, comment='test_edit_props')
assert self.elastic(1, references=['http://test', 'http://test2']) assert self.elastic(1, references=['http://test', 'http://test2'])
assert self.elastic(1, authors=[other_test_user.user_id, test_user.user_id]) assert self.elastic(1, authors=[test_user.user_id, other_test_user.user_id])
assert self.elastic(1, owners=[other_test_user.user_id, test_user.user_id]) assert self.elastic(1, owners=[test_user.user_id, other_test_user.user_id])
def test_edit_all(self): def test_edit_all(self):
rv = self.perform_edit(comment='test_edit_all') rv = self.perform_edit(comment='test_edit_all')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment