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

Fixed hts partner bug
palladiumkenya · Jun 12, 2024 · 5feea09 · 5feea09
2 parents 47991db + 051cfff
commit 5feea09
Show file tree

Hide file tree

Showing 19 changed files with 6,977 additions and 12,122 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "@nestjs/config": "^3.2.0",
     "@nestjs/core": "10.3.3",
     "@nestjs/cqrs": "^10.2.7",
-    "@nestjs/platform-express": "^10.3.3",
+    "@nestjs/platform-express": "^10.3.9",
     "@nestjs/typeorm": "^10.0.2",
     "@types/lodash": "^4.14.149",
     "axios": "^1.0.0",
@@ -54,7 +54,7 @@
     "uuid": "^8.1.0"
   },
   "devDependencies": {
-    "@nestjs/cli": "^7.0.0",
+    "@nestjs/cli": "^10.3.2",
     "@nestjs/schematics": "^10.1.1",
     "@nestjs/testing": "^10.3.3",
     "@types/express": "^4.17.3",
@@ -67,11 +67,11 @@
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-import": "^2.20.1",
-    "jest": "^25.1.0",
+    "jest": "^29.7.0",
     "prettier": "^1.19.1",
     "sqlite3": "^5.0.0",
     "supertest": "^4.0.2",
-    "ts-jest": "25.2.1",
+    "ts-jest": "29.1.2",
     "ts-loader": "^6.2.1",
     "ts-node": "^10.7.0",
     "tsconfig-paths": "^3.9.0",

diff --git a/src/common/common.controller.ts b/src/common/common.controller.ts
@@ -13,6 +13,7 @@ import { GetFacilityLevelByOwnershipPartnerQuery } from './queries/impl/get-faci
 import { GetFacilityLevelByOwnershipCountyQuery } from './queries/impl/get-facility-level-by-ownership-county.query';
 import { GetFacilityByInfrastructureQuery } from './queries/impl/get-facility-by-infrastructure.query';
 import { GetFacilityLinelistQuery } from './queries/impl/get-facility-linelist.query';
+import { GetFacilityTxcurrQuery } from './queries/impl/get-facility-txcurr.query';
 
 @Controller('common')
 export class CommonController {
@@ -367,6 +368,34 @@ export class CommonController {
         return this.queryBus.execute(query);
     }
 
+
+    @Get('facilityTxcurr')
+    async getFacilityTxCurr(
+        @Query('county') county,
+        @Query('subCounty') subCounty,
+        @Query('facility') facility,
+        @Query('partner') partner,
+        @Query('agency') agency,
+    ): Promise<any> {
+        const query = new GetFacilityTxcurrQuery();
+        if(county) {
+            query.county = county;
+        }
+        if(subCounty) {
+            query.subCounty = subCounty;
+        }
+        if(facility) {
+            query.facility = facility;
+        }
+        if(partner) {
+            query.partner = partner;
+        }
+        if(agency) {
+            query.agency = agency;
+        }
+        return this.queryBus.execute(query);
+    }
+
     @Get('sites')
     async getSites(): Promise<any> {
         return this.queryBus.execute(new GetSitesQuery());

diff --git a/src/common/common.module.ts b/src/common/common.module.ts
@@ -14,14 +14,16 @@ import { GetFacilityLevelByOwnershipPartnerHandler } from './queries/handlers/ge
 import { GetFacilityLevelByOwnershipCountyHandler } from './queries/handlers/get-facility-level-by-ownership-county.handler';
 import { GetFacilityByInfrastructureHandler } from './queries/handlers/get-facility-by-infrastructure.handler';
 import { GetFacilityLinelistHandler } from './queries/handlers/get-facility-linelist.handler';
+import { GetFacilityTxcurrHandler } from './queries/handlers/get-facility-txcurr.handler';
 import { CommonController } from './common.controller';
 import { AllEmrSites } from '../care-treatment/common/entities/all-emr-sites.model';
+import { LinelistFACTART } from '../care-treatment/common/entities/linelist-fact-art.model';
 
 @Module({
     imports: [
         CqrsModule,
         ConfigurationModule,
-        TypeOrmModule.forFeature([AllEmrSites], 'mssql')
+        TypeOrmModule.forFeature([AllEmrSites, LinelistFACTART], 'mssql')
     ],
     providers: [
         GetCountiesHandler,
@@ -36,6 +38,7 @@ import { AllEmrSites } from '../care-treatment/common/entities/all-emr-sites.mod
         GetFacilityLevelByOwnershipCountyHandler,
         GetFacilityByInfrastructureHandler,
         GetFacilityLinelistHandler,
+        GetFacilityTxcurrHandler,
     ],
     controllers: [CommonController],
 })

diff --git a/src/common/queries/handlers/get-facility-status-by-partner.handler.ts b/src/common/queries/handlers/get-facility-status-by-partner.handler.ts
@@ -29,7 +29,6 @@ export class GetFacilityStatusByPartnerHandler implements IQueryHandler<GetFacil
             });
         }
 
