add user profile #29

dbraquart · 2024-03-21T08:22:07Z

No description provided.

Signed-off-by: David BRAQUART <[email protected]>

…ofile # Conflicts: # src/main/java/org/gridsuite/useradmin/server/UserAdminController.java # src/main/java/org/gridsuite/useradmin/server/service/UserAdminService.java # src/main/resources/application-local.yml # src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java

Signed-off-by: David BRAQUART <[email protected]>

src/main/java/org/gridsuite/useradmin/server/service/UserAdminService.java

etiennehomer · 2024-04-02T12:24:21Z

src/main/java/org/gridsuite/useradmin/server/entity/UserInfosEntity.java

+        return new UserInfos(entity.getSub(), isAdminFn.test(entity.getSub()), profileName);
+    }
+
+    public void update(UserInfos userInfos, Optional<UserProfileEntity> userProfileEntity) {


It's weird to give a dto and an entity as arguments to this method.
Maybe do the setSub() and setProfile directly in the service

etiennehomer · 2024-04-02T12:34:42Z

src/main/java/org/gridsuite/useradmin/server/entity/UserProfileEntity.java

+        if (entity == null) {
+            return null;
+        }
+        Boolean globalValidity = null;


this part should be out of the toDto() method. Just pass a boolean

etiennehomer · 2024-04-02T12:54:39Z

src/main/java/org/gridsuite/useradmin/server/service/UserAdminService.java

        assertIsAdmin(userId);
        return userAdminRepository.deleteAllBySubIn(subs);
    }

