DM-51807: Replace dashes with underscores in usernames used for uploads (#162)

Author: stvoutsin

CHANGELOG.md

@@ -6,6 +6,13 @@ Find changes for the upcoming release in the project's [changelog.d](https://git
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-3.4.3'></a>
+## 3.4.3 (2025-07-15)
+
+### Changed
+
+- Change dashes to underscores in user database name for uploaded tables
+
 <a id='changelog-3.4.2'></a>
 ## 3.4.2 (2025-07-10)
 

build.gradle

@@ -48,7 +48,7 @@ dependencies {
     }
 
     implementation 'org.opencadc:cadc-access-control-identity:[1.0.7,)'
-    implementation 'org.opencadc:cadc-adql:[1.1.16,)'
+    implementation 'org.opencadc:cadc-adql:1.1.15'
     implementation 'org.opencadc:cadc-dali-pg:0.3.1'
     implementation 'org.opencadc:cadc-dali:[1.2.24,)'
     implementation 'org.opencadc:cadc-log:[1.2.1,)'

src/main/java/org/opencadc/tap/impl/RubinUploadManagerImpl.java

@@ -405,7 +405,9 @@ public String getDatabaseTableName(UploadTable uploadTable) {
         StringBuilder sb = new StringBuilder();
         String username = getUsername();
         if (username != null) {
-            sb.append("user_").append(username).append(".");
+            // Replace dashes with underscores
+            String sanitizedUsername = username.replace("-", "_");
+            sb.append("user_").append(sanitizedUsername).append(".");
         }
         sb.append(uploadTable.tableName);
         sb.append("_");

src/main/java/org/opencadc/tap/kafka/util/KafkaJobService.java

@@ -95,7 +95,11 @@ public static boolean prepareAndSubmitJob(Job job,
             // Temp fix
             // If there is a table upload, use the username as the database
             if (!jobInfo.uploadTables.isEmpty()){
-                databaseString = "user_" + getUsername();
+                String username = getUsername();
+                if (username == null || username.isEmpty()) {
+                    username = "anonymous";
+                }
+                databaseString = "user_" + getUsername().replace("-", "_");
             }
 
             // Submit job to Kafka

src/main/java/org/opencadc/tap/kafka/util/VOTableUtil.java

@@ -258,4 +258,4 @@ public static String generateErrorVOTable(String errorMessage) {
                 + "</RESOURCE>"
                 + "</VOTABLE>";
     }
-}
+}