Production

package.json

@@ -41,6 +41,7 @@
     "fast-glob": "^3.2.2",
     "fs": "^0.0.1-security",
     "helmet": "^3.22.0",
+    "joi": "^17.12.2",
     "lodash": "^4.17.21",
     "moment": "^2.27.0",
     "mssql": "^10.0.2",
@@ -53,7 +54,7 @@
   },
   "devDependencies": {
     "@nestjs/cli": "^7.0.0",
-    "@nestjs/schematics": "^7.0.0",
+    "@nestjs/schematics": "^10.1.1",
     "@nestjs/testing": "^10.3.3",
     "@types/express": "^4.17.3",
     "@types/jest": "25.1.4",
@@ -73,7 +74,7 @@
     "ts-loader": "^6.2.1",
     "ts-node": "^10.7.0",
     "tsconfig-paths": "^3.9.0",
-    "typescript": "^3.7.4"
+    "typescript": "^5.4.2"
   },
   "jest": {
     "moduleFileExtensions": [

src/app.service.ts

@@ -1,8 +1,14 @@
 import { Injectable } from '@nestjs/common';
+import { CacheService } from './cache/cache.service';
 
 @Injectable()
 export class AppService {
+    // constructor(private readonly cacheService: CacheService) {
+    // }
     getHello(): string {
         return 'Hello World!';
     }
+    // deleteCaches(): boolean {
+    //     return this.cacheService.clearAll();
+    // }
 }

src/cache/cache.controller.ts

@@ -0,0 +1,17 @@
+import { Controller, Get, Inject } from '@nestjs/common';
+import { CacheService } from './cache.service';
+
+@Controller('cache')
+export class CacheController {
+    constructor(
+        @Inject(CacheService) private readonly cacheService: CacheService
+    ) { }
+
+    @Get('invalidate-cache')
+    invalidateAllCaches(): { success: boolean } {
+        // Clear all caches
+        this.cacheService.clearAll();
+
+        return { success: true };
+    }
+}

src/cache/cache.service.ts

@@ -0,0 +1,14 @@
+import { Injectable } from '@nestjs/common';
+import { Cache } from 'cache-manager';
+
+@Injectable()
+export class CacheService {
+    constructor(
+        private readonly cacheManager: Cache
+    ) {}
+
+    clearAll(): boolean {
+        this.cacheManager.reset();
+        return true;
+    }
+}

src/cache/caches.module.ts

@@ -0,0 +1,14 @@
+import { Module } from '@nestjs/common';
+import { CacheService } from './cache.service';
+import { CacheController } from './cache.controller';
+
+@Module({
+    providers: [
+        CacheService,
+    ],
+    exports: [CacheService],
+})
+
+export class CachesModule {
+
+}

src/care-treatment/art-verification/queries/handlers/get-art-verification-pending-surveys-by-county.handler.ts

@@ -29,7 +29,7 @@ export class GetArtVerificationPendingSurveysByCountyHandler
                     coalesce(EMRs.SDP, Allsites.SDIP) As SDIP,
                     coalesce(EMRs.[SDP Agency], Allsites.Agency) as Agency
                 from  HIS_Implementation.dbo.EMRandNonEMRSites as Allsites
-                left join HIS_Implementation.dbo.All_EMRSites  EMRs on EMRs.MFL_Code=Allsites.MFLCode
+                left join ODS.dbo.All_EMRSites  EMRs on EMRs.MFL_Code=Allsites.MFLCode
             ),
             --Pick Only the EMR Sites
             EMRSites as (

src/care-treatment/covid/queries/handlers/get-covid-adult-plhiv-current-on-treatment.handler.ts

@@ -2,7 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { GetCovidAdultPLHIVCurrentOnTreatmentQuery } from '../impl/get-covid-adult-plhiv-current-on-treatment.query';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetCovidAdultPLHIVCurrentOnTreatmentQuery)
 export class GetCovidAdultPLHIVCurrentOnTreatmentHandler

src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr-distribution-by-county.handler.ts

@@ -2,8 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { GetCtTxCurrDistributionByCountyQuery } from '../impl/get-ct-tx-curr-distribution-by-county.query';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { FactTransNewCohort } from 'src/care-treatment/new-on-art/entities/fact-trans-new-cohort.model';
-import { AggregateTXCurr } from './../../entities/aggregate-txcurr.model';
+import { AggregateTXCurr } from '../../entities/aggregate-txcurr.model';
 
 @QueryHandler(GetCtTxCurrDistributionByCountyQuery)
 export class GetCtTxCurrDistributionByCountyHandler

src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr-distribution-by-partner.handler.ts

@@ -3,9 +3,7 @@ import { GetCtTxCurrDistributionByPartnerQuery } from '../impl/get-ct-tx-curr-di
 import { InjectRepository } from '@nestjs/typeorm';
 import { FactTransHmisStatsTxcurr } from '../../entities/fact-trans-hmis-stats-txcurr.model';
 import { Repository } from 'typeorm';
-import { DimAgeGroups } from '../../../common/entities/dim-age-groups.model';
-import { FactTransNewCohort } from 'src/care-treatment/new-on-art/entities/fact-trans-new-cohort.model';
-import { AggregateTXCurr } from './../../entities/aggregate-txcurr.model';
+import { AggregateTXCurr } from '../../entities/aggregate-txcurr.model';
 
 @QueryHandler(GetCtTxCurrDistributionByPartnerQuery)
 export class GetCtTxCurrDistributionByPartnerHandler

src/care-treatment/current-on-art/queries/handlers/get-ct-tx-curr.handler.ts

@@ -2,9 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { GetCtTxCurrQuery } from '../impl/get-ct-tx-curr.query';
-import { FactTransHmisStatsTxcurr } from '../../entities/fact-trans-hmis-stats-txcurr.model';
-import { FactTransNewCohort } from '../../../new-on-art/entities/fact-trans-new-cohort.model';
-import { AggregateTXCurr } from './../../entities/aggregate-txcurr.model';
+import { AggregateTXCurr } from '../../entities/aggregate-txcurr.model';
 
 @QueryHandler(GetCtTxCurrQuery)
 export class GetCtTxCurrHandler implements IQueryHandler<GetCtTxCurrQuery> {

src/care-treatment/home/queries/handlers/get-ct-viral-load-cascade-active-art-clients.handler.ts

@@ -2,7 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { GetCtViralLoadCascadeActiveArtClientsQuery } from '../impl/get-ct-viral-load-cascade-active-art-clients.query';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetCtViralLoadCascadeActiveArtClientsQuery)
 export class GetCtViralLoadCascadeActiveArtClientsHandler implements IQueryHandler<GetCtViralLoadCascadeActiveArtClientsQuery> {

src/care-treatment/home/queries/handlers/get-ct-viral-load-suppression-percentage.handler.ts

@@ -3,7 +3,7 @@ import { GetCtViralLoadSuppressionPercentageQuery } from '../impl/get-ct-viral-l
 import { InjectRepository } from '@nestjs/typeorm';
 import { FactTransHmisStatsTxcurr } from '../../entities/fact-trans-hmis-stats-txcurr.model';
 import { Repository } from 'typeorm';
-import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetCtViralLoadSuppressionPercentageQuery)
 export class GetCtViralLoadSuppressionPercentageHandler

src/care-treatment/viral-load/queries/handlers/get-vl-categorization-U-to-U.handler.ts

@@ -68,9 +68,26 @@ export class GetVlCategorizationUToUHandler
         }
 
         if (query.pbfw) {
+            let pbfw = []
+            let ispreg = []
+            query.pbfw.forEach(cat => {
+                let splitCategories = cat.split('|');
+                pbfw.push(splitCategories[0])
+                ispreg.push(splitCategories[1])
+            })
+
             vlUptake.andWhere('f.PBFWCategory IN (:...pbfws)', {
-                pbfws: query.pbfw,
+                pbfws: pbfw,
             });
+            if (ispreg.includes("Yes") && ispreg.includes("No")) {
+                vlUptake.andWhere(`f.Pregnant = 'Yes' OR f.Breastfeeding = 'Yes'`);
+            }
+            else if (ispreg.includes("Yes")) {
+                vlUptake.andWhere(`f.Pregnant = 'Yes'`);
+            }
+            else if (ispreg.includes("No")) {
+                vlUptake.andWhere(`f.Breastfeeding = 'Yes'`);
+            }
         }
 
         return await vlUptake

