Merge pull request #85 from SURFnet/feature/poll-config

Move poll config

Author: oharsta

server/src/main/java/broker/api/BrokerController.java

@@ -77,13 +77,13 @@ public BrokerController(@Value("${config.broker_client_url}") String clientUrl,
                             @Value("${config.local}") boolean local,
                             @Value("${config.allow_playground}") boolean allowPlayground,
                             @Value("${config.poll_enabled}") boolean pollEnabled,
+                            @Value("${config.poll_survey}") URI pollSurvey,
                             @Value("${config.play_home_institution_schacHome}") String playHomeInstitutionSchacHome,
                             @Value("${config.play_guest_institution_schacHome}") String playGuestInstitutionSchacHome,
                             @Value("${config.play_offering_id}") String playOfferingID,
                             @Value("${config.catalog_url}") String catalogUrl,
                             @Value("${config.connection_timeout_millis}") int connectionTimeoutMillis,
                             @Value("${config.edu_hub.gateway_url}") URI eduHubGatewayUrl,
-                            @Value("${config.edu_hub.poll_survey}") URI pollSurvey,
                             @Value("${config.edu_hub.user}") String eduHubUser,
                             @Value("${config.edu_hub.password}") String eduHubPassword,
                             InstitutionRegistry institutionRegistry,

server/src/main/java/broker/mail/MailBox.java

@@ -18,18 +18,18 @@ public class MailBox {
 
     private final JavaMailSender mailSender;
     private final String emailFrom;
-    private final String contactEmail;
+    private final String pollEmail;
     private final String environment;
 
     private final MustacheFactory mustacheFactory = new DefaultMustacheFactory("templates");
 
     public MailBox(JavaMailSender mailSender,
                    String emailFrom,
-                   String contactEmail,
+                   String pollEmail,
                    String environment)  {
         this.mailSender = mailSender;
         this.emailFrom = emailFrom;
-        this.contactEmail = contactEmail;
+        this.pollEmail = pollEmail;
         this.environment = environment;
     }
 
@@ -40,7 +40,7 @@ public void sendPollMail(PollRequest pollRequest) {
             variables.put("environment", environment);
         }
         variables.put("pollRequest", pollRequest);
-        sendMail("poll_en", "Poll result", variables, contactEmail);
+        sendMail("poll_en", "Poll result", variables, pollEmail);
     }
 
     @SneakyThrows

server/src/main/java/broker/mail/MailConf.java

@@ -12,10 +12,10 @@ public class MailConf {
 
     @Bean
     public MailBox mailBox(@Value("${email.from}") String emailFrom,
-                           @Value("${email.contactEmail}") String contactEmail,
+                           @Value("${config.poll_email}") String pollEmail,
                            @Value("${email.environment}") String env,
                            JavaMailSender mailSender) throws IOException {
-        return new MailBox(mailSender, emailFrom, contactEmail, env);
+        return new MailBox(mailSender, emailFrom, pollEmail, env);
     }
 
 

server/src/main/resources/application.yml

@@ -40,7 +40,6 @@ datasource:
 
 email:
   from: "no-reply@surf.nl"
-  contactEmail: "support@surf.nl"
   environment: "local"
 
 config:
@@ -52,6 +51,8 @@ config:
   allow_playground: True
   # Do we ask the user to submit a poll response
   poll_enabled: True
+  poll_survey: "https://surf.yellenge.nl/nogiets"
+  poll_email: "support@surf.nl"
   # Default home institution if playground is enabled
   play_home_institution_schacHome: "utrecht.nl"
   # Default guest institution if playground is enabled
@@ -71,7 +72,6 @@ config:
     secret: secret
   edu_hub:
     gateway_url: http://localhost:8081
-    poll_survey: "https://surf.yellenge.nl/nogiets"
     user: eduhub
     password: secret
   queueit:

server/src/test/java/broker/api/BrokerControllerUnitTest.java

@@ -33,13 +33,13 @@ public class BrokerControllerUnitTest {
             false,
             false,
             true,
+            new URI("http://localhost/poll"),
             "utrecht.nl",
             "eindhoven.nl",
             "1",
             "https://educhange.nl/",
             20_000,
             new URI("https://eduhub.nl"),
-            new URI("https://eduhub.nl"),
             "eduhub",
             "secret",
             new InMemoryInstitutionRegistry(new ClassPathResource("service-registry-test.yml")),