Merge pull request #679 from DwayneJengSage/dev3

DHP-1154 App flag to enable adherence report

Author: DwayneJengSage

src/main/java/org/sagebionetworks/bridge/dynamodb/DynamoApp.java

@@ -68,6 +68,7 @@ public TypeReference<Map<String,ActivityEventUpdateType>> getTypeReference() {
     private String shortName;
     private String sponsorName;
     private String identifier;
+    private boolean adherenceReportEnabled;
     private Map<String, String> automaticCustomEvents;
     private boolean autoVerificationEmailSuppressed;
     private Exporter3Configuration exporter3Configuration;
@@ -185,6 +186,16 @@ public void setVersion(Long version) {
         this.version = version;
     }
 
+    @Override
+    public boolean isAdherenceReportEnabled() {
+        return adherenceReportEnabled;
+    }
+
+    @Override
+    public void setAdherenceReportEnabled(boolean adherenceReportEnabled) {
+        this.adherenceReportEnabled = adherenceReportEnabled;
+    }
+
     /** {@inheritDoc} */
     @Override
     public Map<String, String> getAutomaticCustomEvents() {
@@ -671,7 +682,7 @@ public void setDefaultTemplates(Map<String,String> defaultTemplates) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, shortName, sponsorName, identifier, automaticCustomEvents,
+        return Objects.hash(name, shortName, sponsorName, identifier, adherenceReportEnabled, automaticCustomEvents,
                 autoVerificationEmailSuppressed, exporter3Configuration, exporter3Enabled, participantIpLockingEnabled, appIdExcludedInExport,
                 supportEmail, synapseDataAccessTeamId, synapseProjectId, technicalEmail, usesCustomExportSchedule,
                 uploadMetadataFieldDefinitions, uploadValidationStrictness, consentNotificationEmail,
@@ -692,6 +703,7 @@ public boolean equals(Object obj) {
         DynamoApp other = (DynamoApp) obj;
 
         return (Objects.equals(identifier, other.identifier)
+                && Objects.equals(adherenceReportEnabled, other.adherenceReportEnabled)
                 && Objects.equals(automaticCustomEvents, other.automaticCustomEvents)
                 && Objects.equals(autoVerificationEmailSuppressed, other.autoVerificationEmailSuppressed)
                 && Objects.equals(exporter3Configuration, other.exporter3Configuration)
@@ -743,7 +755,7 @@ public boolean equals(Object obj) {
     @Override
     public String toString() {
         return String.format(
-                "DynamoApp [name=%s, shortName=%s, active=%s, sponsorName=%s, identifier=%s, automaticCustomEvents=%s"
+                "DynamoApp [name=%s, shortName=%s, active=%s, sponsorName=%s, identifier=%s, adherenceReportEnabled=%b, automaticCustomEvents=%s"
                         + "autoVerificationEmailSuppressed=%b, minAgeOfConsent=%s, exporter3Configuration=%s, exporter3Enabled=%b, participantIpLockingEnabled=%b, "
                         + "appIdExcludedInExport=%b, supportEmail=%s, synapseDataAccessTeamId=%s, synapseProjectId=%s, "
                         + "technicalEmail=%s, uploadValidationStrictness=%s, consentNotificationEmail=%s, "
@@ -755,7 +767,7 @@ public String toString() {
                         + "phoneSignInEnabled=%s, accountLimit=%s, oauthProviders=%s, appleAppLinks=%s, androidAppLinks=%s, "
                         + "reauthenticationEnabled=%s, autoVerificationPhoneSuppressed=%s, verifyChannelOnSignInEnabled=%s, "
                         + "defaultTemplates=%s]",
-                name, shortName, active, sponsorName, identifier, automaticCustomEvents,
+                name, shortName, active, sponsorName, identifier, adherenceReportEnabled, automaticCustomEvents,
                 autoVerificationEmailSuppressed, minAgeOfConsent, exporter3Configuration, exporter3Enabled, participantIpLockingEnabled, appIdExcludedInExport,
                 supportEmail, synapseDataAccessTeamId, synapseProjectId, technicalEmail, uploadValidationStrictness,
                 consentNotificationEmail, consentNotificationEmailVerified, version, profileAttributes, taskIdentifiers,

src/main/java/org/sagebionetworks/bridge/models/apps/App.java

@@ -65,6 +65,10 @@ static App create() {
     Long getVersion();
     void setVersion(Long version);
 
+    /** True if this app should run adherence reports. */
+    boolean isAdherenceReportEnabled();
+    void setAdherenceReportEnabled(boolean enabled);
+
     /**
      * Custom events that should be generated for participant upon enrollment. The key in this map is the eventKey, and
      * the value is the offset after the enrollment event (eg, "P1D" for one day after enrollment, "P2W" for 2 weeks

src/test/java/org/sagebionetworks/bridge/dynamodb/DynamoAppTest.java

@@ -129,6 +129,7 @@ public void appFullySerializesForCaching() throws Exception {
                 OAuthProviderTest.CALLBACK_URL, null);
         app.getOAuthProviders().put("myProvider", oauthProvider);
 
+        app.setAdherenceReportEnabled(true);
         app.setAutomaticCustomEvents(ImmutableMap.of("3-days-after-enrollment", "P3D"));
         app.setVersion(2L);
         app.setMinSupportedAppVersions(ImmutableMap.<String, Integer>builder().put(OperatingSystem.IOS, 2).build());
@@ -139,6 +140,7 @@ public void appFullySerializesForCaching() throws Exception {
 
         final JsonNode node = BridgeObjectMapper.get().valueToTree(app);
 
+        assertTrue(node.get("adherenceReportEnabled").booleanValue());
         assertTrue(node.get("autoVerificationEmailSuppressed").booleanValue());
         assertEqualsAndNotNull(app.getConsentNotificationEmail(), node.get("consentNotificationEmail").asText());
         assertEqualsAndNotNull(app.getExporter3Configuration(), JsonUtils.asEntity(node,