From 493375601c42d011e42aac2e5887dcf0cc641fa2 Mon Sep 17 00:00:00 2001
From: Constantin Graf <constantin@solidtime.io>
Date: Mon, 22 Apr 2024 16:26:48 +0200
Subject: [PATCH 1/6] Added extension services

---
 .github/workflows/build-private.yml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-private.yml b/.github/workflows/build-private.yml
index b4fc20e7..ca4a8dd0 100644
--- a/.github/workflows/build-private.yml
+++ b/.github/workflows/build-private.yml
@@ -5,7 +5,7 @@ on:
       - develop
   pull_request:
     paths:
-      - 'workflows/build-private.yml'
+      - '.github/workflows/build-private.yml'
       - 'docker/prod/**'
   workflow_dispatch:
 
@@ -37,6 +37,21 @@ jobs:
           only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
           php_version: 8.3
 
+      - name: "Checkout services extension"
+        uses: actions/checkout@v4
+        with:
+          repository: solidtime-io/extension-services
+          path: extensions/Services
+          ssh-key: ${{ secrets.SSH_PRIVATE_KEY_SERVICES_EXTENSION }}
+
+      - name: "Install dependencies in services extension"
+        uses: php-actions/composer@v6
+        with:
+          working_dir: "extensions/Services"
+          command: install
+          only_args: --no-dev --no-ansi --no-interaction --prefer-dist --ignore-platform-reqs --classmap-authoritative
+          php_version: 8.3
+
       - name: "Setup PHP with PECL extension"
         uses: shivammathur/setup-php@v2
         with:
@@ -65,6 +80,9 @@ jobs:
       - name: "Activate billing extension"
         run: php artisan module:enable Billing
 
+      - name: "Activate services extension"
+        run: php artisan module:enable Services
+
       - name: "Login to GitHub Container Registry"
         uses: docker/login-action@v3
         with:

From ab9fa93ba144b4d4e008e8c48fd1b396373a6769 Mon Sep 17 00:00:00 2001
From: Constantin Graf <constantin@solidtime.io>
Date: Mon, 22 Apr 2024 16:32:11 +0200
Subject: [PATCH 2/6] Removed parallel testing because of filament tests

---
 .github/workflows/build-public.yml | 2 +-
 .github/workflows/phpunit.yml      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-public.yml b/.github/workflows/build-public.yml
index b618e8c8..2bdf2346 100644
--- a/.github/workflows/build-public.yml
+++ b/.github/workflows/build-public.yml
@@ -5,7 +5,7 @@ on:
       - develop
   pull_request:
     paths:
-      - 'workflows/build-public.yml'
+      - '.github/workflows/build-public.yml'
       - 'docker/prod/**'
   workflow_dispatch:
 
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 4848e9af..730d8558 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -50,8 +50,8 @@ jobs:
           php artisan key:generate
           php artisan passport:keys
 
-      - name: "Run PHPUnit in parallel"
-        run: php artisan test --parallel --stop-on-failure --coverage-text --coverage-clover=coverage.xml
+      - name: "Run PHPUnit"
+        run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml
 
       - name: "Upload coverage reports to Codecov"
         uses: codecov/codecov-action@v4.3.0

From 26af7041c2d5a2c3a78c2bb20809007fe253c631 Mon Sep 17 00:00:00 2001
From: Constantin Graf <constantin@solidtime.io>
Date: Mon, 22 Apr 2024 17:16:57 +0200
Subject: [PATCH 3/6] Fixed production logging stack

---
 config/logging.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/logging.php b/config/logging.php
index 7599b746..2a28ad4e 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -69,7 +69,7 @@ return [
 
         'stack_production' => [
             'driver' => 'stack',
-            'channels' => ['single', 'sentry'],
+            'channels' => ['stderr', 'sentry'],
         ],
 
         'daily' => [

From 2605d738159f0280f0648374a97ea7fb9deb828c Mon Sep 17 00:00:00 2001
From: Constantin Graf <constantin@solidtime.io>
Date: Mon, 22 Apr 2024 17:17:22 +0200
Subject: [PATCH 4/6] Error handling in importer for invalid ZIP

---
 .../Import/Importers/TogglDataImporter.php    |  8 ++++++-
 .../Import/Importer/TogglDataImporterTest.php | 22 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/Service/Import/Importers/TogglDataImporter.php b/app/Service/Import/Importers/TogglDataImporter.php
index eacb14a0..07a4bb04 100644
--- a/app/Service/Import/Importers/TogglDataImporter.php
+++ b/app/Service/Import/Importers/TogglDataImporter.php
@@ -6,6 +6,7 @@ namespace App\Service\Import\Importers;
 
 use Exception;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
+use ValueError;
 use ZipArchive;
 
 class TogglDataImporter extends DefaultImporter
@@ -20,7 +21,10 @@ class TogglDataImporter extends DefaultImporter
             $zip = new ZipArchive();
             $temporaryDirectory = TemporaryDirectory::make();
             file_put_contents($temporaryDirectory->path('import.zip'), $data);
-            $zip->open($temporaryDirectory->path('import.zip'), ZipArchive::RDONLY);
+            $res = $zip->open($temporaryDirectory->path('import.zip'), ZipArchive::RDONLY);
+            if ($res !== true) {
+                throw new ImportException('Invalid ZIP, error code: '.$res);
+            }
             $temporaryDirectory = TemporaryDirectory::make();
             $zip->extractTo($temporaryDirectory->path());
             $zip->close();
@@ -107,6 +111,8 @@ class TogglDataImporter extends DefaultImporter
                     ], [], (string) $task->id);
                 }
             }
+        } catch (ValueError $exception) {
+
         } catch (ImportException $exception) {
             throw $exception;
         } catch (Exception $exception) {
diff --git a/tests/Unit/Service/Import/Importer/TogglDataImporterTest.php b/tests/Unit/Service/Import/Importer/TogglDataImporterTest.php
index 2066dae4..06ebb5c5 100644
--- a/tests/Unit/Service/Import/Importer/TogglDataImporterTest.php
+++ b/tests/Unit/Service/Import/Importer/TogglDataImporterTest.php
@@ -5,7 +5,9 @@ declare(strict_types=1);
 namespace Tests\Unit\Service\Import\Importer;
 
 use App\Models\Organization;
+use App\Service\Import\Importers\ImportException;
 use App\Service\Import\Importers\TogglDataImporter;
+use Exception;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
@@ -27,6 +29,25 @@ class TogglDataImporterTest extends ImporterTestAbstract
         return $zipPath;
     }
 
+    public function test_import_throws_exception_if_data_is_not_zip(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $importer = new TogglDataImporter();
+        $importer->init($organization);
+
+        // Act
+        try {
+            $importer->importData('not a zip');
+        } catch (Exception $e) {
+            $this->assertInstanceOf(ImportException::class, $e);
+            $this->assertSame('Invalid ZIP, error code: 19', $e->getMessage());
+
+            return;
+        }
+        $this->fail();
+    }
+
     public function test_import_of_test_file_succeeds(): void
     {
         // Arrange
@@ -48,7 +69,6 @@ class TogglDataImporterTest extends ImporterTestAbstract
         $this->assertSame(1, $report->usersCreated);
         $this->assertSame(2, $report->projectsCreated);
         $this->assertSame(1, $report->clientsCreated);
-
     }
 
     public function test_import_of_test_file_twice_succeeds(): void

From f6c51b712247c1ae90917ccdf3b789396d780c8f Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Tue, 23 Apr 2024 02:54:28 +0200
Subject: [PATCH 5/6] fix timezone issues and add support for timezone user
 setting

---
 resources/js/Components/Common/TimePicker.vue | 14 ++++----
 .../Dashboard/ActivityGraphCard.vue           |  6 ++--
 resources/js/Pages/Time.vue                   |  7 ++--
 resources/js/utils/time.ts                    | 32 +++++++++++++++++--
 resources/js/utils/useUser.ts                 |  6 +++-
 5 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/resources/js/Components/Common/TimePicker.vue b/resources/js/Components/Common/TimePicker.vue
index 49091822..081e72f1 100644
--- a/resources/js/Components/Common/TimePicker.vue
+++ b/resources/js/Components/Common/TimePicker.vue
@@ -1,26 +1,26 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import dayjs from 'dayjs';
+import { getLocalizedDayJs } from '@/utils/time';
 
 const model = defineModel<string | null>({
     default: null,
 });
 
 const hours = computed(() => {
-    return model.value ? dayjs(model.value).utc().hour() : null;
+    return model.value ? getLocalizedDayJs(model.value).hour() : null;
 });
 
 const minutes = computed(() => {
-    return model.value ? dayjs(model.value).utc().minute() : null;
+    return model.value ? getLocalizedDayJs(model.value).minute() : null;
 });
 
 function updateMinutes(event: Event) {
     const target = event.target as HTMLInputElement;
     const newValue = target.value;
     if (!isNaN(parseInt(newValue))) {
-        model.value = dayjs(model.value)
-            .utc()
+        model.value = getLocalizedDayJs(model.value)
             .set('minutes', parseInt(newValue))
+            .utc()
             .format();
     }
 }
@@ -29,9 +29,9 @@ function updateHours(event: Event) {
     const target = event.target as HTMLInputElement;
     const newValue = target.value;
     if (!isNaN(parseInt(newValue))) {
-        model.value = dayjs(model.value)
-            .utc()
+        model.value = getLocalizedDayJs(model.value)
             .set('hours', parseInt(newValue))
+            .utc()
             .format();
     }
 }
diff --git a/resources/js/Components/Dashboard/ActivityGraphCard.vue b/resources/js/Components/Dashboard/ActivityGraphCard.vue
index f3b935cd..a0c1256a 100644
--- a/resources/js/Components/Dashboard/ActivityGraphCard.vue
+++ b/resources/js/Components/Dashboard/ActivityGraphCard.vue
@@ -13,7 +13,7 @@ import {
 } from 'echarts/components';
 import { CanvasRenderer } from 'echarts/renderers';
 import dayjs from 'dayjs';
-import { formatDate, formatTime } from '@/utils/time';
+import { formatDate, formatHumanReadableDuration } from '@/utils/time';
 
 const props = defineProps<{
     dailyHoursTracked: { duration: number; date: string }[];
@@ -76,11 +76,11 @@ const option = ref({
             borderRadius: 5,
         },
         tooltip: {
-            valueFormatter: (value: string, dataIndex: number) => {
+            valueFormatter: (value: number, dataIndex: number) => {
                 return (
                     formatDate(props.dailyHoursTracked[dataIndex].date) +
                     ': ' +
-                    formatTime(value)
+                    formatHumanReadableDuration(value)
                 );
             },
         },
diff --git a/resources/js/Pages/Time.vue b/resources/js/Pages/Time.vue
index 20556e82..287c8c1e 100644
--- a/resources/js/Pages/Time.vue
+++ b/resources/js/Pages/Time.vue
@@ -5,12 +5,12 @@ import { computed, onMounted, ref, watch } from 'vue';
 import MainContainer from '@/Pages/MainContainer.vue';
 import { useTimeEntriesStore } from '@/utils/useTimeEntries';
 import { storeToRefs } from 'pinia';
-import dayjs from 'dayjs';
 import type { TimeEntry } from '@/utils/api';
 import TimeEntryRowHeading from '@/Components/Common/TimeEntry/TimeEntryRowHeading.vue';
 import TimeEntryRow from '@/Components/Common/TimeEntry/TimeEntryRow.vue';
 import { useElementVisibility } from '@vueuse/core';
 import { ClockIcon } from '@heroicons/vue/20/solid';
+import { getLocalizedDateFromTimestamp } from '@/utils/time';
 
 const timeEntriesStore = useTimeEntriesStore();
 const { timeEntries, allTimeEntriesLoaded } = storeToRefs(timeEntriesStore);
@@ -38,10 +38,9 @@ const groupedTimeEntries = computed(() => {
     const groupedEntries: Record<string, TimeEntry[]> = {};
     for (const entry of timeEntries.value) {
         const oldEntries =
-            groupedEntries[dayjs(entry.start).utc().format('YYYY-MM-DD')];
+            groupedEntries[getLocalizedDateFromTimestamp(entry.start)];
         const newEntries = [...(oldEntries ?? []), entry];
-        groupedEntries[dayjs(entry.start).utc().format('YYYY-MM-DD')] =
-            newEntries;
+        groupedEntries[getLocalizedDateFromTimestamp(entry.start)] = newEntries;
     }
     return groupedEntries;
 });
diff --git a/resources/js/utils/time.ts b/resources/js/utils/time.ts
index ced7ca60..996ea2a5 100644
--- a/resources/js/utils/time.ts
+++ b/resources/js/utils/time.ts
@@ -4,12 +4,19 @@ import relativeTime from 'dayjs/plugin/relativeTime';
 import isToday from 'dayjs/plugin/isToday';
 import isYesterday from 'dayjs/plugin/isYesterday';
 import utc from 'dayjs/plugin/utc';
+import timezone from 'dayjs/plugin/timezone';
+import { getUserTimezone } from '@/utils/useUser';
 
 dayjs.extend(relativeTime);
 dayjs.extend(isToday);
 dayjs.extend(isYesterday);
 dayjs.extend(duration);
 dayjs.extend(utc);
+dayjs.extend(timezone);
+
+export function getDayJsInstance() {
+    return dayjs;
+}
 
 export function formatHumanReadableDuration(duration: number): string {
     return dayjs.duration(duration, 's').format('HH[h] mm[min]');
@@ -21,14 +28,35 @@ export function calculateDifference(start: string, end: string | null) {
     }
     return dayjs(end).diff(dayjs(start), 'second');
 }
+
+/**
+ * Returns a formatted time.
+ * @param date - A UTC date time string.
+ */
 export function formatTime(date: string) {
-    return dayjs(date).utc().format('HH:mm');
+    return dayjs.utc(date).tz(getUserTimezone()).format('HH:mm');
 }
 
+export function getLocalizedDayJs(timestamp: string | null) {
+    return dayjs.utc(timestamp).tz(getUserTimezone());
+}
+
+export function getLocalizedDateFromTimestamp(timestamp: string) {
+    return getLocalizedDayJs(timestamp).format('YYYY-MM-DD');
+}
+
+/*
+ * Returns a formatted date.
+ * @param date - date in the format of 'YYYY-MM-DD'
+ */
 export function formatDate(date: string): string {
-    return dayjs(date).utc().format('DD.MM.YYYY');
+    return dayjs(date).format('DD.MM.YYYY');
 }
 
+/*
+ * Returns a human readable date format.
+ * @param date - date in the format of 'YYYY-MM-DD'
+ */
 export function formatHumanReadableDate(date: string) {
     if (dayjs(date).isToday()) {
         return 'Today';
diff --git a/resources/js/utils/useUser.ts b/resources/js/utils/useUser.ts
index e5c3de53..cecdac84 100644
--- a/resources/js/utils/useUser.ts
+++ b/resources/js/utils/useUser.ts
@@ -14,4 +14,8 @@ function getCurrentOrganizationId() {
     return page.props.auth.user.current_team_id;
 }
 
-export { getCurrentOrganizationId, getCurrentUserId };
+function getUserTimezone() {
+    return page.props.auth.user.timezone;
+}
+
+export { getCurrentOrganizationId, getCurrentUserId, getUserTimezone };

From 7dbd3585588bdfdec627baef11b64839cf923e69 Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Tue, 23 Apr 2024 02:59:17 +0200
Subject: [PATCH 6/6] prettier formatting warning fixes

---
 resources/js/Components/Dashboard/DashboardCard.vue  |  3 +--
 resources/js/Components/OrganizationSwitcher.vue     |  4 +---
 resources/js/Pages/Teams/Partials/DeleteTeamForm.vue | 12 +++++++-----
 .../js/Pages/Teams/Partials/TeamMemberManager.vue    |  9 +++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/js/Components/Dashboard/DashboardCard.vue b/resources/js/Components/Dashboard/DashboardCard.vue
index 688cb384..e492657f 100644
--- a/resources/js/Components/Dashboard/DashboardCard.vue
+++ b/resources/js/Components/Dashboard/DashboardCard.vue
@@ -3,8 +3,7 @@
         <CardTitle :title="title" :icon="icon"></CardTitle>
         <div
             class="rounded-lg bg-card-background border border-card-border flex-1 flex items-stretch">
-            <div
-                class="w-full flex flex-col">
+            <div class="w-full flex flex-col">
                 <slot></slot>
             </div>
         </div>
diff --git a/resources/js/Components/OrganizationSwitcher.vue b/resources/js/Components/OrganizationSwitcher.vue
index 05e916da..dc1630cd 100644
--- a/resources/js/Components/OrganizationSwitcher.vue
+++ b/resources/js/Components/OrganizationSwitcher.vue
@@ -88,9 +88,7 @@ const switchToTeam = (team: Organization) => {
                     Organization Settings
                 </DropdownLink>
 
-                <DropdownLink
-                    v-if="isBillingActivated()"
-                    href="/billing">
+                <DropdownLink v-if="isBillingActivated()" href="/billing">
                     Billing
                 </DropdownLink>
 
diff --git a/resources/js/Pages/Teams/Partials/DeleteTeamForm.vue b/resources/js/Pages/Teams/Partials/DeleteTeamForm.vue
index 72c9370b..7af58373 100644
--- a/resources/js/Pages/Teams/Partials/DeleteTeamForm.vue
+++ b/resources/js/Pages/Teams/Partials/DeleteTeamForm.vue
@@ -28,14 +28,16 @@ const deleteTeam = () => {
     <ActionSection>
         <template #title> Delete Organization </template>
 
-        <template #description> Permanently delete this organization. </template>
+        <template #description>
+            Permanently delete this organization.
+        </template>
 
         <template #content>
             <div class="max-w-xl text-sm text-muted">
-                Once a organization is deleted, all of its resources and data will be
-                permanently deleted. Before deleting this organization, please download
-                any data or information regarding this organization that you wish to
-                retain.
+                Once a organization is deleted, all of its resources and data
+                will be permanently deleted. Before deleting this organization,
+                please download any data or information regarding this
+                organization that you wish to retain.
             </div>
 
             <div class="mt-5">
diff --git a/resources/js/Pages/Teams/Partials/TeamMemberManager.vue b/resources/js/Pages/Teams/Partials/TeamMemberManager.vue
index 57b4d19e..1a411396 100644
--- a/resources/js/Pages/Teams/Partials/TeamMemberManager.vue
+++ b/resources/js/Pages/Teams/Partials/TeamMemberManager.vue
@@ -257,9 +257,9 @@ const displayableRole = (role: string) => {
                 <template #title> Pending Team Invitations</template>
 
                 <template #description>
-                    These people have been invited to your organization and have been
-                    sent an invitation email. They may join the organization by
-                    accepting the email invitation.
+                    These people have been invited to your organization and have
+                    been sent an invitation email. They may join the
+                    organization by accepting the email invitation.
                 </template>
 
                 <!-- Pending Organization Member Invitation List -->
@@ -471,7 +471,8 @@ const displayableRole = (role: string) => {
             <template #title> Remove Team Member</template>
 
             <template #content>
-                Are you sure you would like to remove this person from the organization?
+                Are you sure you would like to remove this person from the
+                organization?
             </template>
 
             <template #footer>