Skip to content

Commit

Permalink
Merge branch 'release/2.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabiov
fabiov committed Oct 1, 2021
2 parents 11bd776 + 2ab7d96 commit 61125ac
Show file tree
Hide file tree
Showing 24 changed files with 492 additions and 213 deletions.
2 changes: 1 addition & 1 deletion .githooks/pre-commit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ if [[ -n "$PHP_STAGED_FILES" ]]; then
done
fi

docker-compose exec web vendor/bin/phpunit < /dev/tty
docker-compose exec web vendor/bin/phpunit --coverage-text=coverage.txt < /dev/tty
STATUS=$?

if [[ "$STATUS" -eq 0 ]]; then
Expand Down
2 changes: 2 additions & 0 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
"migrations-diff": "vendor/bin/doctrine-module migrations:diff",
"migrations-migrate": "vendor/bin/doctrine-module migrations:migrate",
"migrations-status": "vendor/bin/doctrine-module migrations:status",
"phpstan-analyze": "vendor/bin/phpstan analyze",
"phpstan-clear-cache": "rm -rf $(php -r 'echo sys_get_temp_dir() . \"/phpstan\";')",
"schema-create": "vendor/bin/doctrine-module orm:schema-tool:create",
"schema-drop": "vendor/bin/doctrine-module orm:schema-tool:drop --force"
}
Expand Down
11 changes: 10 additions & 1 deletion config/autoload/global.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
return [
'db' => ['driver' => 'Pdo'],
'doctrine' => [
'connection' => [
'orm_default' => [
'doctrine_type_mappings' => [
'enum' => 'string',
],
],
],
// migrations configuration
'migrations_configuration' => [
'orm_default' => [
Expand All @@ -22,7 +29,9 @@
],
],
'service_manager' => [
'factories' => ['Laminas\Db\Adapter\Adapter' => 'Laminas\Db\Adapter\AdapterServiceFactory'],
'factories' => [
'Laminas\Db\Adapter\Adapter' => 'Laminas\Db\Adapter\AdapterServiceFactory'
],
],
'session_config' => [
'cookie_lifetime' => 3600, // Session cookie will expire in 1 hour.
Expand Down
134 changes: 134 additions & 0 deletions coverage.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@


Code Coverage Report:
2021-09-30 21:16:19

Summary:
Classes: 51.61% (32/62)
Methods: 54.46% (110/202)
Lines: 34.53% (403/1167)

Application\Controller\PageController
Methods: 100.00% ( 2/ 2) Lines: 100.00% ( 2/ 2)
Application\Entity\Account
Methods: 100.00% ( 8/ 8) Lines: 100.00% ( 14/ 14)
Application\Entity\Category
Methods: 100.00% ( 7/ 7) Lines: 100.00% ( 12/ 12)
Application\Entity\Movement
Methods: 100.00% (12/12) Lines: 100.00% ( 22/ 22)
Application\Entity\Provision
Methods: 100.00% ( 9/ 9) Lines: 100.00% ( 16/ 16)
Application\Entity\Setting
Methods: 100.00% ( 7/ 7) Lines: 100.00% ( 16/ 16)
Application\Entity\User
Methods: 100.00% (22/22) Lines: 100.00% ( 42/ 42)
Application\Repository\AccountRepository
Methods: 0.00% ( 0/ 4) Lines: 0.00% ( 0/ 16)
Application\Repository\CategoryRepository
Methods: 0.00% ( 0/ 4) Lines: 0.00% ( 0/ 21)
Application\Repository\MovementRepository
Methods: 0.00% ( 0/ 6) Lines: 0.00% ( 0/ 40)
Application\Repository\ProvisionRepository
Methods: 0.00% ( 0/ 3) Lines: 0.00% ( 0/ 23)
Application\ViewHelper\CommonJavascript
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 1/ 1)
Application\ViewHelper\Footer
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 4/ 4)
Application\ViewHelper\HelpTooltip
Methods: 0.00% ( 0/ 1) Lines: 0.00% ( 0/ 3)
Application\ViewHelper\Pagination
Methods: 0.00% ( 0/ 2) Lines: 0.00% ( 0/ 22)
Application\ViewHelper\RichInlineScript
Methods: 25.00% ( 1/ 4) Lines: 46.67% ( 7/ 15)
Application\ViewHelper\SbaFormRow
Methods: 0.00% ( 0/ 2) Lines: 0.00% ( 0/ 18)
Application\ViewHelper\SortLink
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 12/ 12)
Application\ViewHelper\UserData
Methods: 0.00% ( 0/ 4) Lines: 0.00% ( 0/ 6)
Auth\Controller\RegistrationController
Methods: 10.00% ( 1/10) Lines: 8.51% ( 8/ 94)
Auth\Controller\UserController
Methods: 20.00% ( 1/ 5) Lines: 15.71% ( 11/ 70)
Auth\Form\AuthForm
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 11/ 11)
Auth\Form\ChangePasswordForm
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 9/ 9)
Auth\Form\Filter\ChangePasswordFilter
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 11/ 11)
Auth\Form\Filter\LoginFilter
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 5/ 5)
Auth\Form\Filter\RegistrationFilter
Methods: 0.00% ( 0/ 1) Lines: 0.00% ( 0/ 3)
Auth\Form\Filter\UserFilter
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 5/ 5)
Auth\Form\ForgottenPasswordFilter
Methods: 0.00% ( 0/ 1) Lines: 0.00% ( 0/ 1)
Auth\Form\ForgottenPasswordForm
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 7/ 7)
Auth\Form\RegistrationForm
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 15/ 15)
Auth\Form\UserForm
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 7/ 7)
Auth\Model\LoggedUser
Methods: 100.00% ( 7/ 7) Lines: 100.00% ( 13/ 13)
Auth\Model\LoggedUserSettings
Methods: 100.00% ( 4/ 4) Lines: 100.00% ( 7/ 7)
Auth\Service\AuthAdapter
Methods: 25.00% ( 1/ 4) Lines: 8.00% ( 2/ 25)
Auth\Service\AuthManager
Methods: 33.33% ( 1/ 3) Lines: 22.22% ( 2/ 9)
Authorize\Acl\Acl
Methods: 66.67% ( 2/ 3) Lines: 82.76% ( 24/ 29)
MoneyLog\Controller\AccountController
Methods: 0.00% ( 0/ 6) Lines: 0.00% ( 0/ 76)
MoneyLog\Controller\CategoryController
Methods: 0.00% ( 0/ 5) Lines: 0.00% ( 0/ 46)
MoneyLog\Controller\DashboardController
Methods: 0.00% ( 0/ 2) Lines: 0.00% ( 0/ 46)
MoneyLog\Controller\MovementController
Methods: 0.00% ( 0/11) Lines: 0.00% ( 0/133)
MoneyLog\Controller\ProvisionController
Methods: 0.00% ( 0/ 5) Lines: 0.00% ( 0/ 43)
MoneyLog\Controller\SettingsController
Methods: 0.00% ( 0/ 2) Lines: 0.00% ( 0/ 18)
MoneyLog\Form\AccountForm
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 6/ 6)
MoneyLog\Form\CategoryForm
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 10/ 10)
MoneyLog\Form\Filter\AccountFilter
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 5/ 5)
MoneyLog\Form\Filter\CategoryFilter
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 5/ 5)
MoneyLog\Form\Filter\MovementFilter
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 11/ 11)
MoneyLog\Form\Filter\ProvisionFilter
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 7/ 7)
MoneyLog\Form\Filter\SettingFilter
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 7/ 7)
MoneyLog\Form\MoveForm
Methods: 100.00% ( 2/ 2) Lines: 100.00% ( 14/ 14)
MoneyLog\Form\MovementForm
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 28/ 28)
MoneyLog\Form\ProvisionForm
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 10/ 10)
MoneyLog\Form\SettingForm
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 8/ 8)
MoneyLog\View\Helper\BalanceModalForm
Methods: 0.00% ( 0/ 1) Lines: 0.00% ( 0/ 2)
MoneyLog\View\Helper\CurrencyForma
Methods: 0.00% ( 0/ 1) Lines: 0.00% ( 0/ 1)
MoneyLog\View\Helper\DataTable
Methods: 0.00% ( 0/ 1) Lines: 0.00% ( 0/ 2)
MoneyLog\View\Helper\DateForma
Methods: 0.00% ( 0/ 1) Lines: 0.00% ( 0/ 1)
MoneyLog\View\Helper\FloatingButtons
Methods: 25.00% ( 1/ 4) Lines: 26.67% ( 4/ 15)
MoneyLog\View\Helper\Morris
Methods: 0.00% ( 0/ 2) Lines: 0.00% ( 0/ 12)
MoneyLog\View\Helper\PageHeader
Methods: 100.00% ( 1/ 1) Lines: 100.00% ( 3/ 3)
MoneyLog\View\Helper\SynopsisFilters
Methods: 0.00% ( 0/ 1) Lines: 0.00% ( 0/ 24)
MoneyLog\View\Helper\WidgetText
Methods: 0.00% ( 0/ 1) Lines: 0.00% ( 0/ 8)
41 changes: 41 additions & 0 deletions data/Migrations/Version20210926172529.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php

declare(strict_types=1);

namespace Migrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

final class Version20210926172529 extends AbstractMigration
{
public function up(Schema $schema): void
{
$this->abortIf(
$this->connection->getDatabasePlatform()->getName() !== 'mysql',
'Migration can only be executed safely on \'mysql\'.'
);

$this->addSql('ALTER TABLE account ADD status ENUM(\'closed\', \'open\', \'highlight\') NOT NULL DEFAULT \'open\'');

$this->addSql('UPDATE account SET status=\'HIGHLIGHT\' WHERE recap=1');
$this->addSql('UPDATE account SET status=\'CLOSED\' WHERE closed=1');

$this->addSql('ALTER TABLE account DROP recap, DROP closed');
}

public function down(Schema $schema): void
{
$this->abortIf(
$this->connection->getDatabasePlatform()->getName() !== 'mysql',
'Migration can only be executed safely on \'mysql\'.'
);

$this->addSql('ALTER TABLE account ADD recap INT NOT NULL, ADD closed TINYINT(1) DEFAULT \'0\' NOT NULL');

$this->addSql('UPDATE account SET recap=1 WHERE status=\'highlight\'');
$this->addSql('UPDATE account SET closed=1 WHERE status=\'closed\'');

$this->addSql('ALTER TABLE account DROP status');
}
}
1 change: 1 addition & 0 deletions module/Application/config/module.config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
'pagination' => Application\ViewHelper\Pagination::class,
'richInlineScript' => Application\ViewHelper\RichInlineScript::class,
'sbaFormRow' => Application\ViewHelper\SbaFormRow::class,
'sortLink' => Application\ViewHelper\SortLink::class,
'userData' => Application\ViewHelper\UserData::class,
],
],
Expand Down
35 changes: 14 additions & 21 deletions module/Application/src/Application/Entity/Account.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
*/
class Account
{
public const STATUS_OPEN = 'open';
public const STATUS_CLOSED = 'closed';
public const STATUS_HIGHLIGHT = 'highlight';

/**
* @ORM\Id
* @ORM\Column(name="id", type="integer", options={"unsigned"=true});
Expand All @@ -34,26 +38,20 @@ class Account
private string $name;

/**
* @ORM\Column(type="integer", nullable=false)
*/
private int $recap;

/**
* @ORM\Column(name="closed", type="boolean", nullable=false, options={"default": false})
* @ORM\Column(type="string", columnDefinition="ENUM('closed', 'open', 'highlight') NOT NULL DEFAULT 'open'")
*/
private bool $closed;
private string $status;

/**
* @ORM\OneToMany(targetEntity="Movement", mappedBy="account")
*/
private Collection $movements;

public function __construct(User $user, string $name, int $recap = 0, bool $closed = false)
public function __construct(User $user, string $name, string $status = self::STATUS_OPEN)
{
$this->user = $user;
$this->name = $name;
$this->recap = $recap;
$this->closed = $closed;
$this->status = $status;
$this->movements = new ArrayCollection();
}

Expand All @@ -77,23 +75,18 @@ public function getUser(): User
return $this->user;
}

public function isClosed(): bool
{
return $this->closed;
}

public function setClosed(bool $closed): void
public function setStatus(string $status): void
{
$this->closed = $closed;
$this->status = $status;
}

public function getRecap(): int
public function getStatus(): string
{
return $this->recap;
return $this->status;
}

public function setRecap(int $recap): void
public function getMovements(): Collection
{
$this->recap = $recap;
return $this->movements;
}
}
45 changes: 32 additions & 13 deletions module/Application/src/Application/Repository/AccountRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,46 +15,46 @@ class AccountRepository extends EntityRepository
public function getUserAccountBalances(int $userId): array
{
$qb = $this->getEntityManager()->createQueryBuilder()
->select('a.id', 'a.name', 'a.recap', 'COALESCE(SUM(m.amount), 0) AS balance')
->select('a.id', 'a.name', 'a.status', 'COALESCE(SUM(m.amount), 0) AS balance')
->from(Account::class, 'a')
->join('a.movements', 'm', Join::WITH, 'a.user=:userId')
->where("a.closed=:closed")
->setParameters([':closed' => false, ':userId' => $userId])
->join('a.movements', 'm', Join::WITH, "a.user=$userId")
->groupBy('a.id');

return $qb->getQuery()->getResult();
}

/**
* @param int $userId
* @param bool $onlyRecap
* @param bool $onlyHighlight
* @return array<Account>
*/
public function getUserAccounts(int $userId, bool $onlyRecap = false): array
public function getUserAccounts(int $userId, bool $onlyHighlight = false): array
{
$qb = $this->createQueryBuilder('a')
->select('a')
->where('a.user=:userId')
->orderBy('a.name', 'ASC')
->setParameter(':userId', $userId);

if ($onlyRecap) {
$qb->andWhere('a.recap=1');
if ($onlyHighlight) {
$qb->andWhere('a.status=:status')->setParameter(':status', Account::STATUS_HIGHLIGHT);
} else {
$qb->andWhere('a.status<>:status')->setParameter(':status', Account::STATUS_CLOSED);
}

return $qb->getQuery()->getResult();
}

/**
* @param int $userId
* @param bool $onlyRecap
* @param bool $onlyHighlight
* @param \DateTime|null|string $date
* @return array<array>
*/
public function getTotals(int $userId, bool $onlyRecap = false, $date = null): array
public function getTotals(int $userId, bool $onlyHighlight = false, $date = null): array
{
$qb = $this->getEntityManager()->createQueryBuilder()
->select('a.id', 'a.name', 'a.recap', 'a.closed', 'COALESCE(SUM(m.amount), 0) AS total')
->select('a.id', 'a.name', 'a.status', 'COALESCE(SUM(m.amount), 0) AS total')
->from(Account::class, 'a')
->leftJoin('a.movements', 'm')
->where("a.user=$userId");
Expand All @@ -64,10 +64,29 @@ public function getTotals(int $userId, bool $onlyRecap = false, $date = null): a
->setParameter(':date', $date instanceof \DateTime ? $date->format('Y-m-d') : $date);
}

if ($onlyRecap) {
$qb->andWhere('a.recap=1');
if ($onlyHighlight) {
$qb->andWhere('a.status=:status')->setParameter(':status', Account::STATUS_HIGHLIGHT);
}

return $qb->orderBy('total', 'DESC')->groupBy('a.id')->getQuery()->getResult();
}

/**
* @param int $userId
* @return array<Account>
*/
public function getByUsage(int $userId): array
{
$qb = $this->getEntityManager()->createQueryBuilder()
->select('a')
->from(Account::class, 'a')
->leftJoin('a.movements', 'm')
->where('a.user=:userId')
->andWhere('a.status<>:status')
->groupBy('m.account')
->orderBy('COUNT(m.account)', 'DESC')
->setParameters([':status' => Account::STATUS_CLOSED, ':userId' => $userId]);

return $qb->getQuery()->getResult();
}
}
Loading

0 comments on commit 61125ac

Please sign in to comment.