Add MISSING e-tag refresh of resource for Job, and Pipeline Graph

2 files changed, 46 insertions, 0 deletions

diff --git a/app/workers/expire_job_cache_worker.rb b/app/workers/expire_job_cache_worker.rb
new file mode 100644
index 00000000000..e3930ee9d41
--- /dev/null
+++ b/app/workers/expire_job_cache_worker.rb
@@ -0,0 +1,37 @@
+class ExpireJobCacheWorker
+  include Sidekiq::Worker
+  include BuildQueue
+
+  def perform(pipeline_id, job_id)
+    job = CommitStatus.joins(:pipeline, :project).find_by(id: job)
+    return unless job
+
+    pipeline = job.pipeline
+    project = job.project
+
+    store.touch(project_pipeline_path(project, pipeline))
+    store.touch(project_job_path(project, job))
+  end
+
+  private
+
+  def project_pipeline_path(project, pipeline)
+    Gitlab::Routing.url_helpers.namespace_project_pipeline_path(
+      project.namespace,
+      project,
+      pipeline,
+      format: :json)
+  end
+
+  def project_job_path(project, job)
+    Gitlab::Routing.url_helpers.namespace_project_build_path(
+      project.namespace,
+      project,
+      job.id,
+      format: :json)
+  end
+
+  def store
+    @store ||= Gitlab::EtagCaching::Store.new
+  end
+end
diff --git a/app/workers/expire_pipeline_cache_worker.rb b/app/workers/expire_pipeline_cache_worker.rb
index 603e2f1aaea..d760f5b140f 100644
--- a/app/workers/expire_pipeline_cache_worker.rb
+++ b/app/workers/expire_pipeline_cache_worker.rb
@@ -10,6 +10,7 @@ class ExpirePipelineCacheWorker
     store = Gitlab::EtagCaching::Store.new
 
     store.touch(project_pipelines_path(project))
+    store.touch(project_pipeline_path(project, pipeline))
     store.touch(commit_pipelines_path(project, pipeline.commit)) if pipeline.commit
     store.touch(new_merge_request_pipelines_path(project))
     each_pipelines_merge_request_path(project, pipeline) do |path|
@@ -28,6 +29,14 @@ class ExpirePipelineCacheWorker
       format: :json)
   end
 
+  def project_pipeline_path(project, pipeline)
+    Gitlab::Routing.url_helpers.namespace_project_pipeline_path(
+      project.namespace,
+      project,
+      pipeline,
+      format: :json)
+  end
+
   def commit_pipelines_path(project, commit)
     Gitlab::Routing.url_helpers.pipelines_namespace_project_commit_path(
       project.namespace,