Make attributes in response optional

Author: Ghost-in-a-Jar

src/main/scala/org/broadinstitute/dsde/workbench/sam/api/UserRoutesV2.scala

@@ -10,7 +10,6 @@ import org.broadinstitute.dsde.workbench.model._
 import org.broadinstitute.dsde.workbench.sam.model.{ResourceRoleName, ResourceTypeName}
 import org.broadinstitute.dsde.workbench.sam.model.api.SamUserResponse._
 import org.broadinstitute.dsde.workbench.sam.model.api.{
-  FilteredResourcesFlat,
   SamUser,
   SamUserAttributesRequest,
   SamUserCombinedStateResponse,
@@ -187,7 +186,7 @@ trait UserRoutesV2 extends SamUserDirectives with SamRequestContextDirectives {
   private def getSamUserCombinedState(samUser: SamUser, samRequestContext: SamRequestContext): Route =
     get {
       complete {
-        val combinedStateResponse = for {
+        for {
           allowances <- userService.getUserAllowances(samUser, samRequestContext)
           maybeAttributes <- userService.getUserAttributes(samUser.id, samRequestContext)
           termsOfServiceDetails <- tosService.getTermsOfServiceDetailsForUser(samUser.id, samRequestContext)
@@ -201,14 +200,13 @@ trait UserRoutesV2 extends SamUserDirectives with SamRequestContextDirectives {
               includePublic = false,
               samRequestContext
             )
-            .recover(_ => FilteredResourcesFlat(Set.empty))
-        } yield maybeAttributes.map(
-          SamUserCombinedStateResponse(samUser, allowances, _, termsOfServiceDetails, Map("enterpriseFeatures" -> enterpriseFeatures.toJson))
+        } yield SamUserCombinedStateResponse(
+          samUser,
+          allowances,
+          maybeAttributes,
+          termsOfServiceDetails,
+          Map("enterpriseFeatures" -> enterpriseFeatures.toJson)
         )
-        combinedStateResponse.map {
-          case Some(response) => OK -> Some(response)
-          case None => NotFound -> None
-        }
       }
     }
 

src/main/scala/org/broadinstitute/dsde/workbench/sam/model/api/SamUserCombinedStateResponse.scala

@@ -13,7 +13,7 @@ object SamUserCombinedStateResponse {
 final case class SamUserCombinedStateResponse(
     samUser: SamUser,
     allowances: SamUserAllowances,
-    attributes: SamUserAttributes,
+    attributes: Option[SamUserAttributes],
     termsOfServiceDetails: TermsOfServiceDetails,
     additionalDetails: Map[String, JsValue]
 )

src/test/scala/org/broadinstitute/dsde/workbench/sam/api/UserRoutesV2Spec.scala

@@ -273,7 +273,7 @@ class UserRoutesV2Spec extends AnyFlatSpec with Matchers with TimeMatchers with
     val userCombinedStateResponse = SamUserCombinedStateResponse(
       defaultUser,
       SamUserAllowances(enabled = true, termsOfService = true),
-      SamUserAttributes(defaultUser.id, marketingConsent = true),
+      Option(SamUserAttributes(defaultUser.id, marketingConsent = true)),
       TermsOfServiceDetails("v1", Instant.now(), permitsSystemUsage = true, isCurrentVersion = true),
       Map("enterpriseFeatures" -> FilteredResourcesFlat(Set(enterpriseFeature)).toJson)
     )