Merge branch 'master' into sqlite-overhaul

stt-datacore · Dec 6, 2023 · e66223f · e66223f
2 parents 3bf564d + e98c73b
commit e66223f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/app/logic/telemetry.ts b/app/logic/telemetry.ts
@@ -2,7 +2,7 @@ import { Op } from 'sequelize';
 import { Voyage } from '../models/VoyageRecord';
 import fs from 'fs';
 
-type CrewPeople = {
+export interface Voyager {
 	crewSymbol: string,
 	seats: { seat_skill: string, seat_index: number, crewCount: number, averageDuration: number }[],
 	averageDuration: number,
@@ -41,7 +41,7 @@ async function recordVoyage(voyagers: string[]) {
 	return true;
 }
 
-async function recordVoyageCalc({ voyagers, estimatedDuration, primary_skill, secondary_skill, am_traits, ship_trait }: { voyagers: string[]; estimatedDuration: number; primary_skill?: string; secondary_skill?: string, am_traits?: string[], ship_trait?: string }) {
+async function recordVoyageCalc({ voyagers, estimatedDuration, primary_skill, secondary_skill, am_traits, ship_trait, extra_stats }: { voyagers: string[]; estimatedDuration: number; primary_skill?: string; secondary_skill?: string, am_traits?: string[], ship_trait?: string, extra_stats?: any }) {
 	// for (let i in voyagers) {
 	// 	const crewSymbol = voyagers[i];
 	// 	await VoyageRecord.create({ crewSymbol, estimatedDuration });
@@ -55,7 +55,8 @@ async function recordVoyageCalc({ voyagers, estimatedDuration, primary_skill, se
 		primary_skill,
 		secondary_skill,
 		am_traits,
-		ship_trait
+		ship_trait,
+		extra_stats
 	});
 
 	return true;
@@ -72,14 +73,18 @@ export async function loadStats() {
 	let dailyfile = `${path}/daily_stats.json`;
 
 	if (fs.existsSync(dailyfile)) {
-		return JSON.parse(fs.readFileSync(dailyfile, 'utf-8')) as { [key: string]: CrewPeople[] };
+		return JSON.parse(fs.readFileSync(dailyfile, 'utf-8')) as { [key: string]: Voyager[] };
 	}
 
 	return {};
 }
 
 export async function createStats(force?: boolean) {
 	let mynow = new Date();
+	mynow.setMinutes(0);
+	mynow.setSeconds(0);
+	mynow.setMilliseconds(0);
+
 	let path = `${process.env.PROFILE_DATA_PATH}/stats`;
 	if (!fs.existsSync(path)) {
 		fs.mkdirSync(path);
@@ -93,14 +98,14 @@ export async function createStats(force?: boolean) {
 			fs.rmSync(dailyfile);
 		}
 		else {
-			setTimeout(() => createStats(), 1000 * 60 * 60);
+			setTimeout(() => createStats(), 1000 * 60 * 30);
 			return;
 		}
 	}
 
 	let result = await getVoyageStats();
 	fs.writeFileSync(dailyfile, JSON.stringify(result));
-	setTimeout(() => createStats(), 1000 * 60 * 60);
+	setTimeout(() => createStats(), 1000 * 60 * 30);
 }
 
 async function getVoyageStats() {	
@@ -122,7 +127,7 @@ async function getVoyageStats() {
 	];
 
 	const records = await Voyage.findAll({ where: { voyageDate: { [Op.gte]: one80DaysAgo }}});
-	const output = {} as { [key: string]: CrewPeople[] };
+	const output = {} as { [key: string]: Voyager[] };
 
 	const dsets = [{
 		date: new Date(Date.now() - (180 * 24 * 60 * 60 * 1000)),
@@ -142,7 +147,7 @@ async function getVoyageStats() {
 		console.log(`From ${d} as '${fn}'...`);
 		let results = records.filter(r => r.voyageDate.getTime() >= dset.date.getTime());
 
-		const cp = {} as { [key: string]: CrewPeople };
+		const cp = {} as { [key: string]: Voyager };
 
 		for (let res of results) {
 			let seat = 0;

diff --git a/app/models/VoyageRecord.ts b/app/models/VoyageRecord.ts
@@ -40,9 +40,10 @@ export class Voyage extends Model {
 
     @Column
     ship_trait?: string;
-}
-
 
+    @Column(DataType.JSON)
+    extra_stats?: any
+}
 
 @Table
 export class Historical extends Model {
@@ -70,5 +71,8 @@ export class Historical extends Model {
 
     @Column
     ship_trait?: string;
+
+    @Column(DataType.JSON)
+    extra_stats?: any
 }
 
diff --git a/app/server.ts b/app/server.ts
@@ -8,6 +8,7 @@ import expressWinston from 'express-winston';
 import { ApiController } from './controllers';
 import { Logger, DataCoreAPI, createStats } from './logic';
 import { sequelize } from './sequelize';
+import { Voyage } from './models/VoyageRecord';
 
 require('dotenv').config();