Mailjet patch 1 #394

mariusmarin-dev · 2025-12-16T11:24:08Z

No description provided.

…tles

# Conflicts: # src/main/java/uk/ac/cam/cl/dtg/isaac/api/EventsFacade.java # src/main/java/uk/ac/cam/cl/dtg/isaac/api/managers/EventBookingManager.java # src/main/java/uk/ac/cam/cl/dtg/isaac/dos/eventbookings/PgEventBooking.java # src/main/java/uk/ac/cam/cl/dtg/isaac/dos/eventbookings/PgEventBookings.java # src/main/java/uk/ac/cam/cl/dtg/isaac/dto/eventbookings/ProjectTitlesResponseDTO.java

github-actions · 2025-12-16T11:24:42Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+        String accountEmail = userRecord.getAccountEmail();
+
+        log.info("MMAILJETT - [User {}] Starting sync for email: {}", userId, sanitiseEmailForLogging(accountEmail));
+        log.debug("MMAILJETT - [User {}] Full user record: deleted={}, emailVerificationStatus={}, providerUserId={}, " +


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 121).

github-actions · 2025-12-16T11:24:42Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+        String accountEmail = userRecord.getAccountEmail();
+
+        log.info("MMAILJETT - [User {}] Starting sync for email: {}", userId, sanitiseEmailForLogging(accountEmail));
+        log.debug("MMAILJETT - [User {}] Full user record: deleted={}, emailVerificationStatus={}, providerUserId={}, " +


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck> _{reported by reviewdog 🐶}
'+' should be on a new line.

github-actions · 2025-12-16T11:24:42Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

        } catch (SegueDatabaseException e) {
-          log.error(String.format("Error storing record of MailJet update to user (%s)!", userId));
+          failedSyncs++;
+          log.error(String.format("MMAILJETT - [User %s] Database error during sync - will retry on next run", userId), e);


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 123).

github-actions · 2025-12-16T11:24:42Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+        mailjetId = mailjetApi.addNewUserOrGetUserIfExists(accountEmail);
+
+        if (mailjetId == null) {
+          log.error("MMAILJETT - [User {}] Failed to create Mailjet contact - addNewUserOrGetUserIfExists returned null", userId);


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 130).

github-actions · 2025-12-16T11:24:42Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+          updateSucceeded = true;
+        } finally {
+          if (!updateSucceeded) {
+            log.error("MMAILJETT - [User {}] Failed to update properties/subscriptions for Mailjet ID {} - " +


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck> _{reported by reviewdog 🐶}
'+' should be on a new line.

github-actions · 2025-12-17T05:41:19Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+        String accountEmail = userRecord.getAccountEmail();
+
+        log.info("MMAILJETT - [User {}] Starting sync for email: {}", userId, sanitiseEmailForLogging(accountEmail));
+        log.info("MMAILJETT - [User {}] Full user record: deleted={}, emailVerificationStatus={}, providerUserId={}, " +


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck> _{reported by reviewdog 🐶}
'+' should be on a new line.

github-actions · 2025-12-17T05:41:19Z

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

+            + "WHERE (users.last_updated >= provider_last_updated OR news_prefs.last_updated >= provider_last_updated "
+            + "           OR events_prefs.last_updated >= provider_last_updated OR provider_last_updated IS NULL)";
+
+      log.info("QUERY :{}", query);


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck> _{reported by reviewdog 🐶}
'method def' child has incorrect indentation level 6, expected level should be 4.

github-actions · 2025-12-17T09:23:18Z

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

+            + "WHERE (users.last_updated >= provider_last_updated OR news_prefs.last_updated >= provider_last_updated "
+            + "           OR events_prefs.last_updated >= provider_last_updated OR provider_last_updated IS NULL)";
+
+      log.info("MMAILJETT - QUERY :{}", query);


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck> _{reported by reviewdog 🐶}
'method def' child has incorrect indentation level 6, expected level should be 4.

github-actions · 2025-12-17T10:30:03Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+    } catch (MailjetException e) {
+      // Check if this is a 404 - contact was deleted from Mailjet but we still have the ID
+      if (is404Error(e)) {
+        log.warn("MMAILJETT - [User {}] Contact with Mailjet ID {} not found (404) during property update - clearing stale ID",


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 127).

github-actions · 2025-12-17T10:30:03Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+    } catch (MailjetException e) {
+      // Check if this is a 404 - contact was deleted from Mailjet but we still have the ID
+      if (is404Error(e)) {
+        log.warn("MMAILJETT - [User {}] Contact with Mailjet ID {} not found (404) during subscription update - clearing stale ID",


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 131).

github-actions · 2025-12-17T10:30:03Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+    }
+
+    // Check for 404 status code in the error message
+    return message.contains("\"StatusCode\" : 404") ||


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck> _{reported by reviewdog 🐶}
'||' should be on a new line.

github-actions · 2025-12-17T10:30:03Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+
+    // Check for 404 status code in the error message
+    return message.contains("\"StatusCode\" : 404") ||
+            message.contains("\"StatusCode\": 404") ||


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck> _{reported by reviewdog 🐶}
'||' should be on a new line.

github-actions · 2025-12-17T10:30:03Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+    try {
+      // Clear the Mailjet ID from the database by setting it to null
+      database.updateExternalAccount(userId, null);
+      log.info("MMAILJETT - [User {}] Successfully cleared stale Mailjet ID {}. " +


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck> _{reported by reviewdog 🐶}
'+' should be on a new line.

github-actions · 2025-12-17T18:52:57Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+import java.io.StringWriter;
 import java.util.List;
+
+import org.json.JSONException;


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck> _{reported by reviewdog 🐶}
Extra separation in import group before 'org.json.JSONException'

github-actions · 2025-12-17T18:52:57Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+        String accountEmail = userRecord.getAccountEmail();
+
+        log.debug("MAILJET - [User {}] Starting sync for email: {}", userId, sanitiseEmailForLogging(accountEmail));
+        log.debug("MAILJET - [User {}] Details: deleted={}, emailStatus={}, mailjetId={}, allowsNews={}, allowsEvents={}, role={}, stage={}",


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 141).

github-actions · 2025-12-17T18:52:57Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

        } catch (SegueDatabaseException e) {
-          log.error(String.format("Error storing record of MailJet update to user (%s)!", userId));
+          failedSyncs++;
+          log.error("MAILJET - [User {}] Database error during sync - will retry on next run: {}", userId, e.getMessage());


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 123).

github-actions · 2025-12-17T18:52:57Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

-          log.error(e.getMessage());
-          throw new ExternalAccountSynchronisationException(e.getMessage());
+          failedSyncs++;
+          log.error("MAILJET - [User {}] Mailjet API error: {} - {}", userId, e.getClass().getSimpleName(), e.getMessage());


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 124).

github-actions · 2025-12-17T18:52:57Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+
+        } catch (Exception e) {
+          failedSyncs++;
+          log.error("MAILJET - [User {}] Unexpected error: {} - {}", userId, e.getClass().getSimpleName(), e.getMessage());


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 123).

github-actions · 2025-12-17T18:52:57Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+   */
+  private boolean shouldSyncToMailjet(UserExternalAccountChanges userRecord) {
+    // Don't sync deleted users or users with delivery failures
+    if (userRecord.isDeleted() ||


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck> _{reported by reviewdog 🐶}
'||' should be on a new line.

github-actions · 2025-12-17T18:52:57Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+      updateSucceeded = true;
+    } finally {
+      if (!updateSucceeded) {
+        log.error("MAILJET - [User {}] Failed to update properties/subscriptions for Mailjet ID {} - contact exists but may have incomplete data",


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 146).

github-actions · 2025-12-17T18:52:57Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+    String message = e.getMessage();
+    return message.contains("\"StatusCode\" : 404") ||
+            message.contains("\"StatusCode\": 404") ||
+            message.contains("Object not found") ||


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck> _{reported by reviewdog 🐶}
'||' should be on a new line.

github-actions · 2025-12-17T18:52:57Z

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

-        + "    LEFT OUTER JOIN external_accounts ON users.id=external_accounts.user_id AND provider_name='MailJet' "
-        + "WHERE (users.last_updated >= provider_last_updated OR news_prefs.last_updated >= provider_last_updated "
-        + "           OR events_prefs.last_updated >= provider_last_updated OR provider_last_updated IS NULL)";
+    String query = "SELECT users.id, provider_user_identifier, email, role, given_name, deleted, email_verification_status, "


🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck> _{reported by reviewdog 🐶}
Line is longer than 120 characters (found 125).

github-actions · 2025-12-17T18:52:57Z

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

+      }
+
+      boolean hasGcse = false;
+      boolean hasALevel = false;


📝 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck> _{reported by reviewdog 🐶}
Abbreviation in name 'hasALevel' must contain no more than '1' consecutive capital letters.

github-actions · 2025-12-17T19:57:30Z

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

   */
  @Override
  public synchronized void synchroniseChangedUsers() throws ExternalAccountSynchronisationException {
+    long startTime = System.currentTimeMillis();


⚠️ [checkstyle] <com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck> _{reported by reviewdog 🐶}
Distance between variable 'startTime' declaration and its first usage is 8, but allowed 3. Consider making that variable final if you still need to store its value in advance (before method calls that might have side effects on the original value).

sonarqubecloud · 2025-12-17T19:58:02Z

Quality Gate failed

Failed conditions
5.9% Duplication on New Code (required ≤ 3%)
E Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+        // Rate limiting: 2 second delay between each user
+        if (totalUsersProcessed > 1) {
+          try {
+            Thread.sleep(2000); // 2 seconds between users


src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+        if (totalUsersProcessed % 100 == 0) {
+          try {
+            log.info("MAILJET - Processed {} users, pausing 10 seconds to avoid rate limits", totalUsersProcessed);
+            Thread.sleep(10000); // 10 seconds every 100 users


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

+   */
  private UserExternalAccountChanges buildUserExternalAccountChanges(final ResultSet results) throws SQLException {
-    String registeredContextsJson = results.getString("registered_contexts");
+    Long userId = results.getLong("id");


To fix the problem, we should change the type of userId from Long (the boxed type) to long (the primitive type) at its declaration in the buildUserExternalAccountChanges function (line 127).
Additionally, if downstream code (such as the constructor for UserExternalAccountChanges) requires a Long, we should either keep the boxed type at that point or explicitly box the value as needed.
However, based on the code shown, the userId value is being passed as an argument to UserExternalAccountChanges, and it would be more efficient and idiomatic to keep it as long—the Java compiler will auto-box as required for the constructor.
No additional imports or methods are needed for this fix; only the type declaration for the local variable needs to change.

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+          throws SegueDatabaseException, MailjetException {
+
+    Long userId = userRecord.getUserId();
+    String accountEmail = userRecord.getAccountEmail();


The general fix for this kind of error is to remove the declaration and assignment of the unused local variable. In this particular instance, String accountEmail = userRecord.getAccountEmail(); on line 181 in processSingleUser is unused; it is declared and assigned, but never referenced after. To fix the error, simply delete this line. No further code changes (such as moving logic elsewhere or keeping the call for side-effects) are needed, as the getAccountEmail method almost certainly does not have side effects. No method signatures or imports need to be changed.

src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/ExternalAccountManager.java

+    boolean accountEmailDeliveryFailed =
+            EmailVerificationStatus.DELIVERY_FAILED.equals(userRecord.getEmailVerificationStatus());


The best way to fix this problem is to remove the declaration and assignment of the unused local variable accountEmailDeliveryFailed from the processSingleUser method in ExternalAccountManager.java, as it serves no purpose and its removal has no side effects. Only lines relating to the declaration of accountEmailDeliveryFailed should be touched. No additional code, imports, or definitions are necessary since its removal does not affect other logic.

mariusmarin-dev added 3 commits November 24, 2025 11:35

735 - Add inline validation and visual error for duplicate project ti…

e5bdb8c

…tles

MAILJET

a19b71b

github-actions bot reviewed Dec 16, 2025

View reviewed changes

PATCH 2

e624a3a

github-actions bot reviewed Dec 17, 2025

View reviewed changes

PATCH 3

ae2cbd8

github-actions bot reviewed Dec 17, 2025

View reviewed changes

mariusmarin-dev added 2 commits December 17, 2025 11:44

PATCH 4

e7a1848

PATCH 5

24c3833

github-actions bot reviewed Dec 17, 2025

View reviewed changes

PATCH 6

184e2d3

github-actions bot reviewed Dec 17, 2025

View reviewed changes

PATCH 7

abac307

github-actions bot reviewed Dec 17, 2025

View reviewed changes

github-advanced-security bot found potential problems Dec 17, 2025

View reviewed changes

@@ -124,7 +124,7 @@
                * @throws SQLException if database access fails
                */
               private UserExternalAccountChanges buildUserExternalAccountChanges(final ResultSet results) throws SQLException {
-                Long userId = results.getLong("id");
+                long userId = results.getLong("id");
                 try {
                   // Extract basic fields

		boolean accountEmailDeliveryFailed =
		EmailVerificationStatus.DELIVERY_FAILED.equals(userRecord.getEmailVerificationStatus());

Mailjet patch 1 #394

Are you sure you want to change the base?

Mailjet patch 1 #394

Uh oh!

Conversation

mariusmarin-dev commented Dec 16, 2025

Uh oh!

github-actions bot Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Dec 17, 2025