Merge pull request #78 from moosetechnology/fix/model-importer

put model importer inside super class
moosetechnology · Oct 7, 2024 · 56314d3 · 56314d3
2 parents 89c52cd + 5b77080
commit 56314d3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/GitLabHealth-Model-Importer/GLHModelImporter.class.st b/src/GitLabHealth-Model-Importer/GLHModelImporter.class.st
@@ -924,7 +924,6 @@ GLHModelImporter >> initialize [
 		                 yourself.
 	self initReader.
 
-	currentImporter := self
 ]
 
 { #category : #importer }
@@ -935,19 +934,6 @@ GLHModelImporter >> loadAllProjectsFromRepositorySoftware [
 	projects := self glhApi projects. 
 ]
 
-{ #category : #'as yet unclassified' }
-GLHModelImporter >> makeGlobal [
-	^ self makeGlobal: DateAndTime now printString.
-]
-
-{ #category : #'as yet unclassified' }
-GLHModelImporter >> makeGlobal: aLabel [ 
-
-	currentImporter := currentImporter ifNil: [ OrderedDictionary new ].
-	currentImporter at: aLabel put: self. 
-	^ self
-]
-
 { #category : #private }
 GLHModelImporter >> newParseCommitResult: result [
 

diff --git a/src/GitProjectHealth-Model-Importer/GPModelImporter.class.st b/src/GitProjectHealth-Model-Importer/GPModelImporter.class.st
@@ -25,7 +25,7 @@ GPModelImporter class >> importers [
 
 { #category : #initialization }
 GPModelImporter class >> reset [
-	currentImporter := nil.
+	currentImporter := OrderedDictionary new.
 ]
 
 { #category : #accessing }
@@ -81,6 +81,19 @@ GPModelImporter >> initialize [
 	self withCommitsSince: (Date today - 1 week) asDateAndTime
 ]
 
+{ #category : #'as yet unclassified' }
+GPModelImporter >> makeGlobal [
+	^ self makeGlobal: DateAndTime now printString.
+]
+
+{ #category : #'as yet unclassified' }
+GPModelImporter >> makeGlobal: aLabel [ 
+
+	currentImporter := GHModelImporter importers ifNil: [ OrderedDictionary new ].
+	currentImporter at: aLabel put: self. 
+	^ currentImporter 
+]
+
 { #category : #accessing }
 GPModelImporter >> withCommitsSince [