Skip to content

Commit 3c504ba

Browse files
committed
fix(matrix): exceptions on matrix page due to recent query optimisation
1 parent 301b30c commit 3c504ba

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

lib/pact_broker/matrix/quick_row.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def pact_created_at
204204
end
205205

206206
def verification_executed_at
207-
verification.execution_date
207+
verification&.execution_date
208208
end
209209

210210
# Add logic for ignoring case

lib/pact_broker/ui/view_models/matrix_line.rb

+29-29
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,40 @@ def initialize line
1717
end
1818

1919
def provider_name
20-
@line[:provider_name]
20+
@line.provider_name
2121
end
2222

2323
def provider_name_url
2424
hal_browser_url(pacticipant_url_from_params(pacticipant_name: provider_name))
2525
end
2626

2727
def consumer_name
28-
@line[:consumer_name]
28+
@line.consumer_name
2929
end
3030

3131
def consumer_name_url
3232
hal_browser_url(pacticipant_url_from_params(pacticipant_name: consumer_name))
3333
end
3434

3535
def pact_version_sha
36-
@line[:pact_version_sha]
36+
@line.pact_version_sha
3737
end
3838

3939
# verification number, used in verification_url method
4040
def number
41-
@line[:verification_number]
41+
@line.verification_number
4242
end
4343

4444
def pact_revision_number
45-
@line[:pact_revision_number]
45+
@line.pact_revision_number
4646
end
4747

4848
def consumer_name
49-
@line[:consumer_name]
49+
@line.consumer_name
5050
end
5151

5252
def consumer_version_number
53-
@line[:consumer_version_number]
53+
@line.consumer_version_number
5454
end
5555

5656
def display_consumer_version_number
@@ -63,23 +63,23 @@ def consumer_version_number_url
6363
end
6464

6565
def consumer_version_order
66-
@line[:consumer_version_order]
66+
@line.consumer_version_order
6767
end
6868

6969
def provider_name
70-
@line[:provider_name]
70+
@line.provider_name
7171
end
7272

7373
def provider_version_number
74-
@line[:provider_version_number]
74+
@line.provider_version_number
7575
end
7676

7777
def display_provider_version_number
7878
PactBroker::Versions::AbbreviateNumber.call(provider_version_number)
7979
end
8080

8181
def provider_version_order
82-
@line[:provider_version_order]
82+
@line.provider_version_order
8383
end
8484

8585
def provider_version_number_url
@@ -88,52 +88,52 @@ def provider_version_number_url
8888
end
8989

9090
def provider_version_order
91-
if @line[:verification_executed_at]
92-
@line[:verification_executed_at].to_time.to_i
91+
if @line.verification_executed_at
92+
@line.verification_executed_at.to_time.to_i
9393
else
9494
0
9595
end
9696
end
9797

9898
def latest_consumer_version_tags
99-
@line[:consumer_version_tags]
100-
.select{ | tag | tag[:latest] }
99+
@line.consumer_version_tags
100+
.select{ | tag | tag.latest }
101101
.collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
102102
end
103103

104104
def other_consumer_version_tags
105-
@line[:consumer_version_tags]
106-
.select{ | tag | !tag[:latest] }
105+
@line.consumer_version_tags
106+
.select{ | tag | !tag.latest }
107107
.collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: consumer_name, version_number: consumer_version_number)) }
108108
end
109109

110110
def latest_provider_version_tags
111-
@line[:provider_version_tags]
112-
.select{ | tag | tag[:latest] }
111+
@line.provider_version_tags
112+
.select{ | tag | tag.latest }
113113
.collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
114114
end
115115

116116
def other_provider_version_tags
117-
@line[:provider_version_tags]
118-
.select{ | tag | !tag[:latest] }
117+
@line.provider_version_tags
118+
.select{ | tag | !tag.latest }
119119
.collect{ | tag | MatrixTag.new(tag.to_hash.merge(pacticipant_name: provider_name, version_number: provider_version_number)) }
120120
end
121121

122122
def orderable_fields
123-
[consumer_name, consumer_version_order, pact_revision_number, provider_name, @line[:verification_id]]
123+
[consumer_name, consumer_version_order, pact_revision_number, provider_name, @line.verification_id]
124124
end
125125

126126
def <=> other
127127
(self.orderable_fields <=> other.orderable_fields) * -1
128128
end
129129

130130
def pseudo_branch_verification_status
131-
if @line[:verification_executed_at]
132-
DateHelper.distance_of_time_in_words(@line[:verification_executed_at], DateTime.now) + " ago"
131+
if @line.verification_executed_at
132+
DateHelper.distance_of_time_in_words(@line.verification_executed_at, DateTime.now) + " ago"
133133
else
134134
''
135135
end
136-
# case @line[:success]
136+
# case @line.success
137137
# when true then "Verified"
138138
# when false then "Failed"
139139
# else ''
@@ -145,7 +145,7 @@ def verification_status_url
145145
end
146146

147147
def pact_publication_date
148-
relative_date(@line[:pact_created_at])
148+
relative_date(@line.pact_created_at)
149149
end
150150

151151
def pact_publication_date_url
@@ -157,11 +157,11 @@ def relative_date date
157157
end
158158

159159
def pact_published_order
160-
@line[:pact_created_at].to_time.to_i
160+
@line.pact_created_at.to_time.to_i
161161
end
162162

163163
def verification_status_class
164-
case @line[:success]
164+
case @line.success
165165
when true then 'success'
166166
when false then 'danger'
167167
else ''
@@ -177,7 +177,7 @@ def overwritten= overwritten
177177
end
178178

179179
def inherited_verification_message
180-
if @line[:verification_executed_at] && @line[:pact_created_at] > @line[:verification_executed_at]
180+
if @line.verification_executed_at && @line.pact_created_at > @line.verification_executed_at
181181
"The verification date is before the pact publication date because this verification has been inherited from a previously verified pact with identical content."
182182
end
183183
end

0 commit comments

Comments
 (0)