Skip to content

Commit c54a69c

Browse files
pamfilosdrjova
authored andcommitted
articles: fix error on import method
Signed-off-by: pamfilos <[email protected]>
1 parent ddf478b commit c54a69c

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

scoap3/articles/models.py

-6
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@ def on_save(self):
5353

5454
compliance_checks.delay(self.id)
5555

56-
def save(self, *args, **kwargs):
57-
if not self.pk:
58-
max_id = Article.objects.aggregate(max_id=models.Max("id"))["max_id"]
59-
self.id = (max_id if max_id is not None else 0) + 1
60-
super().save(*args, **kwargs)
61-
6256

6357
class ArticleFile(models.Model):
6458
article_id = models.ForeignKey(

scoap3/tasks.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ def _create_article(data, licenses):
7777
"subtitle": data["titles"][0].get("subtitle", ""),
7878
"abstract": data["abstracts"][0].get("value", ""),
7979
}
80-
if Article.objects.filter(pk=article_data["id"]).exists():
80+
if article_data.get("id") and Article.objects.filter(pk=article_data["id"]).exists():
8181
article = Article.objects.get(pk=article_data["id"])
8282
article.__dict__.update(**article_data)
8383
else:
84-
article, _ = Article.objects.get_or_create(**article_data)
84+
article = Article.objects.create(**article_data)
8585
article._created_at = data.get("_created") or data.get("record_creation_date")
8686

8787
article.related_licenses.set(licenses)

0 commit comments

Comments
 (0)