src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-by-sex.handler.ts

@@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { Repository } from 'typeorm';
 import { GetVlOutcomesBySexQuery } from '../impl/get-vl-outcomes-by-sex.query';
-import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetVlOutcomesBySexQuery)
 export class GetVlOutcomesBySexHandler

src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-by-year-and-suppression-category.handler.ts

@@ -2,7 +2,7 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { GetVlOutcomesByYearAndSuppressionCategoryQuery } from '../impl/get-vl-outcomes-by-year-and-suppression-category.query';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 
 @QueryHandler(GetVlOutcomesByYearAndSuppressionCategoryQuery)

src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-hvl-by-facility.handler.ts

@@ -1,9 +1,8 @@
 import { InjectRepository } from '@nestjs/typeorm';
 import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { Repository } from 'typeorm';
-import { FactTransVLOutcome } from '../../entities/fact-trans-vl-outcome.model';
 import { GetVlOutcomesHvlByFacilityQuery } from '../impl/get-vl-outcomes-hvl-by-facility.query';
-import { AggregateVLUptakeOutcome } from './../../entities/aggregate-vl-uptake-outcome.model';
+import { AggregateVLUptakeOutcome } from '../../entities/aggregate-vl-uptake-outcome.model';
 
 @QueryHandler(GetVlOutcomesHvlByFacilityQuery)
 export class GetVlOutcomesHvlByFacilityHandler implements IQueryHandler<GetVlOutcomesHvlByFacilityQuery> {

src/care-treatment/viral-load/queries/handlers/get-vl-outcomes-overall.handler.ts

@@ -1,7 +1,6 @@
 import { InjectRepository } from '@nestjs/typeorm';
 import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { Repository } from 'typeorm';
-import { FactTransVLOutcome } from '../../entities/fact-trans-vl-outcome.model';
 import { GetVlOutcomesOverallQuery } from '../impl/get-vl-outcomes-overall.query';
 import { AggregateVLUptakeOutcome } from '../../entities/aggregate-vl-uptake-outcome.model';
 

src/care-treatment/viral-load/queries/handlers/get-vl-overall-gt-1000-copies-received-eac.handler.ts

@@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { Repository } from 'typeorm';
 import { GetVlOverallUptakeGt1000CopiesReceivedEacQuery } from '../impl/get-vl-overall-uptake-gt-1000-copies-received-eac.query';
-import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetVlOverallUptakeGt1000CopiesReceivedEacQuery)
 export class GetVlOverallGt1000CopiesReceivedEacHandler

