work on issueType to have only one

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

Hide file tree

Showing 5 changed files with 45 additions and 26 deletions.
diff --git a/src/JiraPharoAPI-Model-Generator/JPMetamodelGenerator.class.st b/src/JiraPharoAPI-Model-Generator/JPMetamodelGenerator.class.st
@@ -83,5 +83,5 @@ JPMetamodelGenerator >> defineRelations [
 	super defineRelations.
 	(issue property: #components) -* (component property: #issue).
 	(issue property: #worklogs) -* (worklog property: #issue).
-	(issue property: #type) - (issueType property: #issue)
+	(issue property: #type) *- (issueType property: #issues)
 ]
diff --git a/src/JiraPharoAPI-Model/JPIssue.class.st b/src/JiraPharoAPI-Model/JPIssue.class.st
@@ -6,7 +6,7 @@
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `components` | `JPIssue` | `issue` | `JPComponent` | |
-| `type` | `JPIssue` | `issue` | `JPIssueType` | |
+| `type` | `JPIssue` | `issues` | `JPIssueType` | |
 | `worklogs` | `JPIssue` | `issue` | `JPWorklog` | |
 
 
@@ -28,16 +28,16 @@ Class {
 	#name : #JPIssue,
 	#superclass : #JPEntity,
 	#instVars : [
+		'#components => FMMany type: #JPComponent opposite: #issue',
+		'#created => FMProperty',
 		'#description => FMProperty',
-		'#summary => FMProperty',
-		'#key => FMProperty',
 		'#id => FMProperty',
-		'#created => FMProperty',
-		'#timespent => FMProperty',
+		'#key => FMProperty',
 		'#labels => FMProperty',
-		'#components => FMMany type: #JPComponent opposite: #issue',
-		'#worklogs => FMMany type: #JPWorklog opposite: #issue',
-		'#type => FMOne type: #JPIssueType opposite: #issue'
+		'#summary => FMProperty',
+		'#timespent => FMProperty',
+		'#type => FMOne type: #JPIssueType opposite: #issues',
+		'#worklogs => FMMany type: #JPWorklog opposite: #issue'
 	],
 	#category : #'JiraPharoAPI-Model-Entities'
 }
@@ -179,7 +179,7 @@ JPIssue >> timespent: anObject [
 
 { #category : #accessing }
 JPIssue >> type [
-	"Relation named: #type type: #JPIssueType opposite: #issue"
+	"Relation named: #type type: #JPIssueType opposite: #issues"
 
 	<generated>
 	^ type

diff --git a/src/JiraPharoAPI-Model/JPIssueType.class.st b/src/JiraPharoAPI-Model/JPIssueType.class.st
@@ -5,7 +5,7 @@
 ### Other
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `issue` | `JPIssueType` | `type` | `JPIssue` | |
+| `issues` | `JPIssueType` | `type` | `JPIssue` | |
 
 
 ## Properties
@@ -25,13 +25,13 @@ Class {
 	#name : #JPIssueType,
 	#superclass : #JPEntity,
 	#instVars : [
-		'#id => FMProperty',
+		'#avatarId => FMProperty',
 		'#description => FMProperty',
 		'#iconUrl => FMProperty',
+		'#id => FMProperty',
+		'#issues => FMMany type: #JPIssue opposite: #type',
 		'#name => FMProperty',
-		'#subtask => FMProperty',
-		'#avatarId => FMProperty',
-		'#issue => FMOne type: #JPIssue opposite: #type'
+		'#subtask => FMProperty'
 	],
 	#category : #'JiraPharoAPI-Model-Entities'
 }
@@ -52,6 +52,12 @@ JPIssueType >> = aJPIssueType [
 	^ aJPIssueType id = self id
 ]
 
+{ #category : #adding }
+JPIssueType >> addIssue: anObject [
+	<generated>
+	^ self issues add: anObject
+]
+
 { #category : #accessing }
 JPIssueType >> avatarId [
 
@@ -116,19 +122,19 @@ JPIssueType >> id: anObject [
 ]
 
 { #category : #accessing }
-JPIssueType >> issue [
-	"Relation named: #issue type: #JPIssue opposite: #type"
+JPIssueType >> issues [
+	"Relation named: #issues type: #JPIssue opposite: #type"
 
 	<generated>
 	<derived>
-	^ issue
+	^ issues
 ]
 
 { #category : #accessing }
-JPIssueType >> issue: anObject [
+JPIssueType >> issues: anObject [
 
 	<generated>
-	issue := anObject
+	issues value: anObject
 ]
 
 { #category : #accessing }

diff --git a/src/JiraPharoAPI-Tests/JiraPharoImporterTest.class.st b/src/JiraPharoAPI-Tests/JiraPharoImporterTest.class.st
@@ -32,7 +32,7 @@ JiraPharoImporterTest >> testLoadIssues [
 { #category : #tests }
 JiraPharoImporterTest >> testLoadIssuesWithSameType [
 
-	| issueA issueB issueTypeA issueTypeB |
+	| issueA issueB issueTypeA issueTypeB selectedIssueBySet |
 	issueTypeA := JPIssueType new
 		              id: 125;
 		              name: 'sub-task';
@@ -53,7 +53,12 @@ JiraPharoImporterTest >> testLoadIssuesWithSameType [
 	jpImporter loadIssues: {
 			issueA.
 			issueB }.
-	self assert: model size equals: 3
+	self assert: model size equals: 3.
+	"This is necessary because we do not know excalty the type that will be selected since they are the same"
+	selectedIssueBySet := issueA type.
+	self assert: issueA type identicalTo: selectedIssueBySet.
+	self assert: issueB type identicalTo: selectedIssueBySet.
+	self assert: selectedIssueBySet issues size equals: 2
 ]
 
 { #category : #tests }

diff --git a/src/JiraPharoAPI/JiraPharoImporter.class.st b/src/JiraPharoAPI/JiraPharoImporter.class.st
@@ -66,14 +66,22 @@ JiraPharoImporter >> importAllIssuesOf: aUsername [
 { #category : #'api - import' }
 JiraPharoImporter >> loadIssues: issues [
 
-	| issuesToLoad |
+	| issuesToLoad issueTypeToLoad |
 	issuesToLoad := issues reject: [ :issueProposedForImmport |
 		                (self model allWithType: JPIssue) anySatisfy: [
 			                :issue | issue id = issueProposedForImmport id ] ].
 	self model addAll: issuesToLoad.
-	self model addAll:
-		issuesToLoad iterator | [ :issue | issue type ] collectIt
-		| [ :issueType | issueType isNil ] rejectIt > Set
+	issueTypeToLoad := issuesToLoad iterator
+	                   | [ :issue | issue type ] collectIt
+	                   | [ :issueType | issueType isNil ] rejectIt
+	                   |
+	                   [ :issueType | self model includes: issueType ]
+		                   rejectIt > Set.
+	issuesToLoad do: [ :issue |
+		issueTypeToLoad
+			detect: [ :ty | ty = issue type ]
+			ifOne: [ :ty | issue type: ty ] ].
+	self model addAll: issueTypeToLoad
 ]
 
 { #category : #accessing }