mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-16 09:22:33 +00:00
Expand test coverage.
This commit is contained in:
@@ -192,7 +192,7 @@ class AttachmentHelper implements AttachmentHelperInterface
|
|||||||
public function saveAttachmentsForModel(object $model, ?array $files): bool
|
public function saveAttachmentsForModel(object $model, ?array $files): bool
|
||||||
{
|
{
|
||||||
if(!($model instanceof Model)) {
|
if(!($model instanceof Model)) {
|
||||||
return false;
|
return false; // @codeCoverageIgnore
|
||||||
}
|
}
|
||||||
Log::debug(sprintf('Now in saveAttachmentsForModel for model %s', \get_class($model)));
|
Log::debug(sprintf('Now in saveAttachmentsForModel for model %s', \get_class($model)));
|
||||||
if (\is_array($files)) {
|
if (\is_array($files)) {
|
||||||
@@ -270,7 +270,7 @@ class AttachmentHelper implements AttachmentHelperInterface
|
|||||||
$fileObject->rewind();
|
$fileObject->rewind();
|
||||||
|
|
||||||
if(0 === $file->getSize()) {
|
if(0 === $file->getSize()) {
|
||||||
throw new FireflyException('Cannot upload empty or non-existent file.');
|
throw new FireflyException('Cannot upload empty or non-existent file.'); // @codeCoverageIgnore
|
||||||
}
|
}
|
||||||
|
|
||||||
$content = $fileObject->fread($file->getSize());
|
$content = $fileObject->fread($file->getSize());
|
||||||
|
@@ -22,6 +22,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Http\Controllers\Json;
|
namespace FireflyIII\Http\Controllers\Json;
|
||||||
|
|
||||||
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
|
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
|
||||||
use FireflyIII\Http\Controllers\Controller;
|
use FireflyIII\Http\Controllers\Controller;
|
||||||
use FireflyIII\Models\Account;
|
use FireflyIII\Models\Account;
|
||||||
@@ -37,58 +38,16 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
|
|||||||
use FireflyIII\Support\CacheProperties;
|
use FireflyIII\Support\CacheProperties;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* TODO refactor so each auto-complete thing is a function call because lots of code duplication.
|
|
||||||
* Class AutoCompleteController.
|
* Class AutoCompleteController.
|
||||||
*
|
*
|
||||||
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
|
|
||||||
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
|
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
|
||||||
*/
|
*/
|
||||||
class AutoCompleteController extends Controller
|
class AutoCompleteController extends Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a JSON list of all accounts.
|
|
||||||
*
|
|
||||||
* @param Request $request
|
|
||||||
* @param AccountRepositoryInterface $repository
|
|
||||||
*
|
|
||||||
* @return JsonResponse
|
|
||||||
*/
|
|
||||||
public function allAccounts(Request $request, AccountRepositoryInterface $repository): JsonResponse
|
|
||||||
{
|
|
||||||
$search = (string)$request->get('search');
|
|
||||||
$cache = new CacheProperties;
|
|
||||||
$cache->addProperty('ac-all-accounts');
|
|
||||||
// very unlikely a user will actually search for this string.
|
|
||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
|
||||||
$cache->addProperty($key);
|
|
||||||
if ($cache->has()) {
|
|
||||||
return response()->json($cache->get());
|
|
||||||
}
|
|
||||||
// find everything:
|
|
||||||
$return = array_values(
|
|
||||||
array_unique(
|
|
||||||
$repository->getAccountsByType(
|
|
||||||
[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET]
|
|
||||||
)->pluck('name')->toArray()
|
|
||||||
)
|
|
||||||
);
|
|
||||||
if ('' !== $search) {
|
|
||||||
$return = array_values(
|
|
||||||
array_filter(
|
|
||||||
$return, function (string $value) use ($search) {
|
|
||||||
return !(false === stripos($value, $search));
|
|
||||||
}, ARRAY_FILTER_USE_BOTH
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
$cache->store($return);
|
|
||||||
|
|
||||||
return response()->json($return);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of all journals.
|
* List of all journals.
|
||||||
*
|
*
|
||||||
@@ -106,7 +65,7 @@ class AutoCompleteController extends Controller
|
|||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
||||||
$cache->addProperty($key);
|
$cache->addProperty($key);
|
||||||
if ($cache->has()) {
|
if ($cache->has()) {
|
||||||
return response()->json($cache->get());
|
return response()->json($cache->get()); // @codeCoverageIgnore
|
||||||
}
|
}
|
||||||
// find everything:
|
// find everything:
|
||||||
$collector->setLimit(250)->setPage(1);
|
$collector->setLimit(250)->setPage(1);
|
||||||
@@ -129,251 +88,85 @@ class AutoCompleteController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of revenue accounts.
|
|
||||||
*
|
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
* @param AccountRepositoryInterface $repository
|
* @param string $subject
|
||||||
*
|
*
|
||||||
|
* @throws FireflyException
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
*/
|
*/
|
||||||
public function assetAccounts(Request $request, AccountRepositoryInterface $repository): JsonResponse
|
public function autoComplete(Request $request, string $subject): JsonResponse
|
||||||
{
|
{
|
||||||
$search = (string)$request->get('search');
|
$search = (string)$request->get('search');
|
||||||
|
$unfiltered = null;
|
||||||
|
$filtered = null;
|
||||||
$cache = new CacheProperties;
|
$cache = new CacheProperties;
|
||||||
$cache->addProperty('ac-asset-accounts');
|
$cache->addProperty($subject);
|
||||||
// very unlikely a user will actually search for this string.
|
// very unlikely a user will actually search for this string.
|
||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
||||||
$cache->addProperty($key);
|
$cache->addProperty($key);
|
||||||
if ($cache->has()) {
|
if ($cache->has()) {
|
||||||
return response()->json($cache->get());
|
return response()->json($cache->get()); // @codeCoverageIgnore
|
||||||
}
|
}
|
||||||
// find everything:
|
// search for all accounts.
|
||||||
$set = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
|
if ('all-accounts' === $subject) {
|
||||||
$filtered = $set->filter(
|
$unfiltered = $this->getAccounts(
|
||||||
function (Account $account) {
|
[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET, AccountType::LOAN,
|
||||||
if (true === $account->active) {
|
AccountType::DEBT, AccountType::MORTGAGE]
|
||||||
return $account;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false; // @codeCoverageIgnore
|
|
||||||
}
|
|
||||||
);
|
|
||||||
$return = array_values(array_unique($filtered->pluck('name')->toArray()));
|
|
||||||
|
|
||||||
if ('' !== $search) {
|
|
||||||
$return = array_values(
|
|
||||||
array_unique(
|
|
||||||
array_filter(
|
|
||||||
$return, function (string $value) use ($search) {
|
|
||||||
return !(false === stripos($value, $search));
|
|
||||||
}, ARRAY_FILTER_USE_BOTH
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$cache->store($return);
|
|
||||||
|
|
||||||
return response()->json($return);
|
// search for expense accounts.
|
||||||
|
if ('expense-accounts' === $subject) {
|
||||||
|
$unfiltered = $this->getAccounts([AccountType::EXPENSE, AccountType::BENEFICIARY]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// search for revenue accounts.
|
||||||
* Returns a JSON list of all bills.
|
if ('revenue-accounts' === $subject) {
|
||||||
*
|
$unfiltered = $this->getAccounts([AccountType::REVENUE]);
|
||||||
* @param Request $request
|
|
||||||
* @param BillRepositoryInterface $repository
|
|
||||||
*
|
|
||||||
* @return JsonResponse
|
|
||||||
*/
|
|
||||||
public function bills(Request $request, BillRepositoryInterface $repository): JsonResponse
|
|
||||||
{
|
|
||||||
$search = (string)$request->get('search');
|
|
||||||
$cache = new CacheProperties;
|
|
||||||
$cache->addProperty('ac-bills');
|
|
||||||
// very unlikely a user will actually search for this string.
|
|
||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
|
||||||
$cache->addProperty($key);
|
|
||||||
if ($cache->has()) {
|
|
||||||
return response()->json($cache->get());
|
|
||||||
}
|
|
||||||
// find everything:
|
|
||||||
$return = array_unique($repository->getActiveBills()->pluck('name')->toArray());
|
|
||||||
|
|
||||||
if ('' !== $search) {
|
|
||||||
$return = array_values(
|
|
||||||
array_unique(
|
|
||||||
array_filter(
|
|
||||||
$return, function (string $value) use ($search) {
|
|
||||||
return !(false === stripos($value, $search));
|
|
||||||
}, ARRAY_FILTER_USE_BOTH
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
$cache->store($return);
|
|
||||||
|
|
||||||
return response()->json($return);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// search for asset accounts.
|
||||||
* List of budgets.
|
if ('asset-accounts' === $subject) {
|
||||||
*
|
$unfiltered = $this->getAccounts([AccountType::ASSET, AccountType::DEFAULT]);
|
||||||
* @param Request $request
|
|
||||||
* @param BudgetRepositoryInterface $repository
|
|
||||||
*
|
|
||||||
* @return JsonResponse
|
|
||||||
*/
|
|
||||||
public function budgets(Request $request, BudgetRepositoryInterface $repository): JsonResponse
|
|
||||||
{
|
|
||||||
$search = (string)$request->get('search');
|
|
||||||
$cache = new CacheProperties;
|
|
||||||
$cache->addProperty('ac-budgets');
|
|
||||||
// very unlikely a user will actually search for this string.
|
|
||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
|
||||||
$cache->addProperty($key);
|
|
||||||
if ($cache->has()) {
|
|
||||||
return response()->json($cache->get());
|
|
||||||
}
|
|
||||||
// find everything:
|
|
||||||
$return = array_unique($repository->getBudgets()->pluck('name')->toArray());
|
|
||||||
|
|
||||||
if ('' !== $search) {
|
|
||||||
$return = array_values(
|
|
||||||
array_unique(
|
|
||||||
array_filter(
|
|
||||||
$return, function (string $value) use ($search) {
|
|
||||||
return !(false === stripos($value, $search));
|
|
||||||
}, ARRAY_FILTER_USE_BOTH
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
$cache->store($return);
|
|
||||||
|
|
||||||
return response()->json($return);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// search for categories.
|
||||||
* Returns a list of categories.
|
if ('categories' === $subject) {
|
||||||
*
|
$unfiltered = $this->getCategories();
|
||||||
* @param Request $request
|
|
||||||
* @param CategoryRepositoryInterface $repository
|
|
||||||
*
|
|
||||||
* @return JsonResponse
|
|
||||||
*/
|
|
||||||
public function categories(Request $request, CategoryRepositoryInterface $repository): JsonResponse
|
|
||||||
{
|
|
||||||
$search = (string)$request->get('search');
|
|
||||||
$cache = new CacheProperties;
|
|
||||||
$cache->addProperty('ac-categories');
|
|
||||||
// very unlikely a user will actually search for this string.
|
|
||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
|
||||||
$cache->addProperty($key);
|
|
||||||
if ($cache->has()) {
|
|
||||||
return response()->json($cache->get());
|
|
||||||
}
|
|
||||||
// find everything:
|
|
||||||
$return = array_unique($repository->getCategories()->pluck('name')->toArray());
|
|
||||||
if ('' !== $search) {
|
|
||||||
$return = array_values(
|
|
||||||
array_filter(
|
|
||||||
$return, function (string $value) use ($search) {
|
|
||||||
return !(false === stripos($value, $search));
|
|
||||||
}, ARRAY_FILTER_USE_BOTH
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
$cache->store($return);
|
|
||||||
|
|
||||||
return response()->json($return);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// search for budgets.
|
||||||
* List of currency names.
|
if ('budgets' === $subject) {
|
||||||
*
|
$unfiltered = $this->getBudgets();
|
||||||
* @param Request $request
|
|
||||||
* @param CurrencyRepositoryInterface $repository
|
|
||||||
*
|
|
||||||
* @return JsonResponse
|
|
||||||
*/
|
|
||||||
public function currencyNames(Request $request, CurrencyRepositoryInterface $repository): JsonResponse
|
|
||||||
{
|
|
||||||
$search = (string)$request->get('search');
|
|
||||||
$cache = new CacheProperties;
|
|
||||||
$cache->addProperty('ac-currency-names');
|
|
||||||
// very unlikely a user will actually search for this string.
|
|
||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
|
||||||
$cache->addProperty($key);
|
|
||||||
if ($cache->has()) {
|
|
||||||
return response()->json($cache->get());
|
|
||||||
}
|
|
||||||
// find everything:
|
|
||||||
$return = $repository->get()->pluck('name')->toArray();
|
|
||||||
sort($return);
|
|
||||||
|
|
||||||
if ('' !== $search) {
|
|
||||||
$return = array_values(
|
|
||||||
array_unique(
|
|
||||||
array_filter(
|
|
||||||
$return, function (string $value) use ($search) {
|
|
||||||
return !(false === stripos($value, $search));
|
|
||||||
}, ARRAY_FILTER_USE_BOTH
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
$cache->store($return);
|
|
||||||
|
|
||||||
return response()->json($return);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// search for tags
|
||||||
* Returns a JSON list of all beneficiaries.
|
if ('tags' === $subject) {
|
||||||
*
|
$unfiltered = $this->getTags();
|
||||||
* @param Request $request
|
|
||||||
* @param AccountRepositoryInterface $repository
|
|
||||||
*
|
|
||||||
* @return JsonResponse
|
|
||||||
*/
|
|
||||||
public function expenseAccounts(Request $request, AccountRepositoryInterface $repository): JsonResponse
|
|
||||||
{
|
|
||||||
$search = (string)$request->get('search');
|
|
||||||
$cache = new CacheProperties;
|
|
||||||
$cache->addProperty('ac-expense-accounts');
|
|
||||||
// very unlikely a user will actually search for this string.
|
|
||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
|
||||||
$cache->addProperty($key);
|
|
||||||
if ($cache->has()) {
|
|
||||||
return response()->json($cache->get());
|
|
||||||
}
|
|
||||||
// find everything:
|
|
||||||
$set = $repository->getAccountsByType([AccountType::EXPENSE, AccountType::BENEFICIARY]);
|
|
||||||
$filtered = $set->filter(
|
|
||||||
function (Account $account) {
|
|
||||||
if (true === $account->active) {
|
|
||||||
return $account;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
// search for bills
|
||||||
|
if ('bills' === $subject) {
|
||||||
|
$unfiltered = $this->getBills();
|
||||||
}
|
}
|
||||||
);
|
// search for currency names.
|
||||||
$return = array_unique($filtered->pluck('name')->toArray());
|
if ('currency-names' === $subject) {
|
||||||
|
$unfiltered = $this->getCurrencyNames();
|
||||||
sort($return);
|
}
|
||||||
|
if ('transaction_types' === $subject) {
|
||||||
if ('' !== $search) {
|
$unfiltered = $this->getTransactionTypes();
|
||||||
$return = array_values(
|
|
||||||
array_unique(
|
|
||||||
array_filter(
|
|
||||||
$return, function (string $value) use ($search) {
|
|
||||||
return !(false === stripos($value, $search));
|
|
||||||
}, ARRAY_FILTER_USE_BOTH
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
$cache->store($return);
|
|
||||||
|
|
||||||
return response()->json($return);
|
|
||||||
|
// filter results
|
||||||
|
$filtered = $this->filterResult($unfiltered, $search);
|
||||||
|
|
||||||
|
if (null === $filtered) {
|
||||||
|
throw new FireflyException(sprintf('Auto complete handler cannot handle "%s"', $subject)); // @codeCoverageIgnore
|
||||||
|
}
|
||||||
|
$cache->store($filtered);
|
||||||
|
|
||||||
|
return response()->json($filtered);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -394,7 +187,7 @@ class AutoCompleteController extends Controller
|
|||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
||||||
$cache->addProperty($key);
|
$cache->addProperty($key);
|
||||||
if ($cache->has()) {
|
if ($cache->has()) {
|
||||||
return response()->json($cache->get());
|
return response()->json($cache->get()); // @codeCoverageIgnore
|
||||||
}
|
}
|
||||||
// find everything:
|
// find everything:
|
||||||
$collector->setLimit(400)->setPage(1);
|
$collector->setLimit(400)->setPage(1);
|
||||||
@@ -430,94 +223,6 @@ class AutoCompleteController extends Controller
|
|||||||
return response()->json($return);
|
return response()->json($return);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* List of revenue accounts.
|
|
||||||
*
|
|
||||||
* @param Request $request
|
|
||||||
* @param AccountRepositoryInterface $repository
|
|
||||||
*
|
|
||||||
* @return JsonResponse
|
|
||||||
*/
|
|
||||||
public function revenueAccounts(Request $request, AccountRepositoryInterface $repository): JsonResponse
|
|
||||||
{
|
|
||||||
$search = (string)$request->get('search');
|
|
||||||
$cache = new CacheProperties;
|
|
||||||
$cache->addProperty('ac-revenue-accounts');
|
|
||||||
// very unlikely a user will actually search for this string.
|
|
||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
|
||||||
$cache->addProperty($key);
|
|
||||||
if ($cache->has()) {
|
|
||||||
return response()->json($cache->get());
|
|
||||||
}
|
|
||||||
// find everything:
|
|
||||||
$set = $repository->getAccountsByType([AccountType::REVENUE]);
|
|
||||||
$filtered = $set->filter(
|
|
||||||
function (Account $account) {
|
|
||||||
if (true === $account->active) {
|
|
||||||
return $account;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
$return = array_unique($filtered->pluck('name')->toArray());
|
|
||||||
sort($return);
|
|
||||||
|
|
||||||
if ('' !== $search) {
|
|
||||||
$return = array_values(
|
|
||||||
array_unique(
|
|
||||||
array_filter(
|
|
||||||
$return, function (string $value) use ($search) {
|
|
||||||
return !(false === stripos($value, $search));
|
|
||||||
}, ARRAY_FILTER_USE_BOTH
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
$cache->store($return);
|
|
||||||
|
|
||||||
return response()->json($return);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a JSON list of all beneficiaries.
|
|
||||||
*
|
|
||||||
* @param Request $request
|
|
||||||
* @param TagRepositoryInterface $tagRepository
|
|
||||||
*
|
|
||||||
* @return JsonResponse
|
|
||||||
*/
|
|
||||||
public function tags(Request $request, TagRepositoryInterface $tagRepository): JsonResponse
|
|
||||||
{
|
|
||||||
$search = (string)$request->get('search');
|
|
||||||
$cache = new CacheProperties;
|
|
||||||
$cache->addProperty('ac-revenue-accounts');
|
|
||||||
// very unlikely a user will actually search for this string.
|
|
||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
|
||||||
$cache->addProperty($key);
|
|
||||||
if ($cache->has()) {
|
|
||||||
return response()->json($cache->get());
|
|
||||||
}
|
|
||||||
// find everything:
|
|
||||||
$return = array_unique($tagRepository->get()->pluck('tag')->toArray());
|
|
||||||
sort($return);
|
|
||||||
|
|
||||||
if ('' !== $search) {
|
|
||||||
$return = array_values(
|
|
||||||
array_unique(
|
|
||||||
array_filter(
|
|
||||||
$return, function (string $value) use ($search) {
|
|
||||||
return !(false === stripos($value, $search));
|
|
||||||
}, ARRAY_FILTER_USE_BOTH
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
$cache->store($return);
|
|
||||||
|
|
||||||
return response()->json($return);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of journals by type.
|
* List of journals by type.
|
||||||
*
|
*
|
||||||
@@ -536,7 +241,7 @@ class AutoCompleteController extends Controller
|
|||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
||||||
$cache->addProperty($key);
|
$cache->addProperty($key);
|
||||||
if ($cache->has()) {
|
if ($cache->has()) {
|
||||||
return response()->json($cache->get());
|
return response()->json($cache->get()); // @codeCoverageIgnore
|
||||||
}
|
}
|
||||||
// find everything:
|
// find everything:
|
||||||
$type = config('firefly.transactionTypesByWhat.' . $what);
|
$type = config('firefly.transactionTypesByWhat.' . $what);
|
||||||
@@ -563,43 +268,117 @@ class AutoCompleteController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List if transaction types.
|
* @param array $unfiltered
|
||||||
|
* @param string $query
|
||||||
*
|
*
|
||||||
* @param Request $request
|
* @return array|null
|
||||||
* @param JournalRepositoryInterface $repository
|
|
||||||
*
|
|
||||||
* @return JsonResponse
|
|
||||||
*/
|
*/
|
||||||
public function transactionTypes(Request $request, JournalRepositoryInterface $repository): JsonResponse
|
private function filterResult(?array $unfiltered, string $query): ?array
|
||||||
{
|
{
|
||||||
$search = (string)$request->get('search');
|
if (null === $unfiltered) {
|
||||||
$cache = new CacheProperties;
|
return null; // @codeCoverageIgnore
|
||||||
$cache->addProperty('ac-revenue-accounts');
|
|
||||||
// very unlikely a user will actually search for this string.
|
|
||||||
$key = '' === $search ? 'skjf0893j89fj2398hd89dh289h2398hr7isd8900828u209ujnxs88929282u' : $search;
|
|
||||||
$cache->addProperty($key);
|
|
||||||
if ($cache->has()) {
|
|
||||||
return response()->json($cache->get());
|
|
||||||
}
|
}
|
||||||
// find everything:
|
if ('' === $query) {
|
||||||
$return = array_unique($repository->getTransactionTypes()->pluck('type')->toArray());
|
sort($unfiltered);
|
||||||
sort($return);
|
|
||||||
|
|
||||||
if ('' !== $search) {
|
return $unfiltered;
|
||||||
|
}
|
||||||
|
$return = [];
|
||||||
|
if ('' !== $query) {
|
||||||
$return = array_values(
|
$return = array_values(
|
||||||
array_unique(
|
|
||||||
array_filter(
|
array_filter(
|
||||||
$return, function (string $value) use ($search) {
|
$unfiltered, function (string $value) use ($query) {
|
||||||
return !(false === stripos($value, $search));
|
return !(false === stripos($value, $query));
|
||||||
}, ARRAY_FILTER_USE_BOTH
|
}, ARRAY_FILTER_USE_BOTH
|
||||||
)
|
)
|
||||||
)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$cache->store($return);
|
sort($return);
|
||||||
|
|
||||||
return response()->json($return);
|
|
||||||
|
|
||||||
|
return $return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $query
|
||||||
|
* @param array $types
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function getAccounts(array $types): array
|
||||||
|
{
|
||||||
|
$repository = app(AccountRepositoryInterface::class);
|
||||||
|
// find everything:
|
||||||
|
/** @var Collection $collection */
|
||||||
|
$collection = $repository->getAccountsByType($types);
|
||||||
|
$filtered =$collection->filter(function(Account $account) {
|
||||||
|
return $account->active === true;
|
||||||
|
});
|
||||||
|
$return = array_values(array_unique($filtered->pluck('name')->toArray()));
|
||||||
|
|
||||||
|
return $return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function getBills(): array
|
||||||
|
{
|
||||||
|
$repository = app(BillRepositoryInterface::class);
|
||||||
|
|
||||||
|
return array_unique($repository->getActiveBills()->pluck('name')->toArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function getBudgets(): array
|
||||||
|
{
|
||||||
|
$repository = app(BudgetRepositoryInterface::class);
|
||||||
|
|
||||||
|
return array_unique($repository->getBudgets()->pluck('name')->toArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function getCategories(): array
|
||||||
|
{
|
||||||
|
$repository = app(CategoryRepositoryInterface::class);
|
||||||
|
|
||||||
|
return array_unique($repository->getCategories()->pluck('name')->toArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function getCurrencyNames(): array
|
||||||
|
{
|
||||||
|
/** @var CurrencyRepositoryInterface $repository */
|
||||||
|
$repository = app(CurrencyRepositoryInterface::class);
|
||||||
|
|
||||||
|
return $repository->get()->pluck('name')->toArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function getTags(): array
|
||||||
|
{
|
||||||
|
/** @var TagRepositoryInterface $repository */
|
||||||
|
$repository = app(TagRepositoryInterface::class);
|
||||||
|
|
||||||
|
return array_unique($repository->get()->pluck('tag')->toArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function getTransactionTypes(): array
|
||||||
|
{
|
||||||
|
$repository = app(JournalRepositoryInterface::class);
|
||||||
|
|
||||||
|
return array_unique($repository->getTransactionTypes()->pluck('type')->toArray());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -168,8 +168,10 @@ class SplitJournalFormRequest extends Request
|
|||||||
/** @var array $array */
|
/** @var array $array */
|
||||||
foreach ($transactions as $array) {
|
foreach ($transactions as $array) {
|
||||||
if (null !== $array['destination_id'] && null !== $array['source_id'] && $array['destination_id'] === $array['source_id']) {
|
if (null !== $array['destination_id'] && null !== $array['source_id'] && $array['destination_id'] === $array['source_id']) {
|
||||||
|
// @codeCoverageIgnoreStart
|
||||||
$validator->errors()->add('journal_source_id', (string)trans('validation.source_equals_destination'));
|
$validator->errors()->add('journal_source_id', (string)trans('validation.source_equals_destination'));
|
||||||
$validator->errors()->add('journal_destination_id', (string)trans('validation.source_equals_destination'));
|
$validator->errors()->add('journal_destination_id', (string)trans('validation.source_equals_destination'));
|
||||||
|
// @codeCoverageIgnoreEnd
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -193,9 +193,11 @@ class ImportArrayStorage
|
|||||||
unset($transaction['importHashV2'], $transaction['original-source']);
|
unset($transaction['importHashV2'], $transaction['original-source']);
|
||||||
$json = json_encode($transaction);
|
$json = json_encode($transaction);
|
||||||
if (false === $json) {
|
if (false === $json) {
|
||||||
|
// @codeCoverageIgnoreStart
|
||||||
/** @noinspection ForgottenDebugOutputInspection */
|
/** @noinspection ForgottenDebugOutputInspection */
|
||||||
Log::error('Could not encode import array.', print_r($transaction, true));
|
Log::error('Could not encode import array.', print_r($transaction, true));
|
||||||
throw new FireflyException('Could not encode import array. Please see the logs.'); // @codeCoverageIgnore
|
throw new FireflyException('Could not encode import array. Please see the logs.');
|
||||||
|
// @codeCoverageIgnoreEnd
|
||||||
}
|
}
|
||||||
$hash = hash('sha256', $json, false);
|
$hash = hash('sha256', $json, false);
|
||||||
Log::debug(sprintf('The hash is: %s', $hash));
|
Log::debug(sprintf('The hash is: %s', $hash));
|
||||||
|
@@ -179,10 +179,6 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue
|
|||||||
++$misses;
|
++$misses;
|
||||||
}
|
}
|
||||||
Log::info(sprintf('Current progress: %d Transactions. Hits: %d, misses: %d', $total, $hits, $misses));
|
Log::info(sprintf('Current progress: %d Transactions. Hits: %d, misses: %d', $total, $hits, $misses));
|
||||||
// Stop processing this group if the rule specifies 'stop_processing'
|
|
||||||
if ($processor->getRule()->stop_processing) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Log::info(sprintf('Total transactions: %d. Hits: %d, misses: %d', $total, $hits, $misses));
|
Log::info(sprintf('Total transactions: %d. Hits: %d, misses: %d', $total, $hits, $misses));
|
||||||
}
|
}
|
||||||
|
@@ -543,19 +543,12 @@ Route::group(
|
|||||||
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'json', 'as' => 'json.'], function () {
|
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'json', 'as' => 'json.'], function () {
|
||||||
|
|
||||||
// for auto complete
|
// for auto complete
|
||||||
Route::get('expense-accounts', ['uses' => 'Json\AutoCompleteController@expenseAccounts', 'as' => 'expense-accounts']);
|
|
||||||
Route::get('all-accounts', ['uses' => 'Json\AutoCompleteController@allAccounts', 'as' => 'all-accounts']);
|
|
||||||
Route::get('revenue-accounts', ['uses' => 'Json\AutoCompleteController@revenueAccounts', 'as' => 'revenue-accounts']);
|
|
||||||
Route::get('asset-accounts', ['uses' => 'Json\AutoCompleteController@assetAccounts', 'as' => 'asset-accounts']);
|
|
||||||
Route::get('categories', ['uses' => 'Json\AutoCompleteController@categories', 'as' => 'categories']);
|
|
||||||
Route::get('budgets', ['uses' => 'Json\AutoCompleteController@budgets', 'as' => 'budgets']);
|
|
||||||
Route::get('tags', ['uses' => 'Json\AutoCompleteController@tags', 'as' => 'tags']);
|
|
||||||
Route::get('bills', ['uses' => 'Json\AutoCompleteController@bills', 'as' => 'bills']);
|
|
||||||
Route::get('currency-names', ['uses' => 'Json\AutoCompleteController@currencyNames', 'as' => 'currency-names']);
|
|
||||||
Route::get('transaction-journals/all', ['uses' => 'Json\AutoCompleteController@allTransactionJournals', 'as' => 'all-transaction-journals']);
|
Route::get('transaction-journals/all', ['uses' => 'Json\AutoCompleteController@allTransactionJournals', 'as' => 'all-transaction-journals']);
|
||||||
Route::get('transaction-journals/with-id/{tj}', ['uses' => 'Json\AutoCompleteController@journalsWithId', 'as' => 'journals-with-id']);
|
Route::get('transaction-journals/with-id/{tj}', ['uses' => 'Json\AutoCompleteController@journalsWithId', 'as' => 'journals-with-id']);
|
||||||
Route::get('transaction-journals/{what}', ['uses' => 'Json\AutoCompleteController@transactionJournals', 'as' => 'transaction-journals']);
|
Route::get('transaction-journals/{what}', ['uses' => 'Json\AutoCompleteController@transactionJournals', 'as' => 'transaction-journals']);
|
||||||
Route::get('transaction-types', ['uses' => 'Json\AutoCompleteController@transactionTypes', 'as' => 'transaction-types']);
|
// Route::get('transaction-types', ['uses' => 'Json\AutoCompleteController@transactionTypes', 'as' => 'transaction-types']);
|
||||||
|
|
||||||
// boxes
|
// boxes
|
||||||
Route::get('box/balance', ['uses' => 'Json\BoxController@balance', 'as' => 'box.balance']);
|
Route::get('box/balance', ['uses' => 'Json\BoxController@balance', 'as' => 'box.balance']);
|
||||||
@@ -578,6 +571,7 @@ Route::group(
|
|||||||
Route::post('intro/enable/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postEnable', 'as' => 'intro.enable']);
|
Route::post('intro/enable/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postEnable', 'as' => 'intro.enable']);
|
||||||
Route::get('intro/{route}/{specificPage?}', ['uses' => 'Json\IntroController@getIntroSteps', 'as' => 'intro']);
|
Route::get('intro/{route}/{specificPage?}', ['uses' => 'Json\IntroController@getIntroSteps', 'as' => 'intro']);
|
||||||
|
|
||||||
|
Route::get('/{subject}', ['uses' => 'Json\AutoCompleteController@autoComplete', 'as' => 'autocomplete']);
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@@ -29,6 +29,7 @@ use FireflyIII\Models\Bill;
|
|||||||
use FireflyIII\Models\Budget;
|
use FireflyIII\Models\Budget;
|
||||||
use FireflyIII\Models\Category;
|
use FireflyIII\Models\Category;
|
||||||
use FireflyIII\Models\Tag;
|
use FireflyIII\Models\Tag;
|
||||||
|
use FireflyIII\Models\Transaction;
|
||||||
use FireflyIII\Models\TransactionCurrency;
|
use FireflyIII\Models\TransactionCurrency;
|
||||||
use FireflyIII\Models\TransactionJournal;
|
use FireflyIII\Models\TransactionJournal;
|
||||||
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
|
||||||
@@ -47,8 +48,6 @@ use Tests\TestCase;
|
|||||||
*/
|
*/
|
||||||
class AutoCompleteControllerTest extends TestCase
|
class AutoCompleteControllerTest extends TestCase
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@@ -68,11 +67,12 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$collection = new Collection([$accountA]);
|
$collection = new Collection([$accountA]);
|
||||||
$accountRepos = $this->mock(AccountRepositoryInterface::class);
|
$accountRepos = $this->mock(AccountRepositoryInterface::class);
|
||||||
$accountRepos->shouldReceive('getAccountsByType')
|
$accountRepos->shouldReceive('getAccountsByType')
|
||||||
->withArgs([[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET]])
|
->withArgs([[AccountType::REVENUE, AccountType::EXPENSE, AccountType::BENEFICIARY, AccountType::DEFAULT, AccountType::ASSET, AccountType::LOAN,
|
||||||
|
AccountType::DEBT, AccountType::MORTGAGE]])
|
||||||
->andReturn($collection);
|
->andReturn($collection);
|
||||||
|
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.all-accounts'));
|
$response = $this->get(route('json.autocomplete',['all-accounts']));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertExactJson([$accountA->name]);
|
$response->assertExactJson([$accountA->name]);
|
||||||
|
|
||||||
@@ -88,10 +88,10 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$collection = new Collection([$accountA]);
|
$collection = new Collection([$accountA]);
|
||||||
$accountRepos = $this->mock(AccountRepositoryInterface::class);
|
$accountRepos = $this->mock(AccountRepositoryInterface::class);
|
||||||
$accountRepos->shouldReceive('getAccountsByType')
|
$accountRepos->shouldReceive('getAccountsByType')
|
||||||
->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn($collection);
|
->withArgs([[AccountType::ASSET, AccountType::DEFAULT]])->andReturn($collection);
|
||||||
|
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.asset-accounts'));
|
$response = $this->get(route('json.autocomplete',['asset-accounts']));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertExactJson([$accountA->name]);
|
$response->assertExactJson([$accountA->name]);
|
||||||
|
|
||||||
@@ -102,16 +102,39 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
*/
|
*/
|
||||||
public function testAllTransactionJournals(): void
|
public function testAllTransactionJournals(): void
|
||||||
{
|
{
|
||||||
|
$transaction = new Transaction();
|
||||||
|
$transaction->description = 'hi there';
|
||||||
|
$collection = new Collection([$transaction]);
|
||||||
|
|
||||||
$collector = $this->mock(TransactionCollectorInterface::class);
|
$collector = $this->mock(TransactionCollectorInterface::class);
|
||||||
$collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf();
|
$collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf();
|
||||||
$collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
|
$collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
|
||||||
$collector->shouldReceive('getTransactions')->andReturn(new Collection);
|
$collector->shouldReceive('getTransactions')->andReturn($collection);
|
||||||
|
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.all-transaction-journals'));
|
$response = $this->get(route('json.all-transaction-journals'));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
|
||||||
|
*/
|
||||||
|
public function testAllTransactionJournalsSearch(): void
|
||||||
|
{
|
||||||
|
$transaction = new Transaction();
|
||||||
|
$transaction->description = 'hi there';
|
||||||
|
$collection = new Collection([$transaction]);
|
||||||
|
|
||||||
|
$collector = $this->mock(TransactionCollectorInterface::class);
|
||||||
|
$collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf();
|
||||||
|
$collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
|
||||||
|
$collector->shouldReceive('getTransactions')->andReturn($collection);
|
||||||
|
|
||||||
|
$this->be($this->user());
|
||||||
|
$response = $this->get(route('json.all-transaction-journals').'?search=hi');
|
||||||
|
$response->assertStatus(200);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
|
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
|
||||||
*/
|
*/
|
||||||
@@ -123,7 +146,22 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$repository->shouldReceive('getActiveBills')->andReturn($bills);
|
$repository->shouldReceive('getActiveBills')->andReturn($bills);
|
||||||
|
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.bills'));
|
$response = $this->get(route('json.autocomplete',['bills']));
|
||||||
|
$response->assertStatus(200);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
|
||||||
|
*/
|
||||||
|
public function testBillsSearch(): void
|
||||||
|
{
|
||||||
|
$repository = $this->mock(BillRepositoryInterface::class);
|
||||||
|
$bills = factory(Bill::class, 10)->make();
|
||||||
|
|
||||||
|
$repository->shouldReceive('getActiveBills')->andReturn($bills);
|
||||||
|
|
||||||
|
$this->be($this->user());
|
||||||
|
$response = $this->get(route('json.autocomplete',['bills']).'?search=1234');
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,7 +177,7 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
|
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
|
||||||
$categoryRepos->shouldReceive('getBudgets')->andReturn(new Collection([$budget]));
|
$categoryRepos->shouldReceive('getBudgets')->andReturn(new Collection([$budget]));
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.budgets'));
|
$response = $this->get(route('json.autocomplete',['budgets']));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertExactJson([$budget->name]);
|
$response->assertExactJson([$budget->name]);
|
||||||
}
|
}
|
||||||
@@ -156,7 +194,7 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
|
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
|
||||||
$categoryRepos->shouldReceive('getCategories')->andReturn(new Collection([$category]));
|
$categoryRepos->shouldReceive('getCategories')->andReturn(new Collection([$category]));
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.categories'));
|
$response = $this->get(route('json.autocomplete',['categories']));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertExactJson([$category->name]);
|
$response->assertExactJson([$category->name]);
|
||||||
}
|
}
|
||||||
@@ -172,7 +210,7 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$repository->shouldReceive('get')->andReturn(new Collection([$currency]))->once();
|
$repository->shouldReceive('get')->andReturn(new Collection([$currency]))->once();
|
||||||
|
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.currency-names'));
|
$response = $this->get(route('json.autocomplete',['currency-names']));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertExactJson(['Euro']);
|
$response->assertExactJson(['Euro']);
|
||||||
}
|
}
|
||||||
@@ -194,7 +232,7 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::EXPENSE, AccountType::BENEFICIARY]])->once()->andReturn($collection);
|
$accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::EXPENSE, AccountType::BENEFICIARY]])->once()->andReturn($collection);
|
||||||
|
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.expense-accounts'));
|
$response = $this->get(route('json.autocomplete',['expense-accounts']));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertExactJson([$accountA->name]);
|
$response->assertExactJson([$accountA->name]);
|
||||||
}
|
}
|
||||||
@@ -218,6 +256,25 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$response->assertExactJson([['id' => $journal->id, 'name' => $journal->id . ': ' . $journal->description]]);
|
$response->assertExactJson([['id' => $journal->id, 'name' => $journal->id . ': ' . $journal->description]]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
|
||||||
|
*/
|
||||||
|
public function testJournalsWithIdSearch(): void
|
||||||
|
{
|
||||||
|
$journal = $this->user()->transactionJournals()->where('id', '!=', 1)->first();
|
||||||
|
$journal->journal_id = $journal->id;
|
||||||
|
$collection = new Collection([$journal]);
|
||||||
|
$collector = $this->mock(TransactionCollectorInterface::class);
|
||||||
|
$collector->shouldReceive('setLimit')->withArgs([400])->andReturnSelf();
|
||||||
|
$collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf();
|
||||||
|
$collector->shouldReceive('getTransactions')->andReturn($collection);
|
||||||
|
|
||||||
|
$this->be($this->user());
|
||||||
|
$response = $this->get(route('json.journals-with-id', [1]).'?search=a' );
|
||||||
|
$response->assertStatus(200);
|
||||||
|
$response->assertExactJson([['id' => $journal->id, 'name' => $journal->id . ': ' . $journal->description]]);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
|
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
|
||||||
*/
|
*/
|
||||||
@@ -235,7 +292,7 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::REVENUE]])->once()->andReturn($collection);
|
$accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::REVENUE]])->once()->andReturn($collection);
|
||||||
|
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.revenue-accounts'));
|
$response = $this->get(route('json.autocomplete',['revenue-accounts']));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertExactJson([$accountA->name]);
|
$response->assertExactJson([$accountA->name]);
|
||||||
}
|
}
|
||||||
@@ -253,7 +310,7 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$tagRepos->shouldReceive('get')->andReturn(new Collection([$tag]))->once();
|
$tagRepos->shouldReceive('get')->andReturn(new Collection([$tag]))->once();
|
||||||
|
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.tags'));
|
$response = $this->get(route('json.autocomplete', ['tags']));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertExactJson([$tag->tag]);
|
$response->assertExactJson([$tag->tag]);
|
||||||
}
|
}
|
||||||
@@ -263,6 +320,10 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
*/
|
*/
|
||||||
public function testTransactionJournals(): void
|
public function testTransactionJournals(): void
|
||||||
{
|
{
|
||||||
|
$transaction = new Transaction();
|
||||||
|
$transaction->description = 'hi there';
|
||||||
|
$collection = new Collection([$transaction]);
|
||||||
|
|
||||||
// mock stuff
|
// mock stuff
|
||||||
$collector = $this->mock(TransactionCollectorInterface::class);
|
$collector = $this->mock(TransactionCollectorInterface::class);
|
||||||
$journalRepos = $this->mock(JournalRepositoryInterface::class);
|
$journalRepos = $this->mock(JournalRepositoryInterface::class);
|
||||||
@@ -270,12 +331,36 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$collector->shouldReceive('setTypes')->andReturnSelf();
|
$collector->shouldReceive('setTypes')->andReturnSelf();
|
||||||
$collector->shouldReceive('setLimit')->andReturnSelf();
|
$collector->shouldReceive('setLimit')->andReturnSelf();
|
||||||
$collector->shouldReceive('setPage')->andReturnSelf();
|
$collector->shouldReceive('setPage')->andReturnSelf();
|
||||||
$collector->shouldReceive('getTransactions')->andReturn(new Collection);
|
$collector->shouldReceive('getTransactions')->andReturn($collection);
|
||||||
|
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.transaction-journals', ['deposit']));
|
$response = $this->get(route('json.transaction-journals', ['deposit']));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertExactJson([]);
|
$response->assertExactJson(['hi there']);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController
|
||||||
|
*/
|
||||||
|
public function testTransactionJournalsSearch(): void
|
||||||
|
{
|
||||||
|
$transaction = new Transaction();
|
||||||
|
$transaction->description = 'hi there';
|
||||||
|
$collection = new Collection([$transaction]);
|
||||||
|
|
||||||
|
// mock stuff
|
||||||
|
$collector = $this->mock(TransactionCollectorInterface::class);
|
||||||
|
$journalRepos = $this->mock(JournalRepositoryInterface::class);
|
||||||
|
$journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
|
||||||
|
$collector->shouldReceive('setTypes')->andReturnSelf();
|
||||||
|
$collector->shouldReceive('setLimit')->andReturnSelf();
|
||||||
|
$collector->shouldReceive('setPage')->andReturnSelf();
|
||||||
|
$collector->shouldReceive('getTransactions')->andReturn($collection);
|
||||||
|
|
||||||
|
$this->be($this->user());
|
||||||
|
$response = $this->get(route('json.transaction-journals', ['deposit']).'?search=hi');
|
||||||
|
$response->assertStatus(200);
|
||||||
|
$response->assertExactJson(['hi there']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -289,7 +374,7 @@ class AutoCompleteControllerTest extends TestCase
|
|||||||
$journalRepos->shouldReceive('getTransactionTypes')->once()->andReturn(new Collection);
|
$journalRepos->shouldReceive('getTransactionTypes')->once()->andReturn(new Collection);
|
||||||
|
|
||||||
$this->be($this->user());
|
$this->be($this->user());
|
||||||
$response = $this->get(route('json.transaction-types', ['deposit']));
|
$response = $this->get(route('json.autocomplete',['transaction_types']));
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$response->assertExactJson([]);
|
$response->assertExactJson([]);
|
||||||
}
|
}
|
||||||
|
161
tests/Unit/Import/Prerequisites/YnabPrerequisitesTest.php
Normal file
161
tests/Unit/Import/Prerequisites/YnabPrerequisitesTest.php
Normal file
@@ -0,0 +1,161 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* YnabPrerequisitesTest.php
|
||||||
|
* Copyright (c) 2018 thegrumpydictator@gmail.com
|
||||||
|
*
|
||||||
|
* This file is part of Firefly III.
|
||||||
|
*
|
||||||
|
* Firefly III is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Firefly III is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace tests\Unit\Import\Prerequisites;
|
||||||
|
|
||||||
|
use FireflyIII\Import\Prerequisites\YnabPrerequisites;
|
||||||
|
use FireflyIII\Models\Preference;
|
||||||
|
use Log;
|
||||||
|
use Mockery;
|
||||||
|
use Preferences;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class YnabPrerequisitesTest
|
||||||
|
*/
|
||||||
|
class YnabPrerequisitesTest extends TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public function setUp(): void
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
Log::info(sprintf('Now in %s.', \get_class($this)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Import\Prerequisites\YnabPrerequisites
|
||||||
|
*/
|
||||||
|
public function testGetView(): void
|
||||||
|
{
|
||||||
|
|
||||||
|
$object = new YnabPrerequisites;
|
||||||
|
$object->setUser($this->user());
|
||||||
|
$this->assertEquals('import.ynab.prerequisites', $object->getView());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* First test, user has nothing.
|
||||||
|
*
|
||||||
|
* @covers \FireflyIII\Import\Prerequisites\YnabPrerequisites
|
||||||
|
*/
|
||||||
|
public function testGetViewParametersNull(): void
|
||||||
|
{
|
||||||
|
|
||||||
|
Preferences::shouldReceive('getForUser')->once()->withArgs([Mockery::any(), 'ynab_client_id', null])->andReturn(null);
|
||||||
|
Preferences::shouldReceive('getForUser')->once()->withArgs([Mockery::any(), 'ynab_client_secret', null])->andReturn(null);
|
||||||
|
|
||||||
|
$object = new YnabPrerequisites();
|
||||||
|
$object->setUser($this->user());
|
||||||
|
$result = $object->getViewParameters();
|
||||||
|
|
||||||
|
$expected = ['client_id' => '', 'client_secret' => '', 'callback_uri' => 'http://localhost/import/ynab-callback', 'is_https' => false];
|
||||||
|
|
||||||
|
$this->assertEquals($expected, $result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public function testStorePrerequisites(): void {
|
||||||
|
|
||||||
|
Preferences::shouldReceive('setForUser')->once()->withArgs([Mockery::any(), 'ynab_client_id', 'hello']);
|
||||||
|
Preferences::shouldReceive('setForUser')->once()->withArgs([Mockery::any(), 'ynab_client_secret', 'hi there']);
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
'client_id' => 'hello',
|
||||||
|
'client_secret' => 'hi there'
|
||||||
|
];
|
||||||
|
|
||||||
|
$object = new YnabPrerequisites();
|
||||||
|
$object->setUser($this->user());
|
||||||
|
$object->storePrerequisites($data);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* First test, user has empty.
|
||||||
|
*
|
||||||
|
* @covers \FireflyIII\Import\Prerequisites\YnabPrerequisites
|
||||||
|
*/
|
||||||
|
public function testGetViewParametersEmpty(): void
|
||||||
|
{
|
||||||
|
$clientId = new Preference;
|
||||||
|
$clientId->data = '';
|
||||||
|
|
||||||
|
$clientSecret = new Preference;
|
||||||
|
$clientSecret->data = '';
|
||||||
|
|
||||||
|
Preferences::shouldReceive('getForUser')->once()->withArgs([Mockery::any(), 'ynab_client_id', null])->andReturn($clientId);
|
||||||
|
Preferences::shouldReceive('getForUser')->once()->withArgs([Mockery::any(), 'ynab_client_secret', null])->andReturn($clientSecret);
|
||||||
|
|
||||||
|
$object = new YnabPrerequisites();
|
||||||
|
$object->setUser($this->user());
|
||||||
|
$result = $object->getViewParameters();
|
||||||
|
|
||||||
|
$expected = ['client_id' => '', 'client_secret' => '', 'callback_uri' => 'http://localhost/import/ynab-callback', 'is_https' => false];
|
||||||
|
|
||||||
|
$this->assertEquals($expected, $result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Import\Prerequisites\YnabPrerequisites
|
||||||
|
*/
|
||||||
|
public function testIsComplete(): void
|
||||||
|
{
|
||||||
|
|
||||||
|
Preferences::shouldReceive('getForUser')->once()->withArgs([Mockery::any(), 'ynab_client_id', null])->andReturn(null);
|
||||||
|
|
||||||
|
$object = new YnabPrerequisites();
|
||||||
|
$object->setUser($this->user());
|
||||||
|
$result = $object->isComplete();
|
||||||
|
|
||||||
|
$this->assertFalse($result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* First test, user has nothing.
|
||||||
|
*
|
||||||
|
* @covers \FireflyIII\Import\Prerequisites\YnabPrerequisites
|
||||||
|
*/
|
||||||
|
public function testGetViewParametersFilled(): void
|
||||||
|
{
|
||||||
|
$clientId = new Preference;
|
||||||
|
$clientId->data = 'client-id';
|
||||||
|
|
||||||
|
$clientSecret = new Preference;
|
||||||
|
$clientSecret->data = 'client-secret';
|
||||||
|
|
||||||
|
Preferences::shouldReceive('getForUser')->twice()->withArgs([Mockery::any(), 'ynab_client_id', null])->andReturn($clientId);
|
||||||
|
Preferences::shouldReceive('getForUser')->twice()->withArgs([Mockery::any(), 'ynab_client_secret', null])->andReturn($clientSecret);
|
||||||
|
|
||||||
|
$object = new YnabPrerequisites();
|
||||||
|
$object->setUser($this->user());
|
||||||
|
$result = $object->getViewParameters();
|
||||||
|
|
||||||
|
$expected = ['client_id' => 'client-id', 'client_secret' => 'client-secret', 'callback_uri' => 'http://localhost/import/ynab-callback', 'is_https' => false];
|
||||||
|
|
||||||
|
$this->assertEquals($expected, $result);
|
||||||
|
}
|
||||||
|
}
|
319
tests/Unit/Import/Routine/YnabRoutineTest.php
Normal file
319
tests/Unit/Import/Routine/YnabRoutineTest.php
Normal file
@@ -0,0 +1,319 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* YnabRoutineTest.php
|
||||||
|
* Copyright (c) 2018 thegrumpydictator@gmail.com
|
||||||
|
*
|
||||||
|
* This file is part of Firefly III.
|
||||||
|
*
|
||||||
|
* Firefly III is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Firefly III is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace tests\Unit\Import\Routine;
|
||||||
|
|
||||||
|
|
||||||
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
|
use FireflyIII\Import\Routine\YnabRoutine;
|
||||||
|
use FireflyIII\Models\ImportJob;
|
||||||
|
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
|
||||||
|
use FireflyIII\Support\Import\Routine\Ynab\GetAccountsHandler;
|
||||||
|
use FireflyIII\Support\Import\Routine\Ynab\ImportDataHandler;
|
||||||
|
use FireflyIII\Support\Import\Routine\Ynab\StageGetAccessHandler;
|
||||||
|
use FireflyIII\Support\Import\Routine\Ynab\StageGetBudgetsHandler;
|
||||||
|
use Log;
|
||||||
|
use Mockery;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class YnabRoutineTest
|
||||||
|
*/
|
||||||
|
class YnabRoutineTest extends TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public function setUp(): void
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
Log::info(sprintf('Now in %s.', \get_class($this)));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Import\Routine\YnabRoutine
|
||||||
|
*/
|
||||||
|
public function testRunGetAccessToken(): void
|
||||||
|
{
|
||||||
|
$job = new ImportJob;
|
||||||
|
$job->user_id = $this->user()->id;
|
||||||
|
$job->key = 'ynab_r_1_' . random_int(1, 10000);
|
||||||
|
$job->status = 'ready_to_run';
|
||||||
|
$job->stage = 'get_access_token';
|
||||||
|
$job->provider = 'ynab';
|
||||||
|
$job->file_type = '';
|
||||||
|
$job->configuration = [];
|
||||||
|
$job->save();
|
||||||
|
|
||||||
|
// mock handler and repository
|
||||||
|
$handler = $this->mock(StageGetAccessHandler::class);
|
||||||
|
$repository = $this->mock(ImportJobRepositoryInterface::class);
|
||||||
|
|
||||||
|
// mock calls for repository
|
||||||
|
$repository->shouldReceive('setUser')->once();
|
||||||
|
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once();
|
||||||
|
|
||||||
|
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'ready_to_run'])->once();
|
||||||
|
$repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'get_budgets'])->once();
|
||||||
|
|
||||||
|
// mock calls for handler
|
||||||
|
$handler->shouldReceive('setImportJob')->once();
|
||||||
|
$handler->shouldReceive('run')->once();
|
||||||
|
|
||||||
|
$routine = new YnabRoutine;
|
||||||
|
$routine->setImportJob($job);
|
||||||
|
try {
|
||||||
|
$routine->run();
|
||||||
|
} catch (FireflyException $e) {
|
||||||
|
$this->assertTrue(false, $e->getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Import\Routine\YnabRoutine
|
||||||
|
*/
|
||||||
|
public function testRunMultiBudgets(): void
|
||||||
|
{
|
||||||
|
$job = new ImportJob;
|
||||||
|
$job->user_id = $this->user()->id;
|
||||||
|
$job->key = 'ynab_r_2_' . random_int(1, 10000);
|
||||||
|
$job->status = 'ready_to_run';
|
||||||
|
$job->stage = 'get_budgets';
|
||||||
|
$job->provider = 'ynab';
|
||||||
|
$job->file_type = '';
|
||||||
|
$job->configuration = [];
|
||||||
|
$job->save();
|
||||||
|
|
||||||
|
// mock handler and repository
|
||||||
|
$handler = $this->mock(StageGetBudgetsHandler::class);
|
||||||
|
$repository = $this->mock(ImportJobRepositoryInterface::class);
|
||||||
|
|
||||||
|
$config = ['budgets' => [1, 2, 3]];
|
||||||
|
|
||||||
|
// mock calls for repository
|
||||||
|
$repository->shouldReceive('setUser')->once();
|
||||||
|
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once();
|
||||||
|
$repository->shouldReceive('getConfiguration')->once()->andReturn($config);
|
||||||
|
|
||||||
|
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'need_job_config'])->once();
|
||||||
|
$repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'select_budgets'])->once();
|
||||||
|
|
||||||
|
// mock calls for handler
|
||||||
|
$handler->shouldReceive('setImportJob')->once();
|
||||||
|
$handler->shouldReceive('run')->once();
|
||||||
|
|
||||||
|
$routine = new YnabRoutine;
|
||||||
|
$routine->setImportJob($job);
|
||||||
|
try {
|
||||||
|
$routine->run();
|
||||||
|
} catch (FireflyException $e) {
|
||||||
|
$this->assertTrue(false, $e->getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Import\Routine\YnabRoutine
|
||||||
|
*/
|
||||||
|
public function testRunSingleBudget(): void
|
||||||
|
{
|
||||||
|
$job = new ImportJob;
|
||||||
|
$job->user_id = $this->user()->id;
|
||||||
|
$job->key = 'ynab_r_3_' . random_int(1, 10000);
|
||||||
|
$job->status = 'ready_to_run';
|
||||||
|
$job->stage = 'get_budgets';
|
||||||
|
$job->provider = 'ynab';
|
||||||
|
$job->file_type = '';
|
||||||
|
$job->configuration = [];
|
||||||
|
$job->save();
|
||||||
|
|
||||||
|
// mock handler and repository
|
||||||
|
$handler = $this->mock(StageGetBudgetsHandler::class);
|
||||||
|
$repository = $this->mock(ImportJobRepositoryInterface::class);
|
||||||
|
|
||||||
|
$config = ['budgets' => [1]];
|
||||||
|
|
||||||
|
// mock calls for repository
|
||||||
|
$repository->shouldReceive('setUser')->once();
|
||||||
|
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once();
|
||||||
|
$repository->shouldReceive('getConfiguration')->once()->andReturn($config);
|
||||||
|
|
||||||
|
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'ready_to_run'])->once();
|
||||||
|
$repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'get_accounts'])->once();
|
||||||
|
|
||||||
|
// mock calls for handler
|
||||||
|
$handler->shouldReceive('setImportJob')->once();
|
||||||
|
$handler->shouldReceive('run')->once();
|
||||||
|
|
||||||
|
$routine = new YnabRoutine;
|
||||||
|
$routine->setImportJob($job);
|
||||||
|
try {
|
||||||
|
$routine->run();
|
||||||
|
} catch (FireflyException $e) {
|
||||||
|
$this->assertTrue(false, $e->getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Import\Routine\YnabRoutine
|
||||||
|
*/
|
||||||
|
public function testRunGetAccounts(): void
|
||||||
|
{
|
||||||
|
$job = new ImportJob;
|
||||||
|
$job->user_id = $this->user()->id;
|
||||||
|
$job->key = 'ynab_r_4_' . random_int(1, 10000);
|
||||||
|
$job->status = 'ready_to_run';
|
||||||
|
$job->stage = 'get_accounts';
|
||||||
|
$job->provider = 'ynab';
|
||||||
|
$job->file_type = '';
|
||||||
|
$job->configuration = [];
|
||||||
|
$job->save();
|
||||||
|
|
||||||
|
// mock handler and repository
|
||||||
|
$handler = $this->mock(GetAccountsHandler::class);
|
||||||
|
$repository = $this->mock(ImportJobRepositoryInterface::class);
|
||||||
|
|
||||||
|
// mock calls for repository
|
||||||
|
$repository->shouldReceive('setUser')->once();
|
||||||
|
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once();
|
||||||
|
|
||||||
|
$repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'select_accounts'])->once();
|
||||||
|
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'need_job_config'])->once();
|
||||||
|
|
||||||
|
|
||||||
|
// mock calls for handler
|
||||||
|
$handler->shouldReceive('setImportJob')->once();
|
||||||
|
$handler->shouldReceive('run')->once();
|
||||||
|
|
||||||
|
$routine = new YnabRoutine;
|
||||||
|
$routine->setImportJob($job);
|
||||||
|
try {
|
||||||
|
$routine->run();
|
||||||
|
} catch (FireflyException $e) {
|
||||||
|
$this->assertTrue(false, $e->getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Import\Routine\YnabRoutine
|
||||||
|
*/
|
||||||
|
public function testRunGoForImport(): void
|
||||||
|
{
|
||||||
|
$job = new ImportJob;
|
||||||
|
$job->user_id = $this->user()->id;
|
||||||
|
$job->key = 'ynab_r_5_' . random_int(1, 10000);
|
||||||
|
$job->status = 'ready_to_run';
|
||||||
|
$job->stage = 'go-for-import';
|
||||||
|
$job->provider = 'ynab';
|
||||||
|
$job->file_type = '';
|
||||||
|
$job->configuration = [];
|
||||||
|
$job->save();
|
||||||
|
|
||||||
|
// mock handler and repository
|
||||||
|
$handler = $this->mock(ImportDataHandler::class);
|
||||||
|
$repository = $this->mock(ImportJobRepositoryInterface::class);
|
||||||
|
|
||||||
|
// mock calls for repository
|
||||||
|
$repository->shouldReceive('setUser')->once();
|
||||||
|
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once();
|
||||||
|
$repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'do_import'])->once();
|
||||||
|
|
||||||
|
$repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'provider_finished'])->once();
|
||||||
|
$repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'final'])->once();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// mock calls for handler
|
||||||
|
$handler->shouldReceive('setImportJob')->once();
|
||||||
|
$handler->shouldReceive('run')->once();
|
||||||
|
|
||||||
|
$routine = new YnabRoutine;
|
||||||
|
$routine->setImportJob($job);
|
||||||
|
try {
|
||||||
|
$routine->run();
|
||||||
|
} catch (FireflyException $e) {
|
||||||
|
$this->assertTrue(false, $e->getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Import\Routine\YnabRoutine
|
||||||
|
*/
|
||||||
|
public function testRunException(): void
|
||||||
|
{
|
||||||
|
$job = new ImportJob;
|
||||||
|
$job->user_id = $this->user()->id;
|
||||||
|
$job->key = 'ynab_r_6_' . random_int(1, 10000);
|
||||||
|
$job->status = 'ready_to_run';
|
||||||
|
$job->stage = 'bad_state';
|
||||||
|
$job->provider = 'ynab';
|
||||||
|
$job->file_type = '';
|
||||||
|
$job->configuration = [];
|
||||||
|
$job->save();
|
||||||
|
|
||||||
|
// mock handler and repository
|
||||||
|
$handler = $this->mock(ImportDataHandler::class);
|
||||||
|
$repository = $this->mock(ImportJobRepositoryInterface::class);
|
||||||
|
|
||||||
|
// mock calls for repository
|
||||||
|
$repository->shouldReceive('setUser')->once();
|
||||||
|
|
||||||
|
$routine = new YnabRoutine;
|
||||||
|
$routine->setImportJob($job);
|
||||||
|
try {
|
||||||
|
$routine->run();
|
||||||
|
} catch (FireflyException $e) {
|
||||||
|
$this->assertEquals('YNAB import routine cannot handle stage "bad_state"', $e->getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers \FireflyIII\Import\Routine\YnabRoutine
|
||||||
|
*/
|
||||||
|
public function testRunBadStatus(): void
|
||||||
|
{
|
||||||
|
$job = new ImportJob;
|
||||||
|
$job->user_id = $this->user()->id;
|
||||||
|
$job->key = 'ynab_r_7_' . random_int(1, 10000);
|
||||||
|
$job->status = 'not_ready_to_run';
|
||||||
|
$job->stage = 'bad_state';
|
||||||
|
$job->provider = 'ynab';
|
||||||
|
$job->file_type = '';
|
||||||
|
$job->configuration = [];
|
||||||
|
$job->save();
|
||||||
|
|
||||||
|
// mock handler and repository
|
||||||
|
$handler = $this->mock(ImportDataHandler::class);
|
||||||
|
$repository = $this->mock(ImportJobRepositoryInterface::class);
|
||||||
|
|
||||||
|
// mock calls for repository
|
||||||
|
$repository->shouldReceive('setUser')->once();
|
||||||
|
|
||||||
|
$routine = new YnabRoutine;
|
||||||
|
$routine->setImportJob($job);
|
||||||
|
try {
|
||||||
|
$routine->run();
|
||||||
|
} catch (FireflyException $e) {
|
||||||
|
$this->assertEquals('YNAB import routine cannot handle stage "bad_state"', $e->getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user