Fix Organization Application State Corruption on Invalid Information Requests (#20302)

Co-authored-by: Jacob Coffee <jacob@z7x.org>

Author: alanbato

tests/unit/organizations/test_services.py

@@ -293,6 +293,9 @@ def test_request_more_information_organization_application_no_message(
 
         assert len(organization_application.observations) == 0
         send_email.assert_not_called()
+        assert (
+            organization_application.status == OrganizationApplicationStatus.Submitted
+        )
 
     def test_add_organization_application_note(self, db_request, organization_service):
         admin = UserFactory(username="admin", is_superuser=True)

warehouse/organizations/services.py

@@ -256,11 +256,11 @@ def request_more_information(self, organization_application_id, request):
         organization_application = self.get_organization_application(
             organization_application_id
         )
-        organization_application.status = (
-            OrganizationApplicationStatus.MoreInformationNeeded
-        )
 
         if message := request.params.get("message", ""):
+            organization_application.status = (
+                OrganizationApplicationStatus.MoreInformationNeeded
+            )
             organization_application.record_observation(
                 request=request,
                 actor=request.user,