refactor: Fold columns back into update()

lsst-epo · Feb 5, 2024 · f0d3c2a · f0d3c2a
1 parent ca5e903
commit f0d3c2a
Showing 1 changed file with 5 additions and 19 deletions.
diff --git a/src/services/Assets.php b/src/services/Assets.php
@@ -172,7 +172,10 @@ protected function updateContent(string $value, CantoFieldData $cantoFieldData,
             // Find any $queryColumn content column row that match $value, and update them with the data from $cantoFieldData
             $queryColumn = ElementHelper::fieldColumnFromField($cantoDamAssetField, $contentColumnKey);
             if ($queryColumn) {
-                $columns = $this->getColumns($cantoDamAssetField, $cantoFieldData);
+                $columns = [];
+                foreach (self::CONTENT_COLUMN_KEY_MAPPINGS as $propertyName => $selectColumnKey) {
+                    $columns[ElementHelper::fieldColumnFromField($cantoDamAssetField, $selectColumnKey)] = $cantoFieldData->$propertyName;
+                }
                 try {
                     $rows = Db::update($table, $columns, [$queryColumn => $value]);
                 } catch (Exception $e) {
@@ -197,7 +200,7 @@ protected function updateContent(string $value, CantoFieldData $cantoFieldData,
                 $rows = (new Query())
                     ->select([$cantoAssetDataFieldName])
                     ->from([$table])
-                    ->where([$cantoIdFieldName => 0, $cantoAssetDataFieldName => $jsonSearchSql])
+                    ->where([$cantoIdFieldName => 0, $jsonSearchSql])
                     ->all();
             }
         }
@@ -240,21 +243,4 @@ private function getBlockFields(string $fieldType): array
         /** @phpstan-ignore-next-line */
         return Craft::$app->getFields()->getFieldsByType($fieldType);
     }
-
-    /**
-     * Return the $cantoDamAssetField db columns to update with the values from the  $cantoFieldData
-     *
-     * @param FieldInterface $cantoDamAssetField
-     * @param CantoFieldData $cantoFieldData
-     * @return array
-     */
-    private function getColumns(FieldInterface $cantoDamAssetField, CantoFieldData $cantoFieldData): array
-    {
-        $columns = [];
-        foreach (self::CONTENT_COLUMN_KEY_MAPPINGS as $propertyName => $selectColumnKey) {
-            $columns[ElementHelper::fieldColumnFromField($cantoDamAssetField, $selectColumnKey)] = $cantoFieldData->$propertyName;
-        }
-
-        return $columns;
-    }
 }