Merge pull request #707 from palladiumkenya/feat/new-reporting-layer

caching api responses

package.json

@@ -23,15 +23,17 @@
   },
   "dependencies": {
     "@hapi/joi": "^17.1.1",
-    "@nestjs/axios": "^0.1.0",
-    "@nestjs/common": "^7.0.0",
-    "@nestjs/config": "^0.4.0",
-    "@nestjs/core": "^7.0.0",
-    "@nestjs/cqrs": "^7.0.0",
-    "@nestjs/platform-express": "^7.0.0",
-    "@nestjs/typeorm": "^7.0.0",
+    "@nestjs/axios": "^3.0.2",
+    "@nestjs/cache-manager": "^2.2.1",
+    "@nestjs/common": "10.3.3",
+    "@nestjs/config": "^3.2.0",
+    "@nestjs/core": "10.3.3",
+    "@nestjs/cqrs": "^10.2.7",
+    "@nestjs/platform-express": "^10.3.3",
+    "@nestjs/typeorm": "^10.0.2",
     "@types/lodash": "^4.14.149",
     "axios": "^1.0.0",
+    "cache-manager": "^5.4.0",
     "class-transformer": "^0.3.1",
     "cookie-parser": "^1.4.5",
     "csurf": "^1.11.0",
@@ -41,18 +43,18 @@
     "helmet": "^3.22.0",
     "lodash": "^4.17.21",
     "moment": "^2.27.0",
-    "mssql": "^6.2.1",
+    "mssql": "^10.0.2",
     "mysql": "^2.18.1",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
-    "rxjs": "^6.5.5",
-    "typeorm": "^0.2.25",
+    "rxjs": "^7.8.1",
+    "typeorm": "^0.3.20",
     "uuid": "^8.1.0"
   },
   "devDependencies": {
     "@nestjs/cli": "^7.0.0",
     "@nestjs/schematics": "^7.0.0",
-    "@nestjs/testing": "^7.0.0",
+    "@nestjs/testing": "^10.3.3",
     "@types/express": "^4.17.3",
     "@types/jest": "25.1.4",
     "@types/node": "^13.9.1",
@@ -69,7 +71,7 @@
     "supertest": "^4.0.2",
     "ts-jest": "25.2.1",
     "ts-loader": "^6.2.1",
-    "ts-node": "^8.6.2",
+    "ts-node": "^10.7.0",
     "tsconfig-paths": "^3.9.0",
     "typescript": "^3.7.4"
   },

src/app.controller.ts

@@ -1,6 +1,8 @@
-import { Controller, Get } from '@nestjs/common';
+import { Controller, Get, UseInterceptors } from '@nestjs/common';
+import { CacheInterceptor } from '@nestjs/cache-manager';
 import { AppService } from './app.service';
 
+@UseInterceptors(CacheInterceptor)
 @Controller()
 export class AppController {
     constructor(private readonly appService: AppService) {}

src/app.module.ts

@@ -1,4 +1,6 @@
 import { Module, MiddlewareConsumer, RequestMethod } from '@nestjs/common';
+import { CacheModule, CacheInterceptor } from '@nestjs/cache-manager';
+import { APP_INTERCEPTOR } from '@nestjs/core';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { TypeOrmModule } from '@nestjs/typeorm';
@@ -14,6 +16,7 @@ import { PmtctRRIModule } from './pmtct-rri/pmtct-rri.module';
 // import { SelfServiceModule } from './self-service/self-service.module';
 
 import { AgeGroupMappingMiddleware } from './ageGroupMapping.middleware';
+import { CachesModule } from './cache/caches.module';
 @Module({
     imports: [
         ConfigModule.forRoot({
@@ -57,6 +60,9 @@ import { AgeGroupMappingMiddleware } from './ageGroupMapping.middleware';
                 cli: {
                     migrationsDir: 'migration',
                 },
+                extra: {
+                    trustServerCertificate: true,
+                }
             }),
         }),
         TypeOrmModule.forRootAsync({
@@ -86,6 +92,9 @@ import { AgeGroupMappingMiddleware } from './ageGroupMapping.middleware';
                 ),
                 requestTimeout: 300000000,
                 entities: [__dirname + '/**/*.model{.ts,.js}'],
+                extra: {
+                    trustServerCertificate: true,
+                }
             }),
         }),
         ConfigurationModule,
