some small changes

broadinstitute · Jul 16, 2019 · 8706b0e · 8706b0e
1 parent 0924af0
commit 8706b0e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/...in/scala/org/broadinstitute/dsde/workbench/sam/db/tables/ResourceActionPatternTable.scala b/...in/scala/org/broadinstitute/dsde/workbench/sam/db/tables/ResourceActionPatternTable.scala
@@ -20,7 +20,3 @@ object ResourceActionPatternTable extends SQLSyntaxSupport[ResourceActionPattern
     rs.get(e.actionPattern)
   )
 }
-
-object ResourceActionPatternTableBinders {
-
-}
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/directory/PostgresDirectoryDAO.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/directory/PostgresDirectoryDAO.scala
@@ -117,7 +117,7 @@ class PostgresDirectoryDAO(protected val dbRef: DbReference,
             .leftJoin(GroupTable as subGroupTable)
             .on(groupMemberTable.memberGroupId, subGroupTable.id)
             .where
-            .eq(groupTable.name, WorkbenchGroupName(groupName.value))
+            .eq(groupTable.name, groupName)
         }.map(rs => (WorkbenchEmail(rs.string(1)), Option(rs.string(2)).map(WorkbenchUserId), Option(rs.string(3)).map(WorkbenchGroupName)))
           .list().apply()
       }

diff --git a/...test/scala/org/broadinstitute/dsde/workbench/sam/directory/PostgresDirectoryDAOSpec.scala b/...test/scala/org/broadinstitute/dsde/workbench/sam/directory/PostgresDirectoryDAOSpec.scala
@@ -50,7 +50,7 @@ class PostgresDirectoryDAOSpec extends FlatSpec with Matchers with BeforeAndAfte
 
   it should "load a group" in {
     dao.createGroup(defaultGroup).unsafeRunSync()
-    val loadedGroup = dao.loadGroup(defaultGroupName).unsafeRunSync().getOrElse(fail(s"Failed to load group $defaultGroupName"))
+    val loadedGroup = dao.loadGroup(defaultGroup.id).unsafeRunSync().getOrElse(fail(s"Failed to load group $defaultGroupName"))
     loadedGroup shouldEqual defaultGroup
   }