Adiciona trigger para atualizar os dados de coleção no opac_5 #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

samuelveigarangel wants to merge 38 commits into scieloorg:main from samuelveigarangel:issue-opac-339

.envs/.local/.django

-Original file line number
+Diff line change
@@ Expand Up @@
     FETCH_DATA_TIMEOUT=2
     DJANGO_PROFILING_ENABLED=True
-    RUN_ASYNC=False
+    RUN_ASYNC=False
+    # ENDPOINT PARA ATUALIZAÇÃO DE COLEÇÕES
+    # ------------------------------------------------------------------------------
+    ENDPOINT_COLLECTION="/api/v1/update_collection/"

.envs/.local/.jwt

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    JWT_ISS="https://api.seu-django.com"
+    JWT_AUD="seu-flask-servico"
+    JWT_EXP_SECONDS=600
+    JWT_ALG="RS256"
+    # JWT_PRIVATE_KEY JA CORRESPONDENTE AO jwt_public OPAC_5 PARA TESTES.
+    JWT_PRIVATE_KEY_PATH=

collection/api/v1/serializers.py

-Original file line number
+Diff line change
@@ -1,8 +1,12 @@
     from rest_framework import serializers
+    from wagtail.models.sites import Site
     from collection import models
     from core.api.v1.serializers import LanguageSerializer
+    from core.utils.utils import get_url_file_from_wagtail_images
     from organization.api.v1.serializers import OrganizationSerializer
     class CollectionNameSerializer(serializers.ModelSerializer):
         """Serializer para nomes traduzidos da coleção"""
         language = LanguageSerializer(many=False, read_only=True)
@@ Expand All / @@ -14,6 +18,32 @@ class Meta: @@
                 "language",
             ]
+    class CollectionLogoListSerializer(serializers.ListSerializer):
+        """
+        Agrupa os logos por 'purpose' e consolida por idioma,
+        eliminando duplicatas por (purpose, lang_code2).
+        """
+        def to_representation(self, data):
+            items = super().to_representation(data)
+            grouped = {}
+            seen = set()
+            for item in items:
+                purpose = item.get("purpose")
+                url = item.get("logo_url")
+                lang = item.get("language", {})
+                code2 = lang.get("code2")
+                if not purpose or not code2 or not url:
+                    continue
+                key = (purpose, code2)
+                if key in seen:
+                    continue
+                seen.add(key)
+                grouped.setdefault(purpose, {}).update({code2: url})
+            return grouped
     class CollectionLogoSerializer(serializers.ModelSerializer):
         """Serializer para logos da coleção"""
@@ Expand All @@
         class Meta:
             model = models.CollectionLogo
+            list_serializer_class = CollectionLogoListSerializer
             fields = [
-                "logo",
                 "logo_url",
-                "size",
+                "purpose",
                 "language",
             ]
         def get_logo_url(self, obj):
-            """Retorna a URL do logo renderizado no tamanho apropriado"""
             if obj.logo:
-                # Ajusta o rendition baseado no tamanho
-                rendition_specs = {
-                    'small': 'fill-100x100',
-                    'medium': 'fill-200x200',
-                    'large': 'fill-400x400',
-                    'banner': 'width-1200',
-                    'thumbnail': 'fill-150x150',
-                    'header': 'height-80',
-                    'footer': 'height-60',
-                }
-                spec = rendition_specs.get(obj.size, 'fill-200x200')
-                rendition = obj.logo.get_rendition(spec)
-                # Retorna URL completa se houver request no contexto
-                request = self.context.get('request')
-                if request:
-                    return request.build_absolute_uri(rendition.url)
-                return rendition.url
+                return get_url_file_from_wagtail_images(obj.logo)
             return None
     class SupportingOrganizationSerializer(serializers.ModelSerializer):
         """Serializer para organizações de suporte"""
         organization = OrganizationSerializer(read_only=True, many=False)
@@ Expand Down Expand Up / @@ -93,7 +104,6 @@ class Meta: @@
     class CollectionSerializer(serializers.ModelSerializer):
         """Serializer principal para Collection com todos os relacionamentos"""
