Ordered pipelines to display result of last one

src/GitHubHealth-Model-Importer-Tests/GHModelImporterTest.class.st

@@ -0,0 +1,39 @@
+"
+A GHModelImporterTest is a test class for testing the behavior of GHModelImporter
+"
+Class {
+	#name : #GHModelImporterTest,
+	#superclass : #TestCase,
+	#instVars : [
+		'importer'
+	],
+	#category : #'GitHubHealth-Model-Importer-Tests'
+}
+
+{ #category : #running }
+GHModelImporterTest >> setUp [
+	super setUp.
+
+	importer := GHModelImporter new
+]
+
+{ #category : #test }
+GHModelImporterTest >> testParsePipelinesResult [
+
+	| project |
+
+	project := importer parsePipelinesResult: '{
+  "total_count": 1,
+  "workflow_runs": [
+    {
+      "id": 7482814798,
+      "conclusion": "success",
+      "run_started_at": "2024-01-11T00:00:00"
+    }]}'.
+
+	self assert: project workflow_runs size equals: 1.
+
+	self assert: project workflow_runs anyOne status equals: 'success'.
+	self assert: project workflow_runs anyOne runDate equals: (DateAndTime year: 2024 month: 01 day: 11).
+
+]

src/GitHubHealth-Model-Importer-Tests/package.st

@@ -0,0 +1 @@
+Package { #name : #'GitHubHealth-Model-Importer-Tests' }

src/GitHubHealth-Model-Importer/GHModelImporter.class.st

@@ -237,7 +237,11 @@ GHModelImporter >> parsePipelinesResult: pipelineOverview [
 		customMappting listOfElementSchema: GLHPipeline ].
 	reader
 		for: GLHPipeline
-		do: [ :mapping | mapping mapInstVar: #status to: #conclusion ].
+		do: [ :mapping |
+			mapping
+				mapInstVar: #status to: #conclusion ;
+				mapProperty: #run_started_at getter: [ :object | #ignore ] setter: [ :object : value | object runDate: (DateAndTime fromString: value) ]
+		].
 	^ reader nextAs: GHAPIPipelineOverview
 ]
 

src/GitLabHealth-Model-Generator/GLHMetamodelGenerator.class.st

@@ -124,7 +124,9 @@ GLHMetamodelGenerator >> defineProperties [
 	project property: #creator_id type: #Number.
 
 	"Pipelines properties"
-	pipeline property: #status type: #String.
+	(pipeline property: #status type: #String) comment: '#success or #failure'.
+	(pipeline property: #runDate type: #Object) comment: 'Date this pipeline was run'.
+
 	self userProperties.
 	self branchProperties.
 	self fileProperties.

src/GitLabHealth-Model-Visualization/GLHGroupVisualization.class.st

@@ -37,30 +37,46 @@ GLHGroupVisualization >> createLegend [
 { #category : #running }
 GLHGroupVisualization >> createShapeFor: project [
 
-	| box |
+	| box inspect |
+
 	box := RSBox new
 		       size: 5;
 		       model: project;
 		       yourself.
-	box color: (project pipelines
-		ifEmpty: [ self noPipelineColor ]
-		ifNotEmpty: [ :pipelines |
-			(pipelines last status = #success)
+	box color: (project lastPipeline
+		ifNil: [ self noPipelineColor ]
+		ifNotNil: [ :lastPipeline |
+			(lastPipeline status = #success)
 				ifTrue: [ Color green ]
 				ifFalse: [ Color red ]
 		]).
+
+	inspect := RSInspectableInteraction new.
+	inspect inspectShapeBlock: [ :proj |
+		proj inspect.
+		"block must return a Window :-("
+		SystemWindow  new
+	].
+	box @ inspect.
+
+	box @ (RSPopup text: [ :proj |
+		String streamContents: [ :st | 
+			st << proj name ;  cr ; << 'on: '.
+			BasicDatePrinter default printYMD: proj lastPipelineDate withLeadingSpace: false on: st.
+			st space.
+			BasicDatePrinter default printHMS: proj lastPipelineDate separatedBy: $: on: st ] ]).
+
 	^ box
 ]
 
 { #category : #running }
 GLHGroupVisualization >> createShapes: aGLHGroup [
 
 	^(aGLHGroup allToScope: GLHGroup) collect: [ :group || lbl projects composite |
-		projects := group projects
+		projects := (group projects sorted: [:a :b | a lastPipelineDate > b lastPipelineDate])
 			collect: [ :project | self createShapeFor: project ]
 			as: RSGroup.
 
-		projects @ (RSPopup text: #name).
 		RSGridLayout on: projects.
 		lbl := RSLabel new
 			         text: group name;

src/GitLabHealth-Model-Visualization/GLHProject.extension.st

@@ -0,0 +1,31 @@
+Extension { #name : #GLHProject }
+
+{ #category : #'*GitLabHealth-Model-Visualization' }
+GLHProject >> lastPipeline [
+
+	^self
+		attributeAt: #lastPipeline
+		ifAbsentPut: [ pipelines
+			ifEmpty: [ nil ]
+			ifNotEmpty: [
+				(pipelines asOrderedCollection sort: [ :a :b | a runDate > b runDate])
+				first
+			]
+		]
+]
+
+{ #category : #'*GitLabHealth-Model-Visualization' }
+GLHProject >> lastPipelineDate [
+
+	^self
+		attributeAt: #lastPipelineDate
+		ifAbsentPut: [
+			self lastPipeline
+				ifNil: [ DateAndTime now ]
+				ifNotNil: [ :lastPipeline |
+					lastPipeline runDate
+						ifNil: [ DateAndTime now ]
+						ifNotNil: [ :date | date ]
+			]
+		]
+]

src/GitLabHealth-Model/GLHPipeline.class.st

@@ -6,6 +6,7 @@ Class {
 	#superclass : #GLHEntity,
 	#instVars : [
 		'#status => FMProperty',
+		'#runDate => FMProperty',
 		'#project => FMOne type: #GLHProject opposite: #pipelines'
 	],
 	#category : #'GitLabHealth-Model-Entities'
@@ -43,11 +44,27 @@ GLHPipeline >> projectGroup [
 	^ MooseSpecializedGroup with: self project
 ]
 
+{ #category : #accessing }
+GLHPipeline >> runDate [
+
+	<FMProperty: #runDate type: #Object>
+	<generated>
+	<FMComment: 'Date this pipeline was run'>
+	^ runDate
+]
+
+{ #category : #accessing }
+GLHPipeline >> runDate: anObject [
+	<generated>
+	runDate := anObject
+]
+
 { #category : #accessing }
 GLHPipeline >> status [
 
 	<FMProperty: #status type: #String>
 	<generated>
+	<FMComment: '#success or #failure'>
 	^ status
 ]