PATCH 14

Author: mariusmarin-dev

src/main/java/uk/ac/cam/cl/dtg/segue/dao/users/PgExternalAccountPersistenceManager.java

@@ -338,6 +338,8 @@ private String normalizeStage(String stage) {
       case "gcse,a_level":
       case "gcse, a level":
         return "GCSE and A Level";
+      case "all":
+        return "ALL";
       default:
         // Warn about unexpected stage values
         log.warn("MAILJETT - Unexpected stage value '{}' encountered. Returning 'unknown'. "

src/main/java/uk/ac/cam/cl/dtg/util/email/MailJetApiClientWrapper.java

@@ -120,6 +120,8 @@ public JSONObject getAccountByIdOrEmail(final String mailjetIdOrEmail) throws Ma
       MailjetRequest request = new MailjetRequest(Contact.resource, mailjetIdOrEmail);
       MailjetResponse response = mailjetClient.get(request);
 
+      log.info("MAILJETT - response: {}", response.getRawResponseContent());
+
       if (response.getStatus() == 404) {
         log.info("MAILJETT - Mailjet account not found: {}", mailjetIdOrEmail);
         return null;
@@ -181,6 +183,8 @@ public void permanentlyDeleteAccountById(final String mailjetId) throws MailjetE
       MailjetRequest request = new MailjetRequest(Contacts.resource, mailjetId);
       MailjetResponse response = mailjetClient.delete(request);
 
+      log.info("MAILJETT - response: {}", response.getRawResponseContent());
+
       if (response.getStatus() == 204 || response.getStatus() == 200) {
         log.info("MAILJETT - Successfully deleted Mailjet account: {}", mailjetId);
       } else if (response.getStatus() == 404) {
@@ -240,6 +244,8 @@ public String addNewUserOrGetUserIfExists(final String email) throws MailjetExce
               .property(Contact.EMAIL, normalizedEmail);
       MailjetResponse response = mailjetClient.post(request);
 
+      log.info("MAILJETT - response: {}", response.getRawResponseContent());
+
       if (response.getStatus() == 201 || response.getStatus() == 200) {
         JSONObject responseData = response.getData().getJSONObject(0);
         log.info("MAILJETT - responseData : {}", responseData.toString());
@@ -262,7 +268,7 @@ public String addNewUserOrGetUserIfExists(final String email) throws MailjetExce
         try {
           JSONObject existingAccount = getAccountByIdOrEmail(normalizedEmail);
           if (existingAccount != null) {
-            String mailjetId = Integer.toString(existingAccount.getInt("ID"));
+            String mailjetId = existingAccount.getString("ID");
             log.info("MAILJETT - Retrieved existing Mailjet account {} for email: {}",
                     mailjetId, maskEmail(normalizedEmail));
             return mailjetId;
@@ -333,6 +339,8 @@ public void updateUserProperties(final String mailjetId, final String firstName,
 
       MailjetResponse response = mailjetClient.put(request);
 
+      log.info("MAILJETT - response: {}", response.getRawResponseContent());
+
       if (response.getStatus() == 200 && response.getTotal() == 1) {
         log.info("MAILJETT - Successfully updated properties for Mailjet account: {}", mailjetId);
       } else {
@@ -407,6 +415,8 @@ public void updateUserSubscriptions(final String mailjetId,
 
       MailjetResponse response = mailjetClient.post(request);
 
+      log.info("MAILJETT - response: {}", response.getRawResponseContent());
+
       if (response.getStatus() == 201 && response.getTotal() == 1) {
         log.info("MAILJETT - Successfully updated subscriptions for Mailjet account: {}", mailjetId);
       } else {