Skip to content

Add Baikal compatible DAV route and optimize data fetching #256

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
lukastrkan wants to merge 4 commits into
base: main
Choose a base branch
from
+28 −15
Open

Add Baikal compatible DAV route and optimize data fetching #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9759674
Add baikal compatible route for DAV
trkanluk Apr 18, 2026
a30353f
Add baikal compatible route for DAV
trkanluk Apr 18, 2026
2dc28ae
Use database count instead of fetching all data
trkanluk Apr 18, 2026
b14c303
Add legacy DAV route for backward compatibility
trkanluk Apr 18, 2026
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
20 changes: 10 additions & 10 deletions src/Controller/Admin/DashboardController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ class DashboardController extends AbstractController
#[Route('/dashboard', name: 'dashboard')]
public function dashboard(ManagerRegistry $doctrine): Response
{
$users = $doctrine->getRepository(User::class)->findAll();
$calendars = $doctrine->getRepository(CalendarInstance::class)->findAll();
$addressbooks = $doctrine->getRepository(AddressBook::class)->findAll();
$events = $doctrine->getRepository(CalendarObject::class)->findAll();
$contacts = $doctrine->getRepository(Card::class)->findAll();
$usersCount = $doctrine->getRepository(User::class)->count([]);
$calendarsCount = $doctrine->getRepository(CalendarInstance::class)->count([]);
$addressbooksCount = $doctrine->getRepository(AddressBook::class)->count([]);
$eventsCount = $doctrine->getRepository(CalendarObject::class)->count([]);
$contactsCount = $doctrine->getRepository(Card::class)->count([]);

$timezoneParameter = $this->getParameter('timezone');

return $this->render('dashboard.html.twig', [
'users' => $users,
'calendars' => $calendars,
'addressbooks' => $addressbooks,
'events' => $events,
'contacts' => $contacts,
'users' => $usersCount,
'calendars' => $calendarsCount,
'addressbooks' => $addressbooksCount,
'events' => $eventsCount,
'contacts' => $contactsCount,
Comment on lines -29 to +33
Copy link
Copy Markdown
Owner

@tchapi tchapi Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's rename the parameters too so they are explicit

'timezone' => [
'actual_default' => date_default_timezone_get(),
'not_set_in_app' => '' === $timezoneParameter,
Expand Down
13 changes: 13 additions & 0 deletions src/Controller/DAVController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,19 @@ private function initExceptionListener()
});
}

#[Route('/dav.php/{path?}', name: 'dav-old', requirements: ['path' => '.*'])]
Copy link
Copy Markdown
Owner

@tchapi tchapi Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's:

  • name this dav-legacy so that it's consistent with the method name
  • add a comment that explains why it exists (reference to Baikal migration)

public function davLegacy(Request $request, ?string $path): Response
{
return $this->redirect($this->generateUrl('dav', ['path' => $path ?? '']).$this->buildQueryString($request), 301);
Copy link
Copy Markdown
Owner

@tchapi tchapi Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you pass to the generateUrl() method some parameters that are not part of the route definition, they are included in the generated URL as a query string.

So $this->generateUrl('dav', ['path' => $path ?? '', ...$request->query->all()]), should work (no need for a private function)

}

private function buildQueryString(Request $request): string
Copy link
Copy Markdown
Owner

@tchapi tchapi Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uneeded (see above)

{
$qs = $request->getQueryString();

return $qs ? '?'.$qs : '';
}

#[Route('/dav/{path}', name: 'dav', requirements: ['path' => '.*'])]
public function dav(Request $request, ?string $path, ?Profiler $profiler = null)
{
Expand Down
10 changes: 5 additions & 5 deletions templates/dashboard.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,19 @@

<ul class="list-group mb-5">
<li class="list-group-item d-flex justify-content-between align-items-center">
{{ "dashboard.users"|trans }} <span class="badge bg-primary rounded-pill">{{ users|length }}</span>
{{ "dashboard.users"|trans }} <span class="badge bg-primary rounded-pill">{{ users }}</span>
</li>
<li class="list-group-item d-flex justify-content-between align-items-center">
<div>{{ "dashboard.calendars"|trans }}&nbsp;<span class="small text-muted ms-1 me-auto">{{ "dashboard.calendars.help"|trans }}</span></div> <span class="badge bg-primary rounded-pill">{{ calendars|length }}</span>
<div>{{ "dashboard.calendars"|trans }}&nbsp;<span class="small text-muted ms-1 me-auto">{{ "dashboard.calendars.help"|trans }}</span></div> <span class="badge bg-primary rounded-pill">{{ calendars }}</span>
</li>
<li class="list-group-item d-flex justify-content-between align-items-center">
↳ {{ "dashboard.events"|trans }} <span class="badge bg-secondary rounded-pill">{{ events|length }}</span>
↳ {{ "dashboard.events"|trans }} <span class="badge bg-secondary rounded-pill">{{ events }}</span>
</li>
<li class="list-group-item d-flex justify-content-between align-items-center">
{{ "dashboard.address_books"|trans }} <span class="badge bg-primary rounded-pill">{{ addressbooks|length }}</span>
{{ "dashboard.address_books"|trans }} <span class="badge bg-primary rounded-pill">{{ addressbooks }}</span>
</li>
<li class="list-group-item d-flex justify-content-between align-items-center">
↳ {{ "dashboard.contacts"|trans }} <span class="badge bg-secondary rounded-pill">{{ contacts|length }}</span>
↳ {{ "dashboard.contacts"|trans }} <span class="badge bg-secondary rounded-pill">{{ contacts }}</span>
</li>
</ul>
</div>
Expand Down
Loading