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

Cache for Statistics Controller
game-node-app · Feb 29, 2024 · 7bf4ca6 · 7bf4ca6
2 parents 5746664 + b6601bc
commit 7bf4ca6
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 33 deletions.
diff --git a/server_swagger.json b/server_swagger.json
diff --git a/src/achievements/achievements.service.spec.ts b/src/achievements/achievements.service.spec.ts
@@ -11,11 +11,13 @@ import { AchievementCategory } from "./achievements.constants";
 import Mocked = jest.Mocked;
 import sleep from "../utils/sleep";
 import { CollectionEntry } from "../collections/collections-entries/entities/collection-entry.entity";
+import { UserLevelService } from "../user-level/user-level.service";
 
 describe("AchievementsService", () => {
     let service: AchievementsService;
     let dataSource: Mocked<DataSource>;
     let obtainedAchievementRepository: Mocked<Repository<ObtainedAchievement>>;
+    let userLevelService: Mocked<UserLevelService>;
 
     beforeEach(async () => {
         const module: TestingModule = await Test.createTestingModule({
@@ -28,6 +30,12 @@ describe("AchievementsService", () => {
                         getRepository: jest.fn(),
                     },
                 },
+                {
+                    provide: UserLevelService,
+                    useValue: {
+                        increaseExp: jest.fn(),
+                    },
+                },
             ],
         }).compile();
 
@@ -36,6 +44,7 @@ describe("AchievementsService", () => {
         obtainedAchievementRepository = module.get(
             getRepositoryToken(ObtainedAchievement),
         );
+        userLevelService = module.get(UserLevelService);
     });
 
     it("should be defined", () => {
@@ -60,6 +69,7 @@ describe("AchievementsService", () => {
         );
         // Timeout to wait for internal promises to finish
         await sleep(2000);
+        expect(userLevelService.increaseExp).toHaveBeenCalled();
         expect(obtainedAchievementRepository.save).toHaveBeenCalledWith(
             expect.objectContaining({
                 id: "space-station",

diff --git a/src/follow/follow.service.spec.ts b/src/follow/follow.service.spec.ts
@@ -1,18 +1,18 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { FollowService } from './follow.service';
+import { Test, TestingModule } from "@nestjs/testing";
+import { FollowService } from "./follow.service";
 
-describe('FollowService', () => {
-  let service: FollowService;
+describe("FollowService", () => {
+    let service: FollowService;
 
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [FollowService],
-    }).compile();
+    beforeEach(async () => {
+        const module: TestingModule = await Test.createTestingModule({
+            providers: [FollowService],
+        }).compile();
 
-    service = module.get<FollowService>(FollowService);
-  });
+        service = module.get<FollowService>(FollowService);
+    });
 
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
+    it("should be defined", () => {
+        expect(service).toBeDefined();
+    });
 });
diff --git a/src/game/game-repository/dto/game-repository-find-one.dto.ts b/src/game/game-repository/dto/game-repository-find-one.dto.ts
@@ -1,4 +1,3 @@
-import { BaseFindDto } from "../../../utils/base-find.dto";
 import { Game } from "../entities/game.entity";
 import { IsObject, IsOptional } from "class-validator";
 import { FindOptionsRelations } from "typeorm";

diff --git a/src/game/game-repository/game-repository.controller.ts b/src/game/game-repository/game-repository.controller.ts
@@ -29,6 +29,7 @@ export class GameRepositoryController {
     }
 
     @Post("platforms/icon")
+    @HttpCode(200)
     getIconNamesForPlatformAbbreviations(
         @Body() dto: IconNamesForPlatformRequestDto,
     ) {

diff --git a/src/game/game-repository/game-repository.service.spec.ts b/src/game/game-repository/game-repository.service.spec.ts
@@ -1,14 +1,25 @@
 import { Test, TestingModule } from "@nestjs/testing";
 import { ConfigModule } from "@nestjs/config";
 import { GameRepositoryService } from "./game-repository.service";
+import { getMockRepositoryProvider } from "../../../test/mocks/repositoryMocks";
+import { Game } from "./entities/game.entity";
+import { getDataSourceToken } from "@nestjs/typeorm";
+import { dataSourceMock } from "../../../test/mocks/dataSource.mock";
 
 describe("GameSearchService", () => {
     let service: GameRepositoryService;
 
     beforeEach(async () => {
         const module: TestingModule = await Test.createTestingModule({
             imports: [ConfigModule.forRoot()],
-            providers: [GameRepositoryService],
+            providers: [
+                GameRepositoryService,
+                getMockRepositoryProvider(Game),
+                {
+                    provide: getDataSourceToken(),
+                    useValue: dataSourceMock,
+                },
+            ],
         }).compile();
 
         service = module.get<GameRepositoryService>(GameRepositoryService);

diff --git a/src/health/health.service.spec.ts b/src/health/health.service.spec.ts
@@ -1,18 +1,36 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { HealthService } from './health.service';
+import { Test, TestingModule } from "@nestjs/testing";
+import { HealthService } from "./health.service";
+import { HealthCheckService, TypeOrmHealthIndicator } from "@nestjs/terminus";
+import { RedisHealthIndicator } from "@liaoliaots/nestjs-redis-health";
 
-describe('HealthService', () => {
-  let service: HealthService;
+describe("HealthService", () => {
+    let service: HealthService;
 
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [HealthService],
-    }).compile();
+    beforeEach(async () => {
+        const module: TestingModule = await Test.createTestingModule({
+            providers: [
+                HealthService,
+                {
+                    provide: HealthCheckService,
+                    useValue: {
+                        check: jest.fn(),
+                    },
+                },
+                {
+                    provide: RedisHealthIndicator,
+                    useValue: {},
+                },
+                {
+                    provide: TypeOrmHealthIndicator,
+                    useValue: {},
+                },
+            ],
+        }).compile();
 
-    service = module.get<HealthService>(HealthService);
-  });
+        service = module.get<HealthService>(HealthService);
+    });
 
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
+    it("should be defined", () => {
+        expect(service).toBeDefined();
+    });
 });
diff --git a/src/statistics/statistics.controller.ts b/src/statistics/statistics.controller.ts
@@ -22,6 +22,7 @@ import { StatisticsStatusRequestDto } from "./dto/statistics-status-request.dto"
 import { FindStatisticsTrendingGamesDto } from "./dto/find-statistics-trending-games.dto";
 import { FindStatisticsTrendingReviewsDto } from "./dto/find-statistics-trending-reviews.dto";
 import { FindOneStatisticsDto } from "./dto/find-one-statistics.dto";
+import { CacheInterceptor, CacheTTL } from "@nestjs/cache-manager";
 
 @Controller("statistics")
 @ApiTags("statistics")
@@ -41,6 +42,8 @@ export class StatisticsController {
     @Post("trending/games")
     @Public()
     @UseInterceptors(PaginationInterceptor)
+    @UseInterceptors(CacheInterceptor)
+    @CacheTTL(600)
     @ApiResponse({
         status: 200,
         type: StatisticsPaginatedResponseDto,
@@ -55,6 +58,8 @@ export class StatisticsController {
 
     @Post("trending/reviews")
     @UseInterceptors(PaginationInterceptor)
+    @UseInterceptors(CacheInterceptor)
+    @CacheTTL(600)
     @ApiResponse({
         status: 200,
         type: StatisticsPaginatedResponseDto,

diff --git a/src/statistics/statistics.service.spec.ts b/src/statistics/statistics.service.spec.ts
@@ -1,13 +1,23 @@
 import { Test, TestingModule } from "@nestjs/testing";
 import { StatisticsService } from "./statistics.service";
 import { getMockRepositoriesProviders } from "../../test/mocks/repositoryMocks";
+import { Statistics } from "./entity/statistics.entity";
+import { UserLike } from "./entity/user-like.entity";
+import { UserView } from "./entity/user-view.entity";
 
 describe("StatisticsService", () => {
     let service: StatisticsService;
 
     beforeEach(async () => {
         const module: TestingModule = await Test.createTestingModule({
-            providers: [StatisticsService, ...getMockRepositoriesProviders([])],
+            providers: [
+                StatisticsService,
+                ...getMockRepositoriesProviders([
+                    Statistics,
+                    UserLike,
+                    UserView,
+                ]),
+            ],
         }).compile();
 
         service = module.get<StatisticsService>(StatisticsService);

diff --git a/src/sync/igdb/utils/build-filter-find-options.ts b/src/sync/igdb/utils/build-filter-find-options.ts
@@ -1,5 +1,5 @@
 import { GameRepositoryFilterDto } from "../../../game/game-repository/dto/game-repository-filter.dto";
-import { FindManyOptions, FindOptionsWhere, In } from "typeorm";
+import { FindOptionsWhere, In } from "typeorm";
 import { Game } from "../../../game/game-repository/entities/game.entity";
 
 const singleValueProperties = ["category", "status"];

diff --git a/src/user-level/user-level.controller.spec.ts b/src/user-level/user-level.controller.spec.ts
@@ -1,14 +1,16 @@
 import { Test, TestingModule } from "@nestjs/testing";
 import { UserLevelController } from "./user-level.controller";
 import { UserLevelService } from "./user-level.service";
+import { getMockRepositoryProvider } from "../../test/mocks/repositoryMocks";
+import { UserLevel } from "./entities/user-level.entity";
 
 describe("UserLevelController", () => {
     let controller: UserLevelController;
 
     beforeEach(async () => {
         const module: TestingModule = await Test.createTestingModule({
             controllers: [UserLevelController],
-            providers: [UserLevelService],
+            providers: [UserLevelService, getMockRepositoryProvider(UserLevel)],
         }).compile();
 
         controller = module.get<UserLevelController>(UserLevelController);

diff --git a/src/user-level/user-level.service.spec.ts b/src/user-level/user-level.service.spec.ts
@@ -59,7 +59,8 @@ describe("UserLevelService", () => {
         );
         expect(repository.save).toHaveBeenCalledWith(
             expect.objectContaining({
-                currentLevel: mockUserLevel.currentLevel + 1,
+                currentLevel:
+                    structuredClone(getMockUserLevel()).currentLevel + 1,
             } satisfies Partial<UserLevel>),
         );
     });

diff --git a/test/mocks/dataSource.mock.ts b/test/mocks/dataSource.mock.ts
@@ -0,0 +1,7 @@
+export const dataSourceMock = {
+    getRepository: jest.fn(() => {
+        console.warn(
+            "getRepository of dataSourceMock is being called and not being mocked. This is probably going to result in errors.",
+        );
+    }),
+};