Skip to content
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.

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

[GT-145] Fixing, Refreshing and Enriching the Service Group Sample Data #470

Merged
merged 10 commits into from
Sep 14, 2023

Conversation

rowan04
Copy link
Member

@rowan04 rowan04 commented Aug 15, 2023

will resolve #416 when finished

@rowan04 rowan04 changed the title Removing the old service group sample data [GT-145] Fixing, Refreshing and Enriching the Service Group Sample Data Aug 16, 2023
@rowan04 rowan04 force-pushed the 416-refresh-and-enrich-ServiceGroups-from-sampleData branch from 86c2469 to 899b061 Compare August 17, 2023 20:05
@rowan04
Copy link
Member Author

rowan04 commented Aug 17, 2023

rebased to remove extra commit

@rowan04
Copy link
Member Author

rowan04 commented Sep 7, 2023

to note - all service groups are currently incorrectly given only local scope

@rowan04
Copy link
Member Author

rowan04 commented Sep 11, 2023

to note - all service groups are currently incorrectly given only local scope

fixed :)

@rowan04
Copy link
Member Author

rowan04 commented Sep 12, 2023

merge to update this branch with latest dev

@rowan04 rowan04 marked this pull request as ready for review September 12, 2023 10:24
@rowan04 rowan04 requested a review from a team as a code owner September 12, 2023 10:24
@rowan04
Copy link
Member Author

rowan04 commented Sep 12, 2023

Codacy and codeclimate issues to be fixed. Other than that, ready for review

@rowan04 rowan04 force-pushed the 416-refresh-and-enrich-ServiceGroups-from-sampleData branch from bb15afa to a7ba6e0 Compare September 12, 2023 15:45
@rowan04
Copy link
Member Author

rowan04 commented Sep 12, 2023

force push and rebase to merge 3 commits on code formatting fixes into 1 commit.
All codacy and codeclimate issues are now fixed.

Copy link
Member

@gregcorbett gregcorbett left a comment

Choose a reason for hiding this comment

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

Looks good, just one comment.

lib/Doctrine/deploy/AddServiceGroupRoles.php Outdated Show resolved Hide resolved
@gregcorbett gregcorbett self-assigned this Sep 13, 2023
@gregcorbett gregcorbett added this to the May 2023 milestone Sep 13, 2023
@gregcorbett
Copy link
Member

rebasing on top of latest dev

- removing the old, outdated sample data from ServiceGroups.xml and ServiceGroupRoles.xml
…oyed

- reorders when the service groups are deployed in the DeploySampleDataRunner.php file to be after the service endpoints
- adds new code when service groups are created to actually add their services to them
- adding 2 more services to the sample data
- this brings the total to 40, which is a nicer total than 38
- also does some fixes to some incorrect site sample data
- adds 7 service groups, all named SERVICE_GROUP_x
- the groups have 5-8 services in each
- SERVICE_GROUP_1 has 6 services from different sites
- SERVICE_GROUP_2 has 5 services all from the same site
- SERVICE_GROUP 4 and 5 both have all their services from sites in the same NGI
- SERVICE_GROUP_7 has both EGI and Local scope - the rest have one or the other
- each service is used in at least one service group
- some services are used in 2 different service groups. one service is in 3 groups
- creates new file to allow the creation of service group level roles
- adds new file to DeploySampleDataRunner
- each group has a service group administrator
- so 7 users have the service group administrator role
- old file that added service group roles deleted
- as roles added in UsersAndRoles
…scope by default

- before each service group was given just the local scope by default
- this allows egi scopes to be added
- and allows multiple scopes to be added for each service group
- as suggested by codeclimate and codacy
… array item

- the array only ever has one data item in it
- the foreach loop was taking each item from the array, which was just the one item, and setting it to a different variable
- the new code sets the variable to the first and only item in the array instead, without the need for a loop
@gregcorbett gregcorbett force-pushed the 416-refresh-and-enrich-ServiceGroups-from-sampleData branch from 9ec9488 to 9dea011 Compare September 14, 2023 09:47
@gregcorbett gregcorbett merged commit 6fa75c6 into dev Sep 14, 2023
11 of 21 checks passed
@rowan04 rowan04 deleted the 416-refresh-and-enrich-ServiceGroups-from-sampleData branch September 14, 2023 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refresh and enrich ServiceGroups from sample data
2 participants