Improve config names

con2 · Sep 1, 2024 · d0b0e0b · d0b0e0b
1 parent 4d94137
commit d0b0e0b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/server/package.json b/server/package.json
@@ -27,7 +27,7 @@
     "test:coverage": "yarn run -T vitest run --coverage --colors",
     "test:watch": "yarn run -T vitest watch",
     "type-check": "yarn run -T tsc --noEmit",
-    "update-game-popularity": "NODE_ENV=development tsx src/test/scripts/testUpdateGamePopularity.ts",
+    "update-program-popularity": "NODE_ENV=development tsx src/test/scripts/testUpdateProgramItemPopularity.ts",
     "verify-results": "NODE_ENV=development tsx src/test/scripts/testVerifyResults.ts",
     "load-kompassi-data": "NODE_ENV=development tsx src/test/scripts/loadKompassiDataToDb.ts",
     "update-kompassi-datadump": "NODE_ENV=development tsx src/test/scripts/updateKompassiDataDump.ts",

diff --git a/server/src/features/assignment/padg/utils/assignPadg.ts b/server/src/features/assignment/padg/utils/assignPadg.ts
@@ -19,12 +19,12 @@ export const assignPadg = (
   list: ListItem[],
   updateL: (input: Input) => string,
 ): PadgRandomAssignResult[] => {
-  const { PADG_ASSIGNMENT_ROUNDS } = config.server();
+  const { padgAssignmentRounds } = config.server();
 
   let finalHappiness = 0;
   let finalAssignResults: PadgRandomAssignResult[] = [];
 
-  for (let i = 0; i < PADG_ASSIGNMENT_ROUNDS; i++) {
+  for (let i = 0; i < padgAssignmentRounds; i++) {
     const eventsCopy = cloneDeep(events);
 
     const input: PadgInput = {

diff --git a/server/src/features/assignment/random/utils/runRandomAssignment.ts b/server/src/features/assignment/random/utils/runRandomAssignment.ts
@@ -51,13 +51,13 @@ export const runRandomAssignment = (
   const list = unwrapResult(listResult);
   const updateL = (input: RandomAssignUpdateLInput): ListItem[] => input.L;
 
-  const { RANDOM_ASSIGNMENT_ROUNDS } = config.server();
+  const { randomAssignmentRounds } = config.server();
   const input = {
     groups,
     events,
     L: list,
     updateL,
-    assignmentRounds: RANDOM_ASSIGNMENT_ROUNDS,
+    assignmentRounds: randomAssignmentRounds,
   };
 
   let assignResults: AssignmentElement[] | CheckResult | undefined;

diff --git a/server/src/test/test-data-generation/generators/createLotterySignups.ts b/server/src/test/test-data-generation/generators/createLotterySignups.ts
@@ -64,7 +64,7 @@ const getRandomLotterySignup = (
 
   // Select random program items for each start time
   firstFourTimes.forEach((startTime) => {
-    logger.debug(`Generate signups for time ${startTime}`);
+    logger.debug(`Generate lottery signups for time ${startTime}`);
     const programItemsForTime = activeProgramItems.filter(
       (activeProgramItem) =>
         dayjs(activeProgramItem.startTime).toISOString() ===

diff --git a/shared/config/serverConfig.ts b/shared/config/serverConfig.ts
@@ -13,8 +13,8 @@ export interface ServerConfig {
   jwtSecretKeyAdmin: string;
   jwtSecretKeyHelp: string;
   allowedCorsOrigins: readonly string[];
-  PADG_ASSIGNMENT_ROUNDS: number;
-  RANDOM_ASSIGNMENT_ROUNDS: number;
+  padgAssignmentRounds: number;
+  randomAssignmentRounds: number;
   bundleCompression: boolean;
   autoUpdateProgramEnabled: boolean;
   programUpdateInterval: string;
@@ -85,8 +85,8 @@ const prodConfig = {
   jwtSecretKeyHelp: process.env.JWT_SECRET_KEY_HELP ?? "",
   allowedCorsOrigins: getAllowedCorsOrigins(),
   debug: process.env.DEBUG === "true" || false,
-  PADG_ASSIGNMENT_ROUNDS: 300,
-  RANDOM_ASSIGNMENT_ROUNDS: 300,
+  padgAssignmentRounds: 300,
+  randomAssignmentRounds: 300,
   consoleLogFormatJson: true,
 
   // Dev
@@ -113,8 +113,8 @@ const stagingConfig = {
   jwtSecretKeyHelp: process.env.JWT_SECRET_KEY_HELP ?? "",
   allowedCorsOrigins: getAllowedCorsOrigins(),
   debug: process.env.DEBUG === "true" || false,
-  PADG_ASSIGNMENT_ROUNDS: 300,
-  RANDOM_ASSIGNMENT_ROUNDS: 300,
+  padgAssignmentRounds: 300,
+  randomAssignmentRounds: 300,
   consoleLogFormatJson: true,
 
   // Dev
@@ -147,8 +147,8 @@ const devConfig = {
     "http://server:5000",
   ]),
   debug: false,
-  PADG_ASSIGNMENT_ROUNDS: 300,
-  RANDOM_ASSIGNMENT_ROUNDS: 10,
+  padgAssignmentRounds: 300,
+  randomAssignmentRounds: 10,
   consoleLogFormatJson: false,
 
   // Dev