Merge pull request #95 from Xitija/Shiksha-2.0

Task #216144 chore: removed old caching strategy and cache interceptors
tekdi · Apr 4, 2024 · 627ba6a · 627ba6a
2 parents 9be1466 + 56477b1
commit 627ba6a
Show file tree

Hide file tree

Showing 48 changed files with 202 additions and 376 deletions.
diff --git a/src/Question/question.controller.ts b/src/Question/question.controller.ts
@@ -8,7 +8,6 @@ import {
   ApiTags,
 } from "@nestjs/swagger";
 import {
-  CacheInterceptor,
   ClassSerializerInterceptor,
   Controller,
   Get,
@@ -42,7 +41,7 @@ export class QuestionController {
   ) {}
 
   @Get(":adapter/search")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   //@ApiBasicAuth("access-token")
   @ApiOkResponse({ description: "Get all Questions detail." })
   @ApiForbiddenResponse({ description: "Forbidden" })
@@ -82,7 +81,7 @@ export class QuestionController {
   }
 
   @Get(":adapter/questionIds")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   //@ApiBasicAuth("access-token")
   @ApiOkResponse({ description: "Get all Questions detail." })
   @ApiForbiddenResponse({ description: "Forbidden" })
@@ -101,7 +100,7 @@ export class QuestionController {
   }
 
   @Get(":adapter/subjectlist")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   @ApiOkResponse({ description: "Get all subject list" })
   @ApiQuery({ name: "gradeLevel", required: true })
   @ApiForbiddenResponse({ description: "Forbidden" })
@@ -115,7 +114,7 @@ export class QuestionController {
   }
 
   @Get(":adapter/topicslist")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   @ApiOkResponse({ description: "Get all subject list" })
   @ApiQuery({ name: "subject", required: true })
   @ApiForbiddenResponse({ description: "Forbidden" })
@@ -129,7 +128,7 @@ export class QuestionController {
   }
 
   @Get(":adapter/questionid")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   // @ApiBasicAuth("access-token")
   @ApiOkResponse({ description: "Get Questions detail." })
   @ApiForbiddenResponse({ description: "Forbidden" })
@@ -145,7 +144,7 @@ export class QuestionController {
   }
 
   @Get(":adapter/competencieslist")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   //@ApiBasicAuth("access-token")
   @ApiOkResponse({ description: "Get all competencies list." })
   @ApiForbiddenResponse({ description: "Forbidden" })
@@ -163,7 +162,7 @@ export class QuestionController {
   }
 
   @Get("/:id")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   @ApiBasicAuth("access-token")
   @ApiOkResponse({ description: "Question detail." })
   @SerializeOptions({

diff --git a/src/Question/question.module.ts b/src/Question/question.module.ts
@@ -1,4 +1,4 @@
-import { CacheModule, Module } from "@nestjs/common";
+import { Module } from "@nestjs/common";
 import { HttpModule } from "@nestjs/axios";
 import { QuestionController } from "./question.controller";
 import {
@@ -9,14 +9,9 @@ import {
   HasuraQuestionToken,
   QuestionService,
 } from "src/adapters/hasura/question.adapter";
-const ttl = process.env.TTL as never;
+
 @Module({
-  imports: [
-    HttpModule,
-    CacheModule.register({
-      ttl: ttl,
-    }),
-  ],
+  imports: [HttpModule],
   controllers: [QuestionController],
   providers: [
     QumlQuestionService,

diff --git a/src/announcements/announcements.controller.ts b/src/announcements/announcements.controller.ts
@@ -1,6 +1,5 @@
 import {
   Body,
-  CacheInterceptor,
   ClassSerializerInterceptor,
   Controller,
   Delete,
@@ -12,10 +11,8 @@ import {
   Query,
   Req,
   Request,
-  SerializeOptions,
   UseInterceptors,
 } from "@nestjs/common";
-import { FileInterceptor } from "@nestjs/platform-express";
 import {
   ApiBasicAuth,
   ApiBody,
@@ -40,7 +37,7 @@ export class AnnouncementsController {
   ) {}
 
   @Get("/:id")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   @ApiBasicAuth("access-token")
   @ApiCreatedResponse({ description: "Get announcement detail" })
   @ApiForbiddenResponse({ description: "Forbidden" })
@@ -52,7 +49,7 @@ export class AnnouncementsController {
   }
 
   @Get("")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   @ApiBasicAuth("access-token")
   @ApiCreatedResponse({ description: "Get announcements" })
   @ApiForbiddenResponse({ description: "Forbidden" })
@@ -101,7 +98,7 @@ export class AnnouncementsController {
   }
 
   @Delete("/:id")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   @ApiBasicAuth("access-token")
   @ApiOkResponse({ description: "Deleted the announcement " })
   public async deleteAnnouncement(

diff --git a/src/announcements/announcements.module.ts b/src/announcements/announcements.module.ts
@@ -1,4 +1,4 @@
-import { CacheModule, Module } from "@nestjs/common";
+import { Module } from "@nestjs/common";
 import { HttpModule } from "@nestjs/axios";
 import { ScheduleModule } from "@nestjs/schedule";
 import {
@@ -7,15 +7,8 @@ import {
 } from "../adapters/hasura/announcements.adapter";
 import { AnnouncementsController } from "./announcements.controller";
 
-const ttl = process.env.TTL as never;
 @Module({
-  imports: [
-    HttpModule,
-    CacheModule.register({
-      ttl: ttl,
-    }),
-    ScheduleModule.forRoot(),
-  ],
+  imports: [HttpModule, ScheduleModule.forRoot()],
   providers: [
     AnnouncementsService,
     {

diff --git a/src/assessmentset/assessmentset.controller.ts b/src/assessmentset/assessmentset.controller.ts
@@ -15,12 +15,10 @@ import {
   SerializeOptions,
   Req,
   Request,
-  CacheInterceptor,
   Post,
   Body,
   Query,
 } from "@nestjs/common";
-import { AssessmentSetSearchDto } from "./dto/assessmentset-search-dto";
 import { AssessmentsetDto } from "./dto/assessmentset.dto";
 import { AssessmentsetService } from "src/adapters/hasura/assessmentset.adapter";
 
@@ -44,7 +42,7 @@ export class AssessmentsetController {
     return this.service.createAssessmentSet(request, assessmentsetDto);
   }
   @Get("assessmentset/:id")
-  @UseInterceptors(ClassSerializerInterceptor, CacheInterceptor)
+  @UseInterceptors(ClassSerializerInterceptor)
   @ApiBasicAuth("access-token")
   @ApiCreatedResponse({ description: "Assessment set detail" })
   @ApiForbiddenResponse({ description: "Forbidden" })

diff --git a/src/assessmentset/assessmentset.module.ts b/src/assessmentset/assessmentset.module.ts
@@ -1,17 +1,11 @@
-import { CacheModule, Module } from "@nestjs/common";
+import { Module } from "@nestjs/common";
 import { HttpModule } from "@nestjs/axios";
 import { ScheduleModule } from "@nestjs/schedule";
 import { AssessmentsetController } from "./assessmentset.controller";
 import { AssessmentsetService } from "src/adapters/hasura/assessmentset.adapter";
-const ttl = process.env.TTL as never;
+
 @Module({
-  imports: [
-    HttpModule,
-    CacheModule.register({
-      ttl: ttl,
-    }),
-    ScheduleModule.forRoot(),
-  ],
+  imports: [HttpModule, ScheduleModule.forRoot()],
   controllers: [AssessmentsetController],
   providers: [AssessmentsetService],
 })