|
22 | 22 | import logging
|
23 | 23 | import re
|
24 | 24 |
|
25 |
| -from grimoirelab_toolkit.datetime import str_to_datetime |
| 25 | +from grimoirelab_toolkit.datetime import str_to_datetime, datetime_utcnow |
26 | 26 |
|
27 | 27 | from .utils import get_time_diff_days
|
28 | 28 |
|
@@ -69,7 +69,7 @@ def get_elastic_mappings(es_major):
|
69 | 69 | "type": "keyword"
|
70 | 70 | }
|
71 | 71 | }
|
72 |
| - } |
| 72 | + } |
73 | 73 | """
|
74 | 74 |
|
75 | 75 | return {"items": mapping}
|
@@ -313,7 +313,7 @@ def __get_rich_merge(self, item):
|
313 | 313 |
|
314 | 314 | if merge_request['state'] != 'closed':
|
315 | 315 | rich_mr['time_open_days'] = \
|
316 |
| - get_time_diff_days(pull_request['created_at'], datetime_utcnow().replace(tzinfo=None)) |
| 316 | + get_time_diff_days(merge_request['created_at'], datetime_utcnow().replace(tzinfo=None)) |
317 | 317 | else:
|
318 | 318 | rich_mr['time_open_days'] = rich_mr['time_to_close_days']
|
319 | 319 |
|
@@ -383,9 +383,9 @@ def __get_rich_merge(self, item):
|
383 | 383 |
|
384 | 384 | rich_mr['time_to_merge_request_response'] = None
|
385 | 385 | if merge_request['notes_data'] != 0:
|
386 |
| - min_review_date = self.get_time_to_merge_request_response(pull_request) |
387 |
| - rich_pr['time_to_merge_request_response'] = \ |
388 |
| - get_time_diff_days(str_to_datetime(pull_request['created_at']), min_review_date) |
| 386 | + min_review_date = self.get_time_to_merge_request_response(merge_request) |
| 387 | + rich_mr['time_to_merge_request_response'] = \ |
| 388 | + get_time_diff_days(str_to_datetime(merge_request['created_at']), min_review_date) |
389 | 389 |
|
390 | 390 | if self.prjs_map:
|
391 | 391 | rich_mr.update(self.get_item_project(rich_mr))
|
|
0 commit comments