feat: update module stats to new server

Author: Julusian

usage-statistics/src/main.ts

@@ -20,23 +20,16 @@ if (!sourceUrl) {
 	throw new Error('SOURCE_DATABASE_URL environment variable is required')
 }
 
-const oldSourceUrl = process.env.OLD_SOURCE_DATABASE_URL
-if (!oldSourceUrl) {
-	throw new Error('OLD_SOURCE_DATABASE_URL environment variable is required')
-}
-
 const adapter = new PrismaMariaDb(connectionString)
 const prismaDest = new PrismaClient({
 	adapter,
 })
 
 const srcDb = await mariadb.createConnection(sourceUrl)
-const oldDb = await mariadb.createConnection(oldSourceUrl)
 
 const store: AppStore = {
 	prismaDest,
 	srcDb,
-	oldDb,
 }
 
 try {
@@ -52,7 +45,6 @@ try {
 
 	console.log('all done!')
 } finally {
-	await oldDb.end()
 	await srcDb.end()
 	await prismaDest.$disconnect()
 }

usage-statistics/src/modules-data.ts

@@ -5,11 +5,27 @@ import type { AppStore } from './types.js'
 import type { CompanionModules, StatsSamplePeriod } from './prisma/client.js'
 
 function formatQuery(interval: string) {
-	return `SELECT count(distinct uuid) users, module FROM \`module\` where ts >= date_sub(CURRENT_DATE, interval ${interval}) group by module;`
+	return `
+		SELECT 
+			km.module_name as module,
+			COUNT(DISTINCT muls.user_id) as users
+		FROM KnownModule km
+		INNER JOIN ModuleUserLastSeen muls ON km.id = muls.module_id
+		WHERE km.module_type = 'CONNECTION'
+			AND km.module_version = ''
+			AND muls.last_seen >= DATE_SUB(CURRENT_DATE, INTERVAL ${interval})
+		GROUP BY km.module_name
+	`
 }
 
 export async function runModules(store: AppStore): Promise<void> {
-	const allModules: any[] = await store.oldDb.query('SELECT module FROM `module` group by module;')
+	const allModules: any[] = await store.srcDb.query(`
+		SELECT module_name as module
+		FROM KnownModule
+		WHERE module_type = 'CONNECTION'
+			AND module_version = ''
+		GROUP BY module_name
+	`)
 
 	function convertModules(stats: any[], type: StatsSamplePeriod): Omit<CompanionModules, 'id' | 'ts'>[] {
 		const statsMap = new Map<string, number>()
@@ -41,16 +57,16 @@ export async function runModules(store: AppStore): Promise<void> {
 	}
 
 	await Promise.all([
-		runQuery('Platforms 30day', async () => {
-			const rows = await store.oldDb.query(formatQuery('30 day'))
+		runQuery('Modules 30day', async () => {
+			const rows = await store.srcDb.query(formatQuery('30 day'))
 			await writeData(rows, 'day30' as '30day')
 		}),
-		runQuery('Platforms 7day', async () => {
-			const rows = await store.oldDb.query(formatQuery('7 day'))
+		runQuery('Modules 7day', async () => {
+			const rows = await store.srcDb.query(formatQuery('7 day'))
 			await writeData(rows, 'day7' as '7day')
 		}),
-		runQuery('Platforms 1day', async () => {
-			const rows = await store.oldDb.query(formatQuery('24 hour'))
+		runQuery('Modules 1day', async () => {
+			const rows = await store.srcDb.query(formatQuery('24 hour'))
 			await writeData(rows, 'day1' as '1day')
 		}),
 	])

usage-statistics/src/types.ts

@@ -4,5 +4,4 @@ import type mariadb from 'mariadb'
 export interface AppStore {
 	prismaDest: PrismaClient
 	srcDb: mariadb.Connection
-	oldDb: mariadb.Connection
 }