12691758925

Committed 09 Jan 2025 02:19PM UTC coverage: 61.247% (+2.0%) from 59.199%

Build # 12691758925

Build Type

Pull #114

github

Committed by

web-flow

Commit Message

Merge 43f172566 into ad6480d24

Pull Request Pull Request #114: refactor: replace GLHApi and GLPHApi with Gitlab Pharo API

Run Details

286 of 506 new or added lines in 15 files covered. (56.52%)

120 existing lines in 3 files now uncovered.

9516 of 15537 relevant lines covered (61.25%)

0.61 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

68.36

/src/GitLabProjectHealth-Model-Importer/GLPHModelImporter.class.st

1	Class {
2	#name : #GLPHModelImporter,
3	#superclass : #GLHModelImporter,
4	#category : #'GitLabProjectHealth-Model-Importer'
5	}
6
7	{ #category : #commits }
8	GLPHModelImporter >> commitsOfProject: aGLHProject forRefName: refName until: toDate [	×
9		×
NEW 10	\| params results allCommits \|	×
NEW 11		×
NEW 12	params := {	×
NEW 13	#ref_name -> refName.	×
NEW 14	#until -> (toDate ifNotNil: [ toDate asDateAndTime asString ] ifNil: [ '' ])	×
NEW 15	} asDictionary.	×
NEW 16	results := self repoApi commits getAllInProject: aGLHProject id withParams: params.	×
NEW 17	allCommits := (results collect: [ :commitsJson \| self parseCommitsResult: commitsJson ]) flattened.	×
NEW 18		×
NEW 19	self glhModel addAll: allCommits unless: self blockOnIdEquality.	×
NEW 20	aGLHProject repository commits addAll: allCommits unless: self blockOnIdEquality.	×
NEW 21		×
22	self withCommitDiffs ifTrue: [	×
23	aGLHProject repository commits do: [ :commit \|	×
NEW 24	self importDiffOfCommit: commit ] ].	×
NEW 25		×
NEW 26	^allCommits	×
UNCOV 27	]	×
28
29	{ #category : #'private - api' }
30	GLPHModelImporter >> completeImportProject: aGLHProject [	1✔
31	\|completedProject\|	1✔
32	completedProject := super completeImportProject: aGLHProject.	1✔
33		1✔
34	"for this initial import, with only look at some but not all MR"	1✔
35	withInitialMergeRequest ifTrue: [ self	1✔
36	importMergeRequests: completedProject	1✔
37	since: DateAndTime today	1✔
38	until: DateAndTime now. ].	1✔
39		1✔
40	^ completedProject	1✔
41	]	1✔
42
43	{ #category : #'private - configure reader' }
44	GLPHModelImporter >> configureReaderForMergeRequest: reader [	1✔
45	"declare quil y a un array a mapper"	1✔
46		1✔
47	reader for: #ArrayOfMergeRequest customDo: [ :customMappting \|	1✔
48	customMappting listOfElementSchema: GLHMergeRequest ].	1✔
49		1✔
50	"declare la liste des properties"	1✔
51	reader for: GLHMergeRequest do: [ :mapping \|	1✔
52	mapping mapInstVars:	1✔
53	#( blocking_discussions_resolved changes_count description	1✔
54	detailed_merge_status discussion_locked downvotes draft first_deployed_to_production_at	1✔
55	force_remove_source_branch has_conflicts id iid labels latest_build_finished_at	1✔
56	latest_build_started_at merge_commit_sha merge_status	1✔
57	merge_when_pipeline_succeeds merged_at milestone project_id	1✔
58	reference references_full references_relative	1✔
59	references_short sha should_remove_source_branch	1✔
60	source_branch source_project_id squash squash_commit_sha	1✔
61	squash_on_merge state subscribed target_branch target_project_id	1✔
62	task_completion_status_completed_count	1✔
63	task_completion_status_count time_stats_human_time_estimate	1✔
64	time_stats_human_total_time_spent	1✔
65	time_stats_time_estimate time_stats_total_time_spent	1✔
66	title updated_at upvotes user_notes_count web_url work_in_progress ).	1✔
67	(mapping mapInstVar: #created_at) valueSchema: DateAndTime.	1✔
68	(mapping mapInstVar: #updated_at) valueSchema: DateAndTime.	1✔
69	(mapping mapInstVar: #merged_at) valueSchema: DateAndTime.	1✔
70	(mapping mapInstVar: #closed_at) valueSchema: DateAndTime.	1✔
71	"(mapping mapInstVar: #assignee) valueSchema: GLHUser."	1✔
72	mapping	1✔
73	mapProperty: #author	1✔
74	getter: [ ]	1✔
75	setter: [ :object :value \|	1✔
76	object cacheAt: #authorID put: (value at: #id) ].	1✔
77	mapping	1✔
78	mapProperty: #merge_user	1✔
79	getter: [ ]	1✔
80	setter: [ :object :value \|	1✔
81	value ifNotNil: [	1✔
82	object cacheAt: #mergeUserID put: (value at: #id) ] ] ].	1✔
83		1✔
84	"(mapping mapInstVar: #closed_by) valueSchema: GLHUser.	1✔
85	(mapping mapInstVar: #mergeCommit) valueSchema: GLHCommit."	1✔
86	"indique ce que doit faire le reader lorsqu'il parse une DateAndTime object"	1✔
87	reader for: DateAndTime customDo: [ :mapping \|	1✔
88	mapping decoder: [ :string \|	1✔
89	string ifNil: [ nil ] ifNotNil: [ DateAndTime fromString: string ] ] ]	1✔
90	]	1✔
91
92	{ #category : #import }
NEW 93	GLPHModelImporter >> importCommitsOfBranch: aGLHBranch [	×
94		×
95	\| commits \|	×
96	" result := self glhApi	×
97	commitsOfProject: aGLHBranch repository project id	×
98	forRefName: aGLHBranch name."	×
99	commits := self	×
100	importCommitsOfBranch: aGLHBranch	×
101	forRefName: aGLHBranch name	×
102	since: withCommitsSince.	×
103		×
104	self chainsCommitsFrom: commits.	×
105		×
106	commits do: [ :aCommit \|	×
107	aCommit repository: aGLHBranch repository.	×
108	self completeImportedCommit: aCommit.	×
109	]	×
110	]	×
111
112	{ #category : #api }
113	GLPHModelImporter >> importDiffOfCommit: aCommit [	1✔
114		1✔
115	super importDiffOfCommit: aCommit.	1✔
116		1✔
117	"changes are added into the model during the import"	1✔
118	aCommit diffs do: [ :diff \| self importDiffRangesForDiff: diff ].	1✔
119		1✔
120	^ aCommit diffs	1✔
121	]	1✔
122
123	{ #category : #'import - merge request' }
124	GLPHModelImporter >> importDiffOfMergeRequest: aMergeRequest [	1✔
125		1✔
126	\| result diffsResult \|	1✔
127	aMergeRequest diffs ifNotEmpty: [	1✔
128	'Diff of already importer: '	1✔
129	, aMergeRequest iid printString recordInfo.	1✔
130	^ aMergeRequest diffs ].	1✔
131	('Import diff commits of MR ' , aMergeRequest iid printString)	1✔
132	recordInfo.	1✔
133	result := self repoApi mergeRequests diffsOf: aMergeRequest iid inProject: aMergeRequest project_id.	1✔
134		1✔
135	diffsResult := self newParseDiffResult: result.	1✔
136		1✔
137		1✔
138	aMergeRequest diffs	1✔
139	addAll: diffsResult	1✔
140	unless: self blockForDiffEquality.	1✔
141	self glhModel	1✔
142	addAll: aMergeRequest diffs	1✔
143	unless: self blockForDiffEquality.	1✔
144		1✔
145	aMergeRequest diffs do: [ :diff \| self importDiffRangesForDiff: diff ].	1✔
146		1✔
147	^ aMergeRequest diffs	1✔
148	]	1✔
149
150	{ #category : #'import - merge request' }
NEW 151	GLPHModelImporter >> importMergeRequestCommits: aGLPHEMergeRequest [	×
152		×
153	\| commits result \|	×
NEW 154	aGLPHEMergeRequest commits ifNotNil: [ ^ aGLPHEMergeRequest commits ].	×
155		×
NEW 156	result := self repoApi mergeRequests commitsOf: aGLPHEMergeRequest iid inProject: aGLPHEMergeRequest project id.	×
NEW 157		×
NEW 158	commits := (result collect: [ :commitsJson \| self parseCommitsResult: commitsJson ]) flattened.	×
NEW 159	commits := commits collect: [ :commit \| self importCommit: commit id ofProject: aGLPHEMergeRequest project ].	×
160	aGLPHEMergeRequest commits: commits.	×
161		×
162		×
163	^ commits	×
164	]	×
165
166	{ #category : #import }
167	GLPHModelImporter >> importMergeRequestMergeCommits: aGLPHEMergeRequest [	1✔
168		1✔
169	\| foundCommits \|	1✔
170	foundCommits := OrderedCollection new.	1✔
171		1✔
172	('Import commit sha of MR: ' , aGLPHEMergeRequest iid printString)	1✔
173	recordInfo.	1✔
174	"the founds commits are added to the model during their respective import"	1✔
175	aGLPHEMergeRequest mergeRequestCommit: ((self	1✔
176	importCommitOfProject: aGLPHEMergeRequest project	1✔
177	withId: aGLPHEMergeRequest sha) ifNotNil: [ :commit \|	1✔
178	foundCommits add: commit ]).	1✔
179		1✔
180	('Import commit merge_commit_sha of MR: '	1✔
181	, aGLPHEMergeRequest iid printString) recordInfo.	1✔
182	aGLPHEMergeRequest mergedCommit: ((self	1✔
183	importCommitOfProject: aGLPHEMergeRequest project	1✔
184	withId: aGLPHEMergeRequest merge_commit_sha) ifNotNil: [ :commit \|	1✔
185	foundCommits add: commit ]).	1✔
186		1✔
187	('Import commit squash_commit_sha of MR: '	1✔
188	, aGLPHEMergeRequest iid printString) recordInfo.	1✔
189	aGLPHEMergeRequest squashCommit: ((self	1✔
190	importCommitOfProject: aGLPHEMergeRequest project	1✔
191	withId: aGLPHEMergeRequest squash_commit_sha) ifNotNil: [ :commit \|	1✔
192	foundCommits add: commit ]).	1✔
193		1✔
194		1✔
195	self chainsCommitsFrom: foundCommits.	1✔
196	^ foundCommits	1✔
197	]	1✔
198
199	{ #category : #'import - merge request' }
200	GLPHModelImporter >> importMergeRequests: aGLHProject [	1✔
201		1✔
202	\| results parsedResults mrs \|	1✔
203	('Import merge request of Project: ' , aGLHProject id printString)	1✔
204	recordInfo.	1✔
205		1✔
206	results := self repoApi mergeRequests allOfProject: aGLHProject id.	1✔
207	parsedResults := (results collect: [ :projectsJson \| self parseMergeRequestResult: projectsJson ]) flattened.	1✔
208		1✔
209	aGLHProject mergeRequests	1✔
210	addAll: parsedResults	1✔
211	unless: self blockOnIdEquality.	1✔
212		1✔
213	mrs := self glhModel	1✔
214	addAll: aGLHProject mergeRequests	1✔
215	unless: self blockOnIdEquality.	1✔
216		1✔
217		1✔
218	"gets it related commits"	1✔
219	aGLHProject mergeRequests do: [ :mr \|	1✔
220	self importMergeRequestMergeCommits: mr ].	1✔
221		1✔
222		1✔
223	self withCommitDiffs ifTrue: [	1✔
224	aGLHProject mergeRequests do: [ :mr \|	1✔
225	self importDiffOfMergeRequest: mr ] ].	1✔
226		1✔
227	^ mrs	1✔
228	]	1✔
229
230	{ #category : #'import - merge request' }
NEW 231	GLPHModelImporter >> importMergeRequests: aGLHProject since: fromDate until: toDate [	×
232		×
233	\| params result mergeRequests \|	×
NEW 234	('import MR of Project ' , aGLHProject name) recordInfo.	×
235	params := {	×
NEW 236	(#created_after	×
NEW 237	->	×
NEW 238	(fromDate	×
NEW 239	ifNotNil: [ fromDate asDateAndTime asString ]	×
NEW 240	ifNil: [ '' ])).	×
NEW 241	(#created_before	×
NEW 242	->	×
NEW 243	(toDate	×
NEW 244	ifNotNil: [ toDate asDateAndTime asString ]	×
NEW 245	ifNil: [ '' ])).	×
NEW 246	(#scope -> 'all') } asDictionary.	×
NEW 247		×
NEW 248	result := self repoApi mergeRequests	×
NEW 249	allOfProject: aGLHProject id	×
NEW 250	withParams: params.	×
NEW 251	mergeRequests := (result collect: [ :mergeRequestsJson \|	×
NEW 252	self parseMergeRequestResult: mergeRequestsJson ])	×
NEW 253	flattened.	×
NEW 254		×
255	aGLHProject mergeRequests	×
NEW 256	addAll: mergeRequests	×
NEW 257	unless: self blockOnIdEquality.	×
NEW 258		×
259	"gets it related commits"	×
260	aGLHProject mergeRequests do: [ :mr \|	×
261	self importMergeRequestMergeCommits: mr ].	×
262		×
263	self withCommitDiffs ifTrue: [	×
264	aGLHProject mergeRequests do: [ :mr \|	×
265	self importDiffOfMergeRequest: mr ] ].	×
266		×
267	self glhModel	×
NEW 268	addAll: mergeRequests	×
NEW 269	unless: (self blockEqualityOn: #iid).	×
NEW 270		×
271	^ mergeRequests	×
NEW 272	]	×
273
274	{ #category : #'import - merge request' }
NEW 275	GLPHModelImporter >> importMergeResquestApprovals: aGLPHEMergeRequest [	×
276		×
277	\| results parsedResult \|	×
278	(String streamContents: [ :str \|	×
279	str << 'Check approvals of '.	×
280	aGLPHEMergeRequest printOn: str ]) recordInfo.	×
281	results := self repoApi mergeRequests approvalsOf: aGLPHEMergeRequest iid inProject: aGLPHEMergeRequest project id.	×
NEW 282		×
283	parsedResult := generalReader	×
284	on: results readStream;	×
285	next.	×
286		×
287	(parsedResult at: #approved_by) do: [ :approvedUser \|	×
288	aGLPHEMergeRequest addApproved_by:	×
289	(self importUser: ((approvedUser at: #user) at: #id)) ].	×
290	aGLPHEMergeRequest approved: (parsedResult at: #approved).	×
291	^ aGLPHEMergeRequest	×
292	]	×
293
294	{ #category : #'import - merge request' }
295	GLPHModelImporter >> importMergeResquestAuthor: aGLPHEMergeRequest [	1✔
296		1✔
297	\| authorID \|	1✔
298	aGLPHEMergeRequest author ifNotNil: [ ^ aGLPHEMergeRequest author ].	1✔
299	authorID := aGLPHEMergeRequest cacheAt: #authorID ifAbsent: [	1✔
300	\| result \|	1✔
301	result := self repoApi mergeRequests	1✔
302	get: aGLPHEMergeRequest iid	1✔
303	inProject: aGLPHEMergeRequest project_id.	1✔
304		1✔
305	(generalReader	1✔
306	on: result readStream;	1✔
307	next) at: #author at: #id ].	1✔
308	^aGLPHEMergeRequest author: (self importUser: authorID)	1✔
309	]	1✔
310
311	{ #category : #'import - merge request' }
312	GLPHModelImporter >> importMergeResquestMerger: aGLPHEMergeRequest [	1✔
313		1✔
314	\| authorID \|	1✔
315	aGLPHEMergeRequest merge_user ifNotNil: [	1✔
316	^ aGLPHEMergeRequest merge_user ].	1✔
317	authorID := aGLPHEMergeRequest cacheAt: #mergeUserID ifAbsent: [	1✔
318	\| result \|	1✔
319	result := self repoApi mergeRequests	1✔
320	get: aGLPHEMergeRequest iid	1✔
321	inProject: aGLPHEMergeRequest project_id.	1✔
322	(generalReader	1✔
323	on: result readStream;	1✔
324	next)	1✔
325	at: #merge_user	1✔
326	ifPresent: [ :mergeUser \|	1✔
327	mergeUser ifNotNil: [ :mruser \| mruser at: #id ] ] ].	1✔
328	^aGLPHEMergeRequest merge_user: (self importUser: authorID)	1✔
329	]	1✔
330
331	{ #category : #projects }
332	GLPHModelImporter >> importProject: aProjectID [	1✔
333		1✔
334	\| result projectResult \|	1✔
335	('Import project with id: ' , aProjectID printString) recordInfo.	1✔
336		1✔
337	result := self repoApi projects get: aProjectID.	1✔
338	projectResult := self parseProjectResult: result.	1✔
339		1✔
340	^ self completeImportProject: projectResult	1✔
341	]	1✔
342
343	{ #category : #'private - api' }
344	GLPHModelImporter >> importRepository: aGLHRepository [	1✔
345		1✔
346	super importRepository: aGLHRepository.	1✔
347		1✔
348	withInitialCommits ifTrue: [	1✔
349	aGLHRepository branches do: [ :branch \|	1✔
350	self importCommitsOfBranch: branch ] ]	1✔
351	]	1✔
352
353	{ #category : #initialization }
354	GLPHModelImporter >> initReader [	1✔
355		1✔
356	super initReader.	1✔
357	self configureReaderForMergeRequest: generalReader	1✔
358	]	1✔
359
360	{ #category : #initialization }
361	GLPHModelImporter >> initialize [	1✔
362		1✔
363	super initialize.	1✔
364	withCommitDiffs := true	1✔
365	]	1✔
366
367	{ #category : #parsing }
368	GLPHModelImporter >> parseMergeRequestResult: result [	1✔
369		1✔
370	generalReader on: result readStream.	1✔
371	^ generalReader nextAs: #ArrayOfMergeRequest	1✔
372	]	1✔
373
374	{ #category : #parsing }
375	GLPHModelImporter >> parseProjectResult: aResult [	1✔
376	\| reader \|	1✔
377	reader := NeoJSONReader on: aResult readStream.	1✔
378	reader for: GLHProject do: [ :mapping \|	1✔
379	mapping mapInstVars. ].	1✔
380	" reader mapInstVarsFor: GLHProject."	1✔
381		1✔
382	^ reader nextAs: GLHProject	1✔
383	]	1✔
384		1✔
385	{ #category : #accessing }	1✔
386	GLPHModelImporter >> withCommitsSince: someDays [	1✔
387	"substract the current date with a given number of days. Use to retrieve the commits submit in the last giving days"	1✔
388		1✔
389	"(GLPHModelImporter new withCommitsSince: 1 week ) >>> (Date today - 1 week) asDateAndTime"	1✔
390		1✔
391	"(GLPHModelImporter new withCommitsSince: 30 day ) >>> (Date today - 30 day) asDateAndTime"	1✔
392		1✔
393	(someDays isKindOf: DateAndTime)	1✔
394	ifTrue: [ withCommitsSince := someDays ]	1✔
395	ifFalse: [	1✔
396	withCommitsSince := (Date today - someDays) asDateAndTime ]	1✔
397	]	1✔

moosetechnology / GitProjectHealth / 12691758925

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous