Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

* [PR-17](https://github.com/ITK-Leantime/data-api/pull/17)
* Fixed modifiedAfter for tickets and milestones, so it filters on the modified timestamp
instead of the creation date. Edits to older tickets and milestones now sync.

## [0.1.2] - 2026-03-06

* [PR-12](https://github.com/ITK-Leantime/data-api/pull/12)
Expand Down
8 changes: 4 additions & 4 deletions Repositories/ApiDataRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ public function getProjects(int $startId, int $limit, ?int $modifiedAfter = null
->toArray();
}

public function getMilestones(int $startId, int $limit, int $modifiedAfter = null, ?array $ids = null, ?array $projectIds = null): array
public function getMilestones(int $startId, int $limit, ?int $modifiedAfter = null, ?array $ids = null, ?array $projectIds = null): array
{
return $this->query()
->select(["id", "headline", "projectId", "modified"])
->from("zp_tickets", "ticket")
->where("ticket.id", ">=", $startId)
->where("ticket.type", "=", "milestone")
->when($modifiedAfter !== null, fn ($query) => $query->where("ticket.date", ">=", CarbonImmutable::createFromTimestamp($modifiedAfter)->format(APIData::DATE_FORMAT)))
->when($modifiedAfter !== null, fn ($query) => $query->where("ticket.modified", ">=", CarbonImmutable::createFromTimestamp($modifiedAfter)->format(APIData::DATE_FORMAT)))
->when($ids !== null, fn ($query) => $query->whereIn("ticket.id", $ids))
->when($projectIds != null, fn ($query) => $query->whereIn("ticket.projectId", $projectIds))
->orderBy("id", "ASC")
Expand All @@ -44,15 +44,15 @@ public function getMilestones(int $startId, int $limit, int $modifiedAfter = nul
->toArray();
}

public function getTickets(int $startId, int $limit, int $modifiedAfter = null, array $ids = null, ?array $projectIds = null): array
public function getTickets(int $startId, int $limit, ?int $modifiedAfter = null, ?array $ids = null, ?array $projectIds = null): array
{
return $this->query()
->select(["ticket.id", "ticket.headline", "ticket.projectId", "ticket.status", "ticket.planHours", "ticket.hourRemaining", "ticket.tags", "ticket.dateToFinish", "ticket.editTo", "ticket.milestoneid", "ticket.modified", "user.username"])
->from("zp_tickets", "ticket")
->where("ticket.id", ">=", $startId)
->where("ticket.type", "<>", "milestone")
->leftJoin('zp_user as user', "user.id", "=", "ticket.editorId")
->when($modifiedAfter !== null, fn ($query) => $query->where("ticket.date", ">=", CarbonImmutable::createFromTimestamp($modifiedAfter)->format(APIData::DATE_FORMAT)))
->when($modifiedAfter !== null, fn ($query) => $query->where("ticket.modified", ">=", CarbonImmutable::createFromTimestamp($modifiedAfter)->format(APIData::DATE_FORMAT)))
->when($ids !== null, fn ($query) => $query->whereIn("ticket.id", $ids))
->when($projectIds != null, fn ($query) => $query->whereIn("ticket.projectId", $projectIds))
->orderBy("id", "ASC")
Expand Down
4 changes: 2 additions & 2 deletions Services/APIData.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public function getProjects(int $startId, int $limit, ?int $modifiedAfter = null
}, $values);
}

public function getMilestones(int $startId, int $limit, int $modifiedAfter = null, ?array $ids = null, ?array $projectIds = null): array
public function getMilestones(int $startId, int $limit, ?int $modifiedAfter = null, ?array $ids = null, ?array $projectIds = null): array
{
$values = $this->apiDataRepository->getMilestones($startId, $limit, $modifiedAfter, $ids, $projectIds);

Expand All @@ -139,7 +139,7 @@ public function getMilestones(int $startId, int $limit, int $modifiedAfter = nul
}, $values);
}

public function getTickets(int $startId, int $limit, int $modifiedAfter = null, array $ids = null, ?array $projectIds = null): array
public function getTickets(int $startId, int $limit, ?int $modifiedAfter = null, ?array $ids = null, ?array $projectIds = null): array
{
$values = $this->apiDataRepository->getTickets($startId, $limit, $modifiedAfter, $ids, $projectIds);

Expand Down
Loading