Remodela institutições (versão 3) - wip #1263

Copilot · 2026-01-31T23:59:28Z

The comment on line 112 says "FIXME - deprecated - usar CollectionOrganizationSerializer" but it's placed above the supporting_organizations and executing_organizations fields which are actually deprecated. Line 116 then says the same thing above the organizations field, which is the NEW field. The comment on line 112 should be moved to line 116, or line 112's comment should say these fields are deprecated, not that CollectionOrganizationSerializer is deprecated.

Suggested change

# FIXME - deprecated - usar CollectionOrganizationSerializer

supporting_organizations = SupportingOrganizationSerializer(source='supporting_organization', many=True, read_only=True)

executing_organizations = ExecutingOrganizationSerializer(source='executing_organization', many=True, read_only=True)

# FIXME - deprecated - usar CollectionOrganizationSerializer

# FIXME - deprecated fields - usar organizations/CollectionOrganizationSerializer

supporting_organizations = SupportingOrganizationSerializer(source='supporting_organization', many=True, read_only=True)

executing_organizations = ExecutingOrganizationSerializer(source='executing_organization', many=True, read_only=True)

# Organizações relacionadas à coleção (campo recomendado)

Copilot · 2026-01-31T20:54:16Z

The unique_together constraint at line 342 includes both initial_date and final_date which are defined as CharField in BaseDateRange. Since these are string fields, the constraint might not work correctly for date comparisons (e.g., "2023-01-01" vs "2023-1-1" would be considered different). Consider using DateField or ensuring consistent date formatting.

Copilot · 2026-01-31T20:54:16Z

The BaseDateRange model uses CharField for date fields (initial_date and final_date) at lines 646-647. This is inconsistent with the BaseHistory model which uses proper DateField. Using CharField for dates makes validation, querying, and date arithmetic difficult. Consider using DateField instead, or document why string storage is required.

Copilot · 2026-02-01T14:26:26Z

There's a systemic naming inconsistency throughout the codebase. BaseDateRange defines initial_date and final_date fields, but all the journal organization methods use start_date and end_date parameters. This will cause multiple failures:

JournalOrganization.add_organization tries to set start_date/end_date which don't exist

API serializer tries to access end_date in is_current method

Migration creates fields as initial_date/final_date but code references start_date/end_date

This needs to be fixed consistently across all files. Recommended approach: Either rename BaseDateRange fields to start_date/end_date (preferred for modern naming), OR change all method parameters and API references to use initial_date/final_date to match the model.

Copilot · 2026-01-31T23:59:30Z

The has_only_alpha_or_space() function on line 31 returns False for text containing numbers, but the function name suggests it should return True if the text has "only alpha or space". The name is misleading - it should be named something like is_alphabetic_text() or has_no_numbers() to better reflect its behavior.

Copilot · 2026-01-31T23:59:26Z

The function clean_xml_tag_content() uses assert_string parameter with a default of True, which causes it to return None when the text contains numbers (line 52). This behavior could lead to silent data loss when processing organization names that legitimately contain numbers (e.g., "Lab 3", "Building 42"). Consider whether this validation is appropriate for all use cases, or if it should be optional/configurable.

Suggested change

if has_only_alpha_or_space(text_):

return text_

else:

return None

if not has_only_alpha_or_space(text_):

logging.warning(

"clean_xml_tag_content: text failed alpha/space assertion; preserving value: %r",

text_,

)

Copilot · 2026-01-31T20:54:17Z

The clean_xml_tag_content function has a logic issue. When assert_string=True, it returns None if the text contains any non-alphabetic characters (line 39). This means valid organization names with numbers, spaces, or special characters (e.g., "USP 2023", "Fiocruz-RJ") will be discarded. Consider removing the isalpha() check or making it more lenient to allow alphanumeric text with common punctuation.

Copilot · 2026-02-01T14:26:26Z

The clean_xml_tag_content function has an assert_string parameter that when True will return None if the text contains numbers. This behavior could silently discard valid organization names that contain numbers (e.g., "Lab 21", "Unit 3", "Building 5A"). Consider if this validation is too strict for organization names, or document why numeric content should be rejected.

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,11 @@ @@
         ("classic", _("Classic")),
         ("new", _("New")),
         ("migrating", _("Migrating")),
+    ]
+    COLLECTION_ORGANIZATION_ROLES = [
+        ("sponsor", _("Sponsor")),
+        ("funder", _("Funder")),
+        ("partner", _("Partner")),
+        ("coordination", _("Coordination")),
     ]

