Getter For VCell Support ID

Author: Ezequiel-Valencia

vcell-core/src/main/java/cbit/vcell/resource/PropertyLoader.java

@@ -57,7 +57,6 @@ public static void setConfigProvider(VCellConfigProvider configProvider) {
 	public static final String ADMINISTRATOR_ID = "2";
 	public static final String TESTACCOUNT_USERID = "vcellNagios";
 	public static final String VCELL_SUPPORT_USERID = "VCellSupport";
-	public static final String vcellSupportId = record("vcell.user.support", ValueType.GEN);
 
 	public static final String vcellServerIDProperty        = record("vcell.server.id",ValueType.GEN);
 

…n/java/org/vcell/restq/StartUpTasks.java …org/vcell/restq/QuarkusStartUpTasks.javavcell-rest/src/main/java/org/vcell/restq/StartUpTasks.java renamed to vcell-rest/src/main/java/org/vcell/restq/QuarkusStartUpTasks.java vcell-rest/src/main/java/org/vcell/restq/StartUpTasks.java renamed to vcell-rest/src/main/java/org/vcell/restq/QuarkusStartUpTasks.java

@@ -1,7 +1,7 @@
 package org.vcell.restq;
 
+import cbit.sql.ServerStartUpTasks;
 import cbit.vcell.modeldb.AdminDBTopLevel;
-import cbit.vcell.resource.PropertyLoader;
 import io.quarkus.runtime.StartupEvent;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
@@ -15,18 +15,16 @@
 import java.sql.SQLException;
 
 @ApplicationScoped
-public class StartUpTasks {
-    private final static Logger logger = LogManager.getLogger(StartUpTasks.class);
+public class QuarkusStartUpTasks {
+    private final static Logger logger = LogManager.getLogger(QuarkusStartUpTasks.class);
 
     @Inject
     AgroalConnectionFactory connectionFactory;
 
     public void onStartUp(@Observes StartupEvent ev) throws SQLException, DataAccessException {
         logger.info("Executing startup tasks");
-
-        AdminDBTopLevel adminDBTopLevel = new AdminDBTopLevel(connectionFactory);
-        User vcellSupport = adminDBTopLevel.getVCellSupportUser(true);
-        PropertyLoader.setProperty(PropertyLoader.vcellSupportId, vcellSupport.getID().toString());
+        ServerStartUpTasks.executeStartUpTasks(connectionFactory);
+        logger.info("Startup tasks executed successfully");
     }
 
 }

vcell-rest/src/test/java/org/vcell/restq/auth/ACLSupportTest.java

@@ -1,5 +1,6 @@
 package org.vcell.restq.auth;
 
+import cbit.sql.ServerStartUpTasks;
 import cbit.vcell.biomodel.BioModel;
 import cbit.vcell.modeldb.AdminDBTopLevel;
 import cbit.vcell.modeldb.DatabaseServerImpl;
@@ -132,6 +133,6 @@ public void testSpecialClaimsPeopleHave() throws SQLException, DataAccessExcepti
 
     @Test
     public void testVCellSupportIDGrabbing(){
-        Assertions.assertEquals(PropertyLoader.getRequiredProperty(PropertyLoader.vcellSupportId), "4");
+        Assertions.assertEquals(ServerStartUpTasks.getVCellSupportID(), "4");
     }
 }

vcell-server/src/main/java/cbit/sql/ServerStartUpTasks.java

@@ -0,0 +1,24 @@
+package cbit.sql;
+
+import cbit.vcell.modeldb.AdminDBTopLevel;
+import org.vcell.db.ConnectionFactory;
+import org.vcell.util.DataAccessException;
+import org.vcell.util.document.User;
+
+import java.sql.SQLException;
+
+public class ServerStartUpTasks {
+    private static String vcellSupportID = null;
+
+
+    public static void executeStartUpTasks(ConnectionFactory connectionFactory) throws SQLException, DataAccessException {
+        AdminDBTopLevel adminDBTopLevel = new AdminDBTopLevel(connectionFactory);
+        User user = adminDBTopLevel.getVCellSupportUser(true);
+        vcellSupportID = user.getID().toString();
+    }
+
+    public static String getVCellSupportID() {
+        return vcellSupportID;
+    }
+
+}

vcell-server/src/main/java/cbit/vcell/modeldb/DatabasePolicySQL.java

@@ -12,6 +12,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import cbit.sql.ServerStartUpTasks;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.vcell.db.DatabaseSyntax;
@@ -306,7 +307,7 @@ static String getVTableDirectSelectClause(VersionTable vTable,User user) {
 
 	String vcellSupportClause = "";
 	if (user instanceof SpecialUser specialUser && specialUser.isVCellSupport()){
-		vcellSupportClause = " OR " + GroupTable.table.userRef.getQualifiedColName() + " = " + PropertyLoader.getRequiredProperty(PropertyLoader.vcellSupportId);
+		vcellSupportClause = " OR " + GroupTable.table.userRef.getQualifiedColName() + " = " + ServerStartUpTasks.getVCellSupportID();
 	}
 	String sql = 	" ( "+
 						vTable.privacy.getQualifiedColName() + " = " + GroupTable.table.groupid.getQualifiedColName() +