Revert "Remove old search API which is no longer in use"

test/test_api_security.py

@@ -12,7 +12,7 @@ from endpoints.api import api_bp, api
 
 from endpoints.api.team import TeamMember, TeamMemberList, OrganizationTeam, TeamMemberInvite
 from endpoints.api.tag import RepositoryTagImages, RepositoryTag, ListRepositoryTags, RevertTag
-from endpoints.api.search import ConductSearch
+from endpoints.api.search import EntitySearch
 from endpoints.api.image import RepositoryImage, RepositoryImageList
 from endpoints.api.build import (FileDropResource, RepositoryBuildStatus, RepositoryBuildLogs,
                                  RepositoryBuildList, RepositoryBuildResource)
@@ -3672,10 +3672,10 @@ class TestRepositoryBuynlargeOrgrepo(ApiTestCase):
     self._run_test('DELETE', 204, 'devtable', None)
 
 
-class TestConductSearchR9nz(ApiTestCase):
+class TestEntitySearchR9nz(ApiTestCase):
   def setUp(self):
     ApiTestCase.setUp(self)
-    self._set_url(ConductSearch, prefix="R9NZ")
+    self._set_url(EntitySearch, prefix="R9NZ")
 
   def test_get_anonymous(self):
     self._run_test('GET', 200, None, None)

test/test_api_usage.py

@@ -24,7 +24,7 @@ from data.database import RepositoryActionCount
 
 from endpoints.api.team import TeamMember, TeamMemberList, TeamMemberInvite, OrganizationTeam
 from endpoints.api.tag import RepositoryTagImages, RepositoryTag, RevertTag, ListRepositoryTags
-from endpoints.api.search import ConductSearch
+from endpoints.api.search import EntitySearch, ConductSearch
 from endpoints.api.image import RepositoryImage, RepositoryImageList
 from endpoints.api.build import RepositoryBuildStatus, RepositoryBuildList, RepositoryBuildResource
 from endpoints.api.robot import (UserRobotList, OrgRobot, OrgRobotList, UserRobot,
@@ -668,6 +668,40 @@ class TestConductSearch(ApiTestCase):
 
 
 
+class TestGetMatchingEntities(ApiTestCase):
+  def test_notinorg(self):
+    self.login(NO_ACCESS_USER)
+
+    json = self.getJsonResponse(EntitySearch,
+                                params=dict(prefix='o', namespace=ORGANIZATION,
+                                            includeTeams='true'))
+
+    names = set([r['name'] for r in json['results']])
+    assert 'outsideorg' in names
+    assert not 'owners' in names
+
+  def test_inorg(self):
+    self.login(ADMIN_ACCESS_USER)
+
+    json = self.getJsonResponse(EntitySearch,
+                                params=dict(prefix='o', namespace=ORGANIZATION,
+                                            includeTeams='true'))
+
+    names = set([r['name'] for r in json['results']])
+    assert 'outsideorg' in names
+    assert 'owners' in names
+
+  def test_inorg_withorgs(self):
+    self.login(ADMIN_ACCESS_USER)
+
+    json = self.getJsonResponse(EntitySearch,
+                                params=dict(prefix=ORGANIZATION[0], namespace=ORGANIZATION,
+                                            includeOrgs='true'))
+
+    names = set([r['name'] for r in json['results']])
+    assert ORGANIZATION in names
+
+
 class TestCreateOrganization(ApiTestCase):
   def test_existinguser(self):
     self.login(ADMIN_ACCESS_USER)