Fixing merge conflicts

Author: dhanur-sharma

config_generation/generate_jobs.py

@@ -39,7 +39,7 @@ def _create_job_name(self, collection_name):
         if source == "SDE":
             return f"collection.indexer.{collection_name}.xml"
         else:
-            return f"collection.{source}.{collection_name}.xml"
+            return f"collection.indexer.{source}.{collection_name}.xml"
 
     def _create_joblist_name(self, index):
         """

sde_collections/models/collection.py

@@ -116,7 +116,7 @@ def _scraper_config_path(self) -> str:
         return f"sources/scrapers/{self.config_folder}/default.xml"
 
     @property
-    def _plugin_config_path(self) -> str:
+    def _indexer_config_path(self) -> str:
         return f"sources/SDE/{self.config_folder}/default.xml"
 
     @property
@@ -125,7 +125,7 @@ def _indexer_job_path(self) -> str:
 
     @property
     def _scraper_job_path(self) -> str:
-        return f"jobs/collection.scrapers.{self.config_folder}.xml"
+        return f"jobs/collection.indexer.scrapers.{self.config_folder}.xml"
 
     @property
     def tree_root(self) -> str:
@@ -271,7 +271,7 @@ def create_indexer_config(self, overwrite: bool = False):
         indexer_template = open("config_generation/xmls/indexer_template.xml").read()
         indexer_editor = XmlEditor(indexer_template)
         indexer_config = indexer_editor.convert_template_to_indexer(scraper_editor)
-        self._write_to_github(self._plugin_config_path, indexer_config, overwrite)
+        self._write_to_github(self._indexer_config_path, indexer_config, overwrite)
 
     def create_scraper_job(self, overwrite: bool = False):
         """