Merge pull request #166 from moosetechnology/develop

Develop

Author: badetitou

src/GitLabHealth-Model-Analysis-Tests/CodeAdditionByMergeRequestProjectMetricTest.class.st

@@ -7,8 +7,7 @@ Class {
 	#category : #'GitLabHealth-Model-Analysis-Tests'
 }
 
-
-{ #category : #'tests' }
+{ #category : #tests }
 CodeAdditionByMergeRequestProjectMetricTest >> testCalculate [
 
 	| result glhImporter codeAddition mergedCommit |
@@ -103,7 +102,6 @@ CodeAdditionByMergeRequestProjectMetricTest >> testCalculateNoCommits [
 	self assert: result equals: 0
 ]
 
-
 { #category : #tests }
 CodeAdditionByMergeRequestProjectMetricTest >> testCalculateNoMergeRequests [
 

src/GitLabHealth-Model-Analysis-Tests/JiraTimeMRTimeDifferenceProjectMetricTest.class.st

@@ -95,6 +95,66 @@ JiraTimeMRTimeDifferenceProjectMetricTest >> testCalculateNoMergeRequests [
 { #category : #tests }
 JiraTimeMRTimeDifferenceProjectMetricTest >> testCalculateWithNoEstimatedTime [
 
+	| result glhImporter jiraImporter jiraMRDifference commitMerged commit1 |
+	glhImporter := GLPHImporterMock new.
+
+
+	commit1 := GLHCommit new
+		           id: 1;
+		           created_at: createdAt;
+		           committed_date: createdAt;
+		           repository: project1 repository;
+		           deletions: 5.
+
+	commitMerged := GLHCommit new
+		                id: 2;
+		                created_at: createdAt + 1 minutes;
+		                committed_date: createdAt + 1 minutes;
+		                repository: project1 repository;
+		                deletions: 5.
+
+	glhImporter mergeRequests: {
+			
+			(GLHMergeRequest new
+				 project: project1;
+				 iid: 2;
+				 created_at: createdAt;
+				 merged_at: createdAt + 24 hours;
+				 state: #merged;
+				 mergedCommit: commitMerged;
+				 title: '[AZ-123] feat do something') }.
+
+
+	"those commits will be added to the MR with the mock importer"
+	glhImporter commits: { commit1 }.
+
+	jiraImporter := JiraImporterMock new.
+
+	jiraImporter issues: {
+			(JPIssue new
+				 id: 'AZ-123';
+				 key: 'AZ-123';
+				 yourself) }.
+
+
+
+	jiraMRDifference := JiraTimeMRTimeDifferenceProjectMetric new
+		                    project: project1;
+		                    glhImporter: glhImporter;
+		                    jiraImporter: jiraImporter;
+		                    setPeriodSince: since until: until;
+		                    over: Week.
+
+
+	result := jiraMRDifference calculate.
+
+
+	self assert: result equals: nil
+]
+
+{ #category : #tests }
+JiraTimeMRTimeDifferenceProjectMetricTest >> testCalculateWithNoEstimatedTimeAndOneTicketWith [
+
 	| result glhImporter jiraImporter jiraMRDifference jiraIssue commitMerged commit1 |
 	glhImporter := GLPHImporterMock new.
 
@@ -115,11 +175,23 @@ JiraTimeMRTimeDifferenceProjectMetricTest >> testCalculateWithNoEstimatedTime [
 
 	glhImporter mergeRequests: { (GLHMergeRequest new
 			 project: project1;
+			 iid: 1;
+			 created_at: createdAt;
+			 merged_at: createdAt + 1 hours;
+			 state: #merged;
+			 mergedCommit: commitMerged;
+			 title: '[AZ-654] feat do something').
+			
+			(GLHMergeRequest new
+			 project: project1;
+			 iid: 2;
 			 created_at: createdAt;
 			 merged_at: createdAt + 24 hours;
 			 state: #merged;
 			 mergedCommit: commitMerged;
-			 title: '[AZ-654] feat do something') }.
+			 title: '[AZ-123] feat do something')
+			
+			 }.
 
 
 	"those commits will be added to the MR with the mock importer"
@@ -130,7 +202,70 @@ JiraTimeMRTimeDifferenceProjectMetricTest >> testCalculateWithNoEstimatedTime [
 		             id: 'AZ-654';
 		             key: 'AZ-654';
 		             yourself.
-	jiraImporter issues: { jiraIssue }.
+	jiraImporter issues: { (JPIssue new
+		             id: 'AZ-654';
+		             key: 'AZ-654';
+						 timeEstimate: 2 hours;
+		             yourself). (JPIssue new
+		             id: 'AZ-123';
+		             key: 'AZ-123';
+		             yourself). }.
+
+
+
+	jiraMRDifference := JiraTimeMRTimeDifferenceProjectMetric new
+		                    project: project1;
+		                    glhImporter: glhImporter;
+		                    jiraImporter: jiraImporter;
+		                    setPeriodSince: since until: until;
+		                    over: Week.
+
+
+	result := jiraMRDifference calculate.
+
+
+	self assert: result equals: 1 hours asSeconds
+]
+
+{ #category : #tests }
+JiraTimeMRTimeDifferenceProjectMetricTest >> testCalculateWithNoIssue [
+
+	| result glhImporter jiraImporter jiraMRDifference jiraIssue commitMerged commit1 |
+	glhImporter := GLPHImporterMock new.
+
+
+	commit1 := GLHCommit new
+		           id: 1;
+		           created_at: createdAt;
+		           committed_date: createdAt;
+		           repository: project1 repository;
+		           deletions: 5.
+
+	commitMerged := GLHCommit new
+		                id: 2;
+		                created_at: createdAt + 1 minutes;
+		                committed_date: createdAt + 1 minutes;
+		                repository: project1 repository;
+		                deletions: 5.
+
+	glhImporter mergeRequests: { (GLHMergeRequest new
+			 project: project1;
+			 created_at: createdAt;
+			 merged_at: createdAt + 24 hours;
+			 state: #merged;
+			 mergedCommit: commitMerged;
+			 title: 'feat do something') }.
+
+
+	"those commits will be added to the MR with the mock importer"
+	glhImporter commits: { commit1 }.
+
+	jiraImporter := JiraImporterMock new.
+	jiraIssue := JPIssue new
+		             id: 'AZ-654';
+		             key: 'AZ-654';
+		             yourself.
+	jiraImporter issues: {  }.
 
 
 

src/GitLabHealth-Model-Analysis/JiraTimeMRTimeDifferenceProjectMetric.class.st

@@ -11,8 +11,8 @@ Class {
 JiraTimeMRTimeDifferenceProjectMetric >> calculate [
 
 	| groupedByDate dateOver jiraID |
-
 	projectMergeRequests ifNil: [ self load ].
+	projectMergeRequests := projectMergeRequests reject: [:mr | mr jiraIssue isNil or: [(mr jiraIssue timeOriginalEstimate ifNil: [mr jiraIssue timeEstimate ]) isNil]].
 	projectMergeRequests ifEmpty: [ ^ nil ].
 
 	groupedByDate := self setupGroupedDate.
@@ -48,7 +48,6 @@ JiraTimeMRTimeDifferenceProjectMetric >> calculate [
 				                                            ifNil: [
 				                                            jiraIssue timeEstimate ].
 
-			                                jiraTime ifNil: [ ^ nil ].
 			                                (jiraTime - mergeRequestTime)
 				                                asSeconds ].