Merge pull request #460 from City-of-Helsinki/develop

Release (2) 21.9
City-of-Helsinki · Sep 21, 2023 · 30ff489 · 30ff489
2 parents cd9bfa3 + c878f7f
commit 30ff489
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/public/modules/custom/asu_migration/src/ProjectMigrationService.php b/public/modules/custom/asu_migration/src/ProjectMigrationService.php
@@ -70,7 +70,7 @@ private function getFilesFromLocal() {
    * Run migrations.
    */
   public function migrate(): array {
-    getFilesFromTmp();
+    self::getFilesFromTmp();
 
     $errors = $this->migrateProjects();
 
@@ -178,11 +178,8 @@ private function migrateProjects(): array {
 
       if (!$district) {
         $errors[] = "Error with the project $currentProjectId. Error in create district term.";
-        continue;
-      }
-      else {
-        $project->field_district->entity = $district;
       }
+      $project->field_district->entity = $district;
 
       if ($project) {
         if (feof($this->file2)) {
@@ -367,8 +364,8 @@ private function getTerm(array $terms, string $term, string $vid) {
       return reset($terms);
     }
 
-    if (preg_match('~[0-9]+~', $term)) {
-      return FALSE;
+    if (preg_match('~[0-9]+~', $term) || empty($term)) {
+      return NULL;
     }
 
     try {