refactor: reduce repetition in edge calculations

sanger · Jan 23, 2024 · c6af732 · c6af732
1 parent 49545cb
commit c6af732
Showing 1 changed file with 25 additions and 11 deletions.
diff --git a/app/controllers/pipelines_controller.rb b/app/controllers/pipelines_controller.rb
@@ -20,22 +20,36 @@ def calculate_pipelines
     Settings.pipelines.map { |pl| { name: pl.name, filters: pl.filters } }
   end
 
+  def calculate_edges_with_pipeline_data
+    Settings.pipelines.flat_map { |pl| pl.relationships.map { |s, t| { source: s, target: t, pipeline: pl } } }
+  end
+
   def calculate_pipeline_edges
-    Settings.pipelines.flat_map do |pl|
-      pl.relationships.map do |s, t|
-        { group: 'edges', data: { id: SecureRandom.uuid, source: s, target: t, pipeline: pl.name } }
-      end
+    calculate_edges_with_pipeline_data.map do |edge|
+      {
+        group: 'edges',
+        data: {
+          id: SecureRandom.uuid,
+          source: edge[:source],
+          target: edge[:target],
+          pipeline: edge[:pipeline].name
+        }
+      }
     end
   end
 
   def calculate_group_edges
-    edges =
-      Settings.pipelines.flat_map do |pl|
-        pl.relationships.map do |s, t|
-          { group: 'edges', data: { id: SecureRandom.uuid, source: s, target: t, group: pl.pipeline_group } }
-        end
-      end
-    edges.uniq { |e| e[:data][:source] + e[:data][:target] + e[:data][:group] }
+    calculate_edges_with_pipeline_data.map do |edge|
+      {
+        group: 'edges',
+        data: {
+          id: SecureRandom.uuid,
+          source: edge[:source],
+          target: edge[:target],
+          group: edge[:pipeline].pipeline_group
+        }
+      }
+    end
   end
 
   def calculate_edges