Merge branch 'master' of https://github.com/palladiumkenya/dwh-portal…

…-backend into dependabot/npm_and_yarn/npm_and_yarn-security-group-fe5fdaf2a1

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",
@@ -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",

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());

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],
 })

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')

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();
+    }
+}

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[];
+}