pact_broker 2.6.0 → 2.7.0.beta.1

data/lib/pact_broker/domain/verification.rb

@@ -8,6 +8,7 @@ module PactBroker
 
       set_primary_key :id
       associate(:many_to_one, :pact_version, class: "PactBroker::Pacts::PactVersion", key: :pact_version_id, primary_key: :id)
+      associate(:many_to_one, :provider_version, class: "PactBroker::Domain::Version", key: :provider_version_id, primary_key: :id)
 
       def before_create
         super
@@ -78,10 +79,13 @@ module PactBroker
            .limit(1).select(:provider_id))
       end
 
+      def provider_version_number
+        provider_version.number
+      end
+
       def latest_pact_publication
         pact_version.latest_pact_publication
       end
-
     end
 
     Verification.plugin :timestamps

data/lib/pact_broker/matrix/repository.rb

@@ -0,0 +1,51 @@
+require 'pact_broker/repositories/helpers'
+
+module PactBroker
+  module Matrix
+    class Repository
+      include PactBroker::Repositories::Helpers
+      include PactBroker::Repositories
+
+      def find pacticipant_1_name, pacticipant_2_name
+        find_for_version_ids([], [pacticipant_1_name, pacticipant_2_name])
+          .sort{|l1, l2| l2[:consumer_version_order] <=> l1[:consumer_version_order]}
+      end
+
+      ##
+      # candidate_versions Hash of pacticipant name => version
+      # Ihe value is nil, it means all versions for that pacticipant are to be included
+      # Returns a list of matrix lines indicating the compatible versions
+      #
+      def find_compatible_pacticipant_versions criteria
+        version_ids = criteria.reject{ |key, value| !value }.collect do | key, value |
+          version_repository.find_by_pacticipant_name_and_number(key, value).id
+        end
+
+        pacticipant_names = criteria.reject{|key, value| value }.keys
+
+        find_for_version_ids(version_ids, pacticipant_names)
+          .group_by{|line| [line[:consumer_version_number], line[:provider_version_number]]}
+          .values
+          .collect(&:last)
+          .select{ |line | line[:success] }
+      end
+
+      def find_for_version_ids version_ids, pacticipant_names = []
+        PactBroker::Pacts::LatestPactPublicationsByConsumerVersion
+          .select_append(:consumer_version_number, :provider_name, :consumer_name, :provider_version_id, :provider_version_number, :success)
+          .select_append(Sequel[:latest_pact_publications_by_consumer_versions][:created_at].as(:pact_created_at))
+          .select_append(Sequel[:all_verifications][:number])
+          .select_append(Sequel[:all_verifications][:id].as(:verification_id))
+          .select_append(Sequel[:execution_date].as(:verification_executed_at))
+          .left_outer_join(:all_verifications, pact_version_id: :pact_version_id)
+          .where(provider_version_id: version_ids)
+            .or(provider_version_id: nil)
+            .or(provider_name: pacticipant_names)
+          .where(consumer_version_id: version_ids)
+            .or(consumer_name: pacticipant_names)
+          .order(:execution_date, :verification_id)
+          .collect(&:values)
+      end
+    end
+  end
+end

data/lib/pact_broker/matrix/service.rb

@@ -0,0 +1,50 @@
+require 'pact_broker/repositories'
+
+module PactBroker
+  module Matrix
+    module Service
+      VERSION_SELECTOR_PATTERN = %r{(^[^/]+)/version/[^/]+$}.freeze
+
+      extend self
+      extend PactBroker::Repositories
+      extend PactBroker::Services
+
+      def find params
+        matrix_repository.find params[:consumer_name], params[:provider_name]
+      end
+
+      def find_compatible_pacticipant_versions criteria
+        matrix_repository.find_compatible_pacticipant_versions criteria
+      end
+
+      def validate_selectors selectors
+        error_messages = []
+        selectors.each do | version_selector |
+          if !(version_selector =~ VERSION_SELECTOR_PATTERN)
+            error_messages << "Invalid version selector '#{version_selector}'. Format must be <pacticipant_name>/version/<version>"
+          end
+        end
+
+        selectors.each do | version_selector |
+          if match = version_selector.match(VERSION_SELECTOR_PATTERN)
+            pacticipant_name = match[1]
+            unless pacticipant_service.find_pacticipant_by_name(pacticipant_name)
+              error_messages << "Pacticipant '#{pacticipant_name}' not found"
+            end
+          end
+        end
+
+        if error_messages.empty?
+          selected_versions = version_service.find_versions_by_selector(selectors)
+          if selected_versions.any?(&:nil?)
+            selected_versions.each_with_index do | selected_version, i |
+              error_messages << "No pact or verification found for #{selectors[i]}" if selected_version.nil?
+            end
+          end
+        end
+
+        error_messages
+      end
+    end
+  end
+end

data/lib/pact_broker/pacticipants/service.rb

@@ -62,11 +62,27 @@ module PactBroker
       def self.find_relationships
         pact_repository.find_latest_pacts
           .collect do | pact|
-            latest_verification = verification_service.find_latest_verification_for(pact.consumer, pact.provider)
-            webhooks = webhook_service.find_by_consumer_and_provider pact.consumer, pact.provider
-            triggered_webhooks = webhook_service.find_latest_triggered_webhooks pact.consumer, pact.provider
-            PactBroker::Domain::Relationship.create pact.consumer, pact.provider, pact, latest_verification, webhooks, triggered_webhooks
-          end
+            latest_relationship = build_latest_pact_relationship(pact)
+            prod_relationship = build_relationship_for_tagged_pact(pact, 'prod')
+            production_relationship = build_relationship_for_tagged_pact(pact, 'production')
+            [latest_relationship, prod_relationship, production_relationship].compact
+          end.flatten
+      end
+
+      def self.build_latest_pact_relationship pact
+        latest_verification = verification_service.find_latest_verification_for(pact.consumer, pact.provider)
+        webhooks = webhook_service.find_by_consumer_and_provider pact.consumer, pact.provider
+        triggered_webhooks = webhook_service.find_latest_triggered_webhooks pact.consumer, pact.provider
+        tag_names = pact.consumer_version_tag_names.select{ |name| name == 'prod' || name == 'production' }
+        PactBroker::Domain::Relationship.create pact.consumer, pact.provider, pact, true, latest_verification, webhooks, triggered_webhooks, tag_names
+      end
+
+      def self.build_relationship_for_tagged_pact latest_pact, tag
+        pact = pact_service.find_latest_pact consumer_name: latest_pact.consumer_name, provider_name: latest_pact.provider_name, tag: tag
+        return nil unless pact
+        return nil if pact.id == latest_pact.id
+        verification = verification_repository.find_latest_verification_for pact.consumer_name, pact.provider_name, tag
+        PactBroker::Domain::Relationship.create pact.consumer, pact.provider, pact, false, verification, [], [], [tag]
       end
 
       def self.update params

data/lib/pact_broker/pacts/all_pact_publications.rb

@@ -28,6 +28,17 @@ module PactBroker
           where(name_like(:provider_name, provider_name))
         end
 
+        # must be exactly correct names
+        def pacticipants pacticipant_1, pacticipant_2
+          where(
+            consumer_name: pacticipant_1,
+            provider_name: pacticipant_2
+          ).or(
+            consumer_name: pacticipant_2,
+            provider_name: pacticipant_1
+          )
+        end
+
         def tag tag_name
           filter = name_like(Sequel.qualify(:tags, :name), tag_name)
           join(:tags, {version_id: :consumer_version_id}).where(filter)

data/lib/pact_broker/pacts/pact_publication.rb

@@ -22,6 +22,10 @@ module PactBroker
         self.revision_number ||= 1
       end
 
