chore(merge): merge develop into main

Author: github-actions[bot]

.github/workflows/main-v2.yml

@@ -71,7 +71,7 @@ jobs:
 
       - run: bun install --no-cache
 
-      - run: bun nx affected -t lint test build
+      - run: bun nx affected -t lint test build -c ci
 
       - name: Run Playwright tests
         run: bun nx affected --parallel 1 -t e2e-ci
@@ -99,6 +99,8 @@ jobs:
 
           ## for copy pasting in shell
           # bun playwright show-report
+      - name: coverage reports
+        run: npx --yes lcov-result-merger 'coverage/**/lcov.info' 'coverage/lcov.info'
 
       - name: Set Git config
         run: |
@@ -123,6 +125,19 @@ jobs:
           path: playwright-report/
           retention-days: 30
 
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: coverage-report
+          path: coverage/lcov.info
+          retention-days: 30
+
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}          
+
       - name: Merge main -> develop
         uses: devmasx/merge-branch@master
         if: github.ref == 'refs/heads/main'

apps/worker/sync/src/app/processors/check-encounters/pupeteer/getDetailAccepted.ts

@@ -36,13 +36,11 @@ export async function detailAccepted(
     for (const row of rows) {
       const th = await row.$('th');
       if (th) {
-        // logger.verbose(`Processing row`);
         const thTxt = (await th.evaluate((el) => el.textContent)) || '';
         if (thTxt.indexOf('Teamwedstrijd bevestigd') !== -1) {
           const td = await row.$('td');
           if (td) {
             const tdTxt = (await td.evaluate((el) => el.textContent)) || '';
-            // logger.verbose(`Processing td: ${text}`);
             if (tdTxt !== 'Nee') {
               hasAccepted = true;
 
@@ -61,6 +59,6 @@ export async function detailAccepted(
       }
     }
 
-    return { accepted: hasAccepted ? true : false, acceptedOn, acceptedBy };
+    return { accepted: !!hasAccepted, acceptedOn, acceptedBy };
   }
 }

apps/worker/sync/src/app/processors/check-encounters/pupeteer/getDetailEntered.ts

@@ -34,7 +34,6 @@ export async function detailEntered(
     let enteredOn: Date | null = null;
     const enteredBy: string | null = null;
     for (const row of rows) {
-      // logger.verbose(`Processing row`);
       const th = await row.$('th');
       if (th) {
         const headerTxt = (await th.evaluate((el) => el.textContent)) || '';

apps/worker/sync/src/app/processors/check-encounters/pupeteer/getTime.ts

@@ -32,7 +32,6 @@ export async function hasTime(
     for (const row of rows) {
       const header = await row.$('th');
       if (header) {
-        // logger.verbose(`Processing row`);
         const text = await header.evaluate((el) => el.textContent);
         if (text?.indexOf('Tijdstip') !== -1) {
           const td = await row.$('td');

apps/worker/sync/src/app/processors/global.ts

@@ -17,11 +17,4 @@ export class GlobalConsumer {
   onError(job: string, err: Error) {
     this.logger.error(`Job ${job} failed`, err);
   }
-
-  // @OnQueueActive()
-  // handleQueueActive(job: Job) {
-  //   this.logger.log(`[SYNC] Queue ${job.name} is active`);
-
-  //   // super.handleQueueActive(job);
-  // }
 }

apps/worker/sync/src/app/processors/sync-events/competition-sync/processors/draw.ts

@@ -80,14 +80,20 @@ export class CompetitionSyncDrawProcessor extends StepProcessor {
         dbDraw = new DrawCompetition({
           visualCode: `${xmlDraw.Code}`,
           subeventId: subEvent.id,
-          type:
-            xmlDraw.TypeID === XmlDrawTypeID.Elimination
-              ? DrawType.KO
-              : xmlDraw.TypeID === XmlDrawTypeID.RoundRobin ||
-                  xmlDraw.TypeID === XmlDrawTypeID.FullRoundRobin
-                ? DrawType.POULE
-                : DrawType.QUALIFICATION,
+          type: getDrawType(xmlDraw.TypeID),
         });
+
+        function getDrawType(typeID: XmlDrawTypeID): DrawType {
+          switch (typeID) {
+            case XmlDrawTypeID.Elimination:
+              return DrawType.KO;
+            case XmlDrawTypeID.RoundRobin:
+            case XmlDrawTypeID.FullRoundRobin:
+              return DrawType.POULE;
+            default:
+              return DrawType.QUALIFICATION;
+          }
+        }
       }
       // update the draw
       dbDraw.size = xmlDraw.Size;

apps/worker/sync/src/app/processors/sync-events/competition-sync/processors/encounter-location.ts

@@ -28,7 +28,7 @@ export class CompetitionSyncEncounterLocationProcessor extends StepProcessor {
 
     const teamIds = this.encounters
       .map((encounter) => encounter.encounter.homeTeamId ?? null)
-      .filter((id) => id !== null) as string[];
+      .filter((id) => id !== null);
 
     const teams = await Team.findAll({
       where: {
@@ -94,7 +94,7 @@ export class CompetitionSyncEncounterLocationProcessor extends StepProcessor {
       // get the location for the club
       const locations = club.locations?.filter((location) => location.availabilities?.length);
 
-      if (!locations || !locations.length) {
+      if (!locations?.length) {
         this.logger.warn(
           `No locations found for club ${club.id} for encounter ${encounter.encounter.id}`,
         );

apps/worker/sync/src/app/processors/sync-events/competition-sync/processors/event.ts

@@ -40,15 +40,6 @@ export class CompetitionSyncEventProcessor extends StepProcessor {
 
     if (!event) {
       existed = false;
-      const dates: Moment[] = [];
-      for (
-        let date = moment(this.visualTournament.StartDate);
-        date.diff(this.visualTournament.EndDate, 'days') <= 0;
-        date.add(1, 'days')
-      ) {
-        dates.push(date.clone());
-      }
-
       const visualTournament = await this.visualService.getTournament(this.visualTournament.Code);
 
       this.logger.debug(`EventCompetition ${visualTournament.Name} not found, creating`);
@@ -57,11 +48,10 @@ export class CompetitionSyncEventProcessor extends StepProcessor {
         visualCode: visualTournament.Code,
         season: moment(visualTournament.StartDate).year(),
       });
-    } else {
-      // Later we will change the search function to use the tournament code
-      if (event.visualCode === null || event.visualCode !== this.visualTournament.Code) {
-        event.visualCode = this.visualTournament.Code;
-      }
+    }
+    // Later we will change the search function to use the tournament code
+    else if (event.visualCode === null || event.visualCode !== this.visualTournament.Code) {
+      event.visualCode = this.visualTournament.Code;
     }
 
     event.lastSync = new Date();

apps/worker/sync/src/app/processors/sync-events/competition-sync/processors/game.ts

@@ -108,7 +108,8 @@ export class CompetitionSyncGameProcessor extends StepProcessor {
         xmlMatch.Sets.Set = [xmlMatch?.Sets?.Set];
       }
 
-      let gameStatus = GameStatus.NORMAL;
+      let gameStatus: GameStatus;
+
       switch (xmlMatch.ScoreStatus) {
         case XmlScoreStatus.Retirement:
           gameStatus = GameStatus.RETIREMENT;
@@ -122,8 +123,8 @@ export class CompetitionSyncGameProcessor extends StepProcessor {
         case XmlScoreStatus.Walkover:
           gameStatus = GameStatus.WALKOVER;
           break;
-        default:
         case XmlScoreStatus.Normal:
+        default:
           gameStatus = GameStatus.NORMAL;
           break;
       }

libs/backend/competition/change-encounter/src/services/validate/rules/team-club.rule.ts

@@ -51,7 +51,6 @@ export class TeamClubRule extends Rule {
         throw new Error('Working encounter not found');
       }
 
-      // this.logger.debug(`Encounter found in semester ${semseter1 ? 1 : 2}`);
       const encountersSemester1 = [...encountersSem1];
       const encountersSemester2 = [...encountersSem2];