From f6a4b43f1309768ae2a0a55d1bbbef073fc7526a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 5 Dec 2021 16:43:16 +0100
Subject: [PATCH] Fix config references

---
 app/Services/CSV/Conversion/Routine/LineProcessor.php | 4 ++--
 app/Services/Shared/Configuration/Configuration.php   | 2 +-
 app/Services/Shared/Import/Routine/ApiSubmitter.php   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Services/CSV/Conversion/Routine/LineProcessor.php b/app/Services/CSV/Conversion/Routine/LineProcessor.php
index 08e0fc65..d96ad423 100644
--- a/app/Services/CSV/Conversion/Routine/LineProcessor.php
+++ b/app/Services/CSV/Conversion/Routine/LineProcessor.php
@@ -125,13 +125,13 @@ class LineProcessor
             Log::debug('Local mapping (will not be printed)');
             // the role might change because of the mapping.
             $role        = $this->getRoleForColumn($columnIndex, $mapped);
-            $appendValue = config(sprintf('csv_importer.import_roles.%s.append_value', $originalRole));
+            $appendValue = config(sprintf('csv.import_roles.%s.append_value', $originalRole));
 
             if (null === $appendValue) {
                 $appendValue = false;
             }
 
-            Log::debug(sprintf('Append value config: %s', sprintf('csv_importer.import_roles.%s.append_value', $originalRole)));
+            Log::debug(sprintf('Append value config: %s', sprintf('csv.import_roles.%s.append_value', $originalRole)));
 
             $columnValue = new ColumnValue;
             $columnValue->setValue($value);
diff --git a/app/Services/Shared/Configuration/Configuration.php b/app/Services/Shared/Configuration/Configuration.php
index cfb6af61..20142bec 100644
--- a/app/Services/Shared/Configuration/Configuration.php
+++ b/app/Services/Shared/Configuration/Configuration.php
@@ -331,7 +331,7 @@ class Configuration
             // some roles have been given a new name some time in the past.
             $role = $classicRoleNames[$role] ?? $role;
 
-            $config = config(sprintf('csv_importer.import_roles.%s', $role));
+            $config = config(sprintf('csv.import_roles.%s', $role));
             if (null !== $config) {
                 $object->roles[] = $role;
             }
diff --git a/app/Services/Shared/Import/Routine/ApiSubmitter.php b/app/Services/Shared/Import/Routine/ApiSubmitter.php
index 0bbd0b0b..bb1a0e2d 100644
--- a/app/Services/Shared/Import/Routine/ApiSubmitter.php
+++ b/app/Services/Shared/Import/Routine/ApiSubmitter.php
@@ -197,7 +197,7 @@ class ApiSubmitter
     private function searchField(string $field, string $value): int
     {
         // search for the exact description and not just a part of it:
-        $searchModifier = config(sprintf('csv_importer.search_modifier.%s', $field));
+        $searchModifier = config(sprintf('csv.search_modifier.%s', $field));
         $query          = sprintf('%s:"%s"', $searchModifier, $value);
 
         Log::debug(sprintf('Going to search for %s:%s using query %s', $field, $value, $query));