relent and make the field optional for now

broadinstitute · Sep 11, 2023 · b197c5e · b197c5e
1 parent 62a8b6c
commit b197c5e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/src/main/scala/org/broadinstitute/dsde/firecloud/model/Profile.scala b/src/main/scala/org/broadinstitute/dsde/firecloud/model/Profile.scala
@@ -30,7 +30,7 @@ case class BasicProfile (
     programLocationCountry: String,
     termsOfService: Option[String],
     researchArea: Option[String],
-    department: String = "N/A",
+    department: Option[String],
     interestInTerra: Option[String],
   ) extends mappedPropVals {
   require(ProfileValidator.nonEmpty(firstName), "first name must be non-empty")
@@ -56,7 +56,7 @@ case class Profile (
     researchArea: Option[String],
     linkedNihUsername: Option[String] = None,
     linkExpireTime: Option[Long] = None,
-    department: String = "N/A",
+    department: Option[String],
     interestInTerra: Option[String],
   ) extends mappedPropVals {
   require(ProfileValidator.nonEmpty(firstName), "first name must be non-empty")
@@ -67,7 +67,6 @@ case class Profile (
   require(ProfileValidator.nonEmpty(programLocationCity), "program location city must be non-empty")
   require(ProfileValidator.nonEmpty(programLocationState), "program location state must be non-empty")
   require(ProfileValidator.nonEmpty(programLocationCountry), "program location country must be non-empty")
-  require(ProfileValidator.nonEmpty(department), "department must be non-empty")
 }
 
 object Profile {
@@ -102,7 +101,7 @@ object Profile {
         case Some(time) => Some(time.toLong)
         case _ => None
       },
-      department = mappedKVPs("department"),
+      department = mappedKVPs.get("department"),
       interestInTerra = mappedKVPs.get("interestInTerra")
     )
   }

diff --git a/src/test/scala/org/broadinstitute/dsde/firecloud/model/ProfileSpec.scala b/src/test/scala/org/broadinstitute/dsde/firecloud/model/ProfileSpec.scala
@@ -24,7 +24,7 @@ class ProfileSpec extends AnyFreeSpec with Matchers {
           programLocationState = randomString,
           programLocationCountry = randomString,
           termsOfService = Some(termsOfServiceUrl),
-          department = randomString,
+          department = Some(randomString),
           interestInTerra = Some(randomString)
         )
         basicProfile shouldNot be(null)
@@ -41,7 +41,7 @@ class ProfileSpec extends AnyFreeSpec with Matchers {
           programLocationState = randomString,
           programLocationCountry = randomString,
           termsOfService = Some(termsOfServiceUrl),
-          department = randomString,
+          department = Some(randomString),
           interestInTerra = Some(randomString)
         )
         basicProfile shouldNot be(null)
@@ -57,7 +57,7 @@ class ProfileSpec extends AnyFreeSpec with Matchers {
           programLocationCity = randomString,
           programLocationState = randomString,
           programLocationCountry = randomString,
-          department = randomString,
+          department = Some(randomString),
           interestInTerra = Some(randomString)
         )
         profile shouldNot be(null)
@@ -73,7 +73,7 @@ class ProfileSpec extends AnyFreeSpec with Matchers {
           programLocationCity = randomString,
           programLocationState = randomString,
           programLocationCountry = randomString,
-          department = randomString,
+          department = Some(randomString),
           interestInTerra = Some(randomString)
         )
         profile shouldNot be(null)
@@ -89,7 +89,7 @@ class ProfileSpec extends AnyFreeSpec with Matchers {
           programLocationCity = randomString,
           programLocationState = randomString,
           programLocationCountry = randomString,
-          department = randomString,
+          department = Some(randomString),
           interestInTerra = Some(randomString)
         )
         profile shouldNot be(null)
@@ -110,7 +110,7 @@ class ProfileSpec extends AnyFreeSpec with Matchers {
             programLocationCountry = "",
             None,
             None,
-            "",
+            None,
             None
           )
         }
@@ -128,7 +128,7 @@ class ProfileSpec extends AnyFreeSpec with Matchers {
             programLocationCity = randomString,
             programLocationState = randomString,
             programLocationCountry = randomString,
-            department = randomString,
+            department = Some(randomString),
             interestInTerra = Some(randomString)
           )
         }

diff --git a/src/test/scala/org/broadinstitute/dsde/firecloud/webservice/RegisterApiServiceSpec.scala b/src/test/scala/org/broadinstitute/dsde/firecloud/webservice/RegisterApiServiceSpec.scala
@@ -165,7 +165,7 @@ final class RegisterApiServiceSpec extends BaseServiceSpec with RegisterApiServi
           programLocationState = randomString,
           programLocationCountry = randomString,
           termsOfService = if (hasTermsOfService) Some(termsOfServiceUrl) else None,
-          department = randomString,
+          department = Some(randomString),
           interestInTerra = Some(randomString)
         )
       }

diff --git a/src/test/scala/org/broadinstitute/dsde/firecloud/webservice/UserApiServiceSpec.scala b/src/test/scala/org/broadinstitute/dsde/firecloud/webservice/UserApiServiceSpec.scala
@@ -49,7 +49,7 @@ class UserApiServiceSpec extends BaseServiceSpec with SamMockserverUtils
     programLocationState = randomAlpha(),
     programLocationCountry = randomAlpha(),
     termsOfService = None,
-    department = randomAlpha(),
+    department = Some(randomAlpha()),
     interestInTerra = Some(randomAlpha())
   )
   val allProperties: Map[String, String] = fullProfile.propertyValueMap