Merge pull request #1283 from ElixirTeSS/empty-update-logs

Avoid empty update logs

Author: fbacall

lib/ingestors/ingestor.rb

@@ -213,7 +213,14 @@ def write_resources(type, resources, user, provider, source: nil)
               method: source.method
             }
           end
-          resource.create_activity(update ? :update : :create, owner: user, parameters: activity_params)
+
+          if update
+            if resource.log_update_activity?
+              resource.create_activity(:update, owner: user, parameters: activity_params)
+            end
+          else
+            resource.create_activity(:create, owner: user, parameters: activity_params)
+          end
           @stats[key][update ? :updated : :added] += 1
         else
           @stats[key][:rejected] += 1

test/unit/ingestors/ingestor_test.rb

@@ -392,4 +392,40 @@ def run_filter(source_filter)
     end
   end
 
+  test 'does not log useless update activities' do
+    user = users(:scraper_user)
+    provider = content_providers(:goblet)
+    url = 'http://example.com/cool-course-summer'
+    e = events(:course_event)
+    e.update!(scraper_record: true)
+
+    assert provider.events.where(url: url).any?
+
+    event = OpenStruct.new(url: 'http://example.com/cool-course-summer', title: 'A different title')
+
+    ingestor = Ingestors::Ingestor.new
+    ingestor.instance_variable_set(:@events, [event])
+    assert_no_difference('provider.events.count') do
+      assert_no_difference('PublicActivity::Activity.where(key: "event.create").count') do
+        assert_difference('PublicActivity::Activity.where(key: "event.update").count', 1) do
+          assert_difference('PublicActivity::Activity.where(key: "event.update_parameter").count', 1) do # Title is changed
+            ingestor.write(user, provider)
+          end
+        end
+      end
+    end
+
+    ingestor = Ingestors::Ingestor.new
+    ingestor.instance_variable_set(:@events, [event])
+    assert_no_difference('provider.events.count') do
+      assert_no_difference('PublicActivity::Activity.where(key: "event.create").count') do
+        assert_no_difference('PublicActivity::Activity.where(key: "event.update").count') do
+          assert_no_difference('PublicActivity::Activity.where(key: "event.update_parameter").count') do
+            ingestor.write(user, provider) # Nothing changed so don't log
+          end
+        end
+      end
+    end
+  end
+
 end