Merge pull request #21 from moosetechnology/fix-import-project-location

fix import project location

Author: alkalinan

src/GitLabHealth-Model-Importer/GLHModelImporter.class.st

@@ -588,6 +588,18 @@ GLHModelImporter >> importPipelinesOfProject: aGLHProject [
 		aGLHProject pipelines add: pipeline unless: self blockOnIdEquality]
 ]
 
+{ #category : #projects }
+GLHModelImporter >> importProject: aProjectID [
+
+	| result projectResult |
+	('Import project with id: ' , aProjectID printString) recordInfo.
+
+	result := self glhApi project: aProjectID.
+	projectResult := self parseProjectResult: result.
+
+	^ self completeImportProject: projectResult
+]
+
 { #category : #imports }
 GLHModelImporter >> importProjects [
 
@@ -596,11 +608,8 @@ GLHModelImporter >> importProjects [
 
 { #category : #projects }
 GLHModelImporter >> importProjects: aCollectionOfProjectID [
-	
-	^ aCollectionOfProjectID collect: [ :id |
-		self importProject: id.
-		 ]
-	 
+
+	^ aCollectionOfProjectID collect: [ :id | self importProject: id ]
 ]
 
 { #category : #imports }
@@ -933,6 +942,17 @@ GLHModelImporter >> parsePipelinesResult: result [
 	^ reader nextAs: #ArrayOfPipelines
 ]
 
+{ #category : #parsing }
+GLHModelImporter >> parseProjectResult: aResult [ 
+		| reader |
+	reader := NeoJSONReader on: aResult readStream.
+	reader for: GLHProject do: [ :mapping |
+		mapping mapInstVars. ].
+"	reader mapInstVarsFor: GLHProject."
+
+	^ reader nextAs: GLHProject
+]
+
 { #category : #private }
 GLHModelImporter >> parseSubGroupResult: aResult [
 

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

@@ -380,18 +380,6 @@ GLPHModelImporter >> importMergeResquestMerger: aGLPHEMergeRequest [
 	aGLPHEMergeRequest merge_user: (self importUser: authorID)
 ]
 
-{ #category : #'as yet unclassified' }
-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 [
 
@@ -465,17 +453,6 @@ GLPHModelImporter >> parseMergeRequestResult: result [
 	^ 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"