single workspace role for task order officers

tests/domain/test_task_orders.py

@@ -48,3 +48,15 @@ def test_add_officer_with_nonexistent_role():
     owner = task_order.workspace.owner
     with pytest.raises(TaskOrderError):
         TaskOrders.add_officer(owner, task_order, "pilot", ko.to_dictionary())
+
+
+def test_add_officer_who_is_already_workspace_member():
+    task_order = TaskOrderFactory.create()
+    owner = task_order.workspace.owner
+    TaskOrders.add_officer(
+        owner, task_order, "contracting_officer", owner.to_dictionary()
+    )
+
+    assert task_order.contracting_officer == owner
+    member = task_order.workspace.members[0]
+    assert member.user == owner and member.role_name == "owner"

tests/routes/task_orders/test_new_task_order.py

@@ -150,9 +150,7 @@ def test_invite_officers_to_task_order(queue):
     assert len(workspace.members) == 4
     roles = [member.role.name for member in workspace.members]
     # officers exist in roles
-    assert "contracting_officer" in roles
-    assert "contracting_officer_representative" in roles
-    assert "security_officer" in roles
+    assert roles.count("officer") == 3
     # email invitations are enqueued
     assert len(queue.get_queue()) == 3
     # task order has relationship to user for each officer role