Merge branch 'clewellyn-nava/BB2-4266/C4DIC-endpoint' of https://github.com/CMSgov/bluebutton-web-server into clewellyn-nava/BB2-4266/C4DIC-endpoint

Author: jadudm

apps/accounts/tests/test_login.py

@@ -78,6 +78,7 @@ def test_invalid_login(self):
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, 'Login')
 
+    @override_switch('logout', active=True)
     @override_switch('show_testclient_link', active=True)
     @override_switch('login', active=True)
     def test_logout(self):
@@ -88,6 +89,15 @@ def test_logout(self):
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, 'Login')
 
+    @override_switch('logout', active=False)
+    @override_switch('login', active=True)
+    def test_logout_switch_off(self):
+        """
+        Logout endpoint disabled when logout switch is off
+        """
+        response = self.client.get(reverse('logout'), follow=True)
+        self.assertEqual(response.status_code, 404)
+
     @override_switch('show_testclient_link', active=True)
     @override_switch('login', active=True)
     def test_valid_login_email(self):

apps/accounts/urls.py

@@ -15,7 +15,7 @@
 
 urlpatterns = [
     path("api/profile", my_profile, name="my_profile"),
-    path("logout", waffle_switch("login")(LogoutView.as_view()), name="logout"),
+    path("logout", waffle_switch("logout")(LogoutView.as_view()), name="logout"),
     path(
         "create",
         waffle_switch("signup")(create_account),

apps/accounts/v2/urls.py

@@ -15,7 +15,7 @@
 
 urlpatterns = [
     path("api/profile", my_profile, name="my_profile_v2"),
-    path("logout", waffle_switch("login")(LogoutView.as_view()), name="logout_v2"),
+    path("logout", waffle_switch("logout")(LogoutView.as_view()), name="logout_v2"),
     path(
         "create",
         waffle_switch("signup")(create_account),

apps/core/management/commands/create_test_feature_switches.py

@@ -9,6 +9,7 @@
     ("enable_testclient", True, "This enables the test client."),
     ("expire_grant_endpoint", True, "This enables the /v<1/2>/o/expire_authenticated_user/<patient_id>/ endpoint."),
     ("login", True, "This enables login related URLs and code. See apps/accounts/urls.py file for more info."),
+    ("logout", True, "This enables logout related URLs and code. See apps/accounts/urls.py file for more info."),
     ("outreach_email", True, "This enables developer outreach emails. Not active in prod."),
     ("require_pkce", True, "This enforces the presence of the PKCE parameters code_challenge and code_challenge_method when authorizing"),
     ("require_state", True, "This enforces the presence of the state parameter when authorizing"),

apps/fhir/bluebutton/management/commands/migrate_fhir_id_to_v2.py

@@ -18,13 +18,13 @@ def migrate_fhir_id_to_v2(apps=None, schema_editor=None) -> None:
 
     apps_mod = apps if apps is not None else global_apps
     Crosswalk = apps_mod.get_model('bluebutton', 'Crosswalk')
-    for crosswalk in Crosswalk.objects.all():
+    for crosswalk in Crosswalk.objects.iterator(chunk_size=1000):
         if getattr(crosswalk, '_fhir_id', None):
             crosswalk.fhir_id_v2 = getattr(crosswalk, '_fhir_id') # type: ignore[attr-defined]
             crosswalk.save()
 
     ArchivedCrosswalk = apps_mod.get_model('bluebutton', 'ArchivedCrosswalk')
-    for archived in ArchivedCrosswalk.objects.all():
+    for archived in ArchivedCrosswalk.objects.iterator(chunk_size=1000):
         if getattr(archived, '_fhir_id', None):
             archived.fhir_id_v2 = getattr(archived, '_fhir_id') # type: ignore[attr-defined]
             archived.save()
@@ -35,13 +35,13 @@ def reverse_migrate_v2_to_fhir_id(apps=None, schema_editor=None) -> None:
 
     apps_mod = apps if apps is not None else global_apps
     Crosswalk = apps_mod.get_model('bluebutton', 'Crosswalk')
-    for crosswalk in Crosswalk.objects.all():
+    for crosswalk in Crosswalk.objects.iterator(chunk_size=1000):
         if getattr(crosswalk, 'fhir_id_v2', None):
             crosswalk._fhir_id = getattr(crosswalk, 'fhir_id_v2') # type: ignore[attr-defined]
             crosswalk.save()
 
     ArchivedCrosswalk = apps_mod.get_model('bluebutton', 'ArchivedCrosswalk')
-    for archived in ArchivedCrosswalk.objects.all():
+    for archived in ArchivedCrosswalk.objects.iterator(chunk_size=1000):
         if getattr(archived, 'fhir_id_v2', None):
             archived._fhir_id = getattr(archived, 'fhir_id_v2') # type: ignore[attr-defined]
             archived.save()

apps/fhir/bluebutton/migrations/0009_migrate_fhir_id_to_v2.py

@@ -1,10 +1,6 @@
 # Generated by Django 4.2.24 on 2025-09-23 13:25
 
 from django.db import migrations, models
-from apps.fhir.bluebutton.management.commands.migrate_fhir_id_to_v2 import (
-    migrate_fhir_id_to_v2,
-    reverse_migrate_v2_to_fhir_id,
-)
 
 # TODO - Migration is Unapplied
 # This migration needs to be run after deployment of bluebutton 0008 and when all
@@ -18,8 +14,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(migrate_fhir_id_to_v2, reverse_migrate_v2_to_fhir_id),
-        migrations.AddConstraint(  # After migration happens, add constraint that a fhir_id must be present
+        migrations.AddConstraint(  # After migrate_fhir_id_to_v2 is run, add constraint that a fhir_id_v2 or v3 must be present
             model_name='crosswalk',
             constraint=models.CheckConstraint(
                 check=models.Q(fhir_id_v2__isnull=False) | models.Q(fhir_id_v3__isnull=False),