org counts code restructing to better prepare for RBAC merge

awx/main/tests/functional/api/test_organization_counts.py

@@ -3,7 +3,7 @@ import pytest
 from django.core.urlresolvers import reverse
 
 @pytest.fixture
-def resourced_organization(organization, project, user):
+def resourced_organization(organization, project, team, inventory, user):
     admin_user = user('test-admin', True)
     member_user = user('org-member')
 
@@ -11,12 +11,12 @@ def resourced_organization(organization, project, user):
     organization.users.add(member_user)
     organization.admins.add(admin_user)
     organization.projects.add(project)
-    organization.teams.create(name='org-team')
-    inventory = organization.inventories.create(name="associated-inv")
-    inventory.jobtemplates.create(name="test-jt",
-                                  description="test-job-template-desc",
-                                  project=project,
-                                  playbook="test_playbook.yml")
+    # organization.teams.create(name='org-team')
+    # inventory = organization.inventories.create(name="associated-inv")
+    project.jobtemplates.create(name="test-jt",
+                                description="test-job-template-desc",
+                                inventory=inventory,
+                                playbook="test_playbook.yml")
 
     return organization
 
@@ -25,8 +25,9 @@ def test_org_counts_admin(resourced_organization, user, get):
     # Check that all types of resources are counted by a superuser
     external_admin = user('admin', True)
     response = get(reverse('api:organization_list', args=[]), external_admin)
-    counts = response.data['results'][0]['summary_fields']['counts']
+    assert response.status_code == 200
 
+    counts = response.data['results'][0]['summary_fields']['related_field_counts']
     assert counts == {
         'users': 1,
         'admins': 1,
@@ -42,7 +43,9 @@ def test_org_counts_member(resourced_organization, get):
     #   user count, consistent with the RBAC rules
     member_user = resourced_organization.users.get(username='org-member')
     response = get(reverse('api:organization_list', args=[]), member_user)
-    counts = response.data['results'][0]['summary_fields']['counts']
+    assert response.status_code == 200
+
+    counts = response.data['results'][0]['summary_fields']['related_field_counts']
 
     assert counts == {
         'users': 1,  # User can see themselves
@@ -60,10 +63,10 @@ def test_new_org_zero_counts(user, post):
     org_list_url = reverse('api:organization_list', args=[])
     post_response = post(url=org_list_url, data={'name': 'test organization',
                          'description': ''}, user=user('admin', True))
-    new_org_list = post_response.render().data
-    counts_dict = new_org_list['summary_fields']['counts']
-
     assert post_response.status_code == 201
+
+    new_org_list = post_response.render().data
+    counts_dict = new_org_list['summary_fields']['related_field_counts']
     assert counts_dict == {
         'users': 0,
         'admins': 0,
@@ -79,12 +82,14 @@ def test_two_organizations(resourced_organization, organizations, user, get):
     external_admin = user('admin', True)
     organization_zero = organizations(1)[0]
     response = get(reverse('api:organization_list', args=[]), external_admin)
+    assert response.status_code == 200
+
     org_id_full = resourced_organization.id
     org_id_zero = organization_zero.id
     counts = {}
     for i in range(2):
         org_id = response.data['results'][i]['id']
-        counts[org_id] = response.data['results'][i]['summary_fields']['counts']
+        counts[org_id] = response.data['results'][i]['summary_fields']['related_field_counts']
 
     assert counts[org_id_full] == {
         'users': 1,
@@ -102,3 +107,49 @@ def test_two_organizations(resourced_organization, organizations, user, get):
         'inventories': 0,
         'teams': 0
     }
+
+@pytest.mark.django_db
+def test_overlapping_project(resourced_organization, organizations, user, get):
+    # Check correct results for two organizations are returned
+    external_admin = user('admin', True)
+    organization2 = organizations(1)[0]
+    the_project = resourced_organization.projects.all()[0]
+    organization2.projects.add(the_project)
+    organization2.projects.create(name="second-project",
+                                  description="test-proj-desc",
+                                  scm_type="git",
+                                  scm_url="https://github.com/jlaska/ansible-playbooks")
+    inventory = organization2.inventories.create(name="second-inventory")
+    organization2.projects.get(name="second-project").jobtemplates.create(
+        name="second-job-template",
+        inventory=inventory,
+        playbook="hello.yml"
+    )
+
+    response = get(reverse('api:organization_list', args=[]), external_admin)
+    assert response.status_code == 200
+
+    org_id_full = resourced_organization.id
+    org_id2 = organization2.id
+    counts = {}
+    for i in range(2):
+        org_id = response.data['results'][i]['id']
+        counts[org_id] = response.data['results'][i]['summary_fields']['related_field_counts']
+
+    assert counts[org_id_full] == {
+        'users': 1,
+        'admins': 1,
+        'job_templates': 1,
+        'projects': 1,
+        'inventories': 1,
+        'teams': 1
+    }
+    assert counts[org_id2] == {
+        'users': 0,
+        'admins': 0,
+        'job_templates': 2,
+        'projects': 2,
+        'inventories': 1,
+        'teams': 0
+    }
+    assert False