Merge pull request #95 from pitangainnovare/optimize-artjou-metadata

Optimiza obtenção de metadados de article e journal

Author: pitangainnovare

VERSION

@@ -1 +1 @@
-1.9.0
+1.9.1

article/models.py

@@ -95,8 +95,24 @@ def __str__(self):
 
     @classmethod
     def metadata(cls, collection=None):
-        objs = cls.objects.all() if not collection else cls.objects.filter(collection=collection)
-        for a in objs:
+        qs = cls.objects.select_related('collection').only(
+            'collection__acron3',
+            'default_lang',
+            'files',
+            'pid_v2',
+            'pid_v3',
+            'pid_generic',
+            'processing_date',
+            'publication_date',
+            'publication_year',
+            'scielo_issn',
+            'text_langs',
+        )
+
+        if collection:
+            qs = qs.filter(collection=collection)
+
+        for a in qs.iterator():
             yield {
                 'collection': a.collection.acron3,
                 'default_lang': a.default_lang,

journal/models.py

@@ -69,17 +69,23 @@ def __str__(self):
 
     @classmethod
     def metadata(cls, collection=None):
-        objs = cls.objects.all() if not collection else cls.objects.filter(collection=collection)
-        for j in objs:
+        queryset = cls.objects.all()
+        if collection:
+            queryset = queryset.filter(collection=collection)
+
+        for journal in queryset.only(
+            'acronym', 'collection__acron3', 'issns', 'publisher_name',
+            'scielo_issn', 'subject_areas', 'title', 'wos_subject_areas'
+        ):
             yield {
-                'acronym': j.acronym,
-                'collection': j.collection.acron3,
-                'issns': j.issns,
-                'publisher_name': j.publisher_name,
-                'scielo_issn': j.scielo_issn,
-                'subject_areas': j.subject_areas,
-                'title': j.title,
-                'wos_subject_areas': j.wos_subject_areas,
+                'acronym': journal.acronym,
+                'collection': journal.collection.acron3,
+                'issns': set([v for v in journal.issns.values() if v]),
+                'publisher_name': journal.publisher_name,
+                'scielo_issn': journal.scielo_issn,
+                'subject_areas': journal.subject_areas,
+                'title': journal.title,
+                'wos_subject_areas': journal.wos_subject_areas,
             }
 
     class Meta: