AAP-31326: Add OrgName to the Marketing report

ansible · Sep 16, 2024 · 6495e36 · 6495e36
1 parent 6b667d1
commit 6495e36
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/ansible_ai_connect/users/management/commands/tests/test_generate_users_trials_reports.py b/ansible_ai_connect/users/management/commands/tests/test_generate_users_trials_reports.py
@@ -88,7 +88,7 @@ def test_dry_run(self):
         with self.assertLogs(logger="root", level="INFO") as log:
             out = TestGenerateUsersTrialsReports.call_command("--dry-run")
             self.assertInLog("First name,Last name,Organization name,Plan name,Trial started", log)
-            self.assertInLog("First name,Last name,Email,Plan name,Trial started", log)
+            self.assertInLog("First name,Last name,Email,Organization name,Plan name,Trial started", log)
             self.assertIn("Reports not sent", out)
 
     def test_auto_date_range(self):

diff --git a/ansible_ai_connect/users/reports/generators.py b/ansible_ai_connect/users/reports/generators.py
@@ -125,6 +125,7 @@ def generate(
                 "First name",
                 "Last name",
                 "Email",
+                "Organization name",
                 "Plan name",
                 "Trial started",
                 "Trial expired_at",
@@ -140,6 +141,7 @@ def generate(
                         user["given_name"],
                         user["family_name"],
                         user["email"],
+                        organization["name"],
                         plan["plan"]["name"],
                         plan["created_at"],
                         plan["expired_at"],

diff --git a/ansible_ai_connect/users/reports/tests/test_generators.py b/ansible_ai_connect/users/reports/tests/test_generators.py
@@ -209,7 +209,10 @@ def tearDown(self):
         super().cleanup()
 
     def get_report_header(self) -> str:
-        return "OrgId,UUID,First name,Last name,Email,Plan name,Trial started,Trial expired_at"
+        return (
+            "OrgId,UUID,First name,Last name,Email,Organization name,"
+            "Plan name,Trial started,Trial expired_at"
+        )
 
     def get_report_generator(self) -> BaseGenerator:
         return UserMarketingReportGenerator()