add an import for the merge_user

moosetechnology · Jul 2, 2024 · 593425f · 593425f
1 parent 25e91c6
commit 593425f
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 9 deletions.
diff --git a/src/GitLabProjectHealth-Model-Importer-Tests/GLPHApiMock.class.st b/src/GitLabProjectHealth-Model-Importer-Tests/GLPHApiMock.class.st
@@ -8,6 +8,7 @@ Class {
 GLPHApiMock >> mergeRequestOfProject: project withId: id [
 
 	^ '{
-	"author":{ "id": 12 }
+	"author":{ "id": 12 },
+	"merge_user":{ "id": 12 }
 }'
 ]
diff --git a/src/GitLabProjectHealth-Model-Importer-Tests/GLPHModelImporterMergeRequestTest.class.st b/src/GitLabProjectHealth-Model-Importer-Tests/GLPHModelImporterMergeRequestTest.class.st
@@ -29,7 +29,14 @@ GLPHModelImporterMergeRequestTest >> setUp [
 		"created_at":"2024-07-01T16:05:48.775+02:00",
 		"updated_at":"2024-07-01T16:05:51.221+02:00",
 		"merged_by":null,
-		"merge_user":null,
+		"merge_user":{
+				"id":12,
+				"username":"badetitou",
+				"name":"Verhaeghe Benoit",
+				"state":"active",
+				"avatar_url":"https://gitlab.com/badetitou.png",
+				"web_url":"https://gitlab.com/badetitou"
+			},
 		"merged_at":null,
 		"closed_by":null,
 		"closed_at":null,
@@ -105,6 +112,49 @@ GLPHModelImporterMergeRequestTest >> setUp [
 }]'
 ]
 
+{ #category : #test }
+GLPHModelImporterMergeRequestTest >> testParseMergeRequestMergeUserAlreadySet [
+
+	| mergeRequest user |
+	mergeRequest := (glhImporter parseMergeRequestResult: gitlabMergeData) anyOne.
+	user := GLHUser new.
+	mergeRequest merge_user: user.
+	glhImporter importMergeResquestMerger: mergeRequest.
+	self assert: mergeRequest merge_user equals: user
+]
+
+{ #category : #test }
+GLPHModelImporterMergeRequestTest >> testParseMergeRequestMergeUserExistInModelAndCacheID [
+
+	| mergeRequest user |
+	mergeRequest := (glhImporter parseMergeRequestResult: gitlabMergeData)
+		                anyOne.
+	user := glhModel newUser.
+	user id: 12.
+	glhImporter importMergeResquestMerger: mergeRequest.
+	self assert: mergeRequest merge_user equals: user
+]
+
+{ #category : #test }
+GLPHModelImporterMergeRequestTest >> testParseMergeRequestMergeUserIsNil [
+
+	| mergeRequest |
+	mergeRequest := (glhImporter parseMergeRequestResult: '[{"id":46074}]') anyOne.
+	self assert: mergeRequest merge_user equals: nil
+]
+
+{ #category : #test }
+GLPHModelImporterMergeRequestTest >> testParseMergeRequestMergeUserWithoutCache [
+
+	| mergeRequest user |
+	mergeRequest := (glhImporter parseMergeRequestResult: gitlabMergeData) anyOne.
+	mergeRequest flush.
+	user := glhModel newUser.
+	user id: 12.
+	glhImporter importMergeResquestMerger: mergeRequest.
+	self assert: mergeRequest merge_user equals: user
+]
+
 { #category : #test }
 GLPHModelImporterMergeRequestTest >> testParseMergeRequestResult [
 

diff --git a/src/GitLabProjectHealth-Model-Importer/GLPHModelImporter.class.st b/src/GitLabProjectHealth-Model-Importer/GLPHModelImporter.class.st
@@ -118,13 +118,20 @@ GLPHModelImporter >> configureReaderForMergeRequest: reader [
 		(mapping mapInstVar: #merged_at) valueSchema: DateAndTime.
 		(mapping mapInstVar: #closed_at) valueSchema: DateAndTime.
 		"(mapping mapInstVar: #assignee) valueSchema: GLHUser."
-		(mapping
-			 mapProperty: #author
-			 getter: [  ]
-			 setter: [ :object :value | object cacheAt: #authorID put: (value at: #id) ]).
-		"(mapping mapInstVar: #closed_by) valueSchema: GLHUser.
-		(mapping mapInstVar: #mergeCommit) valueSchema: GLHCommit." ].
-
+		mapping
+			mapProperty: #author
+			getter: [  ]
+			setter: [ :object :value |
+			object cacheAt: #authorID put: (value at: #id) ].
+		mapping
+			mapProperty: #merge_user
+			getter: [  ]
+			setter: [ :object :value | 
+				value ifNotNil: [
+					object cacheAt: #mergeUserID put: (value at: #id) ] ] ].
+
+	"(mapping mapInstVar: #closed_by) valueSchema: GLHUser.
+	(mapping mapInstVar: #mergeCommit) valueSchema: GLHCommit."
 	"indique ce que doit faire le reader lorsqu'il parse une DateAndTime object"
 	reader for: DateAndTime customDo: [ :mapping |
 		mapping decoder: [ :string |
@@ -354,6 +361,21 @@ GLPHModelImporter >> importMergeResquestAuthor: aGLPHEMergeRequest [
 	aGLPHEMergeRequest author: (self importUser: authorID)
 ]
 
+{ #category : #'import - merge request' }
+GLPHModelImporter >> importMergeResquestMerger: aGLPHEMergeRequest [
+
+	| authorID |
+	aGLPHEMergeRequest merge_user ifNotNil: [ ^ aGLPHEMergeRequest merge_user ].
+	authorID := aGLPHEMergeRequest cacheAt: #mergeUserID ifAbsent: [
+		            (generalReader
+			             on: (self glhApi
+					              mergeRequestOfProject:
+						              aGLPHEMergeRequest project_id
+					              withId: aGLPHEMergeRequest iid) readStream;
+			             next) at: #merge_user at: #id ].
+	aGLPHEMergeRequest merge_user: (self importUser: authorID)
+]
+
 { #category : #'as yet unclassified' }
 GLPHModelImporter >> importProject: aProjectID [