-
         return await facilitiesStatus
             .groupBy('q.EMR_Status, PartnerName')
             .orderBy('PartnerName')

diff --git a/src/common/queries/handlers/get-facility-txcurr.handler.ts b/src/common/queries/handlers/get-facility-txcurr.handler.ts
@@ -0,0 +1,38 @@
+import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { GetFacilityTxcurrQuery } from '../impl/get-facility-txcurr.query';
+import { LinelistFACTART } from '../../../care-treatment/common/entities/linelist-fact-art.model';
+
+@QueryHandler(GetFacilityTxcurrQuery)
+export class GetFacilityTxcurrHandler implements IQueryHandler<GetFacilityTxcurrQuery> {
+    constructor(
+        @InjectRepository(LinelistFACTART, 'mssql')
+        private readonly repository: Repository<LinelistFACTART>,
+    ) {}
+
+    async execute(query: GetFacilityTxcurrQuery): Promise<any> {
+        const facilities = this.repository
+            .createQueryBuilder('q')
+            .select('count (*) TxCurr, KEPH_Level')
+            .leftJoin('all_EMRSites', 'e', 'e.MFLCode = q.SiteCode')
+            .where(`ARTOutcomeDescription='Active'`);
+
+        if (query.county) {
+            facilities.andWhere('q.County IN (:...county)', {
+                county: [query.county],
+            });
+        }
+
+        if (query.subCounty) {
+            facilities.andWhere('q.SubCounty IN (:...subCounty)', {
+                subCounty: [query.subCounty],
+            });
+        }
+
+
+        return await facilities
+            .groupBy('KEPH_Level')
+            .getRawMany();
+    }
+}
diff --git a/src/common/queries/impl/get-facility-txcurr.query.ts b/src/common/queries/impl/get-facility-txcurr.query.ts
@@ -0,0 +1,7 @@
+export class GetFacilityTxcurrQuery {
+    county?: string[];
+    subCounty?: string[];
+    facility?: string[];
+    partner?: string[];
+    agency?: string[];
+}
diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-age-sex.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-age-sex.handler.ts
@@ -49,7 +49,6 @@ export class GetUptakeByAgeSexHandler
             uptakeByAgeSexSql = `${uptakeByAgeSexSql} and PartnerName IN ('${query.partner
                 .toString()
                 .replace(/,/g, "','")}')`;
-            params.push(query.partner);
         }
 
 

diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-county.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-county.handler.ts
@@ -68,7 +68,6 @@ export class GetUptakeByCountyHandler
             uptakeByCountySql = `${uptakeByCountySql} and PartnerName IN ('${query.partner
                 .toString()
                 .replace(/,/g, "','")}')`;
-            params.push(query.partner);
         }
 
         // if(query.month) {

diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-entrypoint.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-entrypoint.handler.ts
@@ -50,7 +50,6 @@ export class GetUptakeByEntrypointHandler
             uptakeByEntryPointSql = `${uptakeByEntryPointSql} and PartnerName IN ('${query.partner
                 .toString()
                 .replace(/,/g, "','")}')`;
-            params.push(query.partner);
         }
 
         // if(query.month) {

diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-months-since-last-test.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-months-since-last-test.handler.ts
@@ -50,7 +50,6 @@ export class GetUptakeByMonthsSinceLastTestHandler
             uptakeByPopulationTypeSql = `${uptakeByPopulationTypeSql} and PartnerName IN ('${query.partner
                 .toString()
                 .replace(/,/g, "','")}')`;
