Merge pull request #204 from game-node-app/dev

Dev

Author: Lamarcke

package.json

@@ -64,6 +64,7 @@
         "dayjs": "^1.11.13",
         "fuse.js": "^7.1.0",
         "jsonwebtoken": "^9.0.2",
+        "jsum": "^2.0.0-alpha.4",
         "jwks-rsa": "^3.1.0",
         "keyv": "^5.3.3",
         "mime-types": "^2.1.35",
@@ -95,6 +96,7 @@
         "@types/express": "^5.0.0",
         "@types/igdb-api-node": "^5.0.3",
         "@types/jest": "29.5.14",
+        "@types/jsum": "^0.1.2",
         "@types/mime-types": "^2.1.4",
         "@types/node": "^22.13.9",
         "@types/supertest": "^6.0.2",

server_swagger.json

@@ -42,6 +42,7 @@ import { AwardsModule } from "./awards/awards.module";
 import { UserAccountModule } from "./user/user-account/user-account.module";
 import { PreferredPlatformModule } from "./preferred-platform/preferred-platform.module";
 import { LoggerModule } from "nestjs-pino";
+import { RecapModule } from './recap/recap.module';
 
 /**
  * Should only be called after 'ConfigModule' is loaded (e.g. in useFactory)
@@ -201,6 +202,7 @@ function getRedisConfig(target: "cache" | "bullmq" = "cache") {
         AwardsModule,
         UserAccountModule,
         PreferredPlatformModule,
+        RecapModule,
     ],
 })
 export class AppModule implements NestModule {

src/app.module.ts

@@ -3,12 +3,16 @@ import { AuthGuard } from "../auth/auth.guard";
 import { ApiTags } from "@nestjs/swagger";
 import { AwardsService } from "./awards.service";
 import { Public } from "../auth/public.decorator";
+import { AwardsResultService } from "./result/awards-result.service";
 
 @Controller("awards")
 @UseGuards(AuthGuard)
 @ApiTags("awards")
 export class AwardsController {
-    constructor(private readonly awardsService: AwardsService) {}
+    constructor(
+        private readonly awardsService: AwardsService,
+        private readonly awardsResultService: AwardsResultService,
+    ) {}
 
     @Get("events/:id")
     @Public()
@@ -33,4 +37,10 @@ export class AwardsController {
     public async getCategoriesByEventId(@Param("eventId") eventId: number) {
         return this.awardsService.getCategoriesByEventId(eventId);
     }
+
+    @Get(":eventId/results")
+    @Public()
+    public async getResultsByEventId(@Param("eventId") eventId: number) {
+        return this.awardsResultService.getCategoryResultsByEventId(eventId);
+    }
 }

src/awards/awards.controller.ts

@@ -4,13 +4,8 @@ import { AwardsService } from "../awards.service";
 import { WorkerHostProcessor } from "../../utils/WorkerHostProcessor";
 import dayjs from "dayjs";
 import { AwardsEvent } from "../entity/awards-event.entity";
-import { DataSource, Repository } from "typeorm";
-import { AwardsVote } from "../entity/awards-vote.entity";
-import { InjectRepository } from "@nestjs/typeorm";
-import { AwardsCategoryResult } from "../entity/awards-category-result.entity";
-import { AwardsCategoryResultWinner } from "../entity/awards-category-winner.entity";
+import { DataSource } from "typeorm";
 import { AwardsResultService } from "./awards-result.service";
-import { AwardsCategory } from "../entity/awards-category.entity";
 import { VotableAwardsCategoryDto } from "../dto/votable-awards-category.dto";
 
 @Processor(AWARDS_RESULT_QUEUE_NAME)

src/awards/result/awards-result.processor.ts

@@ -22,4 +22,19 @@ export class AwardsResultService {
     ) {
         return await this.awardsCategoryResultWinnerRepository.save(entity);
     }
+
+    public async getCategoryResultsByEventId(eventId: number) {
+        return this.awardsCategoryResultRepository.find({
+            where: {
+                category: {
+                    eventId: eventId,
+                },
+            },
+            relations: {
+                category: true,
+                winners: true,
+            },
+            order: { category: { id: "ASC" }, winners: { position: "ASC" } },
+        });
+    }
 }

src/awards/result/awards-result.service.ts

@@ -2,6 +2,7 @@ import { HttpException, HttpStatus, Injectable } from "@nestjs/common";
 import { CollectionEntry } from "./entities/collection-entry.entity";
 import { InjectRepository } from "@nestjs/typeorm";
 import {
+    Between,
     DeepPartial,
     FindManyOptions,
     FindOptionsRelations,
@@ -31,6 +32,7 @@ import { GameRepositoryService } from "../../game/game-repository/game-repositor
 import { FindRelatedCollectionEntriesResponseDto } from "./dto/find-related-collection-entries.dto";
 import { toMap } from "../../utils/toMap";
 import { DEFAULT_ORDERING_GAP } from "../../utils/ordering";
+import { Cacheable } from "../../utils/cacheable";
 
 @Injectable()
 export class CollectionsEntriesService {
@@ -252,6 +254,24 @@ export class CollectionsEntriesService {
         });
     }
 
+    /**
+     * Find all entries that have been <strong>created/modified</strong> in period.
+     * @param userId
+     * @param period
+     */
+    async findAllByUserIdInPeriod(
+        userId: string,
+        period: { startDate: Date; endDate: Date },
+    ) {
+        return this.collectionEntriesRepository.find({
+            where: {
+                libraryUserId: userId,
+                updatedAt: Between(period.startDate, period.endDate),
+            },
+            relations: this.relations,
+        });
+    }
+
     async findFavoritesByUserId(
         userId: string | undefined,
         targetUserId: string,

src/collections/collections-entries/collections-entries.service.ts

@@ -67,12 +67,7 @@ export class CollectionsService {
             },
             relations: this.relations,
         });
-        if (!targetUserCollections) {
-            throw new HttpException(
-                "No collection found.",
-                HttpStatus.NOT_FOUND,
-            );
-        }
+
         return targetUserCollections.filter((collection) => {
             return (
                 collection.isPublic ||

src/collections/collections.service.ts

@@ -12,6 +12,7 @@ import { FollowInfoRequestDto } from "./dto/follow-info-request.dto";
 import { buildBaseFindOptions } from "../utils/buildBaseFindOptions";
 import { TPaginationData } from "../utils/pagination/pagination-response.dto";
 import { ActivitiesQueueService } from "../activities/activities-queue/activities-queue.service";
+import { PeriodRange } from "../utils/period";
 
 @Injectable()
 export class FollowService {
@@ -24,6 +25,28 @@ export class FollowService {
         private readonly activitiesQueueService: ActivitiesQueueService,
     ) {}
 
+    public async countFollowers(
+        userId: string,
+        period: PeriodRange,
+    ): Promise<number> {
+        const qb = this.userFollowRepository
+            .createQueryBuilder("uf")
+            .where("uf.followedUserId = :userId", { userId });
+
+        if (period.startDate) {
+            qb.andWhere("uf.createdAt >= :startDate", {
+                startDate: period.startDate,
+            });
+        }
+        if (period.endDate) {
+            qb.andWhere("uf.createdAt <= :endDate", {
+                endDate: period.endDate,
+            });
+        }
+
+        return qb.getCount();
+    }
+
     public async findOneById(id: number) {
         return this.userFollowRepository.findOne({
             where: {
@@ -54,7 +77,7 @@ export class FollowService {
             );
         }
         try {
-            const persistedEntry = await this.userFollowRepository.save({
+            await this.userFollowRepository.save({
                 follower: {
                     userId: followerUserId,
                 },

src/follow/follow.service.ts

@@ -16,20 +16,6 @@ import { GameLocalization } from "../entities/game-localization.entity";
 import { GameScreenshot } from "../entities/game-screenshot.entity";
 import { GameCover } from "../entities/game-cover.entity";
 
-export const MANY_TO_MANY_RELATIONS: (keyof Game)[] = [
-    "dlcs",
-    "expansions",
-    "expandedGames",
-    "similarGames",
-    "remakes",
-    "remasters",
-    "gameModes",
-    "genres",
-    "themes",
-    "platforms",
-    "playerPerspectives",
-    "gameEngines",
-];
 /**
  * Look-up table between resource names and their respective entities
  * e.g.: Can be used to quickly retrieve the target repository for a resource