+      def latest_tag_names
+        LatestTaggedPactPublications.where(id: id).select(:tag_name).collect{|t| t[:tag_name]}
+      end
+
       def to_domain
         PactBroker::Domain::Pact.new(
           id: id,

data/lib/pact_broker/pacts/repository.rb

@@ -86,7 +86,7 @@ module PactBroker
       end
 
       def find_latest_pacts
-        LatestPactPublications.order(:consumer_name, :provider_name).collect(&:to_domain_without_tags)
+        LatestPactPublications.order(:consumer_name, :provider_name).collect(&:to_domain)
       end
 
       def find_latest_pact(consumer_name, provider_name, tag = nil)

data/lib/pact_broker/repositories.rb

@@ -37,6 +37,11 @@ module PactBroker
       Verifications::Repository.new
     end
 
+    def matrix_repository
+      require 'pact_broker/matrix/repository'
+      Matrix::Repository.new
+    end
+
     extend self
   end
 end

data/lib/pact_broker/services.rb

@@ -46,5 +46,10 @@ module PactBroker
       require 'pact_broker/badges/service'
       Badges::Service
     end
+
+    def matrix_service
+      require 'pact_broker/matrix/service'
+      Matrix::Service
+    end
   end
 end

data/lib/pact_broker/tags/service.rb

@@ -27,5 +27,4 @@ module PactBroker
 
     end
   end
-
 end

data/lib/pact_broker/ui/app.rb

@@ -1,5 +1,6 @@
 require 'pact_broker/ui/controllers/relationships'
 require 'pact_broker/ui/controllers/groups'
+require 'pact_broker/ui/controllers/matrix'
 require 'pact_broker/doc/controllers/app'
 
 module PactBroker
@@ -21,6 +22,10 @@ module PactBroker
             run PactBroker::Doc::Controllers::App
           end
 
+          map "/matrix" do
+            run PactBroker::UI::Controllers::Matrix
+          end
+
           map "/" do
             run PactBroker::UI::Controllers::Relationships
           end

data/lib/pact_broker/ui/controllers/matrix.rb

@@ -0,0 +1,27 @@
+require 'pact_broker/ui/controllers/base_controller'
+require 'pact_broker/ui/view_models/matrix_line'
+require 'haml'
+
+module PactBroker
+  module UI
+    module Controllers
+      class Matrix < Base
+
+        include PactBroker::Services
+
+        get "/provider/:provider_name/consumer/:consumer_name" do
+          lines = matrix_service.find consumer_name: params[:consumer_name], provider_name: params[:provider_name]
+          lines = lines.collect{|line| PactBroker::UI::ViewDomain::MatrixLine.new(line)}
+          locals = {
+            lines: lines,
+            title: "The Matrix",
+            consumer_name: params[:consumer_name],
+            provider_name: params[:provider_name]
+          }
+          haml :'matrix/show', {locals: locals, layout: :'layouts/main'}
+        end
+
+      end
+    end
+  end
+end

data/lib/pact_broker/ui/controllers/relationships.rb

@@ -11,8 +11,8 @@ module PactBroker
 
         get "/" do
           view_model = ViewDomain::Relationships.new(pacticipant_service.find_relationships)
-
-          haml :'relationships/show', {locals: {relationships: view_model, title: "Pacts"}, layout: :'layouts/main'}
+          page = params[:showProdPacts] == 'true' ? :'relationships/show-prod-tags' : :'relationships/show'
+          haml page, {locals: {relationships: view_model, title: "Pacts"}, layout: :'layouts/main'}
         end
 
       end

data/lib/pact_broker/ui/view_models/matrix_line.rb

@@ -0,0 +1,79 @@
+require 'pact_broker/api/pact_broker_urls'
+require 'pact_broker/ui/helpers/url_helper'
+require 'pact_broker/date_helper'
+
+module PactBroker
+  module UI
+    module ViewDomain
+      class MatrixLine
+
+        include PactBroker::Api::PactBrokerUrls
+
+        def initialize line
+          @line = line
+        end
+
+        def provider_name
+          @line[:provider_name]
+        end
+
+        def consumer_name
+          @line[:consumer_name]
+        end
+
+        def pact_version_sha
+          @line[:pact_version_sha]
+        end
+
+        # verification number
+        def number
+          @line[:number]
+        end
+
+        def consumer_version_number
+          @line[:consumer_version_number]
+        end
+
+        def consumer_version_number_url
+          pact_url_from_params('', @line)
+        end
+
+        def consumer_version_order
+          @line[:consumer_version_order]
+        end
+
+        def provider_version_number
+          @line[:provider_version]
+        end
+
+        def provider_version_number_url
+          hal_browser_url(verification_url(self))
+        end
+
+        def provider_version_order
+          if @line[:execution_date]
+            @line[:execution_date].to_time.to_i
+          else
+            0
+          end
+        end
+
+        def verification_status
+          case @line[:success]
+            when true then "Verified"
+            when false then "Failed"
+            else ''
+          end
+        end
+
+        def verification_status_class
+          case @line[:success]
+            when true then 'success'
+            when false then 'danger'
+            else ''
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/ui/view_models/relationship.rb

@@ -21,6 +21,18 @@ module PactBroker
           @relationship.provider_name
         end
 
+        def consumer_version_number
+          @relationship.consumer_version_number
+        end
+
+        def provider_version_number
+          @relationship.provider_version_number
+        end
+
+        def tag_names
+          @relationship.tag_names.any? ? " (#{@relationship.tag_names.join(', ')}) ": ""
+        end
+
         def consumer_group_url
           Helpers::URLHelper.group_url consumer_name
         end
@@ -29,7 +41,7 @@ module PactBroker
           Helpers::URLHelper.group_url provider_name
         end
 
-        def latest_pact_url
+        def pact_url
           "#{pactigration_base_url('', @relationship)}/latest"
         end
 
@@ -38,6 +50,7 @@ module PactBroker
         end
 
         def webhook_label
+          return "" unless show_webhook_status?
           case @relationship.webhook_status
             when :none then "Create"
             when :success, :failure then webhook_last_execution_date
@@ -47,6 +60,7 @@ module PactBroker
         end
 
         def webhook_status
+          return "" unless show_webhook_status?
           case @relationship.webhook_status
             when :success then "success"
             when :failure then "danger"
@@ -55,6 +69,10 @@ module PactBroker
           end
         end
 
+        def show_webhook_status?
+          @relationship.latest?
+        end
+
         def webhook_last_execution_date
           PactBroker::DateHelper.distance_of_time_in_words(@relationship.last_webhook_execution_date, DateTime.now) + " ago"
         end
@@ -99,11 +117,11 @@ module PactBroker
         def verification_tooltip
           case @relationship.verification_status
           when :success
-            "Successfully verified by #{provider_name} (v#{@relationship.latest_verification_provider_version})"
+            "Successfully verified by #{provider_name} (v#{@relationship.latest_verification_provider_version_number})"
           when :stale
-            "Pact has changed since last successful verification by #{provider_name} (v#{@relationship.latest_verification_provider_version})"
+            "Pact has changed since last successful verification by #{provider_name} (v#{@relationship.latest_verification_provider_version_number})"
           when :failed
-            "Verification by #{provider_name} (v#{@relationship.latest_verification_provider_version}) failed"
+            "Verification by #{provider_name} (v#{@relationship.latest_verification_provider_version_number}) failed"
           else
             nil
           end

data/lib/pact_broker/ui/views/matrix/show.haml

@@ -0,0 +1,42 @@
+%body
+  %link{rel: 'stylesheet', href: '/css/bootstrap.min.css'}
+  %link{rel: 'stylesheet', href: '/stylesheets/relationships.css'}
+  %script{type: 'text/javascript', src:'/javascripts/jquery-2.1.1.min.js'}
+  %script{type: 'text/javascript', src:'/javascripts/jquery.tablesorter.min.js'}
+  %script{type: 'text/javascript', src:'/js/bootstrap.min.js'}
+
+.container
+  %h1.page-header
+    = title
+  %table.table.table-bordered.table-striped{id: 'matrix'}
+    %thead
+      %th.consumer
+        = "#{consumer_name} version"
+        %span.glyphicon.glyphicon-sort.sort
+      %th.provider
+        = "#{provider_name} version"
+        %span.glyphicon.glyphicon-sort.sort
+      %th.verification-result
+        Verification
+        %span.glyphicon.glyphicon-sort.sort
+    %tbody
+    - lines.each do | line |
+      %tr
+        %td.consumer-version{'data-sort-value' => line.consumer_version_order}
+          %a{href: line.consumer_version_number_url}
+            = line.consumer_version_number
+        %td.provider{'data-sort-value' => line.provider_version_order}
+          %a{href: line.provider_version_number_url}
+            = line.provider_version_number
+        %td.verification-result{class: line.verification_status_class}
+          = line.verification_status
+
+:javascript
+  $(function(){
+    $("#matrix").tablesorter({
+      textExtraction : function(node, table, cellIndex){
+        n = $(node);
+        return n.attr('data-sort-value') || n.text();
+      }
+    });
+  });