Merge pull request #118 from moosetechnology/fix-id-was-sent-to-nil

fix: #id was sent to nil in importCreatorOfCommit:
moosetechnology · Jan 30, 2025 · 44f69e0 · 44f69e0
2 parents 1246665 + a3bbc7a
commit 44f69e0
Show file tree

Hide file tree

Showing 31 changed files with 38 additions and 36 deletions.
diff --git a/src/GitLabHealth-Model-Analysis/AnalysisReport.class.st b/src/GitLabHealth-Model-Analysis/AnalysisReport.class.st
@@ -6,7 +6,7 @@ Class {
 		'over',
 		'metrics'
 	],
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #initialization }

diff --git a/src/GitLabHealth-Model-Analysis/ClosedMergeRequestMetric.class.st b/src/GitLabHealth-Model-Analysis/ClosedMergeRequestMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #ClosedMergeRequestMetric,
 	#superclass : #UserMergeRequestMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/ClosedTicketsMetric.class.st b/src/GitLabHealth-Model-Analysis/ClosedTicketsMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #ClosedTicketsMetric,
 	#superclass : #UserJiraMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/CodeAdditionByMRMetric.class.st b/src/GitLabHealth-Model-Analysis/CodeAdditionByMRMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #CodeAdditionByMRMetric,
 	#superclass : #UserMergeRequestMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/CodeAdditionByTicketMetric.class.st b/src/GitLabHealth-Model-Analysis/CodeAdditionByTicketMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #CodeAdditionByTicketMetric,
 	#superclass : #UserJiraMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/CodeAdditionMetric.class.st b/src/GitLabHealth-Model-Analysis/CodeAdditionMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #CodeAdditionMetric,
 	#superclass : #UserCommitsMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/CodeChurnMetric.class.st b/src/GitLabHealth-Model-Analysis/CodeChurnMetric.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'maxCommitWindow'
 	],
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/CodeDeletionByMRMetric.class.st b/src/GitLabHealth-Model-Analysis/CodeDeletionByMRMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #CodeDeletionByMRMetric,
 	#superclass : #UserMergeRequestMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/CodeDeletionByTicketMetric.class.st b/src/GitLabHealth-Model-Analysis/CodeDeletionByTicketMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #CodeDeletionByTicketMetric,
 	#superclass : #UserJiraMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/CodeDeletionMetric.class.st b/src/GitLabHealth-Model-Analysis/CodeDeletionMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #CodeDeletionMetric,
 	#superclass : #UserCommitsMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/CommentContributionMetric.class.st b/src/GitLabHealth-Model-Analysis/CommentContributionMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #CommentContributionMetric,
 	#superclass : #UserCommitsMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/CommitFrequencyMetric.class.st b/src/GitLabHealth-Model-Analysis/CommitFrequencyMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #CommitFrequencyMetric,
 	#superclass : #UserCommitsMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/CommitsNumberByJiraTicketsMetric.class.st b/src/GitLabHealth-Model-Analysis/CommitsNumberByJiraTicketsMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #CommitsNumberByJiraTicketsMetric,
 	#superclass : #UserJiraMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/ContributedProjectMetric.class.st b/src/GitLabHealth-Model-Analysis/ContributedProjectMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #ContributedProjectMetric,
 	#superclass : #UserCommitsMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/DelayUntilFirstChurnMetric.class.st b/src/GitLabHealth-Model-Analysis/DelayUntilFirstChurnMetric.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'maxCommitWindow'
 	],
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/GLHUserCatalogue.class.st b/src/GitLabHealth-Model-Analysis/GLHUserCatalogue.class.st
@@ -5,7 +5,7 @@ Class {
 		'users',
 		'anImporter'
 	],
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #import }

diff --git a/src/GitLabHealth-Model-Analysis/GLHUserCatalogueItem.class.st b/src/GitLabHealth-Model-Analysis/GLHUserCatalogueItem.class.st
@@ -5,7 +5,7 @@ Class {
 		'user',
 		'names'
 	],
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #initialization }

diff --git a/src/GitLabHealth-Model-Analysis/GLHUserCatalogueV2.class.st b/src/GitLabHealth-Model-Analysis/GLHUserCatalogueV2.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #GLHUserCatalogueV2,
 	#superclass : #GLHUserCatalogue,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #import }

diff --git a/src/GitLabHealth-Model-Analysis/GitAnalyzer.class.st b/src/GitLabHealth-Model-Analysis/GitAnalyzer.class.st
@@ -8,7 +8,7 @@ Class {
 		'onProject',
 		'maxChildCommits'
 	],
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #analyze }

diff --git a/src/GitLabHealth-Model-Analysis/JiraTimeMRTimeDifferenceMetric.class.st b/src/GitLabHealth-Model-Analysis/JiraTimeMRTimeDifferenceMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #JiraTimeMRTimeDifferenceMetric,
 	#superclass : #UserJiraMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/MergeRequestDurationMetric.class.st b/src/GitLabHealth-Model-Analysis/MergeRequestDurationMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #MergeRequestDurationMetric,
 	#superclass : #UserMergeRequestMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/OpenedMergeRequestMetric.class.st b/src/GitLabHealth-Model-Analysis/OpenedMergeRequestMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #OpenedMergeRequestMetric,
 	#superclass : #UserMergeRequestMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/PendingMergeRequestMetric.class.st b/src/GitLabHealth-Model-Analysis/PendingMergeRequestMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #PendingMergeRequestMetric,
 	#superclass : #UserMergeRequestMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/ProjectAnalysisReport.class.st b/src/GitLabHealth-Model-Analysis/ProjectAnalysisReport.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'projectName'
 	],
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #accessing }

diff --git a/src/GitLabHealth-Model-Analysis/ReviewedByUserMergeRequestMetric.class.st b/src/GitLabHealth-Model-Analysis/ReviewedByUserMergeRequestMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #ReviewedByUserMergeRequestMetric,
 	#superclass : #UserMergeRequestMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/SelfMergedUnderAMinuteMergeRequestMetric.class.st b/src/GitLabHealth-Model-Analysis/SelfMergedUnderAMinuteMergeRequestMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #SelfMergedUnderAMinuteMergeRequestMetric,
 	#superclass : #UserMergeRequestMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/TimeBetweenCommitMetric.class.st b/src/GitLabHealth-Model-Analysis/TimeBetweenCommitMetric.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #TimeBetweenCommitMetric,
 	#superclass : #UserCommitsMetric,
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #calculating }

diff --git a/src/GitLabHealth-Model-Analysis/UserAnalysisReport.class.st b/src/GitLabHealth-Model-Analysis/UserAnalysisReport.class.st
@@ -5,7 +5,7 @@ Class {
 		'username',
 		'email'
 	],
-	#category : 'GitLabHealth-Model-Analysis'
+	#category : #'GitLabHealth-Model-Analysis'
 }
 
 { #category : #accessing }

diff --git a/src/GitLabHealth-Model-Importer/GLHApiFile.class.st b/src/GitLabHealth-Model-Importer/GLHApiFile.class.st
@@ -5,7 +5,7 @@ Class {
 		'name',
 		'type'
 	],
-	#category : 'GitLabHealth-Model-Importer'
+	#category : #'GitLabHealth-Model-Importer'
 }
 
 { #category : #accessing }

diff --git a/src/GitLabHealth-Model-Importer/GLHModelImporter.class.st b/src/GitLabHealth-Model-Importer/GLHModelImporter.class.st
@@ -424,20 +424,18 @@ GLHModelImporter >> importCommitsOfProject: aProject since: fromDate until: toDa
 { #category : #'import -projects' }
 GLHModelImporter >> importContributedProjectsOfUser: aGLHUser [
 
-	| remaningProjects params results projects |
+	| remaningProjects params results projects projectsIds |
 	params := {
 		          (#order_by -> 'last_activity_at').
 		          (#simple -> 'true') } asDictionary.
 	results := self repoApi projects
 		           contributedProjectsOfUser: aGLHUser id
 		           withParams: params.
 
-	projects := (results collect: [ :projectsJson |
-		             self parseArrayOfProject: projectsJson ]) flattened.
-	projects := self glhModel
-		            addAll: projects
-		            unless: self blockOnIdEquality.
-
+	projectsIds := (results collect: [ :projectsJson |
+		             (NeoJSONReader fromString: projectsJson) collect: [:projectJson | projectJson at: #id ] ]) flattened.
+
+	projects := self importProjects: projectsIds.
 	remaningProjects := self importProjects:
 		                    ((projects collect: #id) difference:
 			                     ((self userCatalogue atId: aGLHUser id) at:

diff --git a/src/GitLabProjectHealth-Model-Importer/GLPHModelImporter.class.st b/src/GitLabProjectHealth-Model-Importer/GLPHModelImporter.class.st
@@ -335,6 +335,10 @@ GLPHModelImporter >> importProject: aProjectID [
 	| result projectResult |
 	('Import project with id:  ' , aProjectID printString) recordInfo.
 
+	(glhModel allWithType: GLHProject)
+		detect: [ :project | project id = aProjectID ]
+		ifOne: [ :project | ^ project ].
+
 	result := self repoApi projects get: aProjectID.
 	projectResult := self parseProjectResult: result.
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ Class { @@
     		'user',
     		'names'
     	],
-    	#category : 'GitLabHealth-Model-Analysis'
+    	#category : #'GitLabHealth-Model-Analysis'
     }
     { #category : #initialization }
@@ Expand Down @@