11496926157

Committed 24 Oct 2024 09:54AM UTC coverage: 58.906% (+0.6%) from 58.319%

Build # 11496926157

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #93 from moosetechnology/revert-92-develop

Revert "Develop"

Run Details

810 of 1504 new or added lines in 51 files covered. (53.86%)

31 existing lines in 4 files now uncovered.

8903 of 15114 relevant lines covered (58.91%)

0.59 hits per line

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

67.63

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

Class {
        #name : #GLPHModelImporter,
        #superclass : #GLHModelImporter,
        #category : #'GitLabProjectHealth-Model-Importer'
}

{ #category : #'as yet unclassified' }
GLPHModelImporter >> blockForDiffRangeEquality [

        ^ [ :existing :new |
          existing diff mooseID = new diff mooseID and: [
                  existing originalLineRange = new originalLineRange and: [
                          existing newLineRange = new newLineRange ] ] ]
]

{ #category : #commit }
GLPHModelImporter >> commitsOfProject: aGLHProject forRefName: refName until: toDate [

        | newlyFoundCommit page |
        page := 0.
        newlyFoundCommit := { true }.
        [ newlyFoundCommit isNotEmpty ] whileTrue: [
                | results parsedResults existingCommits |
                page := page + 1.
                ('import commit page ' , page printString) recordInfo.
                results := self glhApi
                                   commitsOfProject: aGLHProject id
                                   forRefName: refName
                                   since: nil
                                   until: nil
                                   path: nil
                                   author: nil
                                   all: nil
                                   with_stats: nil
                                   firstParent: nil
                                   order: nil
                                   trailers: nil
                                   perPage: 100
                                   page: page.
                parsedResults := self parseCommitsResult: results.
                existingCommits := aGLHProject mooseModel allWithType: GLHCommit.

                newlyFoundCommit := parsedResults reject: [ :commitParsed |
                                            (toDate isNil or: [
                                                     commitParsed committed_date
                                                     < toDate asDateAndTime ]) or: [
                                                    existingCommits anySatisfy: [ :existingCommit |
                                                            existingCommit id = commitParsed id ] ] ].
                self glhModel addAll: newlyFoundCommit unless: self blockOnIdEquality.
                aGLHProject repository commits addAll: newlyFoundCommit unless: self blockOnIdEquality  ].
        self withCommitDiffs ifTrue: [
                aGLHProject repository commits do: [ :commit |
                        self importDiffOfCommit: commit ] ]
]

{ #category : #'private - api' }
GLPHModelImporter >> completeImportProject: aGLHProject [
        |completedProject|
        completedProject := super completeImportProject: aGLHProject.

        "for this initial import, with only look at some but not all MR"
        withInitialMergeRequest ifTrue: [ self
                importMergeRequests: completedProject
                since: DateAndTime today
                until: DateAndTime now. ].

        ^ completedProject
]

{ #category : #'private - configure reader' }
GLPHModelImporter >> configureReaderForMergeRequest: reader [
        "declare quil y a un array a mapper"

        reader for: #ArrayOfMergeRequest customDo: [ :customMappting |
                customMappting listOfElementSchema: GLPHEMergeRequest ].

        "declare la liste des properties"
        reader for: GLPHEMergeRequest do: [ :mapping |
                mapping mapInstVars:
                        #( blocking_discussions_resolved changes_count description
                           detailed_merge_status discussion_locked downvotes draft first_deployed_to_production_at
                           force_remove_source_branch has_conflicts id iid labels latest_build_finished_at
                           latest_build_started_at merge_commit_sha merge_status
                           merge_when_pipeline_succeeds merged_at milestone project_id
                           reference references_full references_relative
                           references_short sha should_remove_source_branch
                           source_branch source_project_id squash squash_commit_sha
                           squash_on_merge state subscribed target_branch target_project_id
                           task_completion_status_completed_count
                           task_completion_status_count time_stats_human_time_estimate
                           time_stats_human_total_time_spent
                           time_stats_time_estimate time_stats_total_time_spent
                           title updated_at upvotes user_notes_count web_url work_in_progress ).
                (mapping mapInstVar: #created_at) valueSchema: DateAndTime.
                (mapping mapInstVar: #updated_at) valueSchema: DateAndTime.
                (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
                        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 |
                        string ifNil: [ nil ] ifNotNil: [ DateAndTime fromString: string ] ] ]
]

{ #category : #import }
GLPHModelImporter >> importCommitsOfBranch: aGLHBranch [

        | commits |
        "        result := self glhApi
                          commitsOfProject: aGLHBranch repository project id
                          forRefName: aGLHBranch name."
        commits := self
                           importCommitsOfBranch: aGLHBranch
                           forRefName: aGLHBranch name
                           since: withCommitsSince.

        self chainsCommitsFrom: commits.

        commits do: [ :aCommit |
                aCommit repository: aGLHBranch repository.
                self completeImportedCommit: aCommit. 
                 ]
]

{ #category : #api }
GLPHModelImporter >> importDiffOfCommit: aCommit [

        super importDiffOfCommit: aCommit.
        
        "changes are added into the model during the import"
        aCommit diffs do: [ :diff | self importDiffRangesForDiff: diff ].

        ^ aCommit diffs
]

{ #category : #'as yet unclassified' }
GLPHModelImporter >> importDiffOfMergeRequest: aMergeRequest [

        | result diffsResult |
        aMergeRequest diffs ifNotEmpty: [
                'Diff of already importer: '
                , aMergeRequest iid printString recordInfo.
                ^ aMergeRequest diffs ].
        ('Import diff commits of MR ' , aMergeRequest iid printString)
                recordInfo.
        result := self glhApi
                          diffsMergeRequestOfProject: aMergeRequest project_id
                          withId: aMergeRequest iid.

        diffsResult := self newParseDiffResult: result.


        aMergeRequest diffs
                addAll: diffsResult
                unless: self blockForDiffEquality.
        self glhModel
                addAll: aMergeRequest diffs
                unless: self blockForDiffEquality.

        aMergeRequest diffs do: [ :diff | self importDiffRangesForDiff: diff ].

        ^ aMergeRequest diffs
]

{ #category : #import }
GLPHModelImporter >> importDiffRangesForDiff: aGLHDiff [

        | diffRanges |
        aGLHDiff diffRanges ifNotEmpty: [
                ('Diffs already imported for ' , aGLHDiff printString) recordInfo.
                ^ aGLHDiff diffRanges ].

        ('Import changes of diff ' , aGLHDiff printString) recordInfo.
        "the import of 'diffRanges' entites is technically done inside the parseDiffString"

        diffRanges := self glhModel
                              addAll: (self parseDiffString: aGLHDiff)
                              unless: self blockForDiffRangeEquality.
        ^ aGLHDiff diffRanges
                  addAll: diffRanges
                  unless: self blockForDiffRangeEquality
]

{ #category : #'import - merge request' }
GLPHModelImporter >> importMergeRequestCommits: aGLPHEMergeRequest [

        | results page commits parseResult |
        aGLPHEMergeRequest commits ifNotNil: [ ^ aGLPHEMergeRequest commits ].
        page := 1.

        parseResult := { nil }.
        commits := OrderedCollection new.

        [
        results := glhApi
                           commitsOfMergeRequest: aGLPHEMergeRequest iid
                           ofProject: aGLPHEMergeRequest project id
                           page: page
                           perPage: 100.
        parseResult := self parseCommitsResult: results.

        commits addAll: parseResult.
        page := page + 1 ] doWhileTrue: [ parseResult isNotEmpty ].


        commits := commits collect: [ :commit | self importCommit: commit id ofProject: aGLPHEMergeRequest project ].
        aGLPHEMergeRequest commits: commits.


        ^ commits
]

{ #category : #import }
GLPHModelImporter >> importMergeRequestMergeCommits: aGLPHEMergeRequest [

        | foundCommits |
        foundCommits := OrderedCollection new.

        ('Import commit sha of MR:  ' , aGLPHEMergeRequest iid printString)
                recordInfo.
        "the founds commits are added to the model during their respective import"
        aGLPHEMergeRequest mergeRequestCommit: ((self
                          importCommitOfProject: aGLPHEMergeRequest project
                          withId: aGLPHEMergeRequest sha) ifNotNil: [ :commit |
                         foundCommits add: commit ]).

        ('Import commit merge_commit_sha of MR:  '
         , aGLPHEMergeRequest iid printString) recordInfo.
        aGLPHEMergeRequest mergedCommit: ((self
                          importCommitOfProject: aGLPHEMergeRequest project
                          withId: aGLPHEMergeRequest merge_commit_sha) ifNotNil: [ :commit |
                         foundCommits add: commit ]).

        ('Import commit squash_commit_sha of MR:  '
         , aGLPHEMergeRequest iid printString) recordInfo.
        aGLPHEMergeRequest squashCommit: ((self
                          importCommitOfProject: aGLPHEMergeRequest project
                          withId: aGLPHEMergeRequest squash_commit_sha) ifNotNil: [ :commit |
                         foundCommits add: commit ]).


        self chainsCommitsFrom: foundCommits.
        ^ foundCommits
]

{ #category : #'import - merge request' }
GLPHModelImporter >> importMergeRequests: aGLHProject [

        | results parsedResults mrs|
        ('Import merge request of Project: ' , aGLHProject id printString)
                recordInfo.

        results := self glhApi mergeRequestOfProject: aGLHProject id.
        parsedResults := self parseMergeRequestResult: results.

        aGLHProject mergeRequests
                addAll: parsedResults
                unless: self blockOnIdEquality.

        mrs := self glhModel
                addAll: aGLHProject mergeRequests
                unless: self blockOnIdEquality.


        "gets it related commits"
        aGLHProject mergeRequests do: [ :mr |
                self importMergeRequestMergeCommits: mr ].


        self withCommitDiffs ifTrue: [
                aGLHProject mergeRequests do: [ :mr |
                        self importDiffOfMergeRequest: mr ] ].
        
        ^ mrs
]

{ #category : #'import - merge request' }
GLPHModelImporter >> importMergeRequests: aGLHProject since: fromDate until: toDate [

        | newlyFoundMR page foundMR |
        ('import MR of Project ' , aGLHProject name) recordInfo.

        page := 0.
        foundMR := OrderedCollection new.
        newlyFoundMR := { true }.
        [ newlyFoundMR isNotEmpty ] whileTrue: [
                | results |
                page := page + 1.
                ('import MR page ' , page printString) recordInfo.
                results := self glhApi
                                   mergeRequestsOfProject: aGLHProject id
                                   createdAfter:
                                   (fromDate ifNotNil: [ fromDate asDateAndTime asString ])
                                   createdBefore:
                                   (toDate ifNotNil: [ toDate asDateAndTime asString ])
                                   authorId: nil
                                   authorUsername: nil
                                   scope: 'all'
                                   orderBy: 'created_at'
                                   page: page.


                newlyFoundMR := aGLHProject mergeRequests
                                        addAll: (self parseMergeRequestResult: results)
                                        unless: self blockOnIdEquality.
                foundMR addAll: newlyFoundMR ].


        "gets it related commits"
        aGLHProject mergeRequests do: [ :mr |
                self importMergeRequestMergeCommits: mr ].

        self withCommitDiffs ifTrue: [
                aGLHProject mergeRequests do: [ :mr |
                        self importDiffOfMergeRequest: mr ] ].

        self glhModel addAll: foundMR unless: (self blockEqualityOn: #iid).

        ^ foundMR
]

{ #category : #'import - merge request' }
GLPHModelImporter >> importMergeResquestApprovals: aGLPHEMergeRequest [

        | results parsedResult |
        (String streamContents: [ :str |
                 str << 'Check approvals of '.
                 aGLPHEMergeRequest printOn: str ]) recordInfo.
        results := self glhApi
                           approvalsOfMergeQuest: aGLPHEMergeRequest iid
                           ofProject: aGLPHEMergeRequest project id.

        parsedResult := generalReader
                                on: results readStream;
                                next.

        (parsedResult at: #approved_by) do: [ :approvedUser |
                aGLPHEMergeRequest addApproved_by:
                        (self importUser: ((approvedUser at: #user) at: #id)) ].
        aGLPHEMergeRequest approved: (parsedResult at: #approved).
        ^ aGLPHEMergeRequest
]

{ #category : #'import - merge request' }
GLPHModelImporter >> importMergeResquestAuthor: aGLPHEMergeRequest [

        | authorID |
        aGLPHEMergeRequest author ifNotNil: [ ^ aGLPHEMergeRequest author ].
        authorID := aGLPHEMergeRequest cacheAt: #authorID ifAbsent: [
                            (generalReader
                                     on: (self glhApi
                                                      mergeRequestOfProject:
                                                              aGLPHEMergeRequest project_id
                                                      withId: aGLPHEMergeRequest iid) readStream;
                                     next) at: #author at: #id ].
        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
                                    ifPresent: [ :mergeUser |
                                    mergeUser ifNotNil: [ :mruser | mruser at: #id ] ] ].
        aGLPHEMergeRequest merge_user: (self importUser: authorID)
]

{ #category : #'private - api' }
GLPHModelImporter >> importProject: aProjectID [

        | result projectResult |
        ('Import project with id:  ' , aProjectID printString) recordInfo.

        result := self glhApi project: aProjectID.
        projectResult := self parseProjectResult: result.

        ^ self completeImportProject: projectResult
]

{ #category : #'private - api' }
GLPHModelImporter >> importRepository: aGLHRepository [

        super importRepository: aGLHRepository.

        withInitialCommits ifTrue: [
                aGLHRepository branches do: [ :branch |
                        self importCommitsOfBranch: branch ] ]
]

{ #category : #initialization }
GLPHModelImporter >> initReader [

        super initReader.
        self configureReaderForMergeRequest: generalReader
]

{ #category : #initialization }
GLPHModelImporter >> initialize [

        super initialize.
        withCommitDiffs := true
]

{ #category : #parsing }
GLPHModelImporter >> parseDiffString: aDiff [
        "parse diff string to create entities for each lines"

        | lines range index firstChangeRange |
        lines := aDiff diffString lines.
        index := 0.
        range := nil.

        lines ifEmpty: [ ^ aDiff diffRanges ].
        lines := self filterCommitChanges: lines.
        (lines first beginsWith: '@@') ifFalse: [ ^ aDiff diffRanges ].

        lines do: [ :line |
                | aChange |
                firstChangeRange := false.
                (line trim beginsWith: #'@@') ifTrue: [
                        range := GLPHEDiffRange newFrom: line.
                        firstChangeRange := true.
                        range := aDiff diffRanges add: range unless: [ :existing :new |
                                         existing originalLineRange = new originalLineRange and: [
                                                 existing newLineRange = new newLineRange ] ] ].

                self withCommitDiffs ifTrue: [
                        firstChangeRange ifFalse: [
                                aChange := GLPHEChange newFrom: line.
                                aChange relativeIndex: index.
                                aChange := range changes add: aChange unless: [ :existing :new |
                                                   existing sourceCode = new sourceCode and: [
                                                           existing index = new index ] ].
                                index := index + 1 ] ] ].

        "add changes to the diff range"
        aDiff diffRanges do: [ :diffRange |
                self glhModel addAll: diffRange changes unless: [ :existing :new |
                        existing diffRange mooseID = new diffRange mooseID and: [
                                existing sourceCode = new sourceCode and: [
                                        existing index = new index ] ] ] ].

        ^ aDiff diffRanges
]

{ #category : #parsing }
GLPHModelImporter >> parseMergeRequestResult: result [

        generalReader on: result readStream.
        ^ generalReader nextAs: #ArrayOfMergeRequest
]

{ #category : #parsing }
GLPHModelImporter >> parseProjectResult: aResult [ 
                | reader |
        reader := NeoJSONReader on: aResult readStream.
        reader for: GLHProject do: [ :mapping |
                mapping mapInstVars. ].
"        reader mapInstVarsFor: GLHProject."

        ^ reader nextAs: GLHProject
]

{ #category : #accessing }
GLPHModelImporter >> withCommitsSince: someDays [
        "substract the current date with a given number of days. Use to retrieve the commits submit in the last giving days"

        "(GLPHModelImporter new withCommitsSince: 1 week ) >>> (Date today - 1 week) asDateAndTime"

        "(GLPHModelImporter new withCommitsSince: 30 day ) >>> (Date today - 30 day) asDateAndTime"

        (someDays isKindOf: DateAndTime)
                ifTrue: [ withCommitsSince := someDays ]
                ifFalse: [
                withCommitsSince := (Date today - someDays) asDateAndTime ]
]

1	Class {
2	#name : #GLPHModelImporter,
3	#superclass : #GLHModelImporter,
4	#category : #'GitLabProjectHealth-Model-Importer'
5	}
6
7	{ #category : #'as yet unclassified' }
8	GLPHModelImporter >> blockForDiffRangeEquality [	1✔
9		1✔
10	^ [ :existing :new \|	1✔
11	existing diff mooseID = new diff mooseID and: [	1✔
12	existing originalLineRange = new originalLineRange and: [	1✔
13	existing newLineRange = new newLineRange ] ] ]	1✔
14	]	1✔
15
16	{ #category : #commit }
17	GLPHModelImporter >> commitsOfProject: aGLHProject forRefName: refName until: toDate [	×
18		×
19	\| newlyFoundCommit page \|	×
20	page := 0.	×
21	newlyFoundCommit := { true }.	×
22	[ newlyFoundCommit isNotEmpty ] whileTrue: [	×
23	\| results parsedResults existingCommits \|	×
24	page := page + 1.	×
25	('import commit page ' , page printString) recordInfo.	×
26	results := self glhApi	×
27	commitsOfProject: aGLHProject id	×
28	forRefName: refName	×
29	since: nil	×
30	until: nil	×
31	path: nil	×
32	author: nil	×
33	all: nil	×
34	with_stats: nil	×
35	firstParent: nil	×
36	order: nil	×
37	trailers: nil	×
38	perPage: 100	×
39	page: page.	×
40	parsedResults := self parseCommitsResult: results.	×
41	existingCommits := aGLHProject mooseModel allWithType: GLHCommit.	×
42		×
43	newlyFoundCommit := parsedResults reject: [ :commitParsed \|	×
44	(toDate isNil or: [	×
45	commitParsed committed_date	×
46	< toDate asDateAndTime ]) or: [	×
47	existingCommits anySatisfy: [ :existingCommit \|	×
48	existingCommit id = commitParsed id ] ] ].	×
49	self glhModel addAll: newlyFoundCommit unless: self blockOnIdEquality.	×
50	aGLHProject repository commits addAll: newlyFoundCommit unless: self blockOnIdEquality ].	×
51	self withCommitDiffs ifTrue: [	×
52	aGLHProject repository commits do: [ :commit \|	×
53	self importDiffOfCommit: commit ] ]	×
54	]	×
55
56	{ #category : #'private - api' }
57	GLPHModelImporter >> completeImportProject: aGLHProject [	1✔
58	\|completedProject\|	1✔
59	completedProject := super completeImportProject: aGLHProject.	1✔
60		1✔
61	"for this initial import, with only look at some but not all MR"	1✔
62	withInitialMergeRequest ifTrue: [ self	1✔
63	importMergeRequests: completedProject	1✔
64	since: DateAndTime today	1✔
65	until: DateAndTime now. ].	1✔
66		1✔
67	^ completedProject	1✔
68	]	1✔
69
70	{ #category : #'private - configure reader' }
71	GLPHModelImporter >> configureReaderForMergeRequest: reader [	1✔
72	"declare quil y a un array a mapper"	1✔
73		1✔
74	reader for: #ArrayOfMergeRequest customDo: [ :customMappting \|	1✔
75	customMappting listOfElementSchema: GLPHEMergeRequest ].	1✔
76		1✔
77	"declare la liste des properties"	1✔
78	reader for: GLPHEMergeRequest do: [ :mapping \|	1✔
79	mapping mapInstVars:	1✔
80	#( blocking_discussions_resolved changes_count description	1✔
81	detailed_merge_status discussion_locked downvotes draft first_deployed_to_production_at	1✔
82	force_remove_source_branch has_conflicts id iid labels latest_build_finished_at	1✔
83	latest_build_started_at merge_commit_sha merge_status	1✔
84	merge_when_pipeline_succeeds merged_at milestone project_id	1✔
85	reference references_full references_relative	1✔
86	references_short sha should_remove_source_branch	1✔
87	source_branch source_project_id squash squash_commit_sha	1✔
88	squash_on_merge state subscribed target_branch target_project_id	1✔
89	task_completion_status_completed_count	1✔
90	task_completion_status_count time_stats_human_time_estimate	1✔
91	time_stats_human_total_time_spent	1✔
92	time_stats_time_estimate time_stats_total_time_spent	1✔
93	title updated_at upvotes user_notes_count web_url work_in_progress ).	1✔
94	(mapping mapInstVar: #created_at) valueSchema: DateAndTime.	1✔
95	(mapping mapInstVar: #updated_at) valueSchema: DateAndTime.	1✔
96	(mapping mapInstVar: #merged_at) valueSchema: DateAndTime.	1✔
97	(mapping mapInstVar: #closed_at) valueSchema: DateAndTime.	1✔
98	"(mapping mapInstVar: #assignee) valueSchema: GLHUser."	1✔
99	mapping	1✔
100	mapProperty: #author	1✔
101	getter: [ ]	1✔
102	setter: [ :object :value \|	1✔
103	object cacheAt: #authorID put: (value at: #id) ].	1✔
104	mapping	1✔
105	mapProperty: #merge_user	1✔
106	getter: [ ]	1✔
107	setter: [ :object :value \|	1✔
108	value ifNotNil: [	1✔
109	object cacheAt: #mergeUserID put: (value at: #id) ] ] ].	1✔
110		1✔
111	"(mapping mapInstVar: #closed_by) valueSchema: GLHUser.	1✔
112	(mapping mapInstVar: #mergeCommit) valueSchema: GLHCommit."	1✔
113	"indique ce que doit faire le reader lorsqu'il parse une DateAndTime object"	1✔
114	reader for: DateAndTime customDo: [ :mapping \|	1✔
115	mapping decoder: [ :string \|	1✔
116	string ifNil: [ nil ] ifNotNil: [ DateAndTime fromString: string ] ] ]	1✔
117	]	1✔
118
119	{ #category : #import }
120	GLPHModelImporter >> importCommitsOfBranch: aGLHBranch [	×
121		×
122	\| commits \|	×
123	" result := self glhApi	×
124	commitsOfProject: aGLHBranch repository project id	×
125	forRefName: aGLHBranch name."	×
126	commits := self	×
127	importCommitsOfBranch: aGLHBranch	×
128	forRefName: aGLHBranch name	×
129	since: withCommitsSince.	×
130		×
131	self chainsCommitsFrom: commits.	×
132		×
133	commits do: [ :aCommit \|	×
134	aCommit repository: aGLHBranch repository.	×
135	self completeImportedCommit: aCommit.	×
136	]	×
137	]	×
138
139	{ #category : #api }
140	GLPHModelImporter >> importDiffOfCommit: aCommit [	1✔
141		1✔
142	super importDiffOfCommit: aCommit.	1✔
143		1✔
144	"changes are added into the model during the import"	1✔
145	aCommit diffs do: [ :diff \| self importDiffRangesForDiff: diff ].	1✔
146		1✔
147	^ aCommit diffs	1✔
148	]	1✔
149
150	{ #category : #'as yet unclassified' }
151	GLPHModelImporter >> importDiffOfMergeRequest: aMergeRequest [	1✔
152		1✔
153	\| result diffsResult \|	1✔
154	aMergeRequest diffs ifNotEmpty: [	1✔
155	'Diff of already importer: '	1✔
156	, aMergeRequest iid printString recordInfo.	1✔
157	^ aMergeRequest diffs ].	1✔
158	('Import diff commits of MR ' , aMergeRequest iid printString)	1✔
159	recordInfo.	1✔
160	result := self glhApi	1✔
161	diffsMergeRequestOfProject: aMergeRequest project_id	1✔
162	withId: aMergeRequest iid.	1✔
163		1✔
164	diffsResult := self newParseDiffResult: result.	1✔
165		1✔
166		1✔
167	aMergeRequest diffs	1✔
168	addAll: diffsResult	1✔
169	unless: self blockForDiffEquality.	1✔
170	self glhModel	1✔
171	addAll: aMergeRequest diffs	1✔
172	unless: self blockForDiffEquality.	1✔
173		1✔
174	aMergeRequest diffs do: [ :diff \| self importDiffRangesForDiff: diff ].	1✔
175		1✔
176	^ aMergeRequest diffs	1✔
177	]	1✔
178
179	{ #category : #import }
180	GLPHModelImporter >> importDiffRangesForDiff: aGLHDiff [	1✔
181		1✔
182	\| diffRanges \|	1✔
183	aGLHDiff diffRanges ifNotEmpty: [	1✔
184	('Diffs already imported for ' , aGLHDiff printString) recordInfo.	1✔
185	^ aGLHDiff diffRanges ].	1✔
186		1✔
187	('Import changes of diff ' , aGLHDiff printString) recordInfo.	1✔
188	"the import of 'diffRanges' entites is technically done inside the parseDiffString"	1✔
189		1✔
190	diffRanges := self glhModel	1✔
191	addAll: (self parseDiffString: aGLHDiff)	1✔
192	unless: self blockForDiffRangeEquality.	1✔
193	^ aGLHDiff diffRanges	1✔
194	addAll: diffRanges	1✔
195	unless: self blockForDiffRangeEquality	1✔
196	]	1✔
197
198	{ #category : #'import - merge request' }
199	GLPHModelImporter >> importMergeRequestCommits: aGLPHEMergeRequest [	×
200		×
201	\| results page commits parseResult \|	×
202	aGLPHEMergeRequest commits ifNotNil: [ ^ aGLPHEMergeRequest commits ].	×
203	page := 1.	×
204		×
205	parseResult := { nil }.	×
206	commits := OrderedCollection new.	×
207		×
208	[	×
NEW 209	results := glhApi	×
210	commitsOfMergeRequest: aGLPHEMergeRequest iid	×
211	ofProject: aGLPHEMergeRequest project id	×
212	page: page	×
213	perPage: 100.	×
214	parseResult := self parseCommitsResult: results.	×
215		×
216	commits addAll: parseResult.	×
217	page := page + 1 ] doWhileTrue: [ parseResult isNotEmpty ].	×
218		×
219		×
220	commits := commits collect: [ :commit \| self importCommit: commit id ofProject: aGLPHEMergeRequest project ].	×
221	aGLPHEMergeRequest commits: commits.	×
222		×
223		×
224	^ commits	×
225	]	×
226
227	{ #category : #import }
228	GLPHModelImporter >> importMergeRequestMergeCommits: aGLPHEMergeRequest [	1✔
229		1✔
230	\| foundCommits \|	1✔
231	foundCommits := OrderedCollection new.	1✔
232		1✔
233	('Import commit sha of MR: ' , aGLPHEMergeRequest iid printString)	1✔
234	recordInfo.	1✔
235	"the founds commits are added to the model during their respective import"	1✔
236	aGLPHEMergeRequest mergeRequestCommit: ((self	1✔
237	importCommitOfProject: aGLPHEMergeRequest project	1✔
238	withId: aGLPHEMergeRequest sha) ifNotNil: [ :commit \|	1✔
239	foundCommits add: commit ]).	1✔
240		1✔
241	('Import commit merge_commit_sha of MR: '	1✔
242	, aGLPHEMergeRequest iid printString) recordInfo.	1✔
243	aGLPHEMergeRequest mergedCommit: ((self	1✔
244	importCommitOfProject: aGLPHEMergeRequest project	1✔
245	withId: aGLPHEMergeRequest merge_commit_sha) ifNotNil: [ :commit \|	1✔
246	foundCommits add: commit ]).	1✔
247		1✔
248	('Import commit squash_commit_sha of MR: '	1✔
249	, aGLPHEMergeRequest iid printString) recordInfo.	1✔
250	aGLPHEMergeRequest squashCommit: ((self	1✔
251	importCommitOfProject: aGLPHEMergeRequest project	1✔
252	withId: aGLPHEMergeRequest squash_commit_sha) ifNotNil: [ :commit \|	1✔
253	foundCommits add: commit ]).	1✔
254		1✔
255		1✔
256	self chainsCommitsFrom: foundCommits.	1✔
257	^ foundCommits	1✔
258	]	1✔
259
260	{ #category : #'import - merge request' }
261	GLPHModelImporter >> importMergeRequests: aGLHProject [	1✔
262		1✔
263	\| results parsedResults mrs\|	1✔
264	('Import merge request of Project: ' , aGLHProject id printString)	1✔
265	recordInfo.	1✔
266		1✔
267	results := self glhApi mergeRequestOfProject: aGLHProject id.	1✔
268	parsedResults := self parseMergeRequestResult: results.	1✔
269		1✔
270	aGLHProject mergeRequests	1✔
271	addAll: parsedResults	1✔
272	unless: self blockOnIdEquality.	1✔
273		1✔
274	mrs := self glhModel	1✔
275	addAll: aGLHProject mergeRequests	1✔
276	unless: self blockOnIdEquality.	1✔
277		1✔
278		1✔
279	"gets it related commits"	1✔
280	aGLHProject mergeRequests do: [ :mr \|	1✔
281	self importMergeRequestMergeCommits: mr ].	1✔
282		1✔
283		1✔
284	self withCommitDiffs ifTrue: [	1✔
285	aGLHProject mergeRequests do: [ :mr \|	1✔
286	self importDiffOfMergeRequest: mr ] ].	1✔
287		1✔
288	^ mrs	1✔
289	]	1✔
290
291	{ #category : #'import - merge request' }
292	GLPHModelImporter >> importMergeRequests: aGLHProject since: fromDate until: toDate [	×
293		×
294	\| newlyFoundMR page foundMR \|	×
295	('import MR of Project ' , aGLHProject name) recordInfo.	×
296		×
297	page := 0.	×
298	foundMR := OrderedCollection new.	×
299	newlyFoundMR := { true }.	×
300	[ newlyFoundMR isNotEmpty ] whileTrue: [	×
301	\| results \|	×
302	page := page + 1.	×
303	('import MR page ' , page printString) recordInfo.	×
NEW 304	results := self glhApi	×
305	mergeRequestsOfProject: aGLHProject id	×
306	createdAfter:	×
307	(fromDate ifNotNil: [ fromDate asDateAndTime asString ])	×
308	createdBefore:	×
309	(toDate ifNotNil: [ toDate asDateAndTime asString ])	×
310	authorId: nil	×
311	authorUsername: nil	×
312	scope: 'all'	×
313	orderBy: 'created_at'	×
314	page: page.	×
315		×
316		×
317	newlyFoundMR := aGLHProject mergeRequests	×
318	addAll: (self parseMergeRequestResult: results)	×
319	unless: self blockOnIdEquality.	×
320	foundMR addAll: newlyFoundMR ].	×
321		×
322		×
323	"gets it related commits"	×
324	aGLHProject mergeRequests do: [ :mr \|	×
325	self importMergeRequestMergeCommits: mr ].	×
326		×
327	self withCommitDiffs ifTrue: [	×
328	aGLHProject mergeRequests do: [ :mr \|	×
329	self importDiffOfMergeRequest: mr ] ].	×
330		×
331	self glhModel addAll: foundMR unless: (self blockEqualityOn: #iid).	×
332		×
333	^ foundMR	×
334	]	×
335
336	{ #category : #'import - merge request' }
337	GLPHModelImporter >> importMergeResquestApprovals: aGLPHEMergeRequest [	×
338		×
339	\| results parsedResult \|	×
340	(String streamContents: [ :str \|	×
341	str << 'Check approvals of '.	×
342	aGLPHEMergeRequest printOn: str ]) recordInfo.	×
343	results := self glhApi	×
344	approvalsOfMergeQuest: aGLPHEMergeRequest iid	×
345	ofProject: aGLPHEMergeRequest project id.	×
346		×
347	parsedResult := generalReader	×
348	on: results readStream;	×
349	next.	×
350		×
351	(parsedResult at: #approved_by) do: [ :approvedUser \|	×
352	aGLPHEMergeRequest addApproved_by:	×
353	(self importUser: ((approvedUser at: #user) at: #id)) ].	×
354	aGLPHEMergeRequest approved: (parsedResult at: #approved).	×
355	^ aGLPHEMergeRequest	×
356	]	×
357
358	{ #category : #'import - merge request' }
359	GLPHModelImporter >> importMergeResquestAuthor: aGLPHEMergeRequest [	1✔
360		1✔
361	\| authorID \|	1✔
362	aGLPHEMergeRequest author ifNotNil: [ ^ aGLPHEMergeRequest author ].	1✔
363	authorID := aGLPHEMergeRequest cacheAt: #authorID ifAbsent: [	1✔
364	(generalReader	1✔
365	on: (self glhApi	1✔
366	mergeRequestOfProject:	1✔
367	aGLPHEMergeRequest project_id	1✔
368	withId: aGLPHEMergeRequest iid) readStream;	1✔
369	next) at: #author at: #id ].	1✔
370	aGLPHEMergeRequest author: (self importUser: authorID)	1✔
371	]	1✔
372
373	{ #category : #'import - merge request' }
374	GLPHModelImporter >> importMergeResquestMerger: aGLPHEMergeRequest [	1✔
375		1✔
376	\| authorID \|	1✔
377	aGLPHEMergeRequest merge_user ifNotNil: [	1✔
378	^ aGLPHEMergeRequest merge_user ].	1✔
379	authorID := aGLPHEMergeRequest cacheAt: #mergeUserID ifAbsent: [	1✔
380	(generalReader	1✔
381	on: (self glhApi	1✔
382	mergeRequestOfProject:	1✔
383	aGLPHEMergeRequest project_id	1✔
384	withId: aGLPHEMergeRequest iid) readStream;	1✔
385	next)	1✔
386	at: #merge_user	1✔
387	ifPresent: [ :mergeUser \|	1✔
388	mergeUser ifNotNil: [ :mruser \| mruser at: #id ] ] ].	1✔
389	aGLPHEMergeRequest merge_user: (self importUser: authorID)	1✔
390	]	1✔
391
392	{ #category : #'private - api' }
393	GLPHModelImporter >> importProject: aProjectID [	1✔
394		1✔
395	\| result projectResult \|	1✔
396	('Import project with id: ' , aProjectID printString) recordInfo.	1✔
397		1✔
398	result := self glhApi project: aProjectID.	1✔
399	projectResult := self parseProjectResult: result.	1✔
400		1✔
401	^ self completeImportProject: projectResult	1✔
402	]	1✔
403
404	{ #category : #'private - api' }
405	GLPHModelImporter >> importRepository: aGLHRepository [	1✔
406		1✔
407	super importRepository: aGLHRepository.	1✔
408		1✔
409	withInitialCommits ifTrue: [	1✔
410	aGLHRepository branches do: [ :branch \|	1✔
411	self importCommitsOfBranch: branch ] ]	1✔
412	]	1✔
413
414	{ #category : #initialization }
415	GLPHModelImporter >> initReader [	1✔
416		1✔
417	super initReader.	1✔
418	self configureReaderForMergeRequest: generalReader	1✔
419	]	1✔
420
421	{ #category : #initialization }
422	GLPHModelImporter >> initialize [	1✔
423		1✔
424	super initialize.	1✔
425	withCommitDiffs := true	1✔
426	]	1✔
427
428	{ #category : #parsing }
429	GLPHModelImporter >> parseDiffString: aDiff [	1✔
430	"parse diff string to create entities for each lines"	1✔
431		1✔
432	\| lines range index firstChangeRange \|	1✔
433	lines := aDiff diffString lines.	1✔
434	index := 0.	1✔
435	range := nil.	1✔
436		1✔
437	lines ifEmpty: [ ^ aDiff diffRanges ].	1✔
438	lines := self filterCommitChanges: lines.	1✔
439	(lines first beginsWith: '@@') ifFalse: [ ^ aDiff diffRanges ].	1✔
440		1✔
441	lines do: [ :line \|	1✔
442	\| aChange \|	1✔
443	firstChangeRange := false.	1✔
444	(line trim beginsWith: #'@@') ifTrue: [	1✔
445	range := GLPHEDiffRange newFrom: line.	1✔
446	firstChangeRange := true.	1✔
447	range := aDiff diffRanges add: range unless: [ :existing :new \|	1✔
448	existing originalLineRange = new originalLineRange and: [	1✔
449	existing newLineRange = new newLineRange ] ] ].	1✔
450		1✔
451	self withCommitDiffs ifTrue: [	1✔
452	firstChangeRange ifFalse: [	1✔
453	aChange := GLPHEChange newFrom: line.	1✔
454	aChange relativeIndex: index.	1✔
455	aChange := range changes add: aChange unless: [ :existing :new \|	1✔
456	existing sourceCode = new sourceCode and: [	1✔
457	existing index = new index ] ].	1✔
458	index := index + 1 ] ] ].	1✔
459		1✔
460	"add changes to the diff range"	1✔
461	aDiff diffRanges do: [ :diffRange \|	1✔
462	self glhModel addAll: diffRange changes unless: [ :existing :new \|	1✔
463	existing diffRange mooseID = new diffRange mooseID and: [	1✔
464	existing sourceCode = new sourceCode and: [	1✔
465	existing index = new index ] ] ] ].	1✔
466		1✔
467	^ aDiff diffRanges	1✔
468	]	1✔
469
470	{ #category : #parsing }
471	GLPHModelImporter >> parseMergeRequestResult: result [	1✔
472		1✔
473	generalReader on: result readStream.	1✔
474	^ generalReader nextAs: #ArrayOfMergeRequest	1✔
475	]	1✔
476
477	{ #category : #parsing }
478	GLPHModelImporter >> parseProjectResult: aResult [	1✔
479	\| reader \|	1✔
480	reader := NeoJSONReader on: aResult readStream.	1✔
481	reader for: GLHProject do: [ :mapping \|	1✔
482	mapping mapInstVars. ].	1✔
483	" reader mapInstVarsFor: GLHProject."	1✔
484		1✔
485	^ reader nextAs: GLHProject	1✔
486	]	1✔
487		1✔
488	{ #category : #accessing }	1✔
489	GLPHModelImporter >> withCommitsSince: someDays [	1✔
490	"substract the current date with a given number of days. Use to retrieve the commits submit in the last giving days"	1✔
491		1✔
492	"(GLPHModelImporter new withCommitsSince: 1 week ) >>> (Date today - 1 week) asDateAndTime"	1✔
493		1✔
494	"(GLPHModelImporter new withCommitsSince: 30 day ) >>> (Date today - 30 day) asDateAndTime"	1✔
495		1✔
496	(someDays isKindOf: DateAndTime)	1✔
497	ifTrue: [ withCommitsSince := someDays ]	1✔
498	ifFalse: [	1✔
499	withCommitsSince := (Date today - someDays) asDateAndTime ]	1✔
500	]	1✔

moosetechnology / GitProjectHealth / 11496926157

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