afup · vgreb · Jan 5, 2026
diff --git a/sources/Afup/Association/Cotisations.php b/sources/Afup/Association/Cotisations.php
diff --git a/sources/Afup/Association/CotisationsFactory.php b/sources/Afup/Association/CotisationsFactory.php
@@ -6,6 +6,7 @@
 
 use Afup\Site\Utils\Utils;
 use AppBundle\Association\Model\Repository\CompanyMemberRepository;
+use AppBundle\MembershipFee\Model\Repository\MembershipFeeRepository;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
@@ -15,6 +16,7 @@ public function __construct(
         private TokenStorageInterface $tokenStorage,
         private CompanyMemberRepository $companyMemberRepository,
         private AuthorizationCheckerInterface $authorizationChecker,
+        private MembershipFeeRepository $membershipFeeRepository,
     ) {}
 
     public function create(): Cotisations
@@ -25,6 +27,7 @@ public function create(): Cotisations
         );
 
         $cotisations->setCompanyMemberRepository($this->companyMemberRepository);
+        $cotisations->setMembershipFeeRepository($this->membershipFeeRepository);
 
         return $cotisations;
     }

diff --git a/sources/AppBundle/Association/CompanyMembership/SubscriptionManagement.php b/sources/AppBundle/Association/CompanyMembership/SubscriptionManagement.php
@@ -8,14 +8,15 @@
 use Afup\Site\Utils\Utils;
 use AppBundle\Association\MemberType;
 use AppBundle\Association\Model\CompanyMember;
+use AppBundle\MembershipFee\Model\MembershipFee;
 
 final readonly class SubscriptionManagement
 {
     public function __construct(private Cotisations $cotisations) {}
 
     public function createInvoiceForInscription(CompanyMember $company, $numberOfMembers): array
     {
-        $endSubscription = $this->cotisations->finProchaineCotisation(false);
+        $endSubscription = $this->cotisations->getNextSubscriptionExpiration(null);
 
         // Create the invoice
         $this->cotisations->ajouter(
@@ -28,12 +29,12 @@ public function createInvoiceForInscription(CompanyMember $company, $numberOfMem
             $endSubscription->format('U'),
             '',
         );
-        $subscriptionArray = $this->cotisations->obtenirDerniere(MemberType::MemberCompany, $company->getId());
+        $subscription = $this->cotisations->getLastestByUserTypeAndId(MemberType::MemberCompany, $company->getId());
 
-        if ($subscriptionArray === false) {
+        if (!$subscription instanceof MembershipFee) {
             throw new \RuntimeException('An error occured');
         }
 
-        return ['invoice' => $subscriptionArray['numero_facture'], 'token' => $subscriptionArray['token']];
+        return ['invoice' => $subscription->getInvoiceNumber(), 'token' => $subscription->getToken()];
     }
 }
diff --git a/sources/AppBundle/Association/UserMembership/SeniorityComputer.php b/sources/AppBundle/Association/UserMembership/SeniorityComputer.php
@@ -4,18 +4,20 @@
 
 namespace AppBundle\Association\UserMembership;
 
-use Afup\Site\Association\Cotisations;
 use AppBundle\Association\MemberType;
 use AppBundle\Association\Model\CompanyMember;
 use AppBundle\Association\Model\User;
+use AppBundle\MembershipFee\Model\MembershipFee;
+use AppBundle\MembershipFee\Model\Repository\MembershipFeeRepository;
+use CCMBenchmark\Ting\Repository\Collection;
 
 class SeniorityComputer
 {
-    public function __construct(private readonly Cotisations $cotisations) {}
+    public function __construct(private readonly MembershipFeeRepository $membershipFeeRepository) {}
 
     public function computeCompany(CompanyMember $companyMember)
     {
-        $cotis = $this->cotisations->obtenirListe(MemberType::MemberCompany, $companyMember->getId());
+        $cotis = $this->membershipFeeRepository->getListByUserTypeAndId(MemberType::MemberCompany, $companyMember->getId());
 
         $infos = $this->computeFromCotisationsAndReturnInfos($cotis);
 
@@ -24,7 +26,7 @@ public function computeCompany(CompanyMember $companyMember)
 
     public function computeCompanyAndReturnInfos(CompanyMember $companyMember): array
     {
-        $cotis = $this->cotisations->obtenirListe(MemberType::MemberCompany, $companyMember->getId());
+        $cotis = $this->membershipFeeRepository->getListByUserTypeAndId(MemberType::MemberCompany, $companyMember->getId());
 
         return $this->computeFromCotisationsAndReturnInfos($cotis);
     }
@@ -38,20 +40,23 @@ public function compute(User $user)
 
     public function computeAndReturnInfos(User $user): array
     {
-        $cotis = $this->cotisations->obtenirListe(MemberType::MemberPhysical, $user->getId());
+        $cotis = $this->membershipFeeRepository->getListByUserTypeAndId(MemberType::MemberPhysical, $user->getId());
 
         return $this->computeFromCotisationsAndReturnInfos($cotis);
     }
 
-    private function computeFromCotisationsAndReturnInfos(array $cotisations): array
+    /**
+     * @param Collection<MembershipFee> $cotisations
+     */
+    private function computeFromCotisationsAndReturnInfos(Collection $cotisations): array
     {
         $now = new \DateTime();
         $diffs = [];
 
         $years = [];
         foreach ($cotisations as $coti) {
-            $from = new \DateTimeImmutable('@' . $coti['date_debut']);
-            $to = new \DateTimeImmutable('@' . $coti['date_fin']);
+            $from = $coti->getStartDate();
+            $to = $coti->getEndDate();
             $to = min($now, $to);
             $diffs[] = $from->diff($to);
             $years[] = $from->format('Y');

diff --git a/sources/AppBundle/Association/UserMembership/UserService.php b/sources/AppBundle/Association/UserMembership/UserService.php
@@ -12,6 +12,7 @@
 use AppBundle\Email\Mailer\MailUser;
 use AppBundle\Email\Mailer\MailUserFactory;
 use AppBundle\Email\Mailer\Message;
+use AppBundle\MembershipFee\Model\MembershipFee;
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
@@ -85,10 +86,7 @@ public function sendWelcomeEmail(User $user): bool
         return $this->mailer->send($message);
     }
 
-    /**
-     * @return array
-     */
-    public function getLastSubscription(User $user)
+    public function getLastSubscription(User $user): ?MembershipFee
     {
         if ($user->getCompanyId()) {
             $id = $user->getCompanyId();
@@ -98,6 +96,6 @@ public function getLastSubscription(User $user)
             $personType = MemberType::MemberPhysical;
         }
 
-        return $this->cotisations->obtenirDerniere($personType, $id);
+        return $this->cotisations->getLastestByUserTypeAndId($personType, $id);
     }
 }
diff --git a/sources/AppBundle/Controller/Website/Member/IndexAction.php b/sources/AppBundle/Controller/Website/Member/IndexAction.php
@@ -9,6 +9,7 @@
 use AppBundle\Association\UserMembership\BadgesComputer;
 use AppBundle\Association\UserMembership\UserService;
 use AppBundle\GeneralMeeting\GeneralMeetingRepository;
+use AppBundle\MembershipFee\Model\MembershipFee;
 use AppBundle\Security\Authentication;
 use AppBundle\Twig\ViewRenderer;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -36,8 +37,8 @@ public function __invoke(): Response
         $cotisation = $userService->getLastSubscription($user);
 
         $dateFinCotisation = null;
-        if ($cotisation) {
-            $dateFinCotisation = new \DateTimeImmutable('@' . $cotisation['date_fin']);
+        if ($cotisation instanceof MembershipFee) {
+            $dateFinCotisation = $cotisation->getEndDate();
         }
 
         $daysBeforeMembershipExpiration = $user->getDaysBeforeMembershipExpiration();

diff --git a/sources/AppBundle/Controller/Website/Membership/Fee/DownloadAction.php b/sources/AppBundle/Controller/Website/Membership/Fee/DownloadAction.php
@@ -12,6 +12,7 @@
 use AppBundle\Association\Model\Repository\UserRepository;
 use AppBundle\Association\Model\User;
 use AppBundle\AuditLog\Audit;
+use AppBundle\MembershipFee\Model\Repository\MembershipFeeRepository;
 use Assert\Assertion;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -23,6 +24,7 @@ final class DownloadAction extends AbstractController
     public function __construct(
         private readonly UserRepository $userRepository,
         private readonly CompanyMemberRepository $companyMemberRepository,
+        private readonly MembershipFeeRepository $membershipFeeRepository,
         private readonly Cotisations $cotisations,
         private readonly Droits $droits,
         private readonly Audit $audit,
@@ -40,19 +42,19 @@ public function __invoke(Request $request): BinaryFileResponse
 
         $tempfile = tempnam(sys_get_temp_dir(), 'membership_fee_download');
         $numeroFacture = $this->cotisations->genererFacture($id, $tempfile);
-        $cotisation = $this->cotisations->obtenir($id);
+        $membershipFee = $this->membershipFeeRepository->get($id);
 
-        if ($cotisation['type_personne'] == MemberType::MemberCompany->value) {
-            $company = $this->companyMemberRepository->get($cotisation['id_personne']);
+        if ($membershipFee->getUserType() == MemberType::MemberCompany) {
+            $company = $this->companyMemberRepository->get($membershipFee->getUserId());
             Assertion::isInstanceOf($company, CompanyMember::class);
             $patternPrefix = $company->getCompanyName();
         } else {
-            $user = $this->userRepository->get($cotisation['id_personne']);
+            $user = $this->userRepository->get($membershipFee->getUserId());
             Assertion::isInstanceOf($user, User::class);
             $patternPrefix = $user->getLastName();
         }
 
-        $pattern = str_replace(' ', '', $patternPrefix) . '_' . $numeroFacture . '_' . date('dmY', (int) $cotisation['date_debut']) . '.pdf';
+        $pattern = str_replace(' ', '', $patternPrefix) . '_' . $numeroFacture . '_' . $membershipFee->getStartDate()->format('dmY') . '.pdf';
 
         $response = new BinaryFileResponse($tempfile, Response::HTTP_OK, [], false);
         $response->deleteFileAfterSend(true);

diff --git a/sources/AppBundle/Controller/Website/Membership/Fee/IndexAction.php b/sources/AppBundle/Controller/Website/Membership/Fee/IndexAction.php
@@ -13,6 +13,8 @@
 use AppBundle\Association\Model\Repository\CompanyMemberRepository;
 use AppBundle\Association\Model\Repository\UserRepository;
 use AppBundle\Association\UserMembership\UserService;
+use AppBundle\MembershipFee\Model\MembershipFee;
+use AppBundle\MembershipFee\Model\Repository\MembershipFeeRepository;
 use AppBundle\Payment\PayboxBilling;
 use AppBundle\Payment\PayboxFactory;
 use AppBundle\Twig\ViewRenderer;
@@ -29,6 +31,7 @@ public function __construct(
         private readonly UserService $userService,
         private readonly PayboxFactory $payboxFactory,
         private readonly Cotisations $cotisations,
+        private readonly MembershipFeeRepository $membershipFeeRepository,
         private readonly Droits $droits,
     ) {}
 
@@ -43,34 +46,27 @@ public function __invoke(): Response
         $now = new \DateTime('now');
         $isSubjectedToVat = Vat::isSubjectedToVat($now);
 
-        if (!$cotisation) {
+        if (!$cotisation instanceof MembershipFee) {
             $message = '';
         } else {
-            $endSubscription = $this->cotisations->finProchaineCotisation($cotisation);
+            $endSubscription = $this->cotisations->getNextSubscriptionExpiration($cotisation);
             $message = sprintf(
                 'Votre dernière cotisation -- %s € -- est valable jusqu\'au %s. <br />
         Si vous renouvelez votre cotisation maintenant, celle-ci sera valable jusqu\'au %s.',
-                number_format((float) $cotisation['montant'], 2, ',', ' '),
-                date("d/m/Y", (int) $cotisation['date_fin']),
+                number_format((float) $cotisation->getAmount(), 2, ',', ' '),
+                $cotisation->getEndDate()->format('d/m/Y'),
                 $endSubscription->format('d/m/Y'),
             );
         }
 
-        $cotisations_physique = $this->cotisations->obtenirListe(MemberType::MemberPhysical, $user->getId());
-        $cotisations_morale = $this->cotisations->obtenirListe(MemberType::MemberCompany, $user->getCompanyId());
+        $cotisations_physique = $this->membershipFeeRepository->getListByUserTypeAndId(MemberType::MemberPhysical, $user->getId());
+        $cotisations_morale = $this->membershipFeeRepository->getListByUserTypeAndId(MemberType::MemberCompany, $user->getCompanyId());
 
-        if (is_array($cotisations_morale) && is_array($cotisations_physique)) {
-            $liste_cotisations = array_merge($cotisations_physique, $cotisations_morale);
-        } elseif (is_array($cotisations_morale)) {
-            $liste_cotisations = $cotisations_morale;
-        } elseif (is_array($cotisations_physique)) {
-            $liste_cotisations = $cotisations_physique;
-        } else {
-            $liste_cotisations = [];
-        }
+        /** @var array<int, MembershipFee> $liste_cotisations */
+        $liste_cotisations = array_merge(iterator_to_array($cotisations_physique), iterator_to_array($cotisations_morale));
 
         foreach ($liste_cotisations as $k => $cotisation) {
-            $liste_cotisations[$k]['telecharger_facture'] = $this->cotisations->isCurrentUserAllowedToReadInvoice($cotisation['id']);
+            $cotisation->setDownloadInvoice($this->cotisations->isCurrentUserAllowedToReadInvoice((string) $cotisation->getId()));
         }
 
         if ($user->getCompanyId() > 0) {
@@ -112,7 +108,7 @@ public function __invoke(): Response
             'isSubjectedToVat' => $isSubjectedToVat,
             'title' => 'Ma cotisation',
             'cotisations' => $liste_cotisations,
-            'time' => time(),
+            'time' => new \DateTime(),
             'montant' => $montant,
             'libelle' => $libelle,
             'paybox' => $paybox,

diff --git a/sources/AppBundle/Controller/Website/Membership/GeneralMeeting/IndexAction.php b/sources/AppBundle/Controller/Website/Membership/GeneralMeeting/IndexAction.php
@@ -49,7 +49,7 @@ public function __invoke(Request $request): Response
         $generalMeetingPlanned = $generalMeetingRepository->hasGeneralMeetingPlanned();
 
         $cotisation = $userService->getLastSubscription($user);
-        $needsMembersheepFeePayment = $latestDate->getTimestamp() > strtotime("+14 day", (int) $cotisation['date_fin']);
+        $needsMembersheepFeePayment = $latestDate->getTimestamp() > strtotime("+14 day", $cotisation->getEndDate()->getTimestamp());
 
         if ($needsMembersheepFeePayment) {
             return $this->view->render('admin/association/membership/generalmeeting_membersheepfee.html.twig', [

diff --git a/sources/AppBundle/Controller/Website/Membership/InvoiceAction.php b/sources/AppBundle/Controller/Website/Membership/InvoiceAction.php
@@ -5,6 +5,7 @@
 namespace AppBundle\Controller\Website\Membership;
 
 use Afup\Site\Association\Cotisations;
+use AppBundle\MembershipFee\Model\MembershipFee;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -18,12 +19,12 @@ public function __invoke(string $invoiceNumber, ?string $token): Response
     {
         $invoice = $this->cotisations->getByInvoice($invoiceNumber, $token);
 
-        if (!$invoice) {
+        if (!$invoice instanceof MembershipFee) {
             throw $this->createNotFoundException(sprintf('Could not find the invoice "%s" with token "%s"', $invoiceNumber, $token));
         }
 
         ob_start();
-        $this->cotisations->genererFacture($invoice['id']);
+        $this->cotisations->genererFacture($invoice->getId());
         $pdf = ob_get_clean();
 
         $response = new Response($pdf);

diff --git a/sources/AppBundle/Controller/Website/Membership/PayboxCallbackAction.php b/sources/AppBundle/Controller/Website/Membership/PayboxCallbackAction.php
@@ -10,6 +10,7 @@
 use AppBundle\Association\Model\Repository\CompanyMemberRepository;
 use AppBundle\Association\Model\Repository\UserRepository;
 use AppBundle\AuditLog\Audit;
+use AppBundle\MembershipFee\Model\MembershipFee;
 use AppBundle\Payment\PayboxResponseFactory;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -46,9 +47,9 @@ public function __invoke(Request $request): Response
 
         if ($etat == AFUP_COTISATIONS_PAIEMENT_REGLE) {
             $account = $this->cotisations->getAccountFromCmd($payboxResponse->getCmd());
-            $lastCotisation = $this->cotisations->obtenirDerniere(MemberType::from($account['type']), $account['id']);
+            $lastCotisation = $this->cotisations->getLastestByUserTypeAndId(MemberType::from($account['type']), $account['id']);
 
-            if ($lastCotisation === false && $account['type'] == MemberType::MemberPhysical->value) {
+            if (!$lastCotisation instanceof MembershipFee && $account['type'] == MemberType::MemberPhysical->value) {
                 $user = $this->userRepository->get($account['id']);
                 $this->eventDispatcher->dispatch(new NewMemberEvent($user));
             }

diff --git a/sources/AppBundle/Controller/Website/Membership/PaymentAction.php b/sources/AppBundle/Controller/Website/Membership/PaymentAction.php
@@ -7,6 +7,7 @@
 use Afup\Site\Association\Cotisations;
 use AppBundle\Association\Model\Repository\CompanyMemberRepository;
 use AppBundle\Compta\BankAccount\BankAccountFactory;
+use AppBundle\MembershipFee\Model\MembershipFee;
 use AppBundle\Payment\PayboxBilling;
 use AppBundle\Payment\PayboxFactory;
 use AppBundle\Twig\ViewRenderer;
@@ -25,7 +26,10 @@ public function __construct(
     public function __invoke(string $invoiceNumber, ?string $token): Response
     {
         $invoice = $this->cotisations->getByInvoice($invoiceNumber, $token);
-        $company = $this->companyMemberRepository->get($invoice['id_personne']);
+        $company = null;
+        if ($invoice instanceof MembershipFee) {
+            $company = $this->companyMemberRepository->get($invoice->getUserId());
+        }
 
         if (!$invoice || $company === null) {
             throw $this->createNotFoundException(sprintf('Could not find the invoice "%s" with token "%s"', $invoiceNumber, $token));
@@ -35,7 +39,7 @@ public function __invoke(string $invoiceNumber, ?string $token): Response
 
         $paybox = $this->payboxFactory->createPayboxForSubscription(
             'F' . $invoiceNumber,
-            (float) $invoice['montant'],
+            (float) $invoice->getAmount(),
             $company->getEmail(),
             $payboxBilling,
         );
@@ -45,7 +49,7 @@ public function __invoke(string $invoiceNumber, ?string $token): Response
         return $this->view->render('site/company_membership/payment.html.twig', [
             'paybox' => $paybox,
             'invoice' => $invoice,
-            'bankAccount' => $bankAccountFactory->createApplyableAt(new \DateTimeImmutable('@' . $invoice['date_debut'])),
+            'bankAccount' => $bankAccountFactory->createApplyableAt(new \DateTimeImmutable('@' . $invoice->getStartDate()->getTimestamp())),
             'afup' => [
                 'raison_sociale' => AFUP_RAISON_SOCIALE,
                 'adresse' => AFUP_ADRESSE,

diff --git a/sources/AppBundle/MembershipFee/Model/MembershipFee.php b/sources/AppBundle/MembershipFee/Model/MembershipFee.php
@@ -29,6 +29,8 @@ class MembershipFee implements NotifyPropertyInterface
     private ?int $nbReminders = null;
     private ?DateTime $lastReminderDate = null;
 
+    private bool $downloadInvoice = false;
+
     public function getId(): ?int
     {
         return $this->id;
@@ -196,4 +198,14 @@ public function setLastReminderDate(?DateTime $lastReminderDate): self
         $this->lastReminderDate = $lastReminderDate;
         return $this;
     }
+
+    public function canDownloadInvoice(): bool
+    {
+        return $this->downloadInvoice;
+    }
+
+    public function setDownloadInvoice(bool $hasPermission): bool
+    {
+        return $this->downloadInvoice = $hasPermission;
+    }
 }