migrate app usage survey data to v3

src/main/kotlin/com/openlattice/mechanic/pods/MechanicUpgradePod.kt

@@ -61,10 +61,7 @@ import com.openlattice.linking.PostgresLinkingFeedbackService
 import com.openlattice.linking.graph.PostgresLinkingQueryService
 import com.openlattice.mechanic.MechanicCli.Companion.UPGRADE
 import com.openlattice.mechanic.Toolbox
-import com.openlattice.mechanic.upgrades.DeleteOrgMetadataEntitySets
-import com.openlattice.mechanic.upgrades.ExportOrganizationMembers
-import com.openlattice.mechanic.upgrades.MigrateChronicleSystemApps
-import com.openlattice.mechanic.upgrades.V3StudyMigrationUpgrade
+import com.openlattice.mechanic.upgrades.*
 import com.openlattice.organizations.roles.HazelcastPrincipalService
 import com.openlattice.organizations.roles.SecurePrincipalsManager
 import com.openlattice.postgres.PostgresTable
@@ -373,9 +370,10 @@ class MechanicUpgradePod {
 
     @Bean
     fun exportOrganizationMembers(): ExportOrganizationMembers {
-        return ExportOrganizationMembers(toolbox, hikariDataSource, principalService(), hazelcastInstance)
+        return ExportOrganizationMembers(toolbox, hikariDataSource, principalService(), hazelcastInstance, rhizomeConfiguration)
     }
 
+    @Bean
     fun migrateChronicleSystemApps(): MigrateChronicleSystemApps {
         return MigrateChronicleSystemApps(
             toolbox,
@@ -385,6 +383,78 @@ class MechanicUpgradePod {
         )
     }
 
+    @Bean
+    fun migrateAppUsageSurveyData(): MigrateAppUsageSurveyData {
+        return MigrateAppUsageSurveyData(
+            toolbox,
+            rhizomeConfiguration,
+            authorizationService(),
+            principalService(),
+            searchService(),
+            dataQueryService(),
+            entitySetService()
+        )
+    }
+
+    @Bean
+    fun migrateTimeUseDiarySummarizedData(): MigrateTimeUseDiarySummarizedData {
+        return MigrateTimeUseDiarySummarizedData(
+            toolbox,
+            rhizomeConfiguration,
+            principalService(),
+            searchService(),
+            dataQueryService(),
+            entitySetService()
+        )
+    }
+
+    @Bean
+    fun migrateOrgSettingsToStudies(): MigrateOrgSettingsToStudies {
+        return MigrateOrgSettingsToStudies(
+            toolbox,
+            entitySetService(),
+            rhizomeConfiguration,
+            dataQueryService()
+        )
+    }
+
+    @Bean
+    fun migrateChronicleParticipantStats(): MigrateChronicleParticipantStats {
+        return MigrateChronicleParticipantStats(
+            toolbox,
+            searchService(),
+            principalService(),
+            entitySetService(),
+            dataQueryService(),
+            rhizomeConfiguration,
+            authorizationService()
+        )
+    }
+
+    @Bean
+    fun migrateTudSubmissions(): MigrateTimeUseDiarySubmissions {
+        return MigrateTimeUseDiarySubmissions(
+            toolbox,
+            rhizomeConfiguration,
+            dataQueryService(),
+            entitySetService(),
+            searchService(),
+            principalService()
+        )
+    }
+
+    @Bean
+    fun migratePreprocessedData() : MigratePreprocessedData {
+        return MigratePreprocessedData(
+            toolbox,
+            rhizomeConfiguration,
+            dataQueryService(),
+            entitySetService(),
+            searchService(),
+            principalService()
+        )
+    }
+
     @PostConstruct
     fun post() {
         Principals.init(principalService(), hazelcastInstance)

src/main/kotlin/com/openlattice/mechanic/upgrades/ExportOrganizationMembers.kt

@@ -1,9 +1,11 @@
 package com.openlattice.mechanic.upgrades
 
+import com.geekbeast.rhizome.configuration.RhizomeConfiguration
 import com.hazelcast.core.HazelcastInstance
 import com.openlattice.hazelcast.HazelcastMap
 import com.openlattice.mechanic.Toolbox
 import com.openlattice.organizations.roles.SecurePrincipalsManager
+import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
 import org.slf4j.LoggerFactory
 
@@ -15,12 +17,13 @@ class ExportOrganizationMembers(
     private val toolbox: Toolbox,
     private val hds: HikariDataSource,
     private val principalService: SecurePrincipalsManager,
-    hazelcast :HazelcastInstance
+    hazelcast :HazelcastInstance,
+    private val rhizomeConfiguration: RhizomeConfiguration
 ) : Upgrade {
     companion object {
         private const val USERS_EXPORT_TABLE_NAME = "users_export"
         const val USERS_EXPORT_TABLE = """
-            CREATE TABLE $USERS_EXPORT_TABLE_NAME ( 
+            CREATE TABLE IF NOT EXISTS $USERS_EXPORT_TABLE_NAME ( 
                 organization_id uuid,
                 principal_id text NOT NULL,
                 principal_email text, 
@@ -36,11 +39,16 @@ class ExportOrganizationMembers(
     private val organizations = HazelcastMap.ORGANIZATIONS.getMap(hazelcast)
     private val users = HazelcastMap.USERS.getMap(hazelcast)
 
+    private fun getDatasource(): HikariDataSource {
+        val (hikariConfiguration) = rhizomeConfiguration.datasourceConfigurations["chronicle"]!!
+        val hc = HikariConfig(hikariConfiguration)
+        return HikariDataSource(hc)
+    }
     override fun upgrade(): Boolean {
         val organizationsIds = organizations.keys.toMutableSet()
         val members = principalService.getOrganizationMembers(organizationsIds)
 
-        hds.connection.use { connection ->
+        getDatasource().connection.use { connection ->
             connection.createStatement().use { stmt -> stmt.execute(USERS_EXPORT_TABLE) }
             connection.prepareStatement(INSERT_USER_SQL).use { ps ->
             members.forEach { (orgId, orgMembers) ->