Merge branch 'main' into OSDEV-2353-production-location-skeleton-page

Author: VadimKovalenkoSNF

doc/release/RELEASE-NOTES.md

@@ -13,6 +13,15 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 #### Migrations
 * 0199_add_production_location_page_switch.py - Adds `enable_production_location_page` feature flag to redirect FE route of `facilities/:osID` to the `production-locations/:osID`.
+* 0200_introduce_indexing_of_the_creation_date_of_the_claim_request.py - Updated the `index_claim_info` function to include the claim request creation date in the `api_facilityindex.claim_info` column.
+
+### Code/API changes
+* [OSDEV-2355](https://opensupplyhub.atlassian.net/browse/OSDEV-2355) - The following changes have been made:
+    * Updated the GET `api/facilities/` and `api/facilities/{os_id}/` endpoints to include `contributor_type` (the raw type from the database) for both public and anonymous sources. Each contributor entry now also includes a `count` field (1 for public contributors and an aggregated count for anonymous entries of the same type), allowing the front end to display and sum counts by type (e.g., “18 Brands”, “9 Suppliers”).
+    * Additionally, updated GET `api/facilities/{os_id}/` to return the claim request creation date. All of this information is required for the redesigned Production Location page - specifically for the claim banner - as well as for the supply chain network.
+
+### Architecture/Environment changes
+* Increased the CPU and memory allocation for the DedupeHub container to `8 CPU` and `40 GB` in the Terraform deployment configuration to address memory overload issues during production location reindexing for the `Test` environment.
 
 ### What's new
 * [OSDEV-2352](https://opensupplyhub.atlassian.net/browse/OSDEV-2352) - Added feature flag named `enable_production_location_page` to enable production location pages with the new design. When the feature flag is enabled in the Django admin panel:
@@ -21,13 +30,11 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
     * Previously opened facility pages at `/facilities/:osID` will redirect to `/production-locations/:osID` after page refresh.
     * When the feature flag is disabled, accessing `/production-locations/:osID` routes will result in a "Not found" page with no automatic redirection to the legacy `/facilities/:osID` route.
 
-### Architecture/Environment changes
-* Increased the CPU and memory allocation for the DedupeHub container to `8 CPU` and `40 GB` in the Terraform deployment configuration to address memory overload issues during production location reindexing for the `Test` environment.
-
 ### Release instructions
 * Ensure that the following commands are included in the `post_deployment` command:
     * `migrate`
     * `reindex_database`
+    * `reindex_locations_with_approved_claim`
 
 
 ## Release 2.19.0

src/django/api/management/commands/post_deployment.py

@@ -8,6 +8,6 @@ class Command(BaseCommand):
             'post-deployment tasks.')
 
     def handle(self, *args, **options):
-        call_command('delete_emailaddress_for_deleted_users')
         call_command('migrate')
         call_command('reindex_database')
+        call_command('reindex_locations_with_approved_claim')

…dex_locations_with_environmental_data.py …reindex_locations_with_approved_claim.pysrc/django/api/management/commands/reindex_locations_with_environmental_data.py renamed to src/django/api/management/commands/reindex_locations_with_approved_claim.py src/django/api/management/commands/reindex_locations_with_environmental_data.py renamed to src/django/api/management/commands/reindex_locations_with_approved_claim.py

@@ -1,5 +1,4 @@
 from django.core.management.base import BaseCommand
-from django.db.models import Q
 
 from api.constants import FacilityClaimStatuses
 from api.models.facility.facility_claim import FacilityClaim
@@ -8,9 +7,7 @@
 
 class Command(BaseCommand):
     help = (
-        'Reindexes only those locations that have approved claims '
-        'containing environmental data (energy consumption, throughput, '
-        'opening/closing dates).'
+        'Reindexes only those locations that have approved claims.'
     )
 
     def add_arguments(self, parser):
@@ -27,54 +24,28 @@ def handle(self, *args, **options):
         dry_run = options.get('dry_run', False)
 
         self.stdout.write(
-            'Searching for approved claims with environmental data...'
+            'Searching for approved claims...'
         )
 
-        # Query for approved location claims that have at least one
-        # environmental field populated.
-        environmental_fields_filter = (
-            Q(opening_date__isnull=False) |
-            Q(closing_date__isnull=False) |
-            Q(estimated_annual_throughput__isnull=False) |
-            Q(energy_coal__isnull=False) |
-            Q(energy_natural_gas__isnull=False) |
-            Q(energy_diesel__isnull=False) |
-            Q(energy_kerosene__isnull=False) |
-            Q(energy_biomass__isnull=False) |
-            Q(energy_charcoal__isnull=False) |
-            Q(energy_animal_waste__isnull=False) |
-            Q(energy_electricity__isnull=False) |
-            Q(energy_other__isnull=False)
-        )
-
-        approved_claims_with_env_data = (
+        location_ids = list(
             FacilityClaim.objects
             .filter(status=FacilityClaimStatuses.APPROVED)
-            .filter(environmental_fields_filter)
-            .select_related('facility')
-        )
-
-        # Extract location IDs (facility_id field).
-        location_ids = list(
-            approved_claims_with_env_data
-            .order_by('facility_id')
             .values_list('facility_id', flat=True)
             .distinct()
         )
 
         if not location_ids:
             self.stdout.write(
                 self.style.WARNING(
-                    'No locations found with approved claims containing '
-                    'environmental data.'
+                    'No locations found with approved claims.'
                 )
             )
             return
 
         self.stdout.write(
             self.style.SUCCESS(
                 f'Found {len(location_ids)} locations with '
-                'environmental data:'
+                'approved claims.'
             )
         )
 
@@ -98,6 +69,6 @@ def handle(self, *args, **options):
             self.stdout.write(
                 self.style.SUCCESS(
                     f'Successfully reindexed {len(location_ids)} '
-                    'locations with environmental data.'
+                    'locations with approved claims.'
                 )
             )

src/django/api/migrations/0200_introduce_indexing_of_the_creation_date_of_the_claim_request.py

@@ -0,0 +1,38 @@
+# Generated by Django 5.2.10 on 2026-02-18 10:54
+
+from django.db.migrations import Migration, RunPython
+from django.db import connection
+
+
+from api.migrations._migration_helper import MigrationHelper
+
+helper = MigrationHelper(connection)
+
+
+def update_indexing_function(apps, schema_editor):
+    '''
+    This function replaces the old index_claim_info function with a similar
+    one that additionally indexes the creation date of the claim request.
+    '''
+
+    helper.run_sql_files([
+        '0200_index_claim_info.sql'
+    ])
+
+
+def revert_updating_indexing_function(apps, schema_editor):
+    helper.run_sql_files([
+        '0188_index_claim_info.sql'
+    ])
+
+
+class Migration(Migration):
+
+    dependencies = [
+        ('api', '0199_add_production_location_page_switch'),
+    ]
+
+    operations = [
+        RunPython(update_indexing_function,
+                  revert_updating_indexing_function)
+    ]

src/django/api/serializers/facility/facility_index_serializer.py

@@ -334,81 +334,80 @@ def get_contributors(self, facility):
         if is_embed_mode_active(self):
             return []
 
-        request = self._get_request()
-        user = request.user if request is not None else None
-        if user is not None and not user.is_anonymous:
-            user_can_see_detail = user.can_view_full_contrib_details
-        else:
-            user_can_see_detail = True
+        user_can_see_detail = can_user_see_detail(self)
 
-        def format_source(contributor):
-            if type(contributor) is not str:
+        def format_source(source):
+            if source.get('admin_id') is None:
                 return {
-                    'id': contributor['admin_id']
-                    if contributor['admin_id'] else None,
-                    'name': contributor['name'],
-                    'is_verified': contributor['is_verified']
-                    if contributor['is_verified'] else False,
-                    'contributor_name': contributor['contributor_name']
-                    if contributor['contributor_name']
-                    else '[Unknown Contributor]',
-                    'list_name': contributor['list_name']
-                    if contributor['list_name'] else None,
+                    'name': source.get('name'),
+                    'contributor_type': source.get('contributor_type') or None,
+                    'count': source.get('count', 1),
                 }
             return {
-                'name': contributor,
+                'id': source.get('admin_id') or None,
+                'name': source.get('name'),
+                'is_verified': bool(source.get('is_verified')),
+                'contributor_name': source.get('contributor_name')
+                or '[Unknown Contributor]',
+                'contributor_type': source.get('contrib_type') or None,
+                'list_name': source.get('list_name') or None,
+                'count': 1,
             }
 
-        res = [contributor
-               for contributor in facility.contributors
-               if contributor['id'] is not None]
-        res.sort(key=lambda x: (x['id'], x['fl_id'] or 0))
-
-        public_contributors = []
-        anonymous_contributors = []
-        for contributor in res:
-            if ((contributor['should_display_associations'] is True)
-                    and user_can_see_detail):
-                public_contributors.append(contributor)
-            else:
-                anonymous_contributors.append(contributor)
-
-        p_contributors_names = [contributor['name']
-                                for contributor in public_contributors]
-        p_contributors_id = [contributor['id']
-                             for contributor in public_contributors]
-        anonymous_contributors_type = []
-        for anon_contributor in anonymous_contributors:
-            if (anon_contributor['name'] not in p_contributors_names
-                    and anon_contributor['id'] not in p_contributors_id):
-                p_contributors_names.append(anon_contributor['name'])
-                p_contributors_id.append(anon_contributor['id'])
-                anonymous_contributors_type.append(
-                    anon_contributor['contrib_type'])
-
-        from api.models.contributor.contributor import Contributor
-        anonymous_contributors_type = [
-            Contributor.prefix_with_count(name, len(list(x)))
-            for name, x in groupby(sorted(anonymous_contributors_type))
+        valid_contributors = [
+            contributor for contributor in facility.contributors
+            if contributor.get('id') is not None
         ]
+        valid_contributors.sort(
+            key=lambda contributor: (
+                contributor['id'],
+                contributor.get('fl_id') or 0,
+            )
+        )
+
+        seen_public_names = set()
+        distinct_public = []
+        public_names = set()
+        public_ids = set()
+        anonymous_types = []
 
-        distinct_p_contributors_name = []
-        distinct_p_contributors = []
-        for pc in public_contributors:
-            if pc['name'] not in distinct_p_contributors_name:
-                distinct_p_contributors_name.append(pc['name'])
-                distinct_p_contributors.append(pc)
-
-        sources = distinct_p_contributors + anonymous_contributors_type
-        distinct_names = []
-        distinct_sources = []
-        formatted_sources = [
-            format_source(source) for source in sources]
-        for formatted_source in formatted_sources:
-            if formatted_source['name'] not in distinct_names:
-                distinct_names.append(formatted_source['name'])
-                distinct_sources.append(formatted_source)
-        return formatted_sources
+        for contributor in valid_contributors:
+            is_public = (
+                contributor.get('should_display_associations') is True
+                and user_can_see_detail
+            )
+            if is_public:
+                if contributor['name'] not in seen_public_names:
+                    seen_public_names.add(contributor['name'])
+                    distinct_public.append(contributor)
+                public_names.add(contributor['name'])
+                public_ids.add(contributor['id'])
+            else:
+                if (contributor['name'] not in public_names
+                        and contributor['id'] not in public_ids):
+                    public_names.add(contributor['name'])
+                    public_ids.add(contributor['id'])
+                    anonymous_types.append(contributor.get('contrib_type'))
+
+        anonymous_entries = []
+        for contrib_type, group in groupby(sorted(anonymous_types)):
+            group_list = list(group)
+            count = len(group_list)
+            anonymous_entries.append({
+                'name': Contributor.prefix_with_count(contrib_type, count),
+                'contributor_type': contrib_type,
+                'count': count,
+            })
+
+        sources = distinct_public + anonymous_entries
+        seen_names = set()
+        result = []
+        for source in sources:
+            formatted = format_source(source)
+            if formatted['name'] not in seen_names:
+                seen_names.add(formatted['name'])
+                result.append(formatted)
+        return result
 
     def _get_request(self):
         if self.context is None:

src/django/api/tests/test_approved_facility_claim.py

@@ -295,3 +295,14 @@ def test_clears_location(self):
             json.loads(updated_facility_location.geojson),
             json.loads(original_facility_location.geojson),
         )
+
+    @override_switch("claim_a_facility", active=True)
+    def test_claim_request_creation_date_is_returned(self):
+        self.facility_claim.status = FacilityClaimStatuses.APPROVED
+        self.facility_claim.save()
+
+        response = self.client.get(
+            "/api/facilities/{}/".format(self.facility_claim.facility.id)
+        ).json()["properties"]["claim_info"]["created_at"]
+
+        self.assertIsNotNone(response)

src/django/api/tests/test_facility_search_contributor.py

@@ -165,6 +165,8 @@ def test_multiple(self):
         contributors = self.fetch_facility_contributors(self.facility)
         self.assertEqual(1, len(contributors))
         self.assertEqual("2 Others", contributors[0].get("name"))
+        self.assertEqual(contributors[0]["contributor_type"], "Other")
+        self.assertEqual(contributors[0]["count"], 2)
 
     def test_private_user(self):
         self.client.login(
@@ -208,3 +210,19 @@ def get_facility_count():
         self.source.is_active = False
         self.source.save()
         self.assertEqual(0, get_facility_count())
+
+    def test_public_contributor_has_count_and_contributor_type(self):
+        self.contributor.contrib_type = "Brand / Retailer"
+        self.contributor.name = "Public Contributor"
+        self.contributor.save()
+        contributors = self.fetch_facility_contributors(self.facility)
+        self.assertEqual(1, len(contributors))
+        self.assertEqual(
+            contributors[0]["contributor_type"],
+            "Brand / Retailer",
+        )
+        self.assertEqual(
+            contributors[0]["contributor_name"],
+            "Public Contributor",
+        )
+        self.assertEqual(contributors[0]["count"], 1)

src/django/api/views/facility/facilities_view_set.py

@@ -188,7 +188,9 @@ def list(self, request):
                                     "name": "contributor_list_name",
                                     "is_verified": false,
                                     "contributor_name": "contributor_name",
-                                    "list_name": "list_name"
+                                    "list_name": "list_name",
+                                    "contributor_type": "contributor_type",
+                                    "count": 1
                                 }
                             ],
                             "has_approved_claim": false,
@@ -326,7 +328,9 @@ def retrieve(self, request, pk=None):
                         {
                             "id": 1,
                             "name": "Brand A (2019 Q1 List)",
-                            "is_verified": true
+                            "is_verified": true,
+                            "contributor_type": "Brand/Retailer",
+                            "count": 1
                         }
                     ]
                 }