Merge branch 'lee5151' into 'main'

Fix ASC Courses existing course node check

See merge request !65

web/modules/custom/asc_courses/src/AscCoursesImporter.php

@@ -46,24 +46,18 @@ public function importCourseNodes($courses_data)
     if ($this->debug) echo "importCourseNodes()\n";
 
     foreach ($courses_data as $course_data) {
-      // echo "importCourseNodes(): " . print_r($course_data, true) . "\n";
       $node_storage = \Drupal::entityTypeManager()->getStorage('node');
-      // if($this->debug) echo "$i catalog-nbr: " . $course_data['catalog-nbr'] . "\n";
-      // if($this->debug > 1) echo "importCourseNodes() - " . print_r($course_data, true);
-
-      // look up existing node
       $node_query = \Drupal::entityQuery('node')
-        ->condition('field_eip_id', $course_data['crse_id'], '=')
+        ->condition('field_subject_abbreviation', $course_data['subject'], '=')
+        ->condition('field_course_number', $course_data['catalog_nbr'], '=')
         ->accessCheck(FALSE);
       $existing_node = $node_query->execute();
 
       if (empty($existing_node)) {
         $this->createCourseNode($node_storage, $course_data);
       } else {
-        // update existing node
         $existing_nid = array_shift($existing_node);
         $this->updateCourseNode($node_storage, $existing_nid, $course_data);
-        // if($this->debug) echo "\n";
       }
     }
   }