fix: we can access the description from the prototype

Badminton-Apps · Aug 7, 2024 · d1869c2 · d1869c2
1 parent b95b384
commit d1869c2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 23 deletions.
diff --git a/libs/backend/competition/assembly/src/services/validate/assembly.service.ts b/libs/backend/competition/assembly/src/services/validate/assembly.service.ts
@@ -41,14 +41,14 @@ export class AssemblyValidationService extends ValidationService<
 
     await this.clearRules();
 
-    await this.registerRule(PlayerCompStatusRule, PlayerCompStatusRule.description);
-    await this.registerRule(TeamBaseIndexRule, TeamBaseIndexRule.description);
-    await this.registerRule(TeamSubeventIndexRule, TeamSubeventIndexRule.description);
-    await this.registerRule(TeamClubBaseRule, TeamClubBaseRule.description);
-    await this.registerRule(PlayerOrderRule, PlayerOrderRule.description);
-    await this.registerRule(PlayerMinLevelRule, PlayerMinLevelRule.description);
-    await this.registerRule(PlayerMaxGamesRule, PlayerMaxGamesRule.description);
-    await this.registerRule(PlayerGenderRule, PlayerGenderRule.description);
+    await this.registerRule(PlayerCompStatusRule);
+    await this.registerRule(TeamBaseIndexRule);
+    await this.registerRule(TeamSubeventIndexRule);
+    await this.registerRule(TeamClubBaseRule);
+    await this.registerRule(PlayerOrderRule);
+    await this.registerRule(PlayerMinLevelRule);
+    await this.registerRule(PlayerMaxGamesRule);
+    await this.registerRule(PlayerGenderRule);
 
     this._logger.log('Rules initialized');
   }

diff --git a/libs/backend/competition/change-encounter/src/services/validate/change-encounter.service.ts b/libs/backend/competition/change-encounter/src/services/validate/change-encounter.service.ts
@@ -21,11 +21,11 @@ export class ChangeEncounterValidationService extends ValidationService<
     this._logger.log('Initializing rules');
     await this.clearRules();
 
-    await this.registerRule(SemesterRule, SemesterRule.description);
-    await this.registerRule(DatePeriodRule, DatePeriodRule.description);
-    await this.registerRule(TeamClubRule, TeamClubRule.description);
-    await this.registerRule(ExceptionRule, ExceptionRule.description);
-    await this.registerRule(LocationRule, LocationRule.description, { activated: false });
+    await this.registerRule(SemesterRule);
+    await this.registerRule(DatePeriodRule);
+    await this.registerRule(TeamClubRule);
+    await this.registerRule(ExceptionRule);
+    await this.registerRule(LocationRule, { activated: false });
 
     this._logger.log('Rules initialized');
   }

diff --git a/libs/backend/competition/change-encounter/src/services/validate/rules/exceptions.rule.ts b/libs/backend/competition/change-encounter/src/services/validate/rules/exceptions.rule.ts
@@ -21,7 +21,6 @@ export class ExceptionRule extends Rule {
   private readonly logger = new Logger(ExceptionRule.name);
 
   async validate(changeEncounter: ChangeEncounterValidationData): Promise<ChangeEncounterOutput> {
-    // this.logger.verbose('Validating rule');
     const errors = [] as ChangeEncounterValidationError<ExceptionRuleParams>[];
     const warnings = [] as ChangeEncounterValidationError<ExceptionRuleParams>[];
     const valid = true;

diff --git a/libs/backend/competition/change-encounter/src/services/validate/rules/semester.rule.ts b/libs/backend/competition/change-encounter/src/services/validate/rules/semester.rule.ts
@@ -52,7 +52,6 @@ export class SemesterRule extends Rule {
         throw new Error('Working encounter not found');
       }
 
-      // this.logger.verbose(`Encounter found in semester ${semseter1 ? 1 : 2}`);
       const encountersSemester1 = [...encountersSem1];
       const encountersSemester2 = [...encountersSem2];
 
@@ -66,9 +65,6 @@ export class SemesterRule extends Rule {
 
       for (const suggestedDate of suggestedDates) {
         const suggestedSemester1 = suggestedDate.getFullYear() === lowestYear;
-        // this.logger.verbose(
-        //   `Checking suggested date: ${suggestedDate.toISOString()}, new semester: ${suggestedSemester1 ? 'Semester 1' : 'Semester 2'}`,
-        // );
 
         encounter.date = suggestedDate;
         const encountersSemester = suggestedSemester1 ? encountersSemester1 : encountersSemester2;

diff --git a/libs/backend/competition/change-encounter/src/services/validate/rules/team-club.rule.ts b/libs/backend/competition/change-encounter/src/services/validate/rules/team-club.rule.ts
@@ -65,9 +65,6 @@ export class TeamClubRule extends Rule {
 
       for (const suggestedDate of suggestedDates) {
         const suggestedSemester1 = suggestedDate.getFullYear() === lowestYear;
-        // this.logger.verbose(
-        //   `Checking suggested date: ${suggestedDate.toISOString()}, new semester: ${suggestedSemester1 ? 'Semester 1' : 'Semester 2'}`,
-        // );
 
         encounter.date = suggestedDate;
         const encountersSemester = suggestedSemester1 ? encountersSemester1 : encountersSemester2;

diff --git a/libs/backend/validation/src/rules/validation.service.ts b/libs/backend/validation/src/rules/validation.service.ts
@@ -24,9 +24,9 @@ export abstract class ValidationService<T, V> implements OnApplicationBootstrap
 
   async registerRule(
     rule: ruleType<T, V>,
-    description: string,
     args?: { meta?: object; activated?: boolean },
   ): Promise<void> {
+
     // find or create rule
     await Rule.findOrCreate({
       where: {
@@ -36,7 +36,7 @@ export abstract class ValidationService<T, V> implements OnApplicationBootstrap
       defaults: {
         group: this.group,
         name: rule.name,
-        description: description,
+        description: rule.prototype.constructor.description,
         activated: args?.activated ?? true,
         meta: {
           activatedForUsers: [],