-            params.push(query.partner);
         }
 
         // if(query.month) {

diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-partner.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-partner.handler.ts
@@ -50,7 +50,6 @@ export class GetUptakeByPartnerHandler
             uptakeByPartnerSql = `${uptakeByPartnerSql} and PartnerName IN ('${query.partner
                 .toString()
                 .replace(/,/g, "','")}')`;
-            params.push(query.partner);
         }
 
         if (query.fromDate) {

diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-population-type.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-population-type.handler.ts
@@ -43,7 +43,6 @@ export class GetUptakeByPopulationTypeHandler implements IQueryHandler<GetUptake
             uptakeByPopulationTypeSql = `${uptakeByPopulationTypeSql} and PartnerName IN ('${query.partner
                 .toString()
                 .replace(/,/g, "','")}')`;
-            params.push(query.partner);
         }
 
         if(query.month) {

diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-sex.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-sex.handler.ts
@@ -2,55 +2,44 @@ import { IQueryHandler, QueryHandler } from '@nestjs/cqrs';
 import { GetUptakeBySexQuery } from '../impl/get-uptake-by-sex.query';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { FactHTSClientTests } from './../../../linkage/entities/fact-hts-client-tests.model';
+import { AggregateHTSUptake } from '../../entities/aggregate-hts-uptake.model';
 
 @QueryHandler(GetUptakeBySexQuery)
 export class GetUptakeBySexHandler
     implements IQueryHandler<GetUptakeBySexQuery> {
     constructor(
-        @InjectRepository(FactHTSClientTests, 'mssql')
-        private readonly repository: Repository<FactHTSClientTests>,
+        @InjectRepository(AggregateHTSUptake, 'mssql')
+        private readonly repository: Repository<AggregateHTSUptake>,
     ) {}
 
     async execute(query: GetUptakeBySexQuery): Promise<any> {
         const params = [];
-        let uptakeBySexSql = `SELECT
-                CASE WHEN Gender = 'M' THEN 'Male' WHEN Gender = 'F' THEN 'Female' ELSE Gender END gender,
+
+        let uptakeBySexSql = this.repository
+            .createQueryBuilder('q')
+            .select(
+                `Gender gender, 
                 SUM(Tested) tested, 
                 SUM(Positive) positive, 
-                ((CAST(SUM(CASE WHEN positive IS NULL THEN 0 ELSE positive END) AS FLOAT)/CAST(SUM(Tested) AS FLOAT))*100) AS positivity
-            FROM
-                NDWH.dbo.FactHTSClientTests AS link
-                LEFT JOIN NDWH.dbo.DimPatient AS pat ON link.PatientKey = pat.PatientKey
-                LEFT JOIN NDWH.dbo.DimAgeGroup AS age ON link.AgeGroupKey = age.AgeGroupKey
-                LEFT JOIN NDWH.dbo.DimPartner AS part ON link.PartnerKey = part.PartnerKey
-                LEFT JOIN NDWH.dbo.DimFacility AS fac ON link.FacilityKey = fac.FacilityKey
-                LEFT JOIN NDWH.dbo.DimAgency AS agency ON link.AgencyKey = agency.AgencyKey
-            WHERE Tested > 0 and TestType IN ('Initial', 'Initial Test')`;
+                ((CAST(SUM(CASE WHEN positive IS NULL THEN 0 ELSE positive END) AS FLOAT)/CAST(SUM(Tested) AS FLOAT))*100) AS positivity`
+            )
+            .where(`Tested > 0`)
 
         if (query.county) {
-            uptakeBySexSql = `${uptakeBySexSql} and County IN ('${query.county
-                .toString()
-                .replace(/,/g, "','")}')`
+            uptakeBySexSql.andWhere('County IN (:...counties)', { counties: query.county });
         }
 
         if (query.subCounty) {
-            uptakeBySexSql = `${uptakeBySexSql} and SubCounty IN ('${query.subCounty
-                .toString()
-                .replace(/,/g, "','")}')`
+            uptakeBySexSql.andWhere('SubCounty IN (:...subCounties)', { subCounties: query.subCounty });
         }
 
         if (query.facility) {
-            uptakeBySexSql = `${uptakeBySexSql} and FacilityName IN ('${query.facility
-                .toString()
-                .replace(/,/g, "','")}')`
+            uptakeBySexSql.andWhere('FacilityName IN (:...facilities)', { facilities: query.facility });
         }
 
+
         if (query.partner) {
-            uptakeBySexSql = `${uptakeBySexSql} and PartnerName IN ('${query.partner
-                .toString()
-                .replace(/,/g, "','")}')`;
-            params.push(query.partner);
+            uptakeBySexSql.andWhere('PartnerName IN (:...partners)', { partners: query.partner });
         }
 
         // if(query.month) {
@@ -64,14 +53,22 @@ export class GetUptakeBySexHandler
         // }
 
         if (query.fromDate) {
-            uptakeBySexSql = `${uptakeBySexSql} and DateTestedKey >= ${query.fromDate}01`;
+            let year = `${query.fromDate}`.substring(0, 4); // Extract year
+            let month = `${query.fromDate}`.substring(4, 6); // Extract month
+            let formattedDate = `${year}-${month}-01`;
+            uptakeBySexSql.andWhere('AsOfDate >= :fromDate', { fromDate: formattedDate });
         }
 
         if (query.toDate) {
-            uptakeBySexSql = `${uptakeBySexSql} and DateTestedKey <= EOMONTH('${query.toDate}01')`;
+            let toDate = `${query.toDate}`;
+            let year = toDate.substring(0, 4);
+            let month = toDate.substring(4, 6);
+            let formattedDate = `${year}-${month}-01`;
+            uptakeBySexSql.andWhere('AsOfDate <=  EOMONTH(:toDate)', { toDate: formattedDate });
         }
 
-        uptakeBySexSql = `${uptakeBySexSql} GROUP BY CASE WHEN Gender = 'M' THEN 'Male' WHEN Gender = 'F' THEN 'Female' ELSE Gender END`;
-        return await this.repository.query(uptakeBySexSql, params);
+        return await uptakeBySexSql
+            .groupBy('Gender')
+            .getRawMany();
     }
 }
diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-tb-screened.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-tb-screened.handler.ts
@@ -50,7 +50,6 @@ export class GetUptakeByTbScreenedHandler
             uptakeByTBScreenedSql = `${uptakeByTBScreenedSql} and PartnerName IN ('${query.partner
                 .toString()
                 .replace(/,/g, "','")}')`;
-            params.push(query.partner);
         }
 
         // if(query.month) {

diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-tb-screening.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-tb-screening.handler.ts
@@ -44,7 +44,6 @@ export class GetUptakeByTBScreeningHandler
             uptakeByClientTestedAsSql = `${uptakeByClientTestedAsSql} and PartnerName IN ('${query.partner
                 .toString()
                 .replace(/,/g, "','")}')`;
-            params.push(query.partner);
         }
 
         if (query.facility) {

diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-testedas.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-testedas.handler.ts
@@ -50,7 +50,6 @@ export class GetUptakeByTestedasHandler
             uptakeByClientTestedAsSql = `${uptakeByClientTestedAsSql} and PartnerName IN ('${query.partner
                 .toString()
                 .replace(/,/g, "','")}')`;
-            params.push(query.partner);
         }
 
         // if(query.month) {

diff --git a/src/hts/uptake/queries/handlers/get-uptake-by-testing-strategy.handler.ts b/src/hts/uptake/queries/handlers/get-uptake-by-testing-strategy.handler.ts
@@ -50,7 +50,6 @@ export class GetUptakeByTestingStrategyHandler
             uptakeByPopulationTypeSql = `${uptakeByPopulationTypeSql} and PartnerName IN ('${query.partner
                 .toString()
                 .replace(/,/g, "','")}')`;
-            params.push(query.partner);
         }
 
         // if(query.month) {
-Original file line number
+Diff line change
@@ Expand Up @@
                 });
             }
             return await facilitiesStatus
                 .groupBy('q.EMR_Status, PartnerName')
                 .orderBy('PartnerName')
@@ Expand Down @@