Skip to content

Refactor date-timezone conversion to fix DB incompatibilities with Log utility #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chasegiunta wants to merge 1 commit into
base: v2-dev
Choose a base branch
from
+8 −5
Open

Refactor date-timezone conversion to fix DB incompatibilities with Log utility #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/utilities/NotificationLog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use craft\base\Utility;
use craft\helpers\DateTimeHelper;
use DateTime;
use DateTimeZone;
use doublesecretagency\notifier\records\Log;
use Exception;

Expand Down Expand Up @@ -131,15 +132,17 @@ private static function _getLogs(string $date): array
$dayLog = [];

// Get system timezone
$timeZone = Craft::$app->timeZone;
$systemTimeZone = new DateTimeZone(Craft::$app->timeZone);
$dateObj = new DateTime($date, $systemTimeZone);

// Convert dateCreated to the system timezone
$dateCreated = "DATE(CONVERT_TZ(dateCreated, 'UTC', '{$timeZone}'))";
// Start and end of the day in system timezone
$startOfDay = (clone $dateObj)->setTime(0, 0, 0)->format('Y-m-d H:i:s');
$endOfDay = (clone $dateObj)->setTime(23, 59, 59)->format('Y-m-d H:i:s');

// Get all envelopes on selected day
$envelopes = Log::find()
->where([$dateCreated => $date])
->andWhere(['type' => 'envelope'])
->where(['type' => 'envelope'])
->andWhere(['between', 'dateCreated', $startOfDay, $endOfDay])
->orderBy('id')
->all();

Expand Down