src/care-treatment/viral-load/queries/handlers/get-vl-overall-gt-1000-copies.handler.ts

@@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { Repository } from 'typeorm';
 import { GetVlOverallUptakeGt1000CopiesQuery } from '../impl/get-vl-overall-uptake-gt-1000-copies.query';
-import { LinelistFACTART } from './../../../common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetVlOverallUptakeGt1000CopiesQuery)
 export class GetVlOverallGt1000CopiesHandler

src/care-treatment/viral-load/queries/handlers/get-vl-overall-number-with-follow-vl-tests-at-gt1000-copies-second-line-regiment.handler.ts

@@ -1,11 +1,10 @@
 import {InjectRepository} from '@nestjs/typeorm';
 import {IQueryHandler, QueryHandler} from '@nestjs/cqrs';
 import {Repository} from 'typeorm';
-import {FactTransNewCohort} from "../../../new-on-art/entities/fact-trans-new-cohort.model";
-import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model';
 import {
     GetVlOverallNumberWithFollowTestsAtGt1000CopiesSecondlineRegimentQuery
 } from "../impl/get-vl-overall-number-with-follow-tests-at-gt1000-copies-secondline-regiment.query";
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetVlOverallNumberWithFollowTestsAtGt1000CopiesSecondlineRegimentQuery)
 export class GetVlOverallNumberWithFollowVlTestsAtGt1000CopiesSecondLineRegimentHandler implements IQueryHandler<GetVlOverallNumberWithFollowTestsAtGt1000CopiesSecondlineRegimentQuery> {

src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-and-suppression-refered-less-intense.handler.ts

@@ -1,9 +1,8 @@
 import { InjectRepository } from '@nestjs/typeorm';
 import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { Repository } from 'typeorm';
-import { FactTransNewCohort } from '../../../new-on-art/entities/fact-trans-new-cohort.model';
 import { GetVlOverallUptakeAndSuppressionReferredLessIntenseQuery } from '../impl/get-vl-overall-uptake-and-suppression-referred-less-intense.query';
-import { LinelistFACTART } from './../../../common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetVlOverallUptakeAndSuppressionReferredLessIntenseQuery)
 export class GetVlOverallUptakeAndSuppressionReferedLessIntenseHandler

src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-received-follow-tests-all.handler.ts

@@ -1,9 +1,8 @@
 import {InjectRepository} from '@nestjs/typeorm';
 import {IQueryHandler, QueryHandler} from '@nestjs/cqrs';
 import {Repository} from 'typeorm';
-import {FactTransNewCohort} from "../../../new-on-art/entities/fact-trans-new-cohort.model";
 import { GetVlOverallUptakeReceivedFollowTestsAllQuery} from "../impl/get-vl-overall-uptake-received-follow-tests-all.query";
-import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetVlOverallUptakeReceivedFollowTestsAllQuery)
 export class GetVlOverallUptakeReceivedFollowTestsAllHandler implements IQueryHandler<GetVlOverallUptakeReceivedFollowTestsAllQuery> {

src/care-treatment/viral-load/queries/handlers/get-vl-overall-uptake-received-follow-tests.handler.ts

@@ -3,7 +3,7 @@ import {IQueryHandler, QueryHandler} from '@nestjs/cqrs';
 import {Repository} from 'typeorm';
 import {FactTransNewCohort} from "../../../new-on-art/entities/fact-trans-new-cohort.model";
 import {GetVlOverallUptakeReceivedFollowTestsQuery} from "../impl/get-vl-overall-uptake-received-follow-tests.query";
-import { LinelistFACTART } from './../../../common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetVlOverallUptakeReceivedFollowTestsQuery)
 export class GetVlOverallUptakeReceivedFollowTestsHandler implements IQueryHandler<GetVlOverallUptakeReceivedFollowTestsQuery> {

src/care-treatment/viral-load/queries/handlers/get-vl-suppression-by-age.handler.ts

@@ -2,8 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { Repository } from 'typeorm';
 import { GetVlSuppressionByAgeQuery } from '../impl/get-vl-suppression-by-age.query';
-import { AggregateVLUptakeOutcome } from './../../entities/aggregate-vl-uptake-outcome.model';
-import { LinelistFACTART } from 'src/care-treatment/common/entities/linelist-fact-art.model';
+import { LinelistFACTART } from '../../../common/entities/linelist-fact-art.model';
 
 @QueryHandler(GetVlSuppressionByAgeQuery)
 export class GetVlSuppressionByAgeHandler

src/care-treatment/viral-load/queries/handlers/get-vl-uptake-U-to-U.handler.ts

@@ -2,7 +2,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { Repository } from 'typeorm';
 import { GetVlUptakeUToUQuery } from '../impl/get-vl-uptake-U-to-U.query';
-import { AggregateVLDurable } from './../../entities/aggregate-vl-durable.model';
+import { AggregateVLDurable } from '../../entities/aggregate-vl-durable.model';
 
 @QueryHandler(GetVlUptakeUToUQuery)
 export class GetVlUptakeUToUHandler
@@ -27,7 +27,7 @@ export class GetVlUptakeUToUHandler
         if (query.county) {
             vlUptake.andWhere('f.County IN (:...counties)', {
                 counties: query.county,
-            
+
             });
         }
 
@@ -68,9 +68,26 @@ export class GetVlUptakeUToUHandler
         }
 
         if (query.pbfw) {
+            let pbfw = []
+            let ispreg = []
+            query.pbfw.forEach(cat => {
+                let splitCategories = cat.split('|');
+                pbfw.push(splitCategories[0])
+                ispreg.push(splitCategories[1])
+            })
+
             vlUptake.andWhere('f.PBFWCategory IN (:...pbfws)', {
-                pbfws: query.pbfw,
+                pbfws: pbfw,
             });
+            if (ispreg.includes("Yes") && ispreg.includes("No")) {
+                vlUptake.andWhere(`(f.Pregnant = 'Yes' OR f.Breastfeeding = 'Yes')`);
+            }
+            else if (ispreg.includes("Yes")) {
+                vlUptake.andWhere(`f.Pregnant = 'Yes'`);
+            }
+            else if (ispreg.includes("No")) {
+                vlUptake.andWhere(`f.Breastfeeding = 'Yes'`);
+            }
         }
 
         return await vlUptake.getRawOne();

src/common/common.module.ts

@@ -9,7 +9,7 @@ import { GetPartnersHandler } from './queries/handlers/get-partners.handler';
 import { GetAgenciesHandler } from './queries/handlers/get-agencies.handler';
 import { GetSitesHandler } from './queries/handlers/get-sites.handler';
 import { CommonController } from './common.controller';
-import { AllEmrSites } from 'src/care-treatment/common/entities/all-emr-sites.model';
+import { AllEmrSites } from '../care-treatment/common/entities/all-emr-sites.model';
 
 @Module({
     imports: [

src/hts/common/queries/handlers/get-hts-partners.handler.ts

@@ -3,7 +3,7 @@ import { GetHtsPartnersQuery } from '../impl/get-hts-partners.query';
 import { InjectRepository } from '@nestjs/typeorm';
 import { FactHtsUptake } from '../../entities/fact-htsuptake.entity';
 import { Repository } from 'typeorm';
-import { AllEmrSites } from 'src/care-treatment/common/entities/all-emr-sites.model';
+import { AllEmrSites } from '../../../../care-treatment/common/entities/all-emr-sites.model';
 
 @QueryHandler(GetHtsPartnersQuery)
 export class GetHtsPartnersHandler

src/hts/hts.module.ts

@@ -22,7 +22,7 @@ import { AggregateHTSUptake } from './uptake/entities/aggregate-hts-uptake.model
 import { FactHTSClientTests } from './linkage/entities/fact-hts-client-tests.model';
 import { FactHTSClientLinkages } from './linkage/entities/fact-hts-client-linkages.model';
 import { FactHTSClientTracing } from './linkage/entities/fact-hts-client-tracing.model';
-import { AllEmrSites } from 'src/care-treatment/common/entities/all-emr-sites.model';
+import { AllEmrSites } from '../care-treatment/common/entities/all-emr-sites.model';
 
 import { GetHtsCountiesHandler } from './common/queries/handlers/get-hts-counties.handler';
 import { GetHtsSubCountiesHandler } from './common/queries/handlers/get-hts-sub-counties.handler';