+    @Transactional()
+    public void updateUser(String sub, String userId, UserInfos userInfos) {


You already have the "sub" in the userInfos

Actually they are different. "sub" is the resource I want to access/change, while "userInfos.sub" is the new name I may want to set.

Should really a user sub be updatable ?

etiennehomer · 2024-04-02T13:01:11Z

src/main/java/org/gridsuite/useradmin/server/service/UserAdminService.java

+    }
+
+    @Transactional()
+    public void updateProfile(UUID profileUuid, String userId, UserProfile userProfile) {


You already have the "profileUuid" in the userProfile

If I remove it, I will have a warning in Controller (unused param). what to do ?

It's fine like this as we keep the profileUuid in the endpoint

etiennehomer · 2024-04-02T13:02:18Z

src/main/java/org/gridsuite/useradmin/server/UserAdminController.java

+    public ResponseEntity<UserProfile> updateUser(@PathVariable("sub") String sub,
+                                               @RequestHeader("userId") String userId,
+                                               @RequestBody UserInfos userInfos) {
+        service.updateUser(sub, userId, userInfos);


You can remove "sub" and work with userInfos nope ?

no I need both

Yes as discussed, it's the classic way to update a resource with rest api

etiennehomer · 2024-04-02T13:56:48Z

src/main/java/org/gridsuite/useradmin/server/dto/UserProfile.java

+    UUID id,
+    String name,
+    UUID loadFlowParameterId,
+    Boolean validity


renamed as allParametersLinksValid

Signed-off-by: David BRAQUART <[email protected]>

src/main/java/org/gridsuite/useradmin/server/RestTemplateConfig.java

src/main/java/org/gridsuite/useradmin/server/RestResponseEntityExceptionHandler.java

src/main/java/org/gridsuite/useradmin/server/UserAdminController.java

src/main/java/org/gridsuite/useradmin/server/entity/UserProfileEntity.java

src/main/java/org/gridsuite/useradmin/server/entity/UserInfosEntity.java

src/main/java/org/gridsuite/useradmin/server/service/DirectoryService.java

TheMaskedTurtle · 2024-04-04T11:28:27Z

src/main/java/org/gridsuite/useradmin/server/service/UserAdminService.java

        assertIsAdmin(userId);
        return userAdminRepository.deleteAllBySubIn(subs);
    }

+    @Transactional()
+    public void updateUser(String sub, String userId, UserInfos userInfos) {


Should really a user sub be updatable ?

src/main/java/org/gridsuite/useradmin/server/service/UserAdminService.java

Signed-off-by: David BRAQUART <[email protected]>

src/main/java/org/gridsuite/useradmin/server/controller/UserProfileController.java

src/main/java/org/gridsuite/useradmin/server/entity/UserProfileEntity.java

src/main/java/org/gridsuite/useradmin/server/service/DirectoryService.java

src/main/java/org/gridsuite/useradmin/server/service/UserProfileService.java

src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java

src/test/java/org/gridsuite/useradmin/server/UserProfileTest.java

Signed-off-by: David BRAQUART <[email protected]>

TheMaskedTurtle · 2024-04-16T14:02:40Z

src/main/java/org/gridsuite/useradmin/server/service/UserAdminService.java

+        UserInfosEntity user = userInfosRepository.findBySub(sub).orElseThrow(() -> new UserAdminException(NOT_FOUND));
+        Optional<UserProfileEntity> profile = userProfileRepository.findByName(userInfos.profileName());
+        user.setSub(userInfos.sub());
+        user.setProfile(profile.orElse(null));


Shouldn't we return a bad_input if the profile is not define ?

we have a common habit to return 404 if we try to update a missing resource.

No I agree if the user is missing, but if the profile is missing ? Here if the profile does not exist we just set it to null but we don't throw.

src/main/java/org/gridsuite/useradmin/server/service/DirectoryService.java

src/main/java/org/gridsuite/useradmin/server/entity/UserInfosEntity.java

src/main/java/org/gridsuite/useradmin/server/service/DirectoryService.java

Signed-off-by: David BRAQUART <[email protected]>

sonarqubecloud · 2024-04-17T10:10:08Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
91.1% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

dbraquart added 2 commits March 20, 2024 14:37

refacto: create a separate entity package

215a26a

Signed-off-by: David BRAQUART <[email protected]>

draft get /profiles

e0f85d9

Signed-off-by: David BRAQUART <[email protected]>

dbraquart force-pushed the dbraquart/add-user-profile branch from bd5e9d4 to e0f85d9 Compare March 21, 2024 11:14

dbraquart added 8 commits March 24, 2024 17:33

add/remove profile ok, update with fullName

dbf2a77

Signed-off-by: David BRAQUART <[email protected]>

set/reset profile to user

a071afc

Signed-off-by: David BRAQUART <[email protected]>

add profile validity status

4a2acce

Signed-off-by: David BRAQUART <[email protected]>

fix: a profile can be used by N users

d76d2e9

Signed-off-by: David BRAQUART <[email protected]>

fix after merge with conflicts

ff173b3

Signed-off-by: David BRAQUART <[email protected]>

clean code (no fullName)

07a5031

Signed-off-by: David BRAQUART <[email protected]>

add UserAdminException(NOT_FOUND)

f9078b8

Signed-off-by: David BRAQUART <[email protected]>

dbraquart force-pushed the dbraquart/add-user-profile branch from c636359 to a3ad1ec Compare March 28, 2024 07:59

add 1 test

87fbf39

Signed-off-by: David BRAQUART <[email protected]>

dbraquart force-pushed the dbraquart/add-user-profile branch from a3ad1ec to 87fbf39 Compare March 28, 2024 08:09

dbraquart changed the title ~~WIP add user profile~~ add user profile Mar 28, 2024

add UserProfile test class

154339c

Signed-off-by: David BRAQUART <[email protected]>

dbraquart force-pushed the dbraquart/add-user-profile branch from 62e2037 to 154339c Compare March 28, 2024 13:51

dbraquart requested a review from etiennehomer March 28, 2024 14:05

add more coverage

cee73e0

Signed-off-by: David BRAQUART <[email protected]>

dbraquart force-pushed the dbraquart/add-user-profile branch from ca38798 to cee73e0 Compare March 28, 2024 19:16

etiennehomer requested changes Apr 2, 2024

View reviewed changes

etiennehomer reviewed Apr 2, 2024

View reviewed changes

dbraquart added 4 commits April 2, 2024 17:53

rev remarks: put back Collection

ea3cc7e

Signed-off-by: David BRAQUART <[email protected]>

rev remarks: remove update

6032c71

Signed-off-by: David BRAQUART <[email protected]>

rev remark: rename validity into allParametersLinksValid

98553aa

Signed-off-by: David BRAQUART <[email protected]>

revert/fix a test

360656a

Signed-off-by: David BRAQUART <[email protected]>

dbraquart requested a review from etiennehomer April 3, 2024 13:48

add unrestricted endpoint to get a user profile (for study-server)

e1027c0

Signed-off-by: David BRAQUART <[email protected]>

TheMaskedTurtle requested changes Apr 4, 2024

View reviewed changes

rev remarks: change post/put on /profiles

b98c931

Signed-off-by: David BRAQUART <[email protected]>

dbraquart added 3 commits April 8, 2024 14:27

rev remarks: remove /users/{sub}/profile

2e0e4af

Signed-off-by: David BRAQUART <[email protected]>

update tests

2775fc8

Signed-off-by: David BRAQUART <[email protected]>

new name UserInfosRepository

9d78755

Signed-off-by: David BRAQUART <[email protected]>

dbraquart requested a review from TheMaskedTurtle April 9, 2024 12:02

rev remarks: use dedicated controller/service

e929c31

Signed-off-by: David BRAQUART <[email protected]>

TheMaskedTurtle requested changes Apr 11, 2024

View reviewed changes

rev remarks: separate entity from dto

472d2bd

Signed-off-by: David BRAQUART <[email protected]>

dbraquart force-pushed the dbraquart/add-user-profile branch from 50f6375 to 472d2bd Compare April 15, 2024 07:22

rev remarks: split test functions

2f52509

Signed-off-by: David BRAQUART <[email protected]>

dbraquart requested a review from TheMaskedTurtle April 15, 2024 12:52

rev remarks: MediaType

ddb4284

Signed-off-by: David BRAQUART <[email protected]>

TheMaskedTurtle reviewed Apr 16, 2024

View reviewed changes

dbraquart added 4 commits April 16, 2024 18:35

rev remarks: use google.common.collect.Sets

7989b75

Signed-off-by: David BRAQUART <[email protected]>

rev remarks: use queryParam

9129358

Signed-off-by: David BRAQUART <[email protected]>

add checkLinksValidity param to GET /profiles

40ec3f4

Signed-off-by: David BRAQUART <[email protected]>

rev remarks: use 422 error in case of integrity violation

8ee16e9

Signed-off-by: David BRAQUART <[email protected]>

dbraquart requested a review from TheMaskedTurtle April 17, 2024 12:39

TheMaskedTurtle approved these changes Apr 17, 2024

View reviewed changes

etiennehomer approved these changes Apr 18, 2024

View reviewed changes

dbraquart merged commit d58a3fa into main Apr 18, 2024
3 checks passed

dbraquart deleted the dbraquart/add-user-profile branch April 18, 2024 09:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add user profile #29

add user profile #29

dbraquart commented Mar 21, 2024

etiennehomer Apr 2, 2024

dbraquart Apr 2, 2024

etiennehomer Apr 2, 2024

dbraquart Apr 2, 2024

etiennehomer Apr 2, 2024

dbraquart Apr 2, 2024 •

edited

Loading

TheMaskedTurtle Apr 4, 2024

etiennehomer Apr 2, 2024

dbraquart Apr 2, 2024

etiennehomer Apr 3, 2024

etiennehomer Apr 2, 2024

dbraquart Apr 2, 2024

etiennehomer Apr 2, 2024

etiennehomer Apr 2, 2024 •

edited

Loading

dbraquart Apr 2, 2024

TheMaskedTurtle Apr 4, 2024

TheMaskedTurtle Apr 16, 2024

dbraquart Apr 16, 2024

TheMaskedTurtle Apr 17, 2024

sonarqubecloud bot commented Apr 17, 2024

add user profile #29

add user profile #29

Conversation

dbraquart commented Mar 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dbraquart Apr 2, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

etiennehomer Apr 2, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Apr 17, 2024

Quality Gate passed

dbraquart Apr 2, 2024 •

edited

Loading

etiennehomer Apr 2, 2024 •

edited

Loading