Refactor

Author: tatevikg1

src/Domain/Common/IspRestrictionsProvider.php

@@ -16,52 +16,114 @@ public function __construct(
 
     public function load(): IspRestrictions
     {
-        if (!is_file($this->confPath) || !is_readable($this->confPath)) {
+        $contents = $this->readConfigFile();
+        if ($contents === null) {
             return new IspRestrictions(null, null, null);
         }
 
+        [$raw, $maxBatch, $minBatchPeriod, $lockFile] = $this->parseContents($contents);
+
+        $this->logIfDetected($maxBatch, $minBatchPeriod, $lockFile);
+
+        return new IspRestrictions($maxBatch, $minBatchPeriod, $lockFile, $raw);
+    }
+
+    private function readConfigFile(): ?string
+    {
+        if (!is_file($this->confPath) || !is_readable($this->confPath)) {
+            return null;
+        }
         $contents = file_get_contents($this->confPath);
         if ($contents === false) {
             $this->logger->warning('Cannot read ISP restrictions file', ['path' => $this->confPath]);
-            return new IspRestrictions(null, null, null);
+            return null;
         }
+        return $contents;
+    }
 
+    /**
+     * @return array{0: array<string,string>, 1: ?int, 2: ?int, 3: ?string}
+     */
+    private function parseContents(string $contents): array
+    {
         $maxBatch = null;
         $minBatchPeriod = null;
         $lockFile = null;
-
         $raw = [];
+
         foreach (preg_split('/\R/', $contents) as $line) {
-            $line = trim($line);
-            if ($line === '' || str_starts_with($line, '#') || str_starts_with($line, ';')) {
-                continue;
-            }
-            $parts = explode('=', $line, 2);
-            if (\count($parts) !== 2) {
+            [$key, $val] = $this->parseLine($line);
+            if ($key === null) {
                 continue;
             }
-            [$key, $val] = array_map('trim', $parts);
             $raw[$key] = $val;
+            [$maxBatch, $minBatchPeriod, $lockFile] = $this->applyKeyValue(
+                $key,
+                $val,
+                $maxBatch,
+                $minBatchPeriod,
+                $lockFile
+            );
+        }
 
-            switch ($key) {
-                case 'maxbatch':
-                    if ($val !== '' && ctype_digit($val)) {
-                        $maxBatch = (int) $val;
-                    }
-                    break;
-                case 'minbatchperiod':
-                    if ($val !== '' && ctype_digit($val)) {
-                        $minBatchPeriod = (int) $val;
-                    }
-                    break;
-                case 'lockfile':
-                    if ($val !== '') {
-                        $lockFile = $val;
-                    }
-                    break;
+        return [$raw, $maxBatch, $minBatchPeriod, $lockFile];
+    }
+
+    /**
+     * @return array{0: ?string, 1: string}
+     */
+    private function parseLine(string $line): array
+    {
+        $line = trim($line);
+        if ($line === '' || str_starts_with($line, '#') || str_starts_with($line, ';')) {
+            return [null, ''];
+        }
+        $parts = explode('=', $line, 2);
+        if (\count($parts) !== 2) {
+            return [null, ''];
+        }
+
+        return array_map('trim', $parts);
+    }
+
+    /**
+     * @param string $key
+     * @param string $val
+     * @param ?int $maxBatch
+     * @param ?int $minBatchPeriod
+     * @param ?string $lockFile
+     * @return array{0: ?int, 1: ?int, 2: ?string}
+     */
+    private function applyKeyValue(
+        string $key,
+        string $val,
+        ?int $maxBatch,
+        ?int $minBatchPeriod,
+        ?string $lockFile
+    ): array {
+        if ($key === 'maxbatch') {
+            if ($val !== '' && ctype_digit($val)) {
+                $maxBatch = (int) $val;
             }
+            return [$maxBatch, $minBatchPeriod, $lockFile];
         }
+        if ($key === 'minbatchperiod') {
+            if ($val !== '' && ctype_digit($val)) {
+                $minBatchPeriod = (int) $val;
+            }
+            return [$maxBatch, $minBatchPeriod, $lockFile];
+        }
+        if ($key === 'lockfile') {
+            if ($val !== '') {
+                $lockFile = $val;
+            }
+            return [$maxBatch, $minBatchPeriod, $lockFile];
+        }
+        return [$maxBatch, $minBatchPeriod, $lockFile];
+    }
 
+    private function logIfDetected(?int $maxBatch, ?int $minBatchPeriod, ?string $lockFile): void
+    {
         if ($maxBatch !== null || $minBatchPeriod !== null || $lockFile !== null) {
             $this->logger->info('ISP restrictions detected', [
                 'path' => $this->confPath,
@@ -70,7 +132,5 @@ public function load(): IspRestrictions
                 'lockfile' => $lockFile,
             ]);
         }
-
-        return new IspRestrictions($maxBatch, $minBatchPeriod, $lockFile, $raw);
     }
 }

src/Domain/Messaging/Service/Processor/CampaignProcessor.php

@@ -61,8 +61,7 @@ public function process(Message $campaign, ?OutputInterface $output = null): voi
 
             $userMessage = $existing ?? new UserMessage($subscriber, $campaign);
             $userMessage->setStatus(UserMessageStatus::Active);
-            $this->entityManager->persist($userMessage);
-            $this->entityManager->flush();
+            $this->userMessageRepository->save($userMessage);
 
             $this->rateLimiter->awaitTurn($output);