-Original file line number
+Diff line change
@@ -0,0 +1,94 @@
+    # Generated by Django 5.2.7 on 2026-01-31 21:41
+    import django.db.models.deletion
+    import modelcluster.fields
+    from django.db import migrations, models
+    class Migration(migrations.Migration):
+        dependencies = [
+            ("collection", "0007_collection_platform_status"),
+            ("organization", "0011_organizationallevel_raworganization_and_more"),
+        ]
+        operations = [
+            migrations.CreateModel(
+                name="CollectionOrganization",
+                fields=[
+                    (
+                        "id",
+                        models.BigAutoField(
+                            auto_created=True,
+                            primary_key=True,
+                            serialize=False,
+                            verbose_name="ID",
+                        ),
+                    ),
+                    (
+                        "sort_order",
+                        models.IntegerField(blank=True, editable=False, null=True),
+                    ),
+                    (
+                        "initial_date",
+                        models.CharField(
+                            blank=True,
+                            max_length=10,
+                            null=True,
+                            verbose_name="Initial Date",
+                        ),
+                    ),
+                    (
+                        "final_date",
+                        models.CharField(
+                            blank=True, max_length=10, null=True, verbose_name="Final Date"
+                        ),
+                    ),
+                    (
+                        "role",
+                        models.CharField(
+                            choices=[
+                                ("coordinator", "Coordinator"),
+                                ("owner", "Owner"),
+                                ("publisher", "Publisher"),
+                                ("sponsor", "Sponsor"),
+                                ("copyright_holder", "Copyright Holder"),
+                                ("partner", "Partner"),
+                                ("funder", "Funder"),
+                                ("host", "Host"),
+                                ("provider", "Provider"),
+                                ("company", "Company"),
+                            ],
+                            max_length=50,
+                            verbose_name="Role",
+                        ),
+                    ),
+                    (
+                        "collection",
+                        modelcluster.fields.ParentalKey(
+                            null=True,
+                            on_delete=django.db.models.deletion.SET_NULL,
+                            related_name="organizations",
+                            to="collection.collection",
+                        ),
+                    ),
+                    (
+                        "organization",
+                        models.ForeignKey(
+                            blank=True,
+                            help_text="Select the standardized organization data",
+                            null=True,
+                            on_delete=django.db.models.deletion.SET_NULL,
+                            to="organization.organization",
+                        ),
+                    ),
+                ],
+                options={
+                    "verbose_name": "Collection Organization",
+                    "verbose_name_plural": "Collection Organizations",
+                    "unique_together": {
+                        ("collection", "organization", "role", "initial_date", "final_date")
+                    },
+                },
+            ),
+        ]

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
         TextWithLang,
     )
     from core.utils.utils import fetch_data
-    from organization.models import HELP_TEXT_ORGANIZATION, Organization
+    from organization.models import HELP_TEXT_ORGANIZATION, Organization, BaseOrganizationRole
     from . import choices
@@ Expand Down Expand Up / @@ -116,11 +116,9 @@ def autocomplete_label(self): @@
         logo_panels = [
             InlinePanel("logos", label=_("Logos"), min_num=0),
         ]
-        supporting_organization_panels = [
-            InlinePanel("supporting_organization", label=_("Supporting Organization")),
-        ]
-        executing_organization_panels = [
-            InlinePanel("executing_organization", label=_("Executing Organization")),
+        organization_panels = [
+            InlinePanel("organizations", label=_("Organizations")),
         ]
         social_network_panels = [
@@ Expand All / @@ -136,10 +134,7 @@ def autocomplete_label(self): @@
                 ),
                 ObjectList(logo_panels, heading=_("Logos")),
                 ObjectList(
-                    supporting_organization_panels, heading=_("Supporting Organizations")
-                ),
-                ObjectList(
-                    executing_organization_panels, heading=_("Executing Organization")
+                    organization_panels, heading=_("Organizations")
                 ),
                 ObjectList(social_network_panels, heading=_("Social networks")),
             ]
@@ Expand Down Expand Up / @@ -330,6 +325,24 @@ class CollectionSocialNetwork(Orderable, SocialNetwork): @@
         )
+    class CollectionOrganization(BaseOrganizationRole, Orderable):
+        # substitui CollectionSupportingOrganization e CollectionExecutingOrganization
+        collection = ParentalKey(
+            Collection,
+            on_delete=models.SET_NULL,
+            null=True,
+            related_name="organizations",
+        )
+        panels = BaseOrganizationRole.panels
+        class Meta:
+            verbose_name = _("Collection Organization")
+            verbose_name_plural = _("Collection Organizations")
+            unique_together = [
+                ("collection", "organization", "role", "initial_date", "final_date"),
+            ]
     class CollectionSupportingOrganization(Orderable, ClusterableModel, BaseHistory):
         collection = ParentalKey(
             Collection,
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -629,6 +629,41 @@ class BaseHistory(models.Model): @@
         class Meta:
             abstract = True
+        @property
+        def initial_date_isoformat(self):
+            if self.initial_date:
+                return self.initial_date.isoformat()
+            return None
+        @property
+        def final_date_isoformat(self):
+            if self.final_date:
+                return self.final_date.isoformat()
+            return None
+    class BaseDateRange(models.Model):
+        initial_date = models.CharField(_("Initial Date"), max_length=10, null=True, blank=True)
+        final_date = models.CharField(_("Final Date"), max_length=10, null=True, blank=True)
+        panels = [
+            FieldPanel("initial_date"),
+            FieldPanel("final_date"),
+        ]
+        class Meta:
+            abstract = True
+        @property
+        def range(self):
+            if self.initial_date and self.final_date:
+                return f"{self.initial_date} - {self.final_date}"
+            elif self.initial_date:
+                return f"from {self.initial_date}"
+            elif self.final_date:
+                return f"until {self.final_date}"
+            return None
     class BaseLogo(models.Model):
         """
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remodela institutições (versão 3) - wip #1263

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Copilot AI Jan 31, 2026

Uh oh!

Copilot AI Jan 31, 2026

Uh oh!

Copilot AI Jan 31, 2026

Uh oh!

Copilot AI Feb 1, 2026

Uh oh!

Copilot AI Jan 31, 2026

Uh oh!

Copilot AI Jan 31, 2026

Uh oh!

Copilot AI Jan 31, 2026

Uh oh!

Copilot AI Feb 1, 2026

Uh oh!

Uh oh!

Uh oh!

Remodela institutições (versão 3) - wip #1263

Are you sure you want to change the base?

Uh oh!

Remodela institutições (versão 3) - wip #1263

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Copilot AI Jan 31, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 31, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 31, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 31, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 31, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 31, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 1, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!