@@ -95,10 +104,21 @@ import { AgeGroupMappingMiddleware } from './ageGroupMapping.middleware';
         CareTreatmentModule,
         OperationalHisModule,
         PmtctRRIModule,
+        CacheModule.register({
+            isGlobal: true,
+            ttl: 60 * 60 * 24 * 1000, // Cache responses for a day
+            max: 1000,
+        }),
         // SelfServiceModule,
     ],
     controllers: [AppController],
-    providers: [AppService],
+    providers: [
+        AppService,
+        {
+            provide: APP_INTERCEPTOR,
+            useClass: CacheInterceptor,
+        },
+    ],
 })
 export class AppModule {
     configure(consumer: MiddlewareConsumer) {

src/care-treatment/care-treatment.controller.ts

@@ -248,7 +248,6 @@ import { GetCtTxCurrVerifiedByCountyQuery } from './current-on-art/queries/impl/
 import { GetCtTxCurrVerifiedByPartnerQuery } from './current-on-art/queries/impl/get-ct-tx-curr-verified-partner.query';
 import { GetOtzEnrollmentTrendQuery } from './otz/queries/impl/get-otz-enrollment-trend.query';
 import { GetOtzEnrollmentAmongAlhivAndOnArtByAgeSexQuery } from './otz/queries/impl/get-otz-enrollment-among-alhiv-and-on-art-by-age-sex.query';
-import { GetOtzNotEnrolledByPartnerHandler } from './otz/queries/handlers/get-otz-not-enrolled-by-partner.handler';
 import { GetOtzNotEnrolledByPartnerQuery } from './otz/queries/impl/get-otz-not-enrolled-by-partner.query';
 import { GetOtzNotEnrolledByCountyQuery } from './otz/queries/impl/get-otz-not-enrolled-by-county.query';
 import { GetAlhivWithReSuppressionQuery } from './otz/queries/impl/get-alhiv-with-re-suppression.query';

src/common/common.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Get, Param, Query } from '@nestjs/common';
+import { Controller, Get, Query } from '@nestjs/common';
 import { QueryBus } from '@nestjs/cqrs';
 import { GetCountiesQuery } from './queries/impl/get-counties.query';
 import { GetSubCountiesQuery } from './queries/impl/get-sub-counties.query';
@@ -10,9 +10,7 @@ import { GetSitesQuery } from './queries/impl/get-sites.query';
 
 @Controller('common')
 export class CommonController {
-    constructor(private readonly queryBus: QueryBus) {
-
-    }
+    constructor(private readonly queryBus: QueryBus) { }
 
     @Get('counties')
     async getCounties(

src/common/common.module.ts

@@ -1,5 +1,4 @@
 import { Module } from '@nestjs/common';
-import { DimFacility } from './entities/dim-facility.entity';
 import { ConfigurationModule } from '../config/config.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { CqrsModule } from '@nestjs/cqrs';
@@ -16,7 +15,8 @@ import { AllEmrSites } from 'src/care-treatment/common/entities/all-emr-sites.mo
     imports: [
         CqrsModule,
         ConfigurationModule,
-        TypeOrmModule.forFeature([AllEmrSites], 'mssql')],
+        TypeOrmModule.forFeature([AllEmrSites], 'mssql')
+    ],
     providers: [
         GetCountiesHandler,
         GetSubCountiesHandler,

src/common/queries/handlers/get-facilities.handler.ts

@@ -1,9 +1,8 @@
 import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { DimFacility } from '../../entities/dim-facility.entity';
 import { GetFacilitiesQuery } from '../impl/get-facilities.query';
-import { AllEmrSites } from './../../../care-treatment/common/entities/all-emr-sites.model';
+import { AllEmrSites } from '../../../care-treatment/common/entities/all-emr-sites.model';
 
 @QueryHandler(GetFacilitiesQuery)
 export class GetFacilitiesHandler implements IQueryHandler<GetFacilitiesQuery> {