From d483b3f47ecd028f6c2291b2fbb073e92a09d128 Mon Sep 17 00:00:00 2001
From: naomi <naomi@happycatsin.space>
Date: Mon, 16 May 2022 17:25:58 +0100
Subject: [PATCH] refactor

---
 src/TimeBasedFieldUpdater.php | 17 ++++++++++-------
 src/Utils.php                 |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/TimeBasedFieldUpdater.php b/src/TimeBasedFieldUpdater.php
index 0ed9ea1..ee0ef43 100644
--- a/src/TimeBasedFieldUpdater.php
+++ b/src/TimeBasedFieldUpdater.php
@@ -1,7 +1,6 @@
 <?php declare(strict_types = 1);
 
 namespace Drupal\opencase;
-use Drupal;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\opencase\Utils;
 
@@ -9,9 +8,10 @@ final class TimeBasedFieldUpdater {
 
     private EntityTypeManagerInterface $entityTypeManager;
     private string $date_field;
+    private Utils $utils;
     private string $entity_type;
-    private array $conditions;
     private string $date_format;
+    private string $bundle;
 
     final public function __construct(
         EntityTypeManagerInterface $entityTypeManager, 
@@ -33,11 +33,14 @@ final class TimeBasedFieldUpdater {
         $conditions[] = ['type', $this->bundle, '='];
         $this->utils->addConditionsToQuery($query, $conditions);
         foreach($query->execute() as $id) {
-            $entity = $this->entityTypeManager->getStorage($this->entity_type)->load($id);
-            foreach($new_values as $new_field=>$new_value) {
-                $entity->$new_field = $new_value; 
-            }
-            $entity->save();
+            $this->updateEntity($id, $new_values);
         }      
     }
+    private function updateEntity(int $entity_id, array $new_values): void {
+        $entity = $this->entityTypeManager->getStorage($this->entity_type)->load($entity_id);
+        foreach($new_values as $new_field=>$new_value) {
+            $entity->$new_field = $new_value; 
+        }
+        $entity->save();
+    }
 }
\ No newline at end of file
diff --git a/src/Utils.php b/src/Utils.php
index 6aecd74..544a61f 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -50,4 +50,4 @@ class Utils {
         $term = reset($terms);
         return (int)(!empty($term) ? $term->id() : 0);
     }
-}
\ No newline at end of file
+}