-        # Campos relacionados (read-only por padrão)
         collection_names = CollectionNameSerializer(source='collection_name', many=True, read_only=True)
         logos = CollectionLogoSerializer(many=True, read_only=True)
         supporting_organizations = SupportingOrganizationSerializer(source='supporting_organization', many=True, read_only=True)
@@ Expand Down @@

collection/apps.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,6 @@ @@
     class CollectionConfig(AppConfig):
         default_auto_field = "django.db.models.BigAutoField"
         name = "collection"
+        def ready(self):
+            from . import signals

collection/choices.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,15 @@ @@
         ("books", _("Books")),
         ("data", _("Data repository")),
     ]
+    LOGO_PURPOSE = [
+        ("homepage", _("Homepage")),
+        ("header", _("Header")),
+        ("logo_drop_menu", _("Logo drop menu")),
+        ("footer", _("Footer")),
+        ("menu", _("Menu")),
+    ]
     PLATFORM_STATUS = [
         ("classic", _("Classic")),
         ("new", _("New")),
@@ Expand Down @@

collection/migrations/0007_alter_collectionexecutingorganization_options_and_more.py

-Original file line number
+Diff line change
@@ -0,0 +1,65 @@
+    # Generated by Django 5.2.3 on 2025-09-25 17:30
+    from django.db import migrations, models
+    class Migration(migrations.Migration):
+        dependencies = [
+            (
+                "collection",
+                "0006_alter_collection_options_alter_collection_acron2_and_more",
+            ),
+            ("core", "0007_alter_language_options_alter_license_options_and_more"),
+        ]
+        operations = [
+            migrations.AlterModelOptions(
+                name="collectionexecutingorganization",
+                options={
+                    "ordering": ["sort_order"],
+                    "verbose_name": "Executing Organization",
+                    "verbose_name_plural": "Executing Organizations",
+                },
+            ),
+            migrations.AlterModelOptions(
+                name="collectionlogo",
+                options={
+                    "ordering": ["sort_order", "language"],
+                    "verbose_name": "Collection Logo",
+                    "verbose_name_plural": "Collection Logos",
+                },
+            ),
+            migrations.AlterModelOptions(
+                name="collectionsupportingorganization",
+                options={
+                    "ordering": ["sort_order"],
+                    "verbose_name": "Supporting Organization",
+                    "verbose_name_plural": "Supporting Organizations",
+                },
+            ),
+            migrations.AlterUniqueTogether(
+                name="collectionlogo",
+                unique_together={("collection", "language", "purpose")},
+            ),
+            migrations.AddField(
+                model_name="collectionlogo",
+                name="purpose",
+                field=models.CharField(
+                    blank=True,
+                    choices=[
+                        ("homepage", "Homepage"),
+                        ("header", "Header"),
+                        ("logo_drop_menu", "Logo drop menu"),
+                        ("footer", "Footer"),
+                        ("menu", "Menu"),
+                    ],
+                    help_text="Select the purpose of this logo",
+                    max_length=20,
+                ),
+            ),
+            migrations.RemoveField(
+                model_name="collectionlogo",
+                name="size",
+            ),
+        ]

collection/migrations/0008_merge_20251028_0412.py

-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    # Generated by Django 5.2.3 on 2025-10-28 04:12
+    from django.db import migrations
+    class Migration(migrations.Migration):
+        dependencies = [
+            ("collection", "0007_alter_collectionexecutingorganization_options_and_more"),
+            ("collection", "0007_collection_platform_status"),
+        ]
+        operations = []

collection/models.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     from wagtail.admin.panels import FieldPanel, InlinePanel, ObjectList, TabbedInterface
     from wagtail.models import Orderable
     from wagtailautocomplete.edit_handlers import AutocompletePanel
+    from django.core.exceptions import ValidationError
     from core.forms import CoreAdminModelForm
     from core.models import (
@@ Expand Down Expand Up / @@ -321,6 +322,7 @@ def get_acronyms(cls, collection_acron_list): @@
             return queryset.filter(acron3__in=collection_acron_list).values_list("acron3", flat=True)
     class CollectionSocialNetwork(Orderable, SocialNetwork):
         page = ParentalKey(
             Collection,
@@ Expand Down Expand Up @@
         class Meta:
             verbose_name = _("Supporting Organization")
             verbose_name_plural = _("Supporting Organizations")
+            ordering = ['sort_order'] # Ordena os icons no opac_5
         def __str__(self):
             return str(self.organization)
@@ Expand Down Expand Up @@
         class Meta:
             verbose_name = _("Executing Organization")
             verbose_name_plural = _("Executing Organizations")
+            ordering = ['sort_order'] # Ordena os icons no opac_5
         def __str__(self):
             return str(self.organization)
@@ Expand All / @@ -396,14 +400,64 @@ class CollectionLogo(Orderable, BaseLogo): @@
             related_name="logos",
             verbose_name=_("Collection"),
         )
+        purpose = models.CharField(
+            max_length=20,
+            choices=choices.LOGO_PURPOSE,
+            blank=True,
+            help_text=_("Select the purpose of this logo"),
+        )
+        panels = [
+            FieldPanel("logo"),
+            AutocompletePanel("language"),
+            FieldPanel("purpose"),
+        ]
         class Meta:
             verbose_name = _("Collection Logo")
             verbose_name_plural = _("Collection Logos")
-            ordering = ["sort_order", "language", "size"]
+            ordering = ['sort_order', 'language']
             unique_together = [
-                ("collection", "size", "language"),
+                ('collection', 'language', 'purpose'),
-            ('collection', 'language', 'purpose'),
+            ("collection", "language", "purpose"),
             ]
+        def clean(self):
+            validation_logo_dimensions = {
+                'homepage': {
+                    'max_width': 200,
+                    'max_height': 100,
+                },
+                'header': {
+                    'max_width': 200,
+                    'max_height': 100,
+                },
+                'logo_drop_menu': {
+                    'max_width': 200,
+                    'max_height': 100,
+                },
+                'footer': {
+                    'max_width': 200,
+                    'max_height': 100,
+                },
+                'menu': {
+                    'max_width': 200,
+                    'max_height': 100,
+                },
+            }
+            if self.logo:
+                self.validate_image_dimensions(self.logo, validation_logo_dimensions[self.purpose])
+        @staticmethod
+        def validate_image_dimensions(image, validation_logo_dimensions):
+            width = image.width
+            height = image.height
+            max_width = validation_logo_dimensions['max_width']
+            max_height = validation_logo_dimensions['max_height']
+            if width < max_width or height > max_height:
+                raise ValidationError({
+                    'logo': _(f'Image dimensions ({width}x{height}px) exceed the maximum allowed size. '
+                        f' Width must be ≤ {max_width}px and height must be ≤ {max_height}px. '
+                    )
+                })
         def __str__(self):
-            return f"{self.collection} - {self.language} ({self.size})"
+            return f"{self.collection} - {self.language} ({self.purpose})"

collection/signals.py

-Original file line number
+Diff line change
@@ -0,0 +1,21 @@
+    from django.db import transaction
+    from django.db.models.signals import post_save
+    from django.dispatch import receiver
+    from django.conf import settings
+    from .models import Collection
+    from .tasks import build_collection_webhook
+    @receiver(post_save, sender=Collection, dispatch_uid="collection.signals.post_save")
+    def collection_post_save(sender, instance, created, **kwargs):
+        def _on_commit():
+            if settings.ACTIVATE_UPDATE_COLLECTION_WEBHOOK:
+                event = "collection.created" if created else "collection.updated"
+                build_collection_webhook.apply_async(
+                    kwargs=dict(
+                        event=event,
+                        collection_acron=instance.acron3,
+                        # headers=headers,
+                    )
+                )
+        transaction.on_commit(_on_commit)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adiciona trigger para atualizar os dados de coleção no opac_5 #1156

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Copilot AI Oct 7, 2025

Uh oh!

Uh oh!

Uh oh!

Adiciona trigger para atualizar os dados de coleção no opac_5 #1156

Are you sure you want to change the base?

Uh oh!

Adiciona trigger para atualizar os dados de coleção no opac_5 #1156

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Copilot AI Oct 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!