{"action":"created","comment":{"url":"https://api.github.com/repos/socrata/cetera/pulls/comments/68863909","id":68863909,"diff_hunk":"@@ -338,47 +241,24 @@ class DocumentClientSpec extends WordSpec with ShouldMatchers with BeforeAndAfte\n     \"construct a filtered match query with nested aggregation for annotations\" in {\n       val query = j\"\"\"{\n         \"filtered\": {\n-          \"filter\": ${complexFilter},\n-          \"query\": ${complexQuery}\n+          \"query\": ${complexQuery},\n+          \"filter\": ${complexFilter}\n         }\n       }\"\"\"\n \n       val expected = j\"\"\"{\n         \"size\": 0,\n         \"query\": ${query},\n-        \"aggregations\": {\n-            \"annotations\": {\n-                \"aggregations\": {\n-                    \"names\": {\n-                        \"terms\": {\n-                            \"field\": \"animl_annotations.categories.name.raw\",\n-                            \"size\": 0\n-                        }\n-                    }\n-                },\n-                \"nested\": {\n-                    \"path\": \"animl_annotations.categories\"\n-                }\n-            }\n-        },\n+        \"aggregations\": {\"annotations\": {\n+          \"aggregations\": {\"names\": {\"terms\": {\"field\": \"animl_annotations.categories.name.raw\",\"size\": 0}}},\n+          \"nested\": {\"path\": \"animl_annotations.categories\"}}},\n         \"query\": ${functionScoreQuery(query)}\n       }\"\"\"\n \n-      val request = documentClient.buildCountRequest(\n-        CategoriesFieldType,\n-        searchQuery = params.searchQuery,\n-        domainSet = DomainSet.empty,\n-        domainMetadata = None,\n-        categories = params.categories,\n-        tags = params.tags,\n-        datatypes = params.datatypes,\n-        user = None,\n-        attribution = None,\n-        parentDatasetId = None\n-      )\n-\n+      val request = documentClient.buildCountRequest(CategoriesFieldType, DomainSet(Set.empty[Domain], None), searchParams)\n       val actual = JsonReader.fromString(request.toString)\n \n+      //actualAggregations should be(expectedAggregations)","path":"cetera-http/src/test/scala/com/socrata/cetera/search/DocumentClientSpec.scala","position":423,"original_position":423,"commit_id":"a85bccd326fe527ae2540d56382fad98bffb29e6","original_commit_id":"a85bccd326fe527ae2540d56382fad98bffb29e6","user":{"login":"jasonij","id":272820,"avatar_url":"https://avatars.githubusercontent.com/u/272820?v=3","gravatar_id":"","url":"https://api.github.com/users/jasonij","html_url":"https://github.com/jasonij","followers_url":"https://api.github.com/users/jasonij/followers","following_url":"https://api.github.com/users/jasonij/following{/other_user}","gists_url":"https://api.github.com/users/jasonij/gists{/gist_id}","starred_url":"https://api.github.com/users/jasonij/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jasonij/subscriptions","organizations_url":"https://api.github.com/users/jasonij/orgs","repos_url":"https://api.github.com/users/jasonij/repos","events_url":"https://api.github.com/users/jasonij/events{/privacy}","received_events_url":"https://api.github.com/users/jasonij/received_events","type":"User","site_admin":false},"body":"?","created_at":"2016-06-28T23:45:45Z","updated_at":"2016-06-28T23:45:45Z","html_url":"https://github.com/socrata/cetera/pull/179#discussion_r68863909","pull_request_url":"https://api.github.com/repos/socrata/cetera/pulls/179","_links":{"self":{"href":"https://api.github.com/repos/socrata/cetera/pulls/comments/68863909"},"html":{"href":"https://github.com/socrata/cetera/pull/179#discussion_r68863909"},"pull_request":{"href":"https://api.github.com/repos/socrata/cetera/pulls/179"}}},"pull_request":{"url":"https://api.github.com/repos/socrata/cetera/pulls/179","id":75402625,"html_url":"https://github.com/socrata/cetera/pull/179","diff_url":"https://github.com/socrata/cetera/pull/179.diff","patch_url":"https://github.com/socrata/cetera/pull/179.patch","issue_url":"https://api.github.com/repos/socrata/cetera/issues/179","number":179,"state":"open","locked":false,"title":"Add ParamSets and reduce excessive param passing","user":{"login":"aynleslie","id":6155686,"avatar_url":"https://avatars.githubusercontent.com/u/6155686?v=3","gravatar_id":"","url":"https://api.github.com/users/aynleslie","html_url":"https://github.com/aynleslie","followers_url":"https://api.github.com/users/aynleslie/followers","following_url":"https://api.github.com/users/aynleslie/following{/other_user}","gists_url":"https://api.github.com/users/aynleslie/gists{/gist_id}","starred_url":"https://api.github.com/users/aynleslie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aynleslie/subscriptions","organizations_url":"https://api.github.com/users/aynleslie/orgs","repos_url":"https://api.github.com/users/aynleslie/repos","events_url":"https://api.github.com/users/aynleslie/events{/privacy}","received_events_url":"https://api.github.com/users/aynleslie/received_events","type":"User","site_admin":false},"body":"### :sparkles: WooHoo!!!  This is it - Phase 6. :sparkles:\r\n\r\n#### What it do?\r\n\r\n- consolidated our params into 3 sets:\r\n  - searchParams:   for those things that decide what to go looking for\r\n  - relevanceParams:   for those things that effect ranking\r\n  - pagingParams:  for those things that effect paging\r\n- replaced mounds of params being passed with these 3 sets.\r\n- broke up the innards of the `compositeFilter` into 3 filters:\r\n  -  1. the domainId filter\r\n  -  2. the visibility filters:  for those things that limit the search results because ya shouldn’t see them\r\n  - 3. the search filters: for those things that decide what to go looking for\r\n- got rid of the awful `IdsAndModRAStatuses` that I added (as promised).\r\n- added the `domainBoosts` to the `DomainSet`, since they seem to belong there, because a) they are used in conjunction with the DomainSet when building queries, b) there computation uses methods already in this class.\r\n- tightened up all the json in the DocumentClientSpec\r\n\r\n#### How was it tested?\r\n\r\nI created a new test to ensure boosts are respected, since the boosts are added post facto to the DomainSet object\r\nI ran sbt the-usual-things  (oh, my gosh, so many tests to fix)\r\nI ran against prod hitting all of our endpoints mixing up params here and there, with and without auth.\r\n","created_at":"2016-06-28T00:45:51Z","updated_at":"2016-06-28T23:45:45Z","closed_at":null,"merged_at":null,"merge_commit_sha":"16dbe1973542fe5ae6600c3377f916b5df489fa7","assignee":{"login":"jasonij","id":272820,"avatar_url":"https://avatars.githubusercontent.com/u/272820?v=3","gravatar_id":"","url":"https://api.github.com/users/jasonij","html_url":"https://github.com/jasonij","followers_url":"https://api.github.com/users/jasonij/followers","following_url":"https://api.github.com/users/jasonij/following{/other_user}","gists_url":"https://api.github.com/users/jasonij/gists{/gist_id}","starred_url":"https://api.github.com/users/jasonij/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jasonij/subscriptions","organizations_url":"https://api.github.com/users/jasonij/orgs","repos_url":"https://api.github.com/users/jasonij/repos","events_url":"https://api.github.com/users/jasonij/events{/privacy}","received_events_url":"https://api.github.com/users/jasonij/received_events","type":"User","site_admin":false},"assignees":[{"login":"jasonij","id":272820,"avatar_url":"https://avatars.githubusercontent.com/u/272820?v=3","gravatar_id":"","url":"https://api.github.com/users/jasonij","html_url":"https://github.com/jasonij","followers_url":"https://api.github.com/users/jasonij/followers","following_url":"https://api.github.com/users/jasonij/following{/other_user}","gists_url":"https://api.github.com/users/jasonij/gists{/gist_id}","starred_url":"https://api.github.com/users/jasonij/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jasonij/subscriptions","organizations_url":"https://api.github.com/users/jasonij/orgs","repos_url":"https://api.github.com/users/jasonij/repos","events_url":"https://api.github.com/users/jasonij/events{/privacy}","received_events_url":"https://api.github.com/users/jasonij/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/socrata/cetera/pulls/179/commits","review_comments_url":"https://api.github.com/repos/socrata/cetera/pulls/179/comments","review_comment_url":"https://api.github.com/repos/socrata/cetera/pulls/comments{/number}","comments_url":"https://api.github.com/repos/socrata/cetera/issues/179/comments","statuses_url":"https://api.github.com/repos/socrata/cetera/statuses/a85bccd326fe527ae2540d56382fad98bffb29e6","head":{"label":"socrata:ayn/refactor6-param-sets","ref":"ayn/refactor6-param-sets","sha":"a85bccd326fe527ae2540d56382fad98bffb29e6","user":{"login":"socrata","id":57695,"avatar_url":"https://avatars.githubusercontent.com/u/57695?v=3","gravatar_id":"","url":"https://api.github.com/users/socrata","html_url":"https://github.com/socrata","followers_url":"https://api.github.com/users/socrata/followers","following_url":"https://api.github.com/users/socrata/following{/other_user}","gists_url":"https://api.github.com/users/socrata/gists{/gist_id}","starred_url":"https://api.github.com/users/socrata/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/socrata/subscriptions","organizations_url":"https://api.github.com/users/socrata/orgs","repos_url":"https://api.github.com/users/socrata/repos","events_url":"https://api.github.com/users/socrata/events{/privacy}","received_events_url":"https://api.github.com/users/socrata/received_events","type":"Organization","site_admin":false},"repo":{"id":29320951,"name":"cetera","full_name":"socrata/cetera","owner":{"login":"socrata","id":57695,"avatar_url":"https://avatars.githubusercontent.com/u/57695?v=3","gravatar_id":"","url":"https://api.github.com/users/socrata","html_url":"https://github.com/socrata","followers_url":"https://api.github.com/users/socrata/followers","following_url":"https://api.github.com/users/socrata/following{/other_user}","gists_url":"https://api.github.com/users/socrata/gists{/gist_id}","starred_url":"https://api.github.com/users/socrata/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/socrata/subscriptions","organizations_url":"https://api.github.com/users/socrata/orgs","repos_url":"https://api.github.com/users/socrata/repos","events_url":"https://api.github.com/users/socrata/events{/privacy}","received_events_url":"https://api.github.com/users/socrata/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/socrata/cetera","description":"Cetera -- the golden-throated search service. Basically a wrapper around elasticsearch to enable keyword search to return dataset metadata for use by the front end in displaying search results.","fork":false,"url":"https://api.github.com/repos/socrata/cetera","forks_url":"https://api.github.com/repos/socrata/cetera/forks","keys_url":"https://api.github.com/repos/socrata/cetera/keys{/key_id}","collaborators_url":"https://api.github.com/repos/socrata/cetera/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/socrata/cetera/teams","hooks_url":"https://api.github.com/repos/socrata/cetera/hooks","issue_events_url":"https://api.github.com/repos/socrata/cetera/issues/events{/number}","events_url":"https://api.github.com/repos/socrata/cetera/events","assignees_url":"https://api.github.com/repos/socrata/cetera/assignees{/user}","branches_url":"https://api.github.com/repos/socrata/cetera/branches{/branch}","tags_url":"https://api.github.com/repos/socrata/cetera/tags","blobs_url":"https://api.github.com/repos/socrata/cetera/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/socrata/cetera/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/socrata/cetera/git/refs{/sha}","trees_url":"https://api.github.com/repos/socrata/cetera/git/trees{/sha}","statuses_url":"https://api.github.com/repos/socrata/cetera/statuses/{sha}","languages_url":"https://api.github.com/repos/socrata/cetera/languages","stargazers_url":"https://api.github.com/repos/socrata/cetera/stargazers","contributors_url":"https://api.github.com/repos/socrata/cetera/contributors","subscribers_url":"https://api.github.com/repos/socrata/cetera/subscribers","subscription_url":"https://api.github.com/repos/socrata/cetera/subscription","commits_url":"https://api.github.com/repos/socrata/cetera/commits{/sha}","git_commits_url":"https://api.github.com/repos/socrata/cetera/git/commits{/sha}","comments_url":"https://api.github.com/repos/socrata/cetera/comments{/number}","issue_comment_url":"https://api.github.com/repos/socrata/cetera/issues/comments{/number}","contents_url":"https://api.github.com/repos/socrata/cetera/contents/{+path}","compare_url":"https://api.github.com/repos/socrata/cetera/compare/{base}...{head}","merges_url":"https://api.github.com/repos/socrata/cetera/merges","archive_url":"https://api.github.com/repos/socrata/cetera/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/socrata/cetera/downloads","issues_url":"https://api.github.com/repos/socrata/cetera/issues{/number}","pulls_url":"https://api.github.com/repos/socrata/cetera/pulls{/number}","milestones_url":"https://api.github.com/repos/socrata/cetera/milestones{/number}","notifications_url":"https://api.github.com/repos/socrata/cetera/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/socrata/cetera/labels{/name}","releases_url":"https://api.github.com/repos/socrata/cetera/releases{/id}","deployments_url":"https://api.github.com/repos/socrata/cetera/deployments","created_at":"2015-01-15T22:15:58Z","updated_at":"2016-01-14T23:15:44Z","pushed_at":"2016-06-28T00:45:51Z","git_url":"git://github.com/socrata/cetera.git","ssh_url":"git@github.com:socrata/cetera.git","clone_url":"https://github.com/socrata/cetera.git","svn_url":"https://github.com/socrata/cetera","homepage":"","size":1210,"stargazers_count":6,"watchers_count":6,"language":"Scala","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":10,"forks":0,"open_issues":10,"watchers":6,"default_branch":"master"}},"base":{"label":"socrata:master","ref":"master","sha":"ef0514bdba8cce1dfacef027e90c18ac4d3eb74b","user":{"login":"socrata","id":57695,"avatar_url":"https://avatars.githubusercontent.com/u/57695?v=3","gravatar_id":"","url":"https://api.github.com/users/socrata","html_url":"https://github.com/socrata","followers_url":"https://api.github.com/users/socrata/followers","following_url":"https://api.github.com/users/socrata/following{/other_user}","gists_url":"https://api.github.com/users/socrata/gists{/gist_id}","starred_url":"https://api.github.com/users/socrata/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/socrata/subscriptions","organizations_url":"https://api.github.com/users/socrata/orgs","repos_url":"https://api.github.com/users/socrata/repos","events_url":"https://api.github.com/users/socrata/events{/privacy}","received_events_url":"https://api.github.com/users/socrata/received_events","type":"Organization","site_admin":false},"repo":{"id":29320951,"name":"cetera","full_name":"socrata/cetera","owner":{"login":"socrata","id":57695,"avatar_url":"https://avatars.githubusercontent.com/u/57695?v=3","gravatar_id":"","url":"https://api.github.com/users/socrata","html_url":"https://github.com/socrata","followers_url":"https://api.github.com/users/socrata/followers","following_url":"https://api.github.com/users/socrata/following{/other_user}","gists_url":"https://api.github.com/users/socrata/gists{/gist_id}","starred_url":"https://api.github.com/users/socrata/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/socrata/subscriptions","organizations_url":"https://api.github.com/users/socrata/orgs","repos_url":"https://api.github.com/users/socrata/repos","events_url":"https://api.github.com/users/socrata/events{/privacy}","received_events_url":"https://api.github.com/users/socrata/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/socrata/cetera","description":"Cetera -- the golden-throated search service. Basically a wrapper around elasticsearch to enable keyword search to return dataset metadata for use by the front end in displaying search results.","fork":false,"url":"https://api.github.com/repos/socrata/cetera","forks_url":"https://api.github.com/repos/socrata/cetera/forks","keys_url":"https://api.github.com/repos/socrata/cetera/keys{/key_id}","collaborators_url":"https://api.github.com/repos/socrata/cetera/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/socrata/cetera/teams","hooks_url":"https://api.github.com/repos/socrata/cetera/hooks","issue_events_url":"https://api.github.com/repos/socrata/cetera/issues/events{/number}","events_url":"https://api.github.com/repos/socrata/cetera/events","assignees_url":"https://api.github.com/repos/socrata/cetera/assignees{/user}","branches_url":"https://api.github.com/repos/socrata/cetera/branches{/branch}","tags_url":"https://api.github.com/repos/socrata/cetera/tags","blobs_url":"https://api.github.com/repos/socrata/cetera/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/socrata/cetera/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/socrata/cetera/git/refs{/sha}","trees_url":"https://api.github.com/repos/socrata/cetera/git/trees{/sha}","statuses_url":"https://api.github.com/repos/socrata/cetera/statuses/{sha}","languages_url":"https://api.github.com/repos/socrata/cetera/languages","stargazers_url":"https://api.github.com/repos/socrata/cetera/stargazers","contributors_url":"https://api.github.com/repos/socrata/cetera/contributors","subscribers_url":"https://api.github.com/repos/socrata/cetera/subscribers","subscription_url":"https://api.github.com/repos/socrata/cetera/subscription","commits_url":"https://api.github.com/repos/socrata/cetera/commits{/sha}","git_commits_url":"https://api.github.com/repos/socrata/cetera/git/commits{/sha}","comments_url":"https://api.github.com/repos/socrata/cetera/comments{/number}","issue_comment_url":"https://api.github.com/repos/socrata/cetera/issues/comments{/number}","contents_url":"https://api.github.com/repos/socrata/cetera/contents/{+path}","compare_url":"https://api.github.com/repos/socrata/cetera/compare/{base}...{head}","merges_url":"https://api.github.com/repos/socrata/cetera/merges","archive_url":"https://api.github.com/repos/socrata/cetera/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/socrata/cetera/downloads","issues_url":"https://api.github.com/repos/socrata/cetera/issues{/number}","pulls_url":"https://api.github.com/repos/socrata/cetera/pulls{/number}","milestones_url":"https://api.github.com/repos/socrata/cetera/milestones{/number}","notifications_url":"https://api.github.com/repos/socrata/cetera/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/socrata/cetera/labels{/name}","releases_url":"https://api.github.com/repos/socrata/cetera/releases{/id}","deployments_url":"https://api.github.com/repos/socrata/cetera/deployments","created_at":"2015-01-15T22:15:58Z","updated_at":"2016-01-14T23:15:44Z","pushed_at":"2016-06-28T00:45:51Z","git_url":"git://github.com/socrata/cetera.git","ssh_url":"git@github.com:socrata/cetera.git","clone_url":"https://github.com/socrata/cetera.git","svn_url":"https://github.com/socrata/cetera","homepage":"","size":1210,"stargazers_count":6,"watchers_count":6,"language":"Scala","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":10,"forks":0,"open_issues":10,"watchers":6,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/socrata/cetera/pulls/179"},"html":{"href":"https://github.com/socrata/cetera/pull/179"},"issue":{"href":"https://api.github.com/repos/socrata/cetera/issues/179"},"comments":{"href":"https://api.github.com/repos/socrata/cetera/issues/179/comments"},"review_comments":{"href":"https://api.github.com/repos/socrata/cetera/pulls/179/comments"},"review_comment":{"href":"https://api.github.com/repos/socrata/cetera/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/socrata/cetera/pulls/179/commits"},"statuses":{"href":"https://api.github.com/repos/socrata/cetera/statuses/a85bccd326fe527ae2540d56382fad98bffb29e6"}}}}
{"actor":{"display_login":"jasonij"}}