{"action":"created","comment":{"url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/comments/32078516","id":32078516,"diff_hunk":"@@ -141,15 +126,49 @@ public void crudStudy() {\n         identifier = null;\n     }\n     \n-    private Study createStudy() {\n-        study = new DynamoStudy();\n-        study.setIdentifier(identifier);\n-        study.setName(\"Test of study creation\");\n-        study.setMaxNumOfParticipants(100);\n-        study.setMinAgeOfConsent(18);\n-        study.setResearcherRole(identifier+\"_researcher\");\n-        study.setStormpathHref(\"http://dev-test-junk\");\n-        return study;\n+    @Test\n+    public void defaultsAreUsedWhenNotProvided() {\n+        study = TestUtils.getValidStudy();\n+        study.setPasswordPolicy(null);\n+        study.setVerifyEmailTemplate(null);\n+        study.setResetPasswordTemplate(null);\n+        identifier = study.getIdentifier();\n+        \n+        study = studyService.createStudy(study);\n+        \n+        assertEquals(PasswordPolicy.DEFAULT_PASSWORD_POLICY, study.getPasswordPolicy());\n+        assertNotNull(study.getVerifyEmailTemplate());\n+        assertNotNull(study.getResetPasswordTemplate());\n+\n+        // Even if partial values are submitted in the JSON, we don't get exceptions, we get defaults\n+        study.setVerifyEmailTemplate(new EmailTemplate(null, \"body ${url}\", MimeType.TEXT));\n+        study.setResetPasswordTemplate(new EmailTemplate(\"subject\", null, MimeType.TEXT));\n+\n+        study = studyService.updateStudy(study);\n+        \n+        assertEquals(\"Verify your account\", study.getVerifyEmailTemplate().getSubject());\n+        assertNotNull(study.getResetPasswordTemplate().getBody());\n+        assertTrue(study.getResetPasswordTemplate().getBody().contains(\"To reset your password please click on this link\"));\n+    }","path":"test/org/sagebionetworks/bridge/services/StudyServiceImplTest.java","position":128,"original_position":128,"commit_id":"7c18f20c72f57c483ca9d95381d29f7db40e4750","original_commit_id":"7c18f20c72f57c483ca9d95381d29f7db40e4750","user":{"login":"DwayneJengSage","id":9541190,"avatar_url":"https://avatars.githubusercontent.com/u/9541190?v=3","gravatar_id":"","url":"https://api.github.com/users/DwayneJengSage","html_url":"https://github.com/DwayneJengSage","followers_url":"https://api.github.com/users/DwayneJengSage/followers","following_url":"https://api.github.com/users/DwayneJengSage/following{/other_user}","gists_url":"https://api.github.com/users/DwayneJengSage/gists{/gist_id}","starred_url":"https://api.github.com/users/DwayneJengSage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/DwayneJengSage/subscriptions","organizations_url":"https://api.github.com/users/DwayneJengSage/orgs","repos_url":"https://api.github.com/users/DwayneJengSage/repos","events_url":"https://api.github.com/users/DwayneJengSage/events{/privacy}","received_events_url":"https://api.github.com/users/DwayneJengSage/received_events","type":"User","site_admin":false},"body":"Test for updating a study that has no templates? (Covers the migration case.)\r\n\r\nTest for updating an inactive vs active study?","created_at":"2015-06-10T00:15:51Z","updated_at":"2015-06-10T00:15:51Z","html_url":"https://github.com/Sage-Bionetworks/BridgePF/pull/691#discussion_r32078516","pull_request_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/691","_links":{"self":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/comments/32078516"},"html":{"href":"https://github.com/Sage-Bionetworks/BridgePF/pull/691#discussion_r32078516"},"pull_request":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/691"}}},"pull_request":{"url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/691","id":36782582,"html_url":"https://github.com/Sage-Bionetworks/BridgePF/pull/691","diff_url":"https://github.com/Sage-Bionetworks/BridgePF/pull/691.diff","patch_url":"https://github.com/Sage-Bionetworks/BridgePF/pull/691.patch","issue_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/691","number":691,"state":"open","locked":false,"title":"Expanding studies to include email templates and password policy","user":{"login":"alxdarksage","id":5589085,"avatar_url":"https://avatars.githubusercontent.com/u/5589085?v=3","gravatar_id":"","url":"https://api.github.com/users/alxdarksage","html_url":"https://github.com/alxdarksage","followers_url":"https://api.github.com/users/alxdarksage/followers","following_url":"https://api.github.com/users/alxdarksage/following{/other_user}","gists_url":"https://api.github.com/users/alxdarksage/gists{/gist_id}","starred_url":"https://api.github.com/users/alxdarksage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alxdarksage/subscriptions","organizations_url":"https://api.github.com/users/alxdarksage/orgs","repos_url":"https://api.github.com/users/alxdarksage/repos","events_url":"https://api.github.com/users/alxdarksage/events{/privacy}","received_events_url":"https://api.github.com/users/alxdarksage/received_events","type":"User","site_admin":false},"body":"Through Stormpath's Java SDK and REST API, we can configure the details of a Stormpath Directory that previously had to be done by hand after a study is created. This checkin:\r\n\r\n- introduces new way, using Jackson filters, to change the serialization of studies for users (required a rewrite of the configuration in BridgeObjectMapper). StudyInfo is removed. Special fromJson() factory methods are removed.\r\n\r\n- Moves most long text configuration for study to templates in conf/study-defaults, including the study consent document.\r\n\r\n- refactor study as other entities; also moving data into columns on save (or save that way initially). Will backfill original studies after relase\r\n\r\n- introducing EmailTemplate for the verify email and reset password emails sent by Stormpath\r\n\r\n- introducing PasswordPolicy object for simplified view of Stormpath password policy configurations. I would just set this to something sensible but the original clients were built with almost no constraints on the password, so for backwards compatability, this can be changed from the default policy.\r\n\r\n- when no templates or password policy is provided, defaults are set to make a valid study, tailored to that study\r\n\r\n- email template HTML is sanitized, tags are removed from text templates.\r\n\r\n- Stormpath directories can now be updated when a study is updated (password policy or templates may have changed)\r\n\r\n- added sponsor name and technical email fields to study; added an active field, will backfill to \"true\" for all existing studies, is not used at this time.\r\n\r\n- Added TestUtils.getValidStudy() and refactored to use it, because creating a study is now kind of a pain (lots of required fields)","created_at":"2015-06-02T22:45:02Z","updated_at":"2015-06-10T00:15:51Z","closed_at":null,"merged_at":null,"merge_commit_sha":"d9acbd40cf5d2716c9cf260fe4e8dba79987efdf","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/691/commits","review_comments_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/691/comments","review_comment_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/691/comments","statuses_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/statuses/7c18f20c72f57c483ca9d95381d29f7db40e4750","head":{"label":"alxdarksage:password-policy","ref":"password-policy","sha":"7c18f20c72f57c483ca9d95381d29f7db40e4750","user":{"login":"alxdarksage","id":5589085,"avatar_url":"https://avatars.githubusercontent.com/u/5589085?v=3","gravatar_id":"","url":"https://api.github.com/users/alxdarksage","html_url":"https://github.com/alxdarksage","followers_url":"https://api.github.com/users/alxdarksage/followers","following_url":"https://api.github.com/users/alxdarksage/following{/other_user}","gists_url":"https://api.github.com/users/alxdarksage/gists{/gist_id}","starred_url":"https://api.github.com/users/alxdarksage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alxdarksage/subscriptions","organizations_url":"https://api.github.com/users/alxdarksage/orgs","repos_url":"https://api.github.com/users/alxdarksage/repos","events_url":"https://api.github.com/users/alxdarksage/events{/privacy}","received_events_url":"https://api.github.com/users/alxdarksage/received_events","type":"User","site_admin":false},"repo":{"id":35578108,"name":"BridgePF","full_name":"alxdarksage/BridgePF","owner":{"login":"alxdarksage","id":5589085,"avatar_url":"https://avatars.githubusercontent.com/u/5589085?v=3","gravatar_id":"","url":"https://api.github.com/users/alxdarksage","html_url":"https://github.com/alxdarksage","followers_url":"https://api.github.com/users/alxdarksage/followers","following_url":"https://api.github.com/users/alxdarksage/following{/other_user}","gists_url":"https://api.github.com/users/alxdarksage/gists{/gist_id}","starred_url":"https://api.github.com/users/alxdarksage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alxdarksage/subscriptions","organizations_url":"https://api.github.com/users/alxdarksage/orgs","repos_url":"https://api.github.com/users/alxdarksage/repos","events_url":"https://api.github.com/users/alxdarksage/events{/privacy}","received_events_url":"https://api.github.com/users/alxdarksage/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/alxdarksage/BridgePF","description":"","fork":true,"url":"https://api.github.com/repos/alxdarksage/BridgePF","forks_url":"https://api.github.com/repos/alxdarksage/BridgePF/forks","keys_url":"https://api.github.com/repos/alxdarksage/BridgePF/keys{/key_id}","collaborators_url":"https://api.github.com/repos/alxdarksage/BridgePF/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/alxdarksage/BridgePF/teams","hooks_url":"https://api.github.com/repos/alxdarksage/BridgePF/hooks","issue_events_url":"https://api.github.com/repos/alxdarksage/BridgePF/issues/events{/number}","events_url":"https://api.github.com/repos/alxdarksage/BridgePF/events","assignees_url":"https://api.github.com/repos/alxdarksage/BridgePF/assignees{/user}","branches_url":"https://api.github.com/repos/alxdarksage/BridgePF/branches{/branch}","tags_url":"https://api.github.com/repos/alxdarksage/BridgePF/tags","blobs_url":"https://api.github.com/repos/alxdarksage/BridgePF/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/alxdarksage/BridgePF/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/alxdarksage/BridgePF/git/refs{/sha}","trees_url":"https://api.github.com/repos/alxdarksage/BridgePF/git/trees{/sha}","statuses_url":"https://api.github.com/repos/alxdarksage/BridgePF/statuses/{sha}","languages_url":"https://api.github.com/repos/alxdarksage/BridgePF/languages","stargazers_url":"https://api.github.com/repos/alxdarksage/BridgePF/stargazers","contributors_url":"https://api.github.com/repos/alxdarksage/BridgePF/contributors","subscribers_url":"https://api.github.com/repos/alxdarksage/BridgePF/subscribers","subscription_url":"https://api.github.com/repos/alxdarksage/BridgePF/subscription","commits_url":"https://api.github.com/repos/alxdarksage/BridgePF/commits{/sha}","git_commits_url":"https://api.github.com/repos/alxdarksage/BridgePF/git/commits{/sha}","comments_url":"https://api.github.com/repos/alxdarksage/BridgePF/comments{/number}","issue_comment_url":"https://api.github.com/repos/alxdarksage/BridgePF/issues/comments{/number}","contents_url":"https://api.github.com/repos/alxdarksage/BridgePF/contents/{+path}","compare_url":"https://api.github.com/repos/alxdarksage/BridgePF/compare/{base}...{head}","merges_url":"https://api.github.com/repos/alxdarksage/BridgePF/merges","archive_url":"https://api.github.com/repos/alxdarksage/BridgePF/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/alxdarksage/BridgePF/downloads","issues_url":"https://api.github.com/repos/alxdarksage/BridgePF/issues{/number}","pulls_url":"https://api.github.com/repos/alxdarksage/BridgePF/pulls{/number}","milestones_url":"https://api.github.com/repos/alxdarksage/BridgePF/milestones{/number}","notifications_url":"https://api.github.com/repos/alxdarksage/BridgePF/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/alxdarksage/BridgePF/labels{/name}","releases_url":"https://api.github.com/repos/alxdarksage/BridgePF/releases{/id}","created_at":"2015-05-13T22:51:13Z","updated_at":"2015-05-13T22:51:14Z","pushed_at":"2015-06-10T00:00:32Z","git_url":"git://github.com/alxdarksage/BridgePF.git","ssh_url":"git@github.com:alxdarksage/BridgePF.git","clone_url":"https://github.com/alxdarksage/BridgePF.git","svn_url":"https://github.com/alxdarksage/BridgePF","homepage":null,"size":70906,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"Sage-Bionetworks:develop","ref":"develop","sha":"506c7b0083a244684ed2d4a45f8ad71d08ec14b7","user":{"login":"Sage-Bionetworks","id":1250897,"avatar_url":"https://avatars.githubusercontent.com/u/1250897?v=3","gravatar_id":"","url":"https://api.github.com/users/Sage-Bionetworks","html_url":"https://github.com/Sage-Bionetworks","followers_url":"https://api.github.com/users/Sage-Bionetworks/followers","following_url":"https://api.github.com/users/Sage-Bionetworks/following{/other_user}","gists_url":"https://api.github.com/users/Sage-Bionetworks/gists{/gist_id}","starred_url":"https://api.github.com/users/Sage-Bionetworks/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Sage-Bionetworks/subscriptions","organizations_url":"https://api.github.com/users/Sage-Bionetworks/orgs","repos_url":"https://api.github.com/users/Sage-Bionetworks/repos","events_url":"https://api.github.com/users/Sage-Bionetworks/events{/privacy}","received_events_url":"https://api.github.com/users/Sage-Bionetworks/received_events","type":"Organization","site_admin":false},"repo":{"id":18604783,"name":"BridgePF","full_name":"Sage-Bionetworks/BridgePF","owner":{"login":"Sage-Bionetworks","id":1250897,"avatar_url":"https://avatars.githubusercontent.com/u/1250897?v=3","gravatar_id":"","url":"https://api.github.com/users/Sage-Bionetworks","html_url":"https://github.com/Sage-Bionetworks","followers_url":"https://api.github.com/users/Sage-Bionetworks/followers","following_url":"https://api.github.com/users/Sage-Bionetworks/following{/other_user}","gists_url":"https://api.github.com/users/Sage-Bionetworks/gists{/gist_id}","starred_url":"https://api.github.com/users/Sage-Bionetworks/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Sage-Bionetworks/subscriptions","organizations_url":"https://api.github.com/users/Sage-Bionetworks/orgs","repos_url":"https://api.github.com/users/Sage-Bionetworks/repos","events_url":"https://api.github.com/users/Sage-Bionetworks/events{/privacy}","received_events_url":"https://api.github.com/users/Sage-Bionetworks/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Sage-Bionetworks/BridgePF","description":"Content lenght","fork":false,"url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF","forks_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/forks","keys_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/teams","hooks_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/hooks","issue_events_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/events{/number}","events_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/events","assignees_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/assignees{/user}","branches_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/branches{/branch}","tags_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/tags","blobs_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/git/refs{/sha}","trees_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/statuses/{sha}","languages_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/languages","stargazers_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/stargazers","contributors_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/contributors","subscribers_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/subscribers","subscription_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/subscription","commits_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/commits{/sha}","git_commits_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/git/commits{/sha}","comments_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/comments{/number}","issue_comment_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/comments{/number}","contents_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/contents/{+path}","compare_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/merges","archive_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/downloads","issues_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues{/number}","pulls_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls{/number}","milestones_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/milestones{/number}","notifications_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/labels{/name}","releases_url":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/releases{/id}","created_at":"2014-04-09T16:38:46Z","updated_at":"2015-05-28T01:11:48Z","pushed_at":"2015-06-09T22:51:40Z","git_url":"git://github.com/Sage-Bionetworks/BridgePF.git","ssh_url":"git@github.com:Sage-Bionetworks/BridgePF.git","clone_url":"https://github.com/Sage-Bionetworks/BridgePF.git","svn_url":"https://github.com/Sage-Bionetworks/BridgePF","homepage":"","size":75159,"stargazers_count":3,"watchers_count":3,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":8,"mirror_url":null,"open_issues_count":3,"forks":8,"open_issues":3,"watchers":3,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/691"},"html":{"href":"https://github.com/Sage-Bionetworks/BridgePF/pull/691"},"issue":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/691"},"comments":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/issues/691/comments"},"review_comments":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/691/comments"},"review_comment":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/pulls/691/commits"},"statuses":{"href":"https://api.github.com/repos/Sage-Bionetworks/BridgePF/statuses/7c18f20c72f57c483ca9d95381d29f7db40e4750"}}}}