Add test cases and modify test conf.

broadinstitute · Oct 16, 2023 · 8ed5caa · 8ed5caa
1 parent 7273a5a
commit 8ed5caa
Show file tree

Hide file tree

Showing 8 changed files with 171 additions and 27 deletions.
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/dataAccess/DirectoryDAO.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/dataAccess/DirectoryDAO.scala
@@ -75,9 +75,8 @@ trait DirectoryDAO {
 
   def acceptTermsOfService(userId: WorkbenchUserId, tosVersion: String, samRequestContext: SamRequestContext): IO[Boolean]
   def rejectTermsOfService(userId: WorkbenchUserId, tosVersion: String, samRequestContext: SamRequestContext): IO[Boolean]
-  def getLatestUserTos(userId: WorkbenchUserId, samRequestContext: SamRequestContext): IO[Option[SamUserTos]]
+  def getUserTos(userId: WorkbenchUserId, samRequestContext: SamRequestContext): IO[Option[SamUserTos]]
   def getUserTos(userId: WorkbenchUserId, tosVersion: String, samRequestContext: SamRequestContext): IO[Option[SamUserTos]]
-
   def createPetManagedIdentity(petManagedIdentity: PetManagedIdentity, samRequestContext: SamRequestContext): IO[PetManagedIdentity]
   def loadPetManagedIdentity(petManagedIdentityId: PetManagedIdentityId, samRequestContext: SamRequestContext): IO[Option[PetManagedIdentity]]
   def getUserFromPetManagedIdentity(petManagedIdentityObjectId: ManagedIdentityObjectId, samRequestContext: SamRequestContext): IO[Option[SamUser]]

diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/dataAccess/PostgresDirectoryDAO.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/dataAccess/PostgresDirectoryDAO.scala
@@ -647,7 +647,7 @@ class PostgresDirectoryDAO(protected val writeDbRef: DbReference, protected val
     }
   }
 
-  override def getLatestUserTos(userId: WorkbenchUserId, samRequestContext: SamRequestContext): IO[Option[SamUserTos]] =
+  override def getUserTos(userId: WorkbenchUserId, samRequestContext: SamRequestContext): IO[Option[SamUserTos]] =
     readOnlyTransaction("getLatestUserTos", samRequestContext) { implicit session =>
       val tosTable = TosTable.syntax
       val column = TosTable.column

diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/service/TosService.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/service/TosService.scala
@@ -47,12 +47,12 @@ class TosService(val directoryDao: DirectoryDAO, val tosConfig: TermsOfServiceCo
 
   @Deprecated
   def getTosDetails(samUser: SamUser, samRequestContext: SamRequestContext): IO[TermsOfServiceDetails] =
-    directoryDao.getLatestUserTos(samUser.id, samRequestContext).map { tos =>
+    directoryDao.getUserTos(samUser.id, samRequestContext).map { tos =>
       TermsOfServiceDetails(isEnabled = true, tosConfig.isGracePeriodEnabled, tosConfig.version, tos.map(_.version))
     }
 
   def getTosComplianceStatus(samUser: SamUser, samRequestContext: SamRequestContext): IO[TermsOfServiceComplianceStatus] = for {
-    latestUserTos <-  directoryDao.getLatestUserTos(samUser.id, samRequestContext)
+    latestUserTos <-  directoryDao.getUserTos(samUser.id, samRequestContext)
     previousUserTos <-  directoryDao.getUserTos(samUser.id, tosConfig.rollingAcceptanceWindowPreviousTosVersion, samRequestContext)
     userHasAcceptedLatestVersion = userHasAcceptedLatestTosVersion(latestUserTos)
     permitsSystemUsage = tosAcceptancePermitsSystemUsage(samUser, latestUserTos, previousUserTos)

diff --git a/src/test/resources/reference.conf b/src/test/resources/reference.conf
@@ -62,6 +62,8 @@ termsOfService {
   enabled = false
   version = 1
   url = "app.terra.bio/#terms-of-service"
+  rollingAcceptanceWindowExpirationDatetime = "2019-01-01T00:00:00Z"
+  rollingAcceptanceWindowPreviousTosVersion = 0
 }
 
 petServiceAccount {

diff --git a/src/test/scala/org/broadinstitute/dsde/workbench/sam/api/TestSamRoutes.scala b/src/test/scala/org/broadinstitute/dsde/workbench/sam/api/TestSamRoutes.scala
@@ -24,6 +24,7 @@ import org.broadinstitute.dsde.workbench.sam.util.SamRequestContext
 import org.broadinstitute.dsde.workbench.sam.{Generator, TestSupport}
 import org.scalatest.concurrent.ScalaFutures
 
+import java.time.Instant
 import scala.concurrent.ExecutionContext
 
 /** Created by dvoet on 7/14/17.
@@ -49,7 +50,7 @@ class TestSamRoutes(
       userService,
       statusService,
       managedGroupService,
-      TermsOfServiceConfig(true, false, "0", "app.terra.bio/#terms-of-service"),
+      TermsOfServiceConfig(true, false, "0", "app.terra.bio/#terms-of-service", Instant.now(), "0"),
       policyEvaluatorService,
       tosService,
       LiquibaseConfig("", false),
@@ -91,7 +92,7 @@ class TestSamTosEnabledRoutes(
       userService,
       statusService,
       managedGroupService,
-      TermsOfServiceConfig(true, false, "0", "app.terra.bio/#terms-of-service"),
+      TermsOfServiceConfig(true, false, "0", "app.terra.bio/#terms-of-service", Instant.now(), "0"),
       policyEvaluatorService,
       tosService,
       LiquibaseConfig("", false),

diff --git a/src/test/scala/org/broadinstitute/dsde/workbench/sam/dataAccess/MockDirectoryDAO.scala b/src/test/scala/org/broadinstitute/dsde/workbench/sam/dataAccess/MockDirectoryDAO.scala
@@ -340,7 +340,14 @@ class MockDirectoryDAO(val groups: mutable.Map[WorkbenchGroupIdentity, Workbench
         true
     }
 
-  override def getLatestUserTos(userId: WorkbenchUserId, samRequestContext: SamRequestContext): IO[Option[SamUserTos]] =
+  override def getUserTos(userId: WorkbenchUserId, samRequestContext: SamRequestContext): IO[Option[SamUserTos]] =
+    loadUser(userId, samRequestContext).map {
+      case None => None
+      case Some(_) =>
+        userTos.get(userId)
+    }
+
+  override def getUserTos(userId: WorkbenchUserId, tosVersion: String, samRequestContext: SamRequestContext): IO[Option[SamUserTos]] =
     loadUser(userId, samRequestContext).map {
       case None => None
       case Some(_) =>

diff --git a/...est/scala/org/broadinstitute/dsde/workbench/sam/dataAccess/PostgresDirectoryDAOSpec.scala b/...est/scala/org/broadinstitute/dsde/workbench/sam/dataAccess/PostgresDirectoryDAOSpec.scala
@@ -1486,7 +1486,7 @@ class PostgresDirectoryDAOSpec extends RetryableAnyFreeSpec with Matchers with B
         dao.acceptTermsOfService(defaultUser.id, tosConfig.version, samRequestContext).unsafeRunSync() shouldBe true
 
         // Assert
-        val userTos = dao.getLatestUserTos(defaultUser.id, samRequestContext).unsafeRunSync()
+        val userTos = dao.getUserTos(defaultUser.id, samRequestContext).unsafeRunSync()
         userTos should not be empty
         userTos.get.createdAt should beAround(Instant.now())
         userTos.get.action shouldBe TosTable.ACCEPT
@@ -1501,7 +1501,7 @@ class PostgresDirectoryDAOSpec extends RetryableAnyFreeSpec with Matchers with B
         dao.acceptTermsOfService(defaultUser.id, "2", samRequestContext).unsafeRunSync() shouldBe true
 
         // Assert
-        val userTos = dao.getLatestUserTos(defaultUser.id, samRequestContext).unsafeRunSync()
+        val userTos = dao.getUserTos(defaultUser.id, samRequestContext).unsafeRunSync()
         userTos should not be empty
         userTos.get.createdAt should beAround(Instant.now())
         userTos.get.action shouldBe TosTable.ACCEPT
@@ -1516,7 +1516,7 @@ class PostgresDirectoryDAOSpec extends RetryableAnyFreeSpec with Matchers with B
         dao.rejectTermsOfService(user.id, tosConfig.version, samRequestContext).unsafeRunSync() shouldBe true
 
         // Assert
-        val userTos = dao.getLatestUserTos(user.id, samRequestContext).unsafeRunSync()
+        val userTos = dao.getUserTos(user.id, samRequestContext).unsafeRunSync()
         userTos should not be empty
         userTos.get.createdAt should beAround(Instant.now())
         userTos.get.action shouldBe TosTable.REJECT
@@ -1530,7 +1530,7 @@ class PostgresDirectoryDAOSpec extends RetryableAnyFreeSpec with Matchers with B
         dao.rejectTermsOfService(user.id, tosConfig.version, samRequestContext).unsafeRunSync() shouldBe true
 
         // Assert
-        val userTos = dao.getLatestUserTos(user.id, samRequestContext).unsafeRunSync()
+        val userTos = dao.getUserTos(user.id, samRequestContext).unsafeRunSync()
         userTos should not be empty
         userTos.get.createdAt should beAround(Instant.now())
         userTos.get.action shouldBe TosTable.REJECT
@@ -1544,7 +1544,7 @@ class PostgresDirectoryDAOSpec extends RetryableAnyFreeSpec with Matchers with B
         dao.createUser(user, samRequestContext).unsafeRunSync()
 
         // Assert
-        val userTos = dao.getLatestUserTos(user.id, samRequestContext).unsafeRunSync()
+        val userTos = dao.getUserTos(user.id, samRequestContext).unsafeRunSync()
         userTos should be(None)
       }
     }