add a new test and load only one issueType

Evref-BL · Jul 25, 2024 · c065ea4 · c065ea4
1 parent 8d04420
commit c065ea4
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 1 deletion.
diff --git a/src/JiraPharoAPI-Model-Generator/JPMetamodelGenerator.class.st b/src/JiraPharoAPI-Model-Generator/JPMetamodelGenerator.class.st
@@ -59,6 +59,7 @@ JPMetamodelGenerator >> defineProperties [
 	issueType property: #name type: #String.
 	issueType property: #subtask type: #String.
 	issueType property: #avatarId type: #String.
+	issueType withEqualityCheckOn: { #id }.
 
 	component property: #id type: #Number.
 	component property: #name type: #String.

diff --git a/src/JiraPharoAPI-Model/JPIssueType.class.st b/src/JiraPharoAPI-Model/JPIssueType.class.st
@@ -45,6 +45,13 @@ JPIssueType class >> annotation [
 	^ self
 ]
 
+{ #category : #comparing }
+JPIssueType >> = aJPIssueType [
+
+	<generated>
+	^ aJPIssueType id = self id
+]
+
 { #category : #accessing }
 JPIssueType >> avatarId [
 
@@ -73,6 +80,13 @@ JPIssueType >> description: anObject [
 	description := anObject
 ]
 
+{ #category : #comparing }
+JPIssueType >> hash [
+
+	<generated>
+	^ self id hash 
+]
+
 { #category : #accessing }
 JPIssueType >> iconUrl [
 

diff --git a/src/JiraPharoAPI-Tests/JiraPharoImporterTest.class.st b/src/JiraPharoAPI-Tests/JiraPharoImporterTest.class.st
@@ -29,6 +29,52 @@ JiraPharoImporterTest >> testLoadIssues [
 	self assert: model size equals: 1.
 ]
 
+{ #category : #tests }
+JiraPharoImporterTest >> testLoadIssuesWithSameType [
+
+	| issueA issueB issueTypeA issueTypeB |
+	issueTypeA := JPIssueType new
+		              id: 125;
+		              name: 'sub-task';
+		              yourself.
+	issueTypeB := JPIssueType new
+		              id: 125;
+		              name: 'sub-task';
+		              yourself.
+	issueA := JPIssue new
+		          id: 1;
+		          type: issueTypeA;
+		          yourself.
+	issueB := JPIssue new
+		          id: 2;
+		          type: issueTypeB;
+		          yourself.
+
+	jpImporter loadIssues: {
+			issueA.
+			issueB }.
+	self assert: model size equals: 3
+]
+
+{ #category : #tests }
+JiraPharoImporterTest >> testLoadOneIssueWithAIssueType [
+
+	| issueA issueTypeA |
+	issueTypeA := JPIssueType new
+		              id: 125;
+		              name: 'sub-task';
+		              yourself.
+	issueA := JPIssue new
+		          id: 1;
+		          type: issueTypeA;
+		          yourself.
+
+	jpImporter loadIssues: { issueA }.
+	self assert: model size equals: 2.
+	self assert: (model allWithType: JPIssue) size equals: 1.
+	self assert: (model allWithType: JPIssueType) size equals: 1
+]
+
 { #category : #test }
 JiraPharoImporterTest >> testLoadSameIssueTwoTimes [
 

diff --git a/src/JiraPharoAPI/JiraPharoImporter.class.st b/src/JiraPharoAPI/JiraPharoImporter.class.st
@@ -70,7 +70,10 @@ JiraPharoImporter >> loadIssues: issues [
 	issuesToLoad := issues reject: [ :issueProposedForImmport |
 		                (self model allWithType: JPIssue) anySatisfy: [
 			                :issue | issue id = issueProposedForImmport id ] ].
-	self model addAll: issuesToLoad
+	self model addAll: issuesToLoad.
+	self model addAll:
+		issuesToLoad iterator | [ :issue | issue type ] collectIt
+		| [ :issueType | issueType isNil ] rejectIt > Set
 ]
 
 { #category : #accessing }