Merge branch 'alex/groups' into hibernate-refactor/roblex-buffer

Author: lepsalex

CONTRIBUTING.md

@@ -65,6 +65,7 @@ Please note we have a code of conduct, please follow it in all your interactions
 #### General
 1. DB via Test Containers - no in-memory DB or OS specific services
 2. No dependencies on any external services (ie. production micro-service)
+3. Tests **DO NOT** clear their data between runs, meaning that no test should rely on or expect a clean DB when running
 
 ##### Unit Testing
 

pom.xml

@@ -159,7 +159,13 @@
             <version>2.9.5</version>
         </dependency>
 
-        <!-- JSON Testing -->
+        <!-- Testing -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.11.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>net.javacrumbs.json-unit</groupId>
             <artifactId>json-unit-fluent</artifactId>

src/main/java/bio/overture/ego/controller/GroupController.java

@@ -57,9 +57,7 @@
 @RequestMapping("/groups")
 public class GroupController {
 
-  /** Dependencies */
   private final GroupService groupService;
-
   private final ApplicationService applicationService;
   private final UserService userService;
 
@@ -359,6 +357,17 @@ public void deleteAppsFromGroup(
     }
   }
 
+  @AdminScoped
+  @RequestMapping(method = RequestMethod.POST, value = "/{id}/users")
+  @ApiResponses(
+          value = {@ApiResponse(code = 200, message = "Add Users to Group", response = Group.class)})
+  public @ResponseBody Group addUsersToGroups(
+          @RequestHeader(value = HttpHeaders.AUTHORIZATION, required = true) final String accessToken,
+          @PathVariable(value = "id", required = true) String grpId,
+          @RequestBody(required = true) List<String> users) {
+    return groupService.addUsersToGroup(grpId, users);
+  }
+
   @ExceptionHandler({EntityNotFoundException.class})
   public ResponseEntity<Object> handleEntityNotFoundException(
       HttpServletRequest req, EntityNotFoundException ex) {

src/main/java/bio/overture/ego/model/entity/Group.java

@@ -40,6 +40,25 @@
 @EqualsAndHashCode(of = {"id"})
 @ToString(exclude = {"users", "applications", "permissions"})
 @JsonPropertyOrder({"id", "name", "description", "status", "applications", "groupPermissions"})
+@NamedEntityGraph(
+        name = "group-entity-with-relationships",
+        attributeNodes = {
+                @NamedAttributeNode("id"),
+                @NamedAttributeNode("name"),
+                @NamedAttributeNode("description"),
+                @NamedAttributeNode("status"),
+                @NamedAttributeNode(value = "users", subgraph = "users-subgraph"),
+                @NamedAttributeNode(value = "applications", subgraph = "relationship-subgraph"),
+        },
+        subgraphs = {
+                @NamedSubgraph(
+                        name = "relationship-subgraph",
+                        attributeNodes = {
+                                @NamedAttributeNode("id")
+                        }
+                )
+        }
+)
 public class Group implements PolicyOwner, Identifiable<UUID> {
 
   @Id
@@ -67,6 +86,7 @@ public class Group implements PolicyOwner, Identifiable<UUID> {
       joinColumns = {@JoinColumn(name = Fields.GROUPID_JOIN)},
       inverseJoinColumns = {@JoinColumn(name = Fields.APPID_JOIN)})
   @JsonIgnore
+  @Builder.Default
   private Set<Application> applications = new HashSet<>();
 
   @ManyToMany(
@@ -77,14 +97,17 @@ public class Group implements PolicyOwner, Identifiable<UUID> {
       joinColumns = {@JoinColumn(name = Fields.GROUPID_JOIN)},
       inverseJoinColumns = {@JoinColumn(name = Fields.USERID_JOIN)})
   @JsonIgnore
+  @Builder.Default
   private Set<User> users = new HashSet<>();
 
   @JsonIgnore
+  @Builder.Default
   @JoinColumn(name = Fields.OWNER)
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
   private Set<Policy> policies = new HashSet<>();
 
   @JsonIgnore
+  @Builder.Default
   @JoinColumn(name = Fields.GROUPID_JOIN)
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
   private Set<GroupPermission> permissions = new HashSet<>();

src/main/java/bio/overture/ego/model/entity/User.java

@@ -35,17 +35,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -87,6 +77,25 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @JsonView(Views.REST.class)
+@NamedEntityGraph(
+        name = "user-entity-with-relationships",
+        attributeNodes = {
+                @NamedAttributeNode("id"),
+                @NamedAttributeNode("name"),
+                @NamedAttributeNode("email"),
+                @NamedAttributeNode("status"),
+                @NamedAttributeNode(value = "groups", subgraph = "users-subgraph"),
+                @NamedAttributeNode(value = "applications", subgraph = "relationship-subgraph"),
+        },
+        subgraphs = {
+                @NamedSubgraph(
+                        name = "relationship-subgraph",
+                        attributeNodes = {
+                                @NamedAttributeNode("id")
+                        }
+                )
+        }
+)
 public class User implements PolicyOwner, Identifiable<UUID> {
 
   // TODO: find JPA equivalent for GenericGenerator

src/main/java/bio/overture/ego/repository/GroupRepository.java

@@ -17,14 +17,23 @@
 package bio.overture.ego.repository;
 
 import bio.overture.ego.model.entity.Group;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.EntityGraph.EntityGraphType;
 
+import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 
 public interface GroupRepository extends NamedRepository<Group, UUID> {
 
+  @EntityGraph(value = "group-entity-with-relationships", type = EntityGraphType.FETCH)
+  Group findOneByNameIgnoreCase(String name);
+
   Optional<Group> getGroupByNameIgnoreCase(String name);
 
+  Set<Group> findAllByIdIn(List<UUID> groupIds);
+
   @Override
   default Optional<Group> findByName(String name) {
     return getGroupByNameIgnoreCase(name);

src/main/java/bio/overture/ego/repository/UserRepository.java

@@ -17,13 +17,22 @@
 package bio.overture.ego.repository;
 
 import bio.overture.ego.model.entity.User;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
 import java.util.Optional;
 import java.util.UUID;
 
 public interface UserRepository extends NamedRepository<User, UUID> {
 
   Optional<User> getUserByNameIgnoreCase(String name);
 
+  @EntityGraph(value = "user-entity-with-relationships", type = EntityGraph.EntityGraphType.FETCH)
+  User findOneByNameIgnoreCase(String name);
+
   boolean existsUserByNameIgnoreCase(String name);
 
   @Override

src/main/java/bio/overture/ego/repository/queryspecification/GroupSpecification.java

@@ -36,13 +36,15 @@ public static Specification<Group> containsText(@Nonnull String text) {
 
   public static Specification<Group> containsApplication(@Nonnull UUID appId) {
     return (root, query, builder) -> {
+      query.distinct(true);
       Join<Application, Group> groupJoin = root.join("applications");
       return builder.equal(groupJoin.<Integer>get("id"), appId);
     };
   }
 
   public static Specification<Group> containsUser(@Nonnull UUID userId) {
     return (root, query, builder) -> {
+      query.distinct(true);
       Join<User, Group> groupJoin = root.join("users");
       return builder.equal(groupJoin.<Integer>get("id"), userId);
     };

src/main/java/bio/overture/ego/service/ApplicationService.java

@@ -142,7 +142,7 @@ public Optional<Application> findApplicationByClientId(@NonNull String clientId)
     return applicationRepository.getApplicationByClientIdIgnoreCase(clientId);
   }
 
-  public Application getApplicationByClientId(@NonNull String clientId) {
+  public Application getByClientId(@NonNull String clientId) {
     val result = findApplicationByClientId(clientId);
     checkNotFound(
         result.isPresent(),
@@ -167,15 +167,15 @@ public Application findByBasicToken(@NonNull String token) {
     val parts = contents.split(":");
     val clientId = parts[0];
     log.error(format("Extracted client id '%s'", clientId));
-    return getApplicationByClientId(clientId);
+    return getByClientId(clientId);
   }
 
   @Override
   public ClientDetails loadClientByClientId(@NonNull String clientId)
       throws ClientRegistrationException {
     // find client using clientid
 
-    val application = getApplicationByClientId(clientId);
+    val application = getByClientId(clientId);
 
     if (application == null) {
       throw new ClientRegistrationException("Client ID not found.");

src/main/java/bio/overture/ego/service/GroupService.java

@@ -19,10 +19,13 @@
 import bio.overture.ego.model.entity.Group;
 import bio.overture.ego.model.entity.GroupPermission;
 import bio.overture.ego.model.enums.AccessLevel;
+import bio.overture.ego.model.exceptions.NotFoundException;
 import bio.overture.ego.model.exceptions.PostWithIdentifierException;
 import bio.overture.ego.model.params.PolicyIdStringWithAccessLevel;
 import bio.overture.ego.model.search.SearchFilter;
+import bio.overture.ego.repository.ApplicationRepository;
 import bio.overture.ego.repository.GroupRepository;
+import bio.overture.ego.repository.UserRepository;
 import bio.overture.ego.repository.queryspecification.GroupSpecification;
 import com.google.common.collect.ImmutableList;
 import lombok.NonNull;
@@ -44,21 +47,27 @@
 public class GroupService extends AbstractNamedService<Group, UUID> {
 
   private final GroupRepository groupRepository;
+  private final UserRepository userRepository;
+  private final ApplicationRepository applicationRepository;
   private final ApplicationService applicationService;
   private final PolicyService policyService;
   private final GroupPermissionService permissionService;
 
   @Autowired
   public GroupService(
       @NonNull GroupRepository groupRepository,
-      @NonNull ApplicationService applicationService,
+      @NonNull UserRepository userRepository,
+      @NonNull ApplicationRepository applicationRepository,
       @NonNull PolicyService policyService,
+      @NonNull ApplicationService applicationService,
       @NonNull GroupPermissionService permissionService) {
     super(Group.class, groupRepository);
+    this.groupRepository = groupRepository;
+    this.userRepository = userRepository;
+    this.applicationRepository = applicationRepository;
     this.applicationService = applicationService;
     this.policyService = policyService;
     this.permissionService = permissionService;
-    this.groupRepository = groupRepository;
   }
 
   public Group create(@NonNull Group groupInfo) {
@@ -79,6 +88,17 @@ public Group addAppsToGroup(@NonNull String grpId, @NonNull List<String> appIDs)
     return getRepository().save(group);
   }
 
+  public Group addUsersToGroup(@NonNull String grpId, @NonNull List<String> userIds) {
+    val group = getById(fromString(grpId));
+    userIds.forEach(
+            userId -> {
+              val user = userRepository.findById(fromString(userId)).orElseThrow(() -> new NotFoundException(String.format("Could not find User with ID: %s", userId)));
+              group.getUsers().add(user);
+              user.getGroups().add(group);
+            });
+    return groupRepository.save(group);
+  }
+
   public Group addGroupPermissions(
       @NonNull String groupId, @NonNull List<PolicyIdStringWithAccessLevel> permissions) {
     val group = getById(fromString(groupId));
@@ -98,7 +118,19 @@ public Group get(@NonNull String groupId) {
   }
 
   public Group update(@NonNull Group other) {
-    return groupRepository.save(other);
+    val existingGroup = getById(other.getId());
+
+    val updatedGroup =
+        Group.builder()
+            .id(existingGroup.getId())
+            .name(other.getName())
+            .description(other.getDescription())
+            .status(other.getStatus())
+            .applications(existingGroup.getApplications())
+            .users(existingGroup.getUsers())
+        .build();;
+
+    return groupRepository.save(updatedGroup);
   }
 
   // TODO - this was the original update - will use an improved version of this for the PATCH
@@ -191,8 +223,9 @@ public void deleteAppsFromGroup(@NonNull String grpId, @NonNull List<String> app
     // TODO - Properly handle invalid IDs here
     appIDs.forEach(
         appId -> {
-          // TODO if app id not valid (does not exist) we need to throw EntityNotFoundException
-          group.getApplications().remove(applicationService.get(appId));
+          val app = applicationRepository.findById(fromString(appId)).orElseThrow(() -> new NotFoundException(String.format("Could not find Application with ID: %s", appId)));
+          group.getApplications().remove(app);
+          app.getGroups().remove(group);
         });
     groupRepository.save(group);
   }

src/main/java/bio/overture/ego/token/CustomTokenEnhancer.java

@@ -56,7 +56,7 @@ private UserJWTAccessToken getUserAccessToken(String userName) {
   }
 
   private AppJWTAccessToken getApplicationAccessToken(String clientId) {
-    val app = applicationService.getApplicationByClientId(clientId);
+    val app = applicationService.getByClientId(clientId);
     val token = tokenService.generateAppToken(app);
 
     return tokenService.getAppAccessToken(token);