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.

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

Jump to bottom

Feature/519 team management #559

Merged
merged 77 commits into from
Nov 16, 2023
Merged

Feature/519 team management #559

merged 77 commits into from
Nov 16, 2023

Conversation

Vakmeth
Copy link
Collaborator

@Vakmeth Vakmeth commented Nov 7, 2023 •
edited
Loading

Was gemacht wurde:

  • Neuer Dialog für die Erstellung von Teams mit Organisationen implementiert
  • TeamauthorizationService + OrganisationAuthorizationService eingebaut
  • Controller für die Organisations gebaut auf welchem alle Organisationen zurückgegeben werden können, falls der User der GL angehört
  • PostRequest für Teams implementiert welche die generierten Teams im Frontend samt ihrer Organisationen in die DB speichert

@Vakmeth Vakmeth force-pushed the feature/519-team-management branch 4 times, most recently from ed3047c to f8e77f5 Compare November 13, 2023 15:24
peggimann
peggimann requested changes Nov 13, 2023
View reviewed changes
Copy link
Collaborator

@peggimann peggimann left a comment

Choose a reason for hiding this comment

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

  • Use same icon as checkin history
  • Only show active orgs and enable/disable button
  • Make two endpoints for get orgs
  • choose different icon for alert

backend/src/main/java/ch/puzzle/okr/controller/OrganisationController.java Outdated Show resolved Hide resolved
backend/src/main/java/ch/puzzle/okr/repository/OrganisationRepository.java Show resolved Hide resolved
backend/src/main/java/ch/puzzle/okr/service/business/OrganisationBusinessService.java Outdated Show resolved Hide resolved
@Vakmeth Vakmeth force-pushed the feature/519-team-management branch from 54e7630 to b1349e9 Compare November 14, 2023 09:43
@Vakmeth Vakmeth marked this pull request as ready for review November 14, 2023 10:15
Vakmeth added 22 commits November 15, 2023 10:15
@Vakmeth
begin with implementing backend of team management
00f567a
@Vakmeth
format files
3ebc850
@Vakmeth
implement authorization flow of organisation
b556bc9
@Vakmeth
replace organisation business service with organisation authorization…
3d4ad10 
… service
@Vakmeth
implement mapper and dtos in controller
f301fb7
@Vakmeth
format mapper
935ee39
@Vakmeth
write first test to check whether controller return organisations cor…
44d90c6 
…rectly
@Vakmeth
implement dialog which opens on click to header section
d81bd40
@Vakmeth
format newly generated dialog
337edbf
@Vakmeth
fix tests by adding missing import of matdialog module
9557069
@Vakmeth
fix problem of multiple dialogs opening by storing dialogRef
1a50a5f
@Vakmeth
rearrange structure of backend validation of organisations and implem…
f4c8a81 
…ent frontend service to call backend
@Vakmeth
format new models and service
90aa298
@Vakmeth
fix backend call by changing fetchType
ac96a20
@Vakmeth
fix frontend service test by inserting httpclienttesting module
0687508
@Vakmeth
implement hidden view of team management icon if user is not part of …
4502f88 
…leadership
@Vakmeth
style teammanagement to match other dialogs
fc85fbd
@Vakmeth
format components
ffabeab
@Vakmeth
implement submit button in form
28be409
@Vakmeth
implement workflow to create new teams with organisations
98e6339
@Vakmeth
format new authorization service of teams
90585fa
@Vakmeth
fix tests by mocking authorizationservice instead of business service…
b861316 
… and adding organisation list to existing test dtos of team
Vakmeth and others added 20 commits November 15, 2023 10:17
@Vakmeth
implement hidden view of team management icon if user is not part of …
371111d 
…leadership
@kcinay055679 @Vakmeth
add tests for organisation authorization service
4e19fc0
@kcinay055679 @Vakmeth
add test for organisation business service
173a812
@kcinay055679 @Vakmeth
add organisationpersistence service
08914e0
@kcinay055679 @Vakmeth
fix error in shouldRemoveEmptryEntriesOfListTest
50f14a8
@Vakmeth
remove not needed methods
864f293
@Vakmeth
refactor structure
378bf76
@Vakmeth
replace edit button with same as in check-in-history
f8f620e
@Vakmeth
implement two endpoints to get organisations and to get organisations…
d2fb028 
… of team
@Vakmeth
disable button when team has inactive organisations
9c756dc
@Vakmeth
implement error icon when team has inactive organisations in it
d7122db
@Vakmeth
implement conditional display of icons
b46ed1d
@Vakmeth
implement tests for new method in team component
91bbd3d
@Vakmeth
implement missing tests for new backend operations
d435b0f
@Vakmeth
disable call if user has no write all access
ea9ca65
@Vakmeth
add necesary authorization to check inactive teams in test
556e84f
@Vakmeth
implement missing tests and fix error of dublicated organisations in …
9024a31 
…team management
@Vakmeth
use replay subject to emit has admin access
e309e1e
@Vakmeth
make call to admin access only when given
ddbdb1e
@Vakmeth
change order of tests
4ab3628
@Vakmeth Vakmeth force-pushed the feature/519-team-management branch from 560059f to 4ab3628 Compare November 15, 2023 09:19
tuxmatta
tuxmatta previously approved these changes Nov 15, 2023
View reviewed changes
@peggimann peggimann merged commit ad5032f into main Nov 16, 2023
4 checks passed
@Miguel7373 Miguel7373 deleted the feature/519-team-management branch October 31, 2024 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peggimann peggimann peggimann approved these changes

@tuxmatta tuxmatta tuxmatta left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Vakmeth @tuxmatta @peggimann @kcinay055679