Skip to content

fix(GithubModelImporter): Store both group name and display name #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Gabriel-Darbord wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

fix(GithubModelImporter): Store both group name and display name #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3be11a1
Fix #248: `name` stores `login` and new `display_name` stores `name`
Gabriel-Darbord Mar 27, 2026
26f1047
Gitlab Group: `name` stores `path` and `display_name` stores `name`
Gabriel-Darbord Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/GitHubHealth-Model-Importer/GithubModelImporter.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,11 @@ GithubModelImporter >> configureReaderForDiff: reader [
GithubModelImporter >> configureReaderForGroup: reader [

super configureReaderForGroup: reader.

reader
for: GLHGroup
do: [ :mapping | mapping mapInstVar: #web_url to: #html_url ]

reader for: GLHGroup do: [ :mapping |
mapping mapInstVar: #web_url to: #html_url.
mapping mapInstVar: #name to: #login.
mapping mapInstVar: #display_name to: #name ]
]

{ #category : #'private - configure reader' }
Expand Down Expand Up @@ -853,7 +854,7 @@ GithubModelImporter >> importPullRequestsOfProject: aProject [
GithubModelImporter >> importRepositoriesOfGroup: groupResult [
"Github Repository = GLHProject"

| reposResult itemsPerPage pageNumber reposFound repos |
| itemsPerPage pageNumber reposFound repos |
itemsPerPage := 100.
pageNumber := 1.
('Extract all repositories of ' , groupResult name) recordInfo.
Expand All @@ -868,16 +869,14 @@ GithubModelImporter >> importRepositoriesOfGroup: groupResult [
reposFound addAll: repos.
[ repos size = itemsPerPage ] whileTrue: [
pageNumber := pageNumber + 1.
('Extract issues from ' , reposFound size printString , ' to '
('Extract commits from ' , reposFound size printString , ' to '
, (reposFound size + itemsPerPage) printString) recordInfo.
repos := self parseArrayOfProject: (self repoApi organizations
getRepositoriesOfOrganization: groupResult name
perPage: itemsPerPage
page: pageNumber).
reposFound addAll: repos ].

reposResult := self repoApi organizations
getRepositoriesOfOrganization: groupResult name.
Comment on lines -879 to -880
Copy link
Copy Markdown
Member Author

@Gabriel-Darbord Gabriel-Darbord Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like dead code?

groupResult projects addAll: reposFound.
self glhModel addAll: groupResult projects.
groupResult projects do: [ :project |
Expand Down
3 changes: 2 additions & 1 deletion src/GitLabHealth-Model-Generator/GLHMetamodelGenerator.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,8 @@ GLHMetamodelGenerator >> groupProperties [
group property: #web_url type: #String.
group property: #description type: #String.
group property: #visibility type: #String.
group property: #avatar_url type: #String
group property: #avatar_url type: #String.
group property: #display_name type: #String
]

{ #category : #issues }
Expand Down
4 changes: 3 additions & 1 deletion src/GitLabHealth-Model-Importer/GitlabModelImporter.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,9 @@ GitlabModelImporter >> configureReaderForGroup: reader [
super configureReaderForGroup: reader.

reader for: GLHGroup do: [ :mapping |
(mapping mapInstVar: #projects) valueSchema: #ArrayOfProject ]
(mapping mapInstVar: #projects) valueSchema: #ArrayOfProject.
mapping mapInstVar: #name to: #path.
mapping mapInstVar: #display_name to: #name ]
]

{ #category : #'private - configure reader' }
Expand Down
26 changes: 21 additions & 5 deletions src/GitLabHealth-Model/GLHGroup.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ A GitLab Group
|---|
| `avatar_url` | `String` | nil | |
| `description` | `String` | nil | |
| `display_name` | `String` | nil | |
| `id` | `Number` | nil | |
| `name` | `String` | nil | Basic name of the entity, not full reference.|
| `visibility` | `String` | nil | |
Expand All @@ -35,14 +36,15 @@ Class {
#traits : 'FamixTNamedEntity',
#classTraits : 'FamixTNamedEntity classTrait',
#instVars : [
'#id => FMProperty',
'#web_url => FMProperty',
'#description => FMProperty',
'#visibility => FMProperty',
'#avatar_url => FMProperty',
'#description => FMProperty',
'#display_name => FMProperty',
'#group => FMOne type: #GLHGroup opposite: #subGroups',
'#id => FMProperty',
'#projects => FMMany type: #GLHProject opposite: #group',
'#subGroups => FMMany type: #GLHGroup opposite: #group',
'#group => FMOne type: #GLHGroup opposite: #subGroups'
'#visibility => FMProperty',
'#web_url => FMProperty'
],
#category : #'GitLabHealth-Model-Entities'
}
Expand Down Expand Up @@ -103,6 +105,20 @@ GLHGroup >> description: anObject [
description := anObject
]

{ #category : #accessing }
GLHGroup >> display_name [

<FMProperty: #display_name type: #String>
<generated>
^ display_name
]

{ #category : #accessing }
GLHGroup >> display_name: anObject [
<generated>
display_name := anObject
]

{ #category : #accessing }
GLHGroup >> group [
"Relation named: #group type: #GLHGroup opposite: #subGroups"
Expand Down
Loading