Projects/nettsiden
8
3
Fork 0
Code Issues 28 Pull Requests Activity

Wrap door status entries in dataclass

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2026-01-13 13:39:12 +09:00
parent 9e2fab0ea2
commit 2e7acb7a9a
4 changed files with 89 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/pvv/side/door.php
View File

@@ -6,6 +6,28 @@ namespace pvv\side;
use DateTimeImmutable;
class DoorStatus {
private DateTimeImmutable $time;
private bool $open;
public function __construct(DateTimeImmutable $time, bool $open) {
$this->time = $time;
$this->open = $open;
}
public function getTime(): DateTimeImmutable {
return $this->time;
}
public function getTimeStamp(): int {
return $this->time->getTimestamp();
}
public function isOpen(): bool {
return $this->open;
}
}
class Door {
private $pdo;
@@ -16,7 +38,7 @@ class Door {
}
/**
* @return array{time: DateTimeImmutable, open: bool}[]
* @return DoorStatus[]
*/
public function getAll(): array {
$query = '
@@ -29,19 +51,21 @@ class Door {
$statement = $this->pdo->prepare($query);
$statement->execute();
$doorEvents = [];
foreach ($statement->fetchAll() as $row) {
$doorEvents[] = [
'time' => (new DateTimeImmutable)->setTimestamp((int) $row['time']),
'open' => (bool) $row['open'],
];
}
$result = array_map(
function ($row) {
return new DoorStatus(
(new DateTimeImmutable)->setTimestamp((int) $row['time']),
(bool) $row['open'],
);
},
$statement->fetchAll(),
);
return $doorEvents;
return $result;
}
/**
* @return array{time: DateTimeImmutable, open: bool}[]
* @return DoorStatus[]
*/
public function getEntriesAfter(\DateTimeImmutable $startTime): array {
$timestamp = $startTime->getTimestamp();
@@ -58,21 +82,20 @@ class Door {
$statement->bindParam(':startTime', $timestamp, \PDO::PARAM_INT);
$statement->execute();
$doorEvents = [];
foreach ($statement->fetchAll() as $row) {
$doorEvents[] = [
'time' => (new DateTimeImmutable)->setTimestamp((int) $row['time']),
'open' => (bool) $row['open'],
];
}
$result = array_map(
function ($row) {
return new DoorStatus(
(new DateTimeImmutable)->setTimestamp((int) $row['time']),
(bool) $row['open'],
);
},
$statement->fetchAll(),
);
return $doorEvents;
return $result;
}
/**
* @return ?array{time: DateTimeImmutable, open: bool}
*/
public function getCurrent(): ?array {
public function getCurrent(): ?DoorStatus {
$query = '
SELECT
time,
@@ -89,10 +112,12 @@ class Door {
return null;
}
return [
'time' => (new DateTimeImmutable)->setTimestamp((int) $row['time']),
'open' => (bool) $row['open'],
];
$result = new DoorStatus(
(new DateTimeImmutable)->setTimestamp((int) $row['time']),
(bool) $row['open'],
);
return $result;
}
private function removeOld(): void {