Improve MCC logging

bbimber · bbimber · commit b98702570bec · 2024-04-02T21:28:49.000-07:00
diff --git a/mcc/src/org/labkey/mcc/query/TriggerHelper.java b/mcc/src/org/labkey/mcc/query/TriggerHelper.java
@@ -279,7 +279,7 @@ public int ensureMccAliasExists(Collection<String> rawIds, Map<Object, Object> e
             if (ciExistingAliases.containsKey(rs.getString(FieldKey.fromString("subjectname")))) {
                 if (!ciExistingAliases.get(rs.getString(FieldKey.fromString("subjectname"))).equalsIgnoreCase(rs.getString(FieldKey.fromString("externalAlias"))))
                 {
-                    _log.error("Incoming MCC alias for: " + rs.getString(FieldKey.fromString("subjectname")) + " does not match existing: " + rs.getString(FieldKey.fromString("externalAlias")));
+                    _log.error("Incoming MCC alias for: " + rs.getString(FieldKey.fromString("subjectname")) + "(" + ciExistingAliases.get(rs.getString(FieldKey.fromString("subjectname"))) + ") does not match existing: " + rs.getString(FieldKey.fromString("externalAlias")));
                 }
             }
         });

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ public int ensureMccAliasExists(Collection<String> rawIds, Map<Object, Object> e`
`279`	`279`	`if (ciExistingAliases.containsKey(rs.getString(FieldKey.fromString("subjectname")))) {`
`280`	`280`	`if (!ciExistingAliases.get(rs.getString(FieldKey.fromString("subjectname"))).equalsIgnoreCase(rs.getString(FieldKey.fromString("externalAlias"))))`
`281`	`281`	`{`
`282`		`- _log.error("Incoming MCC alias for: " + rs.getString(FieldKey.fromString("subjectname")) + " does not match existing: " + rs.getString(FieldKey.fromString("externalAlias")));`
	`282`	`+ _log.error("Incoming MCC alias for: " + rs.getString(FieldKey.fromString("subjectname")) + "(" + ciExistingAliases.get(rs.getString(FieldKey.fromString("subjectname"))) + ") does not match existing: " + rs.getString(FieldKey.fromString("externalAlias")));`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`	`});`