The Fix

broadinstitute · Dec 9, 2019 · eb62c41 · eb62c41
1 parent ab8812c
commit eb62c41
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/db/dao/PostgresGroupDAO.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/db/dao/PostgresGroupDAO.scala
@@ -104,18 +104,18 @@ trait PostgresGroupDAO {
     val sg = subGroupMemberTable.syntax("sg")
     val gm = GroupMemberTable.syntax(groupMemberTableAlias)
     val sgColumns = subGroupMemberTable.column
-    samsqls"""${subGroupMemberTable.table}(${sgColumns.parentGroupId}, ${sgColumns.memberGroupId}, ${sgColumns.memberUserId}) AS (
+    samsqls"""${subGroupMemberTable.table}(${sgColumns.memberGroupId}, ${sgColumns.memberUserId}) AS (
           ${directMembersQuery(groupId, groupMemberTableAlias)}
           UNION
-          SELECT ${gm.groupId}, ${gm.memberGroupId}, ${gm.memberUserId}
+          SELECT ${gm.memberGroupId}, ${gm.memberUserId}
           FROM ${subGroupMemberTable as sg}, ${GroupMemberTable as gm}
           WHERE ${gm.groupId} = ${sg.memberGroupId}
         )"""
   }
 
   private def directMembersQuery(groupId: WorkbenchGroupIdentity, groupMemberTableAlias: String = "gm"): SQLSyntax = {
     val gm = GroupMemberTable.syntax(groupMemberTableAlias)
-    samsqls"""select ${gm.groupId}, ${gm.memberGroupId}, ${gm.memberUserId}
+    samsqls"""select ${gm.memberGroupId}, ${gm.memberUserId}
                from ${GroupMemberTable as gm}
                where ${gm.groupId} = (${workbenchGroupIdentityToGroupPK(groupId)})"""
   }

diff --git a/...test/scala/org/broadinstitute/dsde/workbench/sam/directory/PostgresDirectoryDAOSpec.scala b/...test/scala/org/broadinstitute/dsde/workbench/sam/directory/PostgresDirectoryDAOSpec.scala
@@ -6,7 +6,7 @@ import akka.http.scaladsl.model.StatusCodes
 import cats.effect.IO
 import org.broadinstitute.dsde.workbench.model._
 import org.broadinstitute.dsde.workbench.model.google.{GoogleProject, ServiceAccount, ServiceAccountDisplayName, ServiceAccountSubjectId}
-import org.broadinstitute.dsde.workbench.sam.{Generator, TestSupport}
+import org.broadinstitute.dsde.workbench.sam.TestSupport
 import org.broadinstitute.dsde.workbench.sam.model._
 import org.broadinstitute.dsde.workbench.sam.openam.PostgresAccessPolicyDAO
 import org.postgresql.util.PSQLException
@@ -747,22 +747,23 @@ class PostgresDirectoryDAOSpec extends FreeSpec with Matchers with BeforeAndAfte
       }
 
       "intersect lots of groups with lots of dups and overlaps" in {
-        val groupCount = 20
-        val userCount = 70
+        val groupCount = 80
+        val userCount = 100
 
-        val allUsers = for (_ <- 1 to userCount) yield {
-          dao.createUser(Generator.genWorkbenchUser.sample.get).unsafeRunSync()
+        val allUsers = for (i <- 1 to userCount) yield {
+          dao.createUser(WorkbenchUser(WorkbenchUserId(s"user$i"), None, WorkbenchEmail(s"user$i"))).unsafeRunSync()
         }
 
         val allUserIds: Set[WorkbenchSubject] = allUsers.map(_.id).toSet
-        val allUsersGroup = Generator.genBasicWorkbenchGroup.sample.get.copy(members = allUserIds)
-        dao.createGroup(allUsersGroup).unsafeRunSync()
-        val allUsersGroup2 = Generator.genBasicWorkbenchGroup.sample.get.copy(members = allUserIds)
-        dao.createGroup(allUsersGroup2).unsafeRunSync()
+
+        val allSubGroups = for (i <- 1 to groupCount) yield {
+          val group = BasicWorkbenchGroup(WorkbenchGroupName(s"subgroup$i"), allUserIds, WorkbenchEmail(s"subgroup$i"))
+          dao.createGroup(group).unsafeRunSync()
+        }
 
         val allGroups = for (i <- 1 to groupCount) yield {
           // create a group with 1 user and 1 subgroup, subgroup with "allgroups" users and another user
-          val group = BasicWorkbenchGroup(WorkbenchGroupName(s"group$i"), Set(allUsersGroup.id, allUsersGroup2.id), WorkbenchEmail(s"group$i"))
+          val group = BasicWorkbenchGroup(WorkbenchGroupName(s"group$i"), allSubGroups.map(_.id).toSet, WorkbenchEmail(s"group$i"))
           dao.createGroup(group).unsafeRunSync()
         }