Merge pull request #50 from localgovdrupal/fix/1.x/32-remove-order

Fix/1.x/32 remove order

Author: rupertj

src/ImportInterface.php

@@ -3,6 +3,7 @@
 namespace Drupal\localgov_publications_importer;
 
 use Drupal\file\Entity\File;
+use Drupal\user\UserInterface;
 
 /**
  * Interface for content being imported.
@@ -75,4 +76,14 @@ public function getPipeline(): string;
    */
   public function getFile(): ?File;
 
+  /**
+   * Get the creator user.
+   */
+  public function getCreator(): ?UserInterface;
+
+  /**
+   * Set the creator user.
+   */
+  public function setCreator(UserInterface $user): void;
+
 }

src/Plugin/LocalGovImporter/Save/Publication.php

@@ -61,6 +61,7 @@ public function import(ImportInterface $import): ?NodeInterface {
       $publicationPage = $nodeStorage->create([
         'type' => 'localgov_publication_page',
         'title' => $page->getTitle(),
+        'uid' => $import->getCreator()->id(),
         'book' => $book,
       ]);
 

src/Plugin/LocalGovImporter/Transform/Linebreaks.php

@@ -22,11 +22,4 @@ public function transformContent(string $content): string {
     return trim(str_replace("\t\n", ' ', $content));
   }
 
-  /**
-   * {@inheritDoc}
-   */
-  public function order(): int {
-    return 30;
-  }
-
 }

tests/src/Functional/ExtractAndSaveTest.php

@@ -68,6 +68,8 @@ public function testExtractAndSaveAsPublications($fileName, $title, $pageCount):
 
     $node = $savePlugin->import($import);
     $this->assertInstanceOf(NodeInterface::class, $node);
+
+    $this->assertEquals($import->getCreator()->id(), $node->getOwner()->id());
   }
 
 }

tests/src/Functional/FileProviderTrait.php

@@ -57,20 +57,21 @@ public function createImport($fileName): ImportInterface {
     $file_system = \Drupal::service('file_system');
     $file_system->copy($fileName, $targetLocation, FileExists::Replace);
 
+    $user = $this->drupalCreateUser();
+
     $file = File::create([
       'filename' => basename($fileName),
       'uri' => $targetLocation,
       'status' => 1,
-      'uid' => 1,
+      'uid' => $user->id(),
     ]);
     $file->save();
 
     $import = Import::create([
       'file' => $file,
       'title' => $file->getFilename(),
-      // We may not need these.
-      'creator' => NULL,
-      'pipeline' => '',
+      'creator' => $user,
+      'pipeline' => 'standard',
     ]);
 
     $import->save();