From 8710028256a44b0abb925e3f058cc659890fe68a Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 2 Jan 2020 12:45:11 -0500
Subject: [PATCH] Fix factories and seed sample script Update display of
 defense component on portfolio settings page

---
 script/seed_sample.py                 | 10 +++++-----
 templates/portfolios/admin.html       |  6 +++++-
 tests/factories.py                    |  6 +++++-
 tests/routes/portfolios/test_index.py |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/script/seed_sample.py b/script/seed_sample.py
index 9f64f049..47b7efb9 100644
--- a/script/seed_sample.py
+++ b/script/seed_sample.py
@@ -34,7 +34,7 @@ from atst.routes.dev import _DEV_USERS as DEV_USERS
 from atst.utils import pick
 
 from tests.factories import (
-    random_service_branch,
+    random_defense_component,
     TaskOrderFactory,
     CLINFactory,
     AttachmentFactory,
@@ -308,7 +308,7 @@ def create_demo_portfolio(name, data):
 
     portfolio = Portfolios.create(
         user=portfolio_owner,
-        portfolio_attrs={"name": name, "defense_component": random_service_branch()},
+        portfolio_attrs={"name": name, "defense_component": random_defense_component()},
     )
 
     add_task_orders_to_portfolio(portfolio)
@@ -336,7 +336,7 @@ def seed_db():
         user=amanda,
         portfolio_attrs={
             "name": "TIE Interceptor",
-            "defense_component": random_service_branch(),
+            "defense_component": random_defense_component(),
         },
     )
     add_task_orders_to_portfolio(tie_interceptor)
@@ -347,7 +347,7 @@ def seed_db():
         user=amanda,
         portfolio_attrs={
             "name": "TIE Fighter",
-            "defense_component": random_service_branch(),
+            "defense_component": random_defense_component(),
         },
     )
     add_task_orders_to_portfolio(tie_fighter)
@@ -363,7 +363,7 @@ def seed_db():
             user=user,
             portfolio_attrs={
                 "name": ship,
-                "defense_component": random_service_branch(),
+                "defense_component": random_defense_component(),
             },
         )
         add_task_orders_to_portfolio(portfolio)
diff --git a/templates/portfolios/admin.html b/templates/portfolios/admin.html
index b7796315..89f905b0 100644
--- a/templates/portfolios/admin.html
+++ b/templates/portfolios/admin.html
@@ -43,7 +43,11 @@
           <div>
             <div class='admin-title'>{{ "portfolios.admin.defense_component_label" | translate }}</div>
             {% if portfolio.defense_component %}
-              <div class='admin-content'>{{ "forms.portfolio.defense_component.choices.%s" | format(portfolio.defense_component) | translate }}</div>
+              <div class='admin-content'>
+                {% for component in portfolio.defense_component %}
+                  {{ "forms.portfolio.defense_component.choices.%s" | format(component) | translate }}<br>
+                {% endfor %}
+              </div>
             {% else %}
               <div class='admin-content'>{{ "fragments.portfolio_admin.none" | translate }}</div>
             {% endif %}
diff --git a/tests/factories.py b/tests/factories.py
index ee4159f6..8ed74dd0 100644
--- a/tests/factories.py
+++ b/tests/factories.py
@@ -21,6 +21,10 @@ def random_service_branch():
     return random_choice(data.SERVICE_BRANCHES)
 
 
+def random_defense_component():
+    return [random_choice(data.SERVICE_BRANCHES)]
+
+
 def random_dod_id():
     return "".join(random.choices(string.digits, k=10))
 
@@ -104,7 +108,7 @@ class PortfolioFactory(Base):
         model = Portfolio
 
     name = factory.Faker("domain_word")
-    defense_component = factory.LazyFunction(random_service_branch)
+    defense_component = factory.LazyFunction(random_defense_component)
     description = factory.Faker("sentence")
 
     @classmethod
diff --git a/tests/routes/portfolios/test_index.py b/tests/routes/portfolios/test_index.py
index 489f73b2..f15f4149 100644
--- a/tests/routes/portfolios/test_index.py
+++ b/tests/routes/portfolios/test_index.py
@@ -34,7 +34,7 @@ def test_create_portfolio_success(client, user_session):
         data={
             "name": "My project name",
             "description": "My project description",
-            "defense_component": "army",
+            "defense_component": ["army"],
         },
     )