Develop

src/BitBucketHealth-Model-Importer-Tests/BitBucketModelImporterTest.class.st

@@ -134,7 +134,7 @@ BitBucketModelImporterTest >> testGetContributionFromDiffsWithoutRemoved [
 { #category : #tests }
 BitBucketModelImporterTest >> testImportCommitsOfProjectSinceUntil [
 
-	| bitBucketApi glphModel bitBucketImporter project commits group repo |
+	| bitBucketApi glphModel bitBucketImporter project commits group repo firstCommit |
 	"Given"
 	bitBucketApi := BitBucketApiMock new.
 
@@ -160,8 +160,10 @@ BitBucketModelImporterTest >> testImportCommitsOfProjectSinceUntil [
 	self
 		assert: (bitBucketImporter glhModel allWithType: GLHCommit) size
 		equals: 1.
-
-  self assert: project repository commits size equals: 1. 
+
+	self assert: project repository commits size equals: 1.
+	firstCommit := project repository commits first.
+	self assert: firstCommit additions equals: 1
 ]
 
 { #category : #tests }
@@ -282,7 +284,8 @@ BitBucketModelImporterTest >> testImportMergeRequestCommits [
 
 	"Then"
 	self deny: mergeRequest commits equals: nil.
-	self assert: mergeRequest commits equals: commits
+	self assert: mergeRequest commits equals: commits.
+	self assert: mergeRequest commits first additions equals: 1
 ]
 
 { #category : #tests }

src/BitBucketHealth-Model-Importer/BitBucketModelImporter.class.st

@@ -174,22 +174,18 @@ BitBucketModelImporter >> importCommitsOfProject: aGLHProject since: since until
 		           until: until.
 
 	commits := commits collect: [ :commit |
-		           | glhCommit commitDiffs contribution |
-		           glhCommit := self parseCommitIntoGLHCommit: commit.
-		           commitDiffs := self repoApi
-			                          diffsOfCommit: glhCommit id
-			                          inRepoProjectId: aGLHProject id
-			                          inProjectGroupId: aGLHProject group id.
-
-		           contribution := self getContributionFromDiffs:
-			                           (commitDiffs at: #diffs).
-		           glhCommit additions: (contribution at: #additions).
-		           glhCommit deletions: (contribution at: #deletions).
-		           glhCommit ].
+
+		           self parseCommitIntoGLHCommit: commit ofProject: aGLHProject.
 
-
-	commits := self glhModel addAll: commits unless: self blockOnIdEquality.
-	^ aGLHProject repository commits addAll: commits unless: self blockOnIdEquality.
+		         ].
+
+
+	commits := self glhModel
+		           addAll: commits
+		           unless: self blockOnIdEquality.
+	^ aGLHProject repository commits
+		  addAll: commits
+		  unless: self blockOnIdEquality
 ]
 
 { #category : #'import - projects' }
@@ -301,7 +297,7 @@ BitBucketModelImporter >> importMergeRequestCommits: mergeRequest [
 		           inProjectGroupId: mergeRequest project group id.
 
 	commits := commits collect: [ :commit |
-		           self parseCommitIntoGLHCommit: commit ].
+		           self parseCommitIntoGLHCommit: commit ofProject: mergeRequest project ].
 
 	mergeRequest commits: commits.
 
@@ -384,15 +380,23 @@ BitBucketModelImporter >> importUserByUsername: username [
 ]
 
 { #category : #parsing }
-BitBucketModelImporter >> parseCommitIntoGLHCommit: commitDictionary [
+BitBucketModelImporter >> parseCommitIntoGLHCommit: commitDictionary ofProject: aGLHProject [
 
-	| author committer parentIds |
+	| author committer parentIds commitDiffs contribution |
 	author := commitDictionary at: #author.
 	committer := commitDictionary at: #committer.
 
 	parentIds := (commitDictionary at: #parents) collect: [ :parent |
 		             parent at: #id ].
 
+	commitDiffs := self repoApi
+		               diffsOfCommit: (commitDictionary at: #id)
+		               inRepoProjectId: aGLHProject id
+		               inProjectGroupId: aGLHProject group id.
+
+	contribution := self getContributionFromDiffs:
+		                (commitDiffs at: #diffs).
+
 	^ GLHCommit new
 		  id: (commitDictionary at: #id);
 		  message: (commitDictionary at: #message);
@@ -406,7 +410,9 @@ BitBucketModelImporter >> parseCommitIntoGLHCommit: commitDictionary [
 					   (commitDictionary at: #committerTimestamp) / 1000);
 		  committer_email: (committer at: #emailAddress);
 		  committer_name: (committer at: #name);
-		  parent_ids: parentIds
+		  parent_ids: parentIds;
+		  additions: (contribution at: #additions);
+		  deletions: (contribution at: #deletions)
 ]
 
 { #category : #parsing }

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

@@ -9,6 +9,7 @@ CodeAdditionByTicketMetric >> calculate [
 
 	| groupedByDate dateOver |
 	userMergeRequests ifNil: [ self load ].
+
 	groupedByDate := self setupGroupedDate.
 	userMergeRequests ifEmpty: [ ^ 0 ].
 
@@ -19,11 +20,11 @@ CodeAdditionByTicketMetric >> calculate [
 			at: dateOver printString
 			ifPresent: [ :value | value add: userMergeRequest ] ].
 
-	groupedByDate := groupedByDate collect: [ :group |  
-		| average |
-		average := (group collect: [ :mergeRequest | mergeRequest commits sum: [ :commit | commit additions ] ]) average
-		 
-	].
+	groupedByDate := groupedByDate collect: [ :group |
+		                 | average |
+		                 average := (group collect: [ :mergeRequest |
+			                             mergeRequest commits sum: [ :commit |
+				                             commit additions ] ]) average ].
 
 	^ groupedByDate average asFloat
 ]
@@ -40,5 +41,5 @@ CodeAdditionByTicketMetric >> load [
 	userMergeRequests := self
 		                     loadUserCompleteMergeRequestsWithJiraIssueSince:
 		                     (period at: #since)
-		                     until: (period at: #until).
+		                     until: (period at: #until)
 ]

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

@@ -9,6 +9,7 @@ CodeDeletionByTicketMetric >> calculate [
 
 	| groupedByDate dateOver |
 	userMergeRequests ifNil: [ self load ].
+
 	groupedByDate := self setupGroupedDate.
 	userMergeRequests ifEmpty: [ ^ 0 ].
 

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

@@ -375,7 +375,7 @@ GitMetricExporter >> generateUsersAnalysesDuringPeriod: period over: aDateWeekMo
 				               until: (period at: #until);
 				               over: aDateWeekMonthOrYear;
 				               user: user;
-									emailDomain: emailDomain.
+				               emailDomain: emailDomain.
 
 
 			  result := newMetric calculate.

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

@@ -187,7 +187,9 @@ UserMetric >> loadUserCompleteMergeRequestsSince: since until: until [
 UserMetric >> loadUserCompleteMergeRequestsWithJiraIssueSince: since until: until [
 
 	| email mergeRequests |
-	mergeRequests := self loadUserCompleteMergeRequestsSince: since until: until.
+	mergeRequests := self
+		                 loadUserCompleteMergeRequestsSince: since
+		                 until: until.
 
 	email := self userEmail.
 
@@ -244,6 +246,9 @@ UserMetric >> user: anObject [
 
 { #category : #email }
 UserMetric >> userEmail [
+
+	user public_email = '' ifFalse: [ ^ user public_email ].
+
 	^ ('' join: {
 			   user username.
 			   emailDomain }) asLowercase