fix: modify date parsing logic #22

brobro10000 · 2025-12-18T20:39:30Z

Description:
This pull request refactors how Unix timestamps are converted to timezone-aware datetime objects across the customer billing app. The main change is the introduction of a new utility function, datetime_from_timestamp, which centralizes and standardizes this conversion. The pull request also updates all relevant usages to use this new function, adds comprehensive unit tests for it, and introduces a new date format constant for consistency in formatting.

Refactoring and Code Consistency:

Introduced datetime_from_timestamp in utils.py to standardize conversion of Unix timestamps to timezone-aware datetimes, replacing scattered implementations throughout the codebase.
Updated all usages in models.py and tasks.py to use the new datetime_from_timestamp function, improving code maintainability and consistency. [1] [2] [3] [4] [5] [6] [7]

Testing:

Added a new test suite in test_utils.py to verify correctness, timezone awareness, and expected behavior of datetime_from_timestamp.

Formatting Improvements:

Added a new date format constant BRAZE_DATE_DD_MM_YYYY in constants.py and updated formatting in tasks.py to use this constant for consistency in date representations. [1] [2] [3]

Code Cleanup:

Removed unused imports and the now-obsolete _datetime_from_timestamp function from models.py. [1] [2]
Jira:
ENT-XXXX

Merge checklist:

./manage.py makemigrations has been run
- Note: This must be run if you modified any models.
  - It may or may not make a migration depending on exactly what you modified, but it should still be run.

Post merge:

Ensure that your changes went out to the stage instance
Deploy to prod instance

Copilot

Pull request overview

This pull request improves date formatting consistency in customer billing email tasks by introducing a shared date format constant and updating datetime handling. While the intent is good, the implementation introduces inconsistencies with established codebase patterns for timezone-aware datetime creation.

Adds BRAZE_DATE_DD_MM_YYYY constant for consistent "DD Month YYYY" date formatting
Updates date formatting in trial end/subscription start and payment receipt emails
Changes datetime parsing from deprecated utcfromtimestamp() to fromtimestamp() with timezone awareness

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File	Description
enterprise_access/apps/customer_billing/constants.py	Adds new `BRAZE_DATE_DD_MM_YYYY` constant for standardized date formatting across email templates
enterprise_access/apps/customer_billing/tasks.py	Updates datetime imports and modifies date parsing in two email tasks to use timezone-aware UTC datetimes and the new format constant

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-12-18T20:42:33Z

enterprise_access/apps/customer_billing/tasks.py

+        start_str = format_datetime_obj(datetime.fromtimestamp(period_start, tz=tz.utc), BRAZE_DATE_DD_MM_YYYY)
+        end_str = format_datetime_obj(datetime.fromtimestamp(period_end, tz=tz.utc), BRAZE_DATE_DD_MM_YYYY)


The timezone handling here is inconsistent with the established pattern in this codebase. Throughout this file (lines 142, 143, 213, 339), the codebase uses timezone.make_aware(datetime.fromtimestamp()) to create timezone-aware datetime objects. The new approach using datetime.fromtimestamp(period_start, tz=tz.utc) is functionally equivalent but breaks this consistent pattern.

Additionally, the import alias timezone as tz for the standard library's timezone conflicts with the existing import of Django's timezone utility on line 11, which is used throughout this file for timezone.make_aware(). This makes the code harder to maintain and understand.

For consistency with the rest of the codebase, consider using the established pattern instead.

enterprise_access/apps/customer_billing/tasks.py

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

enterprise_access/apps/customer_billing/tests/test_utils.py

enterprise_access/apps/customer_billing/utils.py

enterprise_access/apps/customer_billing/tests/test_utils.py

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

enterprise_access/apps/customer_billing/tests/test_utils.py

enterprise_access/apps/customer_billing/constants.py

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

enterprise_access/apps/customer_billing/tasks.py

enterprise_access/apps/customer_billing/constants.py

Copilot

Pull request overview

Copilot reviewed 6 out of 7 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

enterprise_access/apps/customer_billing/utils.py

enterprise_access/apps/customer_billing/tasks.py

enterprise_access/apps/customer_billing/constants.py

enterprise_access/apps/customer_billing/utils.py

enterprise_access/apps/customer_billing/tasks.py

enterprise_access/apps/customer_billing/utils.py

ENT-11296: Change the trial cancellation email to trigger when the user cancels their subscription in Stripe (cancel_at set) rather than when the subscription status changes to canceled at the end of the 14-day trial. This provides immediate feedback to users when they cancel. Adds subscription_cancel_at field to StripeEventSummary model to track scheduled cancellations. Includes duplicate prevention to ensure users only receive one cancellation email. The status change trigger remains as a fallback for edge cases. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 7 out of 8 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

enterprise_access/apps/customer_billing/utils.py

Copilot

Pull request overview

Copilot reviewed 7 out of 8 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

enterprise_access/apps/customer_billing/utils.py

Copilot

Pull request overview

Copilot reviewed 7 out of 8 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

enterprise_access/apps/customer_billing/utils.py

enterprise_access/apps/customer_billing/tests/test_utils.py

enterprise_access/apps/customer_billing/utils.py

Copilot

Pull request overview

Copilot reviewed 7 out of 8 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-07T01:40:40Z

enterprise_access/apps/customer_billing/tests/test_utils.py

+    def test_datetime_from_timestamp_has_expected_components(self):
+        """
+        Validate that datetime_from_timestamp returns the correct *local-date*
+        representation for the given timestamp.
+        """


This test comment mentions "local-date representation" which suggests awareness of the timezone issue. However, testing against the same flawed implementation (computing expected using the same method) means the test validates consistency with the bug rather than correctness. The test should instead use a known timestamp and verify against the expected UTC datetime value, independent of server timezone configuration.

Copilot · 2026-01-07T01:40:40Z

enterprise_access/apps/customer_billing/tests/test_utils.py

+    def test_datetime_from_timestamp_uses_current_timezone(self):
+        """
+        datetime_from_timestamp should attach the current Django timezone
+        (make_aware default behavior).
+        """
+        ts = 1767285545
+
+        dt = datetime_from_timestamp(ts)
+
+        self.assertEqual(dt.tzinfo, pytz.UTC)


This test has a misleading docstring. It states "datetime_from_timestamp should attach the current Django timezone (make_aware default behavior)" but then asserts dt.tzinfo == pytz.UTC. The test name also says "uses_current_timezone" which conflicts with the assertion checking for UTC.

The docstring suggests the function should use Django's current timezone setting, but the implementation explicitly passes timezone=pytz.UTC to make_aware, which overrides the current timezone. The test should clarify that it expects UTC timezone specifically, not the "current" timezone.

brobro10000 requested review from a team as code owners December 18, 2025 20:39

Copilot AI review requested due to automatic review settings December 18, 2025 20:39

Copilot started reviewing on behalf of brobro10000 December 18, 2025 20:40 View session

Copilot AI reviewed Dec 18, 2025

View reviewed changes

brobro10000 added 2 commits December 22, 2025 15:39

fix: modify date parsing logic

d2caed2

chore: lint errors

7727602

Copilot AI review requested due to automatic review settings December 22, 2025 15:40

brobro10000 force-pushed the hu/ent-11212 branch from 7456d74 to 7727602 Compare December 22, 2025 15:40

Copilot started reviewing on behalf of brobro10000 December 22, 2025 15:40 View session

Copilot AI reviewed Dec 22, 2025

View reviewed changes

brobro10000 added 2 commits December 22, 2025 16:05

feat: generalize timestamp conversion to existing implementation

a58ac8f

chore: add tests

bd307b2

Copilot AI review requested due to automatic review settings December 22, 2025 16:53

Copilot started reviewing on behalf of brobro10000 December 22, 2025 16:54 View session

Copilot AI reviewed Dec 22, 2025

View reviewed changes

brobro10000 added 2 commits December 22, 2025 17:20

chore: cleanup tests

53a164c

chore: fix broken test

e6edd61

Copilot AI review requested due to automatic review settings December 22, 2025 17:50

Copilot started reviewing on behalf of brobro10000 December 22, 2025 17:50 View session

Copilot AI reviewed Dec 22, 2025

View reviewed changes

enterprise_access/apps/customer_billing/tests/test_utils.py Show resolved Hide resolved

enterprise_access/apps/customer_billing/tests/test_utils.py Show resolved Hide resolved

pwnage101 reviewed Dec 22, 2025

View reviewed changes

enterprise_access/apps/customer_billing/constants.py Outdated Show resolved Hide resolved

chore: PR feedback

675d216

Copilot AI review requested due to automatic review settings December 23, 2025 16:21

Copilot started reviewing on behalf of brobro10000 December 23, 2025 16:22 View session

Copilot AI reviewed Dec 23, 2025

View reviewed changes

chore: more feedback

2212648

brobro10000 force-pushed the hu/ent-11212 branch from 8206664 to 2212648 Compare December 23, 2025 16:46

brobro10000 requested a review from pwnage101 December 23, 2025 16:48

chore: additional PR feedback

f80eda1

Copilot AI review requested due to automatic review settings January 6, 2026 17:02

Copilot started reviewing on behalf of brobro10000 January 6, 2026 17:02 View session

Copilot AI reviewed Jan 6, 2026

View reviewed changes

iloveagent57 and others added 3 commits January 6, 2026 17:15

chore: quality

af3abcd

Merge branch 'main' into hu/ent-11212

d73bcf9

Copilot AI review requested due to automatic review settings January 6, 2026 17:16

Copilot started reviewing on behalf of brobro10000 January 6, 2026 17:17 View session

Copilot AI reviewed Jan 6, 2026

View reviewed changes

enterprise_access/apps/customer_billing/utils.py Outdated Show resolved Hide resolved

Copilot AI review requested due to automatic review settings January 6, 2026 17:28

brobro10000 force-pushed the hu/ent-11212 branch from 5cda7c5 to aa0635f Compare January 6, 2026 17:28

Copilot started reviewing on behalf of brobro10000 January 6, 2026 17:28 View session

brobro10000 force-pushed the hu/ent-11212 branch from aa0635f to 1e031ce Compare January 6, 2026 17:30

Copilot AI reviewed Jan 6, 2026

View reviewed changes

enterprise_access/apps/customer_billing/utils.py Outdated Show resolved Hide resolved

brobro10000 force-pushed the hu/ent-11212 branch from 1e031ce to d598f2e Compare January 6, 2026 17:39

Copilot AI review requested due to automatic review settings January 6, 2026 17:43

brobro10000 force-pushed the hu/ent-11212 branch from d598f2e to a189654 Compare January 6, 2026 17:43

Copilot started reviewing on behalf of brobro10000 January 6, 2026 17:44 View session

chore: ai feedback

5a76e7b

brobro10000 force-pushed the hu/ent-11212 branch from a189654 to 5a76e7b Compare January 6, 2026 17:44

Copilot AI reviewed Jan 6, 2026

View reviewed changes

enterprise_access/apps/customer_billing/utils.py Show resolved Hide resolved

enterprise_access/apps/customer_billing/tests/test_utils.py Show resolved Hide resolved

pwnage101 approved these changes Jan 6, 2026

View reviewed changes

enterprise_access/apps/customer_billing/utils.py Show resolved Hide resolved

brobro10000 added 2 commits January 7, 2026 01:17

chore: PR feedback

4adabc0

chore: change utility to fromtimestamp

1a305f7

Copilot AI review requested due to automatic review settings January 7, 2026 01:36

Copilot started reviewing on behalf of brobro10000 January 7, 2026 01:36 View session

Copilot AI reviewed Jan 7, 2026

View reviewed changes

brobro10000 merged commit 3b113cb into main Jan 7, 2026
9 checks passed

brobro10000 deleted the hu/ent-11212 branch January 7, 2026 01:49

		start_str = format_datetime_obj(datetime.fromtimestamp(period_start, tz=tz.utc), BRAZE_DATE_DD_MM_YYYY)
		end_str = format_datetime_obj(datetime.fromtimestamp(period_end, tz=tz.utc), BRAZE_DATE_DD_MM_YYYY)

fix: modify date parsing logic #22

fix: modify date parsing logic #22

Uh oh!

Conversation

brobro10000 commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 7, 2026

Choose a reason for hiding this comment

brobro10000 commented Dec 18, 2025 •

edited

Loading