diff --git a/apps/reports/services/report_builder.py b/apps/reports/services/report_builder.py index 3815b84..c7eed13 100644 --- a/apps/reports/services/report_builder.py +++ b/apps/reports/services/report_builder.py @@ -4,23 +4,23 @@ TICKET_STATE_LABELS = { } USERS_COLUMNS = [ - {"key": "user_uuid", "label": "User UUID"}, - {"key": "username", "label": "Username"}, - {"key": "first_name", "label": "First Name"}, - {"key": "last_name", "label": "Last Name"}, - {"key": "email", "label": "Email"}, - {"key": "phone_number", "label": "Phone Number"}, - {"key": "address", "label": "Address"}, + {"key": "user_uuid", "label": "accounts_uuid"}, + {"key": "username", "label": "accounts_username"}, + {"key": "first_name", "label": "accounts_first_name"}, + {"key": "last_name", "label": "accounts_last_name"}, + {"key": "email", "label": "accounts_email"}, + {"key": "phone_number", "label": "accounts_phone_number"}, + {"key": "address", "label": "accounts_address"}, ] TICKETS_COLUMNS = [ - {"key": "ticket_uuid", "label": "Ticket UUID"}, - {"key": "user_uuid", "label": "User UUID"}, - {"key": "title", "label": "Title"}, - {"key": "description", "label": "Description"}, - {"key": "state", "label": "State"}, - {"key": "created_at", "label": "Created At"}, - {"key": "updated_at", "label": "Updated At"}, + {"key": "ticket_uuid", "label": "advertising_uuid"}, + {"key": "user_uuid", "label": "advertising_user"}, + {"key": "title", "label": "advertising_title"}, + {"key": "description", "label": "advertising_description"}, + {"key": "state", "label": "advertising_state"}, + {"key": "created_at", "label": "advertising_created_at"}, + {"key": "updated_at", "label": "advertising_updated_at"}, ] diff --git a/apps/reports/tests.py b/apps/reports/tests.py index 0828d70..1411dbd 100644 --- a/apps/reports/tests.py +++ b/apps/reports/tests.py @@ -67,13 +67,13 @@ class GenerateReportTests(APITestCase): self.assertEqual( [cell.value for cell in users_sheet[2]], [ - "User UUID", - "Username", - "First Name", - "Last Name", - "Email", - "Phone Number", - "Address", + "accounts_uuid", + "accounts_username", + "accounts_first_name", + "accounts_last_name", + "accounts_email", + "accounts_phone_number", + "accounts_address", ], ) self.assertEqual( @@ -97,13 +97,13 @@ class GenerateReportTests(APITestCase): self.assertEqual( [cell.value for cell in tickets_sheet[2]], [ - "Ticket UUID", - "User UUID", - "Title", - "Description", - "State", - "Created At", - "Updated At", + "advertising_uuid", + "advertising_user", + "advertising_title", + "advertising_description", + "advertising_state", + "advertising_created_at", + "advertising_updated_at", ], ) self.assertEqual(