chore: Refactor code related to the subscriptions

Author: marienfressinaud

src/cli/Users.php

@@ -45,7 +45,7 @@ public function index(Request $request): Response
         foreach ($users as $user) {
             $created_at = $user->created_at->format('Y-m-d');
             $validated_label = '';
-            if (!$user->validated_at) {
+            if (!$user->isValidated()) {
                 $validated_label = ' (not validated)';
             }
             $output[] = "{$user->id} {$created_at} {$user->email}{$validated_label}";
@@ -146,7 +146,7 @@ public function validate(Request $request): Response
             return Response::text(404, "User {$user_id} doesn’t exist.");
         }
 
-        if ($user->validated_at) {
+        if ($user->isValidated()) {
             return Response::text(400, "User {$user_id} has already been validated.");
         }
 
@@ -162,14 +162,7 @@ public function validate(Request $request): Response
 
         if (\App\Configuration::areSubscriptionsEnabled()) {
             $subscriptions_service = new services\Subscriptions();
-
-            $account = $subscriptions_service->account($user->email);
-            if ($account) {
-                $user->subscription_account_id = $account['id'];
-                $user->subscription_expired_at = $account['expired_at'];
-            } else {
-                \Minz\Log::error("Can’t get a subscription account for user {$user->id}."); // @codeCoverageIgnore
-            }
+            $subscriptions_service->initAccount($user);
         }
 
         $user->save();

src/controllers/my/Account.php

@@ -31,17 +31,10 @@ public function show(): Response
         $user = auth\CurrentUser::require();
 
         $sub_enabled = \App\Configuration::areSubscriptionsEnabled();
-        if ($sub_enabled && $user->subscription_account_id && $user->isSubscriptionOverdue()) {
+        if ($sub_enabled && $user->hasSubscriptionAccount() && $user->isSubscriptionOverdue()) {
             $service = new services\Subscriptions();
-
-            $expired_at = $service->expiredAt($user->subscription_account_id);
-
-            if ($expired_at) {
-                $user->subscription_expired_at = $expired_at;
-                $user->save();
-            } else {
-                \Minz\Log::error("Can’t get the expired_at for user {$user->id}.");
-            }
+            $service->refreshExpiredAt($user);
+            $user->save();
         }
 
         return Response::ok('my/account/show.phtml', [

src/controllers/my/Subscription.php

@@ -44,7 +44,7 @@ public function create(Request $request): Response
             return Response::redirect('account');
         }
 
-        if (!$user->validated_at) {
+        if (!$user->isValidated()) {
             \Minz\Flash::set('error', _('You must verify your account first.'));
             return Response::redirect('account');
         }
@@ -58,19 +58,16 @@ public function create(Request $request): Response
         }
 
         $subscription_service = new services\Subscriptions();
+        $result = $subscription_service->initAccount($user);
 
-        $account = $subscription_service->account($user->email);
-        if (!$account) {
-            \Minz\Log::error("Can’t get a subscription account for user {$user->id}.");
+        if (!$result) {
             \Minz\Flash::set(
                 'error',
                 _('An error occured when getting you a subscription account, please contact the support.')
             );
             return Response::redirect('account');
         }
 
-        $user->subscription_account_id = $account['id'];
-        $user->subscription_expired_at = $account['expired_at'];
         $user->save();
 
         return Response::redirect('account');

src/controllers/my/Validation.php

@@ -83,13 +83,7 @@ public function create(Request $request): Response
 
         if (\App\Configuration::areSubscriptionsEnabled()) {
             $subscriptions_service = new services\Subscriptions();
-            $account = $subscriptions_service->account($user->email);
-            if ($account) {
-                $user->subscription_account_id = $account['id'];
-                $user->subscription_expired_at = $account['expired_at'];
-            } else {
-                \Minz\Log::error("Can’t get a subscription account for user {$user->id}."); // @codeCoverageIgnore
-            }
+            $subscriptions_service->initAccount($user);
         }
 
         $user->save();
@@ -115,7 +109,7 @@ public function resendEmail(Request $request): Response
     {
         $user = auth\CurrentUser::require();
 
-        if ($user->validated_at) {
+        if ($user->isValidated()) {
             // nothing to do, the user is already validated
             return Response::redirect('home');
         }

src/jobs/scheduled/InactivityNotifier.php

@@ -40,7 +40,7 @@ public function perform(): void
         $mailer = new mailers\Users();
 
         foreach ($inactive_users as $user) {
-            if ($user->validated_at) {
+            if ($user->isValidated()) {
                 $success = $mailer->sendInactivityEmail($user->id);
             } else {
                 $success = true;

src/jobs/scheduled/SubscriptionsSync.php

@@ -43,39 +43,16 @@ public function perform(): void
         // happen if a previous request failed.
         $users = models\User::listBy(['subscription_account_id' => null]);
         foreach ($users as $user) {
-            if (!$user->validated_at) {
+            if (!$user->isValidated()) {
                 continue;
             }
 
-            $account = $subscriptions_service->account($user->email);
-            if ($account) {
-                $user->subscription_account_id = $account['id'];
-                $user->subscription_expired_at = $account['expired_at'];
-                $user->save();
-            }
+            $subscriptions_service->initAccount($user);
+            $user->save();
         }
 
         // Then, synchronize expiration dates.
         $users = models\User::listAll();
-        $account_ids_to_users = array_column($users, null, 'subscription_account_id');
-        $account_ids = array_keys($account_ids_to_users);
-
-        $result = $subscriptions_service->sync($account_ids);
-        if ($result === null) {
-            return;
-        }
-
-        foreach ($result as $account_id => $expired_at) {
-            if (!isset($account_ids_to_users[$account_id])) {
-                \Minz\Log::error("Subscription account {$account_id} does not exist.");
-                continue;
-            }
-
-            $user = $account_ids_to_users[$account_id];
-            if ($user->subscription_expired_at != $expired_at) {
-                $user->subscription_expired_at = $expired_at;
-                $user->save();
-            }
-        }
+        $subscriptions_service->sync($users);
     }
 }

src/models/User.php

@@ -693,7 +693,15 @@ public function verifyPassword(string $password): bool
      */
     public function mustValidateEmail(): bool
     {
-        return !$this->validated_at && $this->created_at < \Minz\Time::ago(1, 'day');
+        return !$this->isValidated() && $this->created_at < \Minz\Time::ago(1, 'day');
+    }
+
+    /**
+     * Return whether the account is validated or not.
+     */
+    public function isValidated(): bool
+    {
+        return $this->validated_at !== null;
     }
 
     /**