adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-16 04:02:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved import test files; Added timezone argument to importers

Browse Source
This commit is contained in:
Constantin Graf
2024-05-29 15:40:38 +02:00
committed by Constantin Graf
parent 7af77c9357
commit b5a240cb2f
25 changed files with 62 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Service/Import/ImportService.php
View File

@@ -19,7 +19,7 @@ class ImportService
/**
* @throws ImportException
*/
public function import(Organization $organization, string $importerType, string $data): ReportDto
public function import(Organization $organization, string $importerType, string $data, string $timezone): ReportDto
{
/** @var ImporterContract $importer */
$importer = app(ImporterProvider::class)->getImporter($importerType);
@@ -27,8 +27,8 @@ class ImportService
Storage::disk(config('filesystems.default'))
->put('import/'.Carbon::now()->toDateString().'-'.$organization->getKey().'-'.Str::uuid(), $data);
DB::transaction(function () use (&$importer, &$data) {
$importer->importData($data);
DB::transaction(function () use (&$importer, &$data, &$timezone) {
$importer->importData($data, $timezone);
});
return $importer->getReport();

2
app/Service/Import/Importers/ClockifyProjectsImporter.php
View File

@@ -15,7 +15,7 @@ class ClockifyProjectsImporter extends DefaultImporter
* @throws ImportException
*/
#[\Override]
public function importData(string $data): void
public function importData(string $data, string $timezone): void
{
try {
$reader = Reader::createFromString($data);

10
app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
View File

@@ -40,7 +40,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
* @throws ImportException
*/
#[\Override]
public function importData(string $data): void
public function importData(string $data, string $timezone): void
{
try {
$reader = Reader::createFromString($data);
@@ -106,9 +106,9 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
// Start
if (preg_match('/^[0-9]{1,2}:[0-9]{1,2} (AM|PM)$/', $record['Start Time']) === 1) {
$start = Carbon::createFromFormat('m/d/Y h:i A', $record['Start Date'].' '.$record['Start Time'], 'UTC');
$start = Carbon::createFromFormat('m/d/Y h:i A', $record['Start Date'].' '.$record['Start Time'], $timezone);
} else {
$start = Carbon::createFromFormat('m/d/Y H:i:s A', $record['Start Date'].' '.$record['Start Time'], 'UTC');
$start = Carbon::createFromFormat('m/d/Y H:i:s A', $record['Start Date'].' '.$record['Start Time'], $timezone);
}
if ($start === null) {
throw new ImportException('Start date ("'.$record['Start Date'].'") or time ("'.$record['Start Time'].'") are invalid');
@@ -117,9 +117,9 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
// End
if (preg_match('/^[0-9]{1,2}:[0-9]{1,2} (AM|PM)$/', $record['End Time']) === 1) {
$end = Carbon::createFromFormat('m/d/Y h:i A', $record['End Date'].' '.$record['End Time'], 'UTC');
$end = Carbon::createFromFormat('m/d/Y h:i A', $record['End Date'].' '.$record['End Time'], $timezone);
} else {
$end = Carbon::createFromFormat('m/d/Y H:i:s A', $record['End Date'].' '.$record['End Time'], 'UTC');
$end = Carbon::createFromFormat('m/d/Y H:i:s A', $record['End Date'].' '.$record['End Time'], $timezone);
}
if ($end === null) {
throw new ImportException('End date ("'.$record['End Date'].'") or time ("'.$record['End Time'].'") are invalid');

2
app/Service/Import/Importers/ImporterContract.php
View File

@@ -10,7 +10,7 @@ interface ImporterContract
{
public function init(Organization $organization): void;
public function importData(string $data): void;
public function importData(string $data, string $timezone): void;
public function getReport(): ReportDto;

2
app/Service/Import/Importers/TogglDataImporter.php
View File

@@ -16,7 +16,7 @@ class TogglDataImporter extends DefaultImporter
* @throws ImportException
*/
#[\Override]
public function importData(string $data): void
public function importData(string $data, string $timezone): void
{
try {
$zip = new ZipArchive();

6
app/Service/Import/Importers/TogglTimeEntriesImporter.php
View File

@@ -40,7 +40,7 @@ class TogglTimeEntriesImporter extends DefaultImporter
* @throws ImportException
*/
#[\Override]
public function importData(string $data): void
public function importData(string $data, string $timezone): void
{
try {
$reader = Reader::createFromString($data);
@@ -100,12 +100,12 @@ class TogglTimeEntriesImporter extends DefaultImporter
}
$timeEntry->billable = $record['Billable'] === 'Yes';
$timeEntry->tags = $this->getTags($record['Tags']);
$start = Carbon::createFromFormat('Y-m-d H:i:s', $record['Start date'].' '.$record['Start time'], 'UTC');
$start = Carbon::createFromFormat('Y-m-d H:i:s', $record['Start date'].' '.$record['Start time'], $timezone);
if ($start === null) {
throw new ImportException('Start date ("'.$record['Start date'].'") or time ("'.$record['Start time'].'") are invalid');
}
$timeEntry->start = $start;
$end = Carbon::createFromFormat('Y-m-d H:i:s', $record['End date'].' '.$record['End time'], 'UTC');
$end = Carbon::createFromFormat('Y-m-d H:i:s', $record['End date'].' '.$record['End time'], $timezone);
if ($end === null) {
throw new ImportException('End date ("'.$record['End date'].'") or time ("'.$record['End time'].'") are invalid');
}