Improving matching project org_types.

app.py

@@ -16,7 +16,7 @@
 from flask import Flask, make_response, request, jsonify, render_template
 import requests
 from flask.ext.heroku import Heroku
-from sqlalchemy import desc
+from sqlalchemy import desc, or_
 from sqlalchemy.sql.expression import func
 from sqlalchemy.orm import defer
 from dictalchemy import make_class_dictable
@@ -564,7 +564,9 @@ def get_projects(id=None):
             # Support searching for multiple org_types
             if "," in value:
                 values = [unicode(item) for item in value.split(",")]
-                query = query.join(Project.organization).filter(getattr(Organization, org_attr).in_(values))
+                # build a list of ilike queries to match on
+                ilike_values = [getattr(Organization, org_attr).ilike(format_ilike_term(value)) for value in values]
+                query = query.join(Project.organization).filter(or_(*ilike_values))
             else:
                 query = query.join(Project.organization).filter(getattr(Organization, org_attr).ilike(format_ilike_term(value)))
         elif 'q' in attr:

test/integration/test_projects.py

@@ -489,7 +489,7 @@ def test_project_organzation_type_filter(self):
         '''
         Test searching for projects from certain types of organizations.
         '''
-        brigade = OrganizationFactory(name=u'Brigade Org', type=u'Brigade')
+        brigade = OrganizationFactory(name=u'Brigade Org', type=u'Brigade, midwest')
         code_for_all = OrganizationFactory(name=u'Code for All Org', type=u'Code for All')
         gov_org = OrganizationFactory(name=u'Gov Org', type=u'Government')