Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4be65d4
Atualiza versão para 1.11.0
rafaelpezzuto Jun 12, 2025
c381d67
Cria dbindex para campos date e logfile em modelo LogFileDate
rafaelpezzuto Jun 12, 2025
3a1dced
Substitui alguns prints por logging
rafaelpezzuto Jun 12, 2025
e256c7c
Atualiza lib scielo_usage_counter para 1.5.0
rafaelpezzuto Jun 13, 2025
0b2f443
Adiciona index em campos de journal
rafaelpezzuto Jun 13, 2025
9ab02e8
Adiciona index em campos de article
rafaelpezzuto Jun 13, 2025
c48957b
Adiciona index em campos de modelos de app metrics
rafaelpezzuto Jun 13, 2025
8ffede5
Adiciona campo id em fetch de metadados de journal e article
rafaelpezzuto Jun 13, 2025
40afecc
Remove import desnecessário em log_manager
rafaelpezzuto Jun 13, 2025
7642cfa
Corrige imports em tasks de metrics
rafaelpezzuto Jun 13, 2025
6db3df6
Adiciona comentários em métodos auxiliares
rafaelpezzuto Jun 13, 2025
3b64715
Cria método para obter cache de dados de modelos de metrics
rafaelpezzuto Jun 13, 2025
0759d17
Cria método para obter dados de artigos e periódicos
rafaelpezzuto Jun 13, 2025
6d5ee8e
Adiciona comentários em metodo principal para processar logs
rafaelpezzuto Jun 13, 2025
6246e1c
Adiciona cache em chamada ao processador de linha
rafaelpezzuto Jun 13, 2025
f61a311
Comenta processador de linha e adiciona param cache
rafaelpezzuto Jun 13, 2025
e3d30b5
Passa a obter art e jou a partir de pre-fetch
rafaelpezzuto Jun 13, 2025
277ad9e
Otimiza método para obter dados do banco (passa a usar cache)
rafaelpezzuto Jun 13, 2025
7cee8fe
Comenta outros métodos auxiliares
rafaelpezzuto Jun 13, 2025
4e79061
Otimiza método que indexa métricas
rafaelpezzuto Jun 13, 2025
87cd12e
Adiciona arquivos de migração
rafaelpezzuto Jun 13, 2025
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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.0
1.11.0
21 changes: 21 additions & 0 deletions article/migrations/0003_article_collection_scielo_issn_idx.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 5.0.7 on 2025-06-12 17:16

from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("article", "0002_alter_article_unique_together_article_files_and_more"),
("collection", "0001_initial"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.AddIndex(
model_name="article",
index=models.Index(
fields=["collection", "scielo_issn"], name="collection_scielo_issn_idx"
),
),
]
5 changes: 5 additions & 0 deletions article/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ def metadata(cls, collection=None):

for a in qs.iterator():
yield {
'id': a.id,
'collection': a.collection.acron3,
'default_lang': a.default_lang,
'files': a.files,
Expand All @@ -137,3 +138,7 @@ class Meta:
'pid_v3',
'pid_generic',
)
indexes = [
models.Index(fields=['collection', 'scielo_issn'], name='collection_scielo_issn_idx'),
]

19 changes: 19 additions & 0 deletions journal/migrations/0002_alter_journal_scielo_issn.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 5.0.7 on 2025-06-12 17:16

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("journal", "0001_initial"),
]

operations = [
migrations.AlterField(
model_name="journal",
name="scielo_issn",
field=models.CharField(
db_index=True, max_length=9, verbose_name="SciELO ISSN"
),
),
]
3 changes: 3 additions & 0 deletions journal/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ class Journal(CommonControlField):
on_delete=models.CASCADE,
blank=False,
null=False,
db_index=True,
)

scielo_issn = models.CharField(
verbose_name=_('SciELO ISSN'),
max_length=9,
blank=False,
null=False,
db_index=True,
)

issns = models.JSONField(
Expand Down Expand Up @@ -78,6 +80,7 @@ def metadata(cls, collection=None):
'scielo_issn', 'subject_areas', 'title', 'wos_subject_areas'
):
yield {
'id': journal.id,
'acronym': journal.acronym,
'collection': journal.collection.acron3,
'issns': set([v for v in journal.issns.values() if v]),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Generated by Django 5.0.7 on 2025-06-12 17:16

from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("log_manager", "0004_logfile_validation"),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

operations = [
migrations.AlterField(
model_name="logfile",
name="status",
field=models.CharField(
choices=[
("CRE", "Created"),
("QUE", "Queued"),
("PAR", "Parsing"),
("PRO", "Processed"),
("INV", "Invalidated"),
("IGN", "Ignored"),
],
max_length=3,
verbose_name="Status",
),
),
migrations.AlterField(
model_name="logfiledate",
name="date",
field=models.DateField(db_index=True, verbose_name="Date"),
),
migrations.AddIndex(
model_name="logfiledate",
index=models.Index(
fields=["date", "log_file"], name="log_manager_date_32b410_idx"
),
),
]
5 changes: 5 additions & 0 deletions log_manager/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ class LogFileDate(CommonControlField):
verbose_name=_("Date"),
null=False,
blank=False,
db_index=True,
)

log_file = models.ForeignKey(
'LogFile',
verbose_name=_('Log File'),
blank=True,
on_delete=models.DO_NOTHING,
db_index=True,
)

base_form_class = CoreAdminModelForm
Expand All @@ -43,6 +45,9 @@ class Meta:
'date',
'log_file',
)
indexes = [
models.Index(fields=['date', 'log_file']),
]

@classmethod
def create_or_update(cls, user, log_file, date):
Expand Down
1 change: 0 additions & 1 deletion log_manager/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import os

from django.conf import settings
from django.core.serializers.json import DjangoJSONEncoder
from django.core.mail import send_mail
from django.contrib.auth import get_user_model
from django.utils.translation import gettext as _
Expand Down
23 changes: 23 additions & 0 deletions metrics/migrations/0007_alter_usersession_datetime_and_more.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 5.0.7 on 2025-06-12 17:16

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("metrics", "0006_alter_itemaccess_content_type"),
]

operations = [
migrations.AlterField(
model_name="usersession",
name="datetime",
field=models.DateTimeField(db_index=True, verbose_name="Datetime"),
),
migrations.AddIndex(
model_name="itemaccess",
index=models.Index(
fields=["item", "user_session"], name="metrics_ite_item_id_8799c9_idx"
),
),
]
4 changes: 4 additions & 0 deletions metrics/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class UserSession(models.Model):
verbose_name=_("Datetime"),
null=False,
blank=False,
db_index=True,
)

user_agent = models.ForeignKey(
Expand Down Expand Up @@ -208,3 +209,6 @@ class Meta:
'media_language',
'content_type',
)
indexes = [
models.Index(fields=['item', 'user_session']),
]
Loading