kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +00:00
Code Issues Projects Releases Wiki Activity

Auto commit for release 'branch-v6.2' on 2024-12-22

Browse Source
This commit is contained in:
github-actions
2024-12-22 14:00:37 +01:00
parent f6e642f72e
commit 705aac419a
49 changed files with 218 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Api/V2/Controllers/Model/ExchangeRate/DestroyController.php
View File

@@ -1,4 +1,5 @@
<?php
/*
* DestroyController.php
* Copyright (c) 2024 james@firefly-iii.org.
@@ -60,7 +61,7 @@ class DestroyController extends Controller
throw new NotFoundHttpException();
}
$this->repository->deleteRate($rate);
return response()->json([], 204);
}
}

21
app/Api/V2/Controllers/Model/ExchangeRate/StoreController.php
View File

@@ -1,4 +1,5 @@
<?php
/*
* DestroyController.php
* Copyright (c) 2024 james@firefly-iii.org.
@@ -25,8 +26,6 @@ namespace FireflyIII\Api\V2\Controllers\Model\ExchangeRate;
use FireflyIII\Api\V2\Controllers\Controller;
use FireflyIII\Api\V2\Request\Model\ExchangeRate\StoreRequest;
use FireflyIII\Api\V2\Request\Model\ExchangeRate\UpdateRequest;
use FireflyIII\Models\CurrencyExchangeRate;
use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
use FireflyIII\Transformers\V2\ExchangeRateTransformer;
@@ -55,18 +54,18 @@ class StoreController extends Controller
public function store(StoreRequest $request): JsonResponse
{
$date = $request->getDate();
$rate = $request->getRate();
$from = $request->getFromCurrency();
$to = $request->getToCurrency();
$date = $request->getDate();
$rate = $request->getRate();
$from = $request->getFromCurrency();
$to = $request->getToCurrency();
// already has rate?
$object = $this->repository->getSpecificRateOnDate($from, $to, $date);
if(null !== $object) {
$object = $this->repository->getSpecificRateOnDate($from, $to, $date);
if (null !== $object) {
// just update it, no matter.
$rate = $this->repository->updateExchangeRate($object, $rate, $date);
}
if(null === $object) {
if (null === $object) {
// store new
$rate = $this->repository->storeExchangeRate($from, $to, $rate, $date);
}
@@ -76,7 +75,7 @@ class StoreController extends Controller
return response()
->api($this->jsonApiObject(self::RESOURCE_KEY, $rate, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}

12
app/Api/V2/Controllers/Model/ExchangeRate/UpdateController.php
View File

@@ -1,4 +1,5 @@
<?php
/*
* DestroyController.php
* Copyright (c) 2024 james@firefly-iii.org.
@@ -30,7 +31,6 @@ use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterf
use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
use FireflyIII\Transformers\V2\ExchangeRateTransformer;
use Illuminate\Http\JsonResponse;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class UpdateController extends Controller
{
@@ -55,15 +55,15 @@ class UpdateController extends Controller
public function update(UpdateRequest $request, CurrencyExchangeRate $exchangeRate): JsonResponse
{
$date = $request->getDate();
$rate = $request->getRate();
$date = $request->getDate();
$rate = $request->getRate();
$exchangeRate = $this->repository->updateExchangeRate($exchangeRate, $rate, $date);
$transformer = new ExchangeRateTransformer();
$transformer = new ExchangeRateTransformer();
$transformer->setParameters($this->parameters);
return response()
->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))
->header('Content-Type', self::CONTENT_TYPE);
->header('Content-Type', self::CONTENT_TYPE)
;
}
}

2
app/Api/V2/Request/Model/ExchangeRate/DestroyRequest.php
View File

@@ -1,4 +1,5 @@
<?php
/*
* DestroyRequest.php
* Copyright (c) 2024 james@firefly-iii.org.
@@ -47,5 +48,4 @@ class DestroyRequest extends FormRequest
'date' => 'required|date|after:1900-01-01|before:2099-12-31',
];
}
}

9
app/Api/V2/Request/Model/ExchangeRate/StoreRequest.php
View File

@@ -1,4 +1,5 @@
<?php
/*
* DestroyRequest.php
* Copyright (c) 2024 james@firefly-iii.org.
@@ -44,10 +45,13 @@ class StoreRequest extends FormRequest
return (string) $this->get('rate');
}
public function getFromCurrency(): TransactionCurrency {
public function getFromCurrency(): TransactionCurrency
{
return TransactionCurrency::where('code', $this->get('from'))->first();
}
public function getToCurrency(): TransactionCurrency {
public function getToCurrency(): TransactionCurrency
{
return TransactionCurrency::where('code', $this->get('to'))->first();
}
@@ -63,5 +67,4 @@ class StoreRequest extends FormRequest
'to' => 'required|exists:transaction_currencies,code',
];
}
}

5
app/Api/V2/Request/Model/ExchangeRate/UpdateRequest.php
View File

@@ -1,4 +1,5 @@
<?php
/*
* DestroyRequest.php
* Copyright (c) 2024 james@firefly-iii.org.
@@ -38,7 +39,8 @@ class UpdateRequest extends FormRequest
return $this->getCarbonDate('date');
}
public function getRate(): string {
public function getRate(): string
{
return (string) $this->get('rate');
}
@@ -52,5 +54,4 @@ class UpdateRequest extends FormRequest
'rate' => 'required|numeric|gt:0',
];
}
}