Clean up ExpressJS services

apps/demo-renderer-app/src/utils/populateInputParams.ts

@@ -51,7 +51,7 @@
 }
 
 // setting local parameter as false as we are calling $populate with an NPM package, not a server
-// package doesn't contain any fhir resources to "know" the context from
+// the package doesn't contain any fhir resources to "know" the context from
 function createLocalParam(): ParametersParameter {
   return {
     name: 'local',
@@ -63,7 +63,7 @@
   launchContext: LaunchContext,
   patient: Patient,
   user: Practitioner,
   fhirPathContext: Record<string, any>
 ): ParametersParameter | null {
   const name = launchContext.extension[0].valueId ?? launchContext.extension[0].valueCoding?.code;
   if (!name) {
@@ -170,7 +170,7 @@
   launchContexts: LaunchContext[],
   sourceQueries: SourceQuery[],
   questionnaireLevelVariables: QuestionnaireLevelXFhirQueryVariable[],
   fhirPathContext: Record<string, any>
 ): Parameters | null {
   const patientSubject = createPatientSubject(questionnaire, patient);
   if (!patientSubject) {

apps/smart-forms-app/package.json

@@ -26,8 +26,8 @@
   },
   "homepage": "https://github.com/aehrc/smart-forms#readme",
   "dependencies": {
-    "@aehrc/sdc-assemble": "^1.2.0",
-    "@aehrc/sdc-populate": "^2.2.4",
+    "@aehrc/sdc-assemble": "^1.3.1",
+    "@aehrc/sdc-populate": "^2.2.7",
     "@aehrc/smart-forms-renderer": "^0.35.9",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",

deployment/forms-server/forms-server-app/lib/forms-server-app-stack.ts

@@ -12,6 +12,7 @@ import {
 import { AssembleEndpoint } from 'forms-server-assemble-endpoint';
 import { HapiEndpoint } from 'forms-server-hapi-endpoint';
 import { Certificate } from 'aws-cdk-lib/aws-certificatemanager';
+import { PopulateEndpoint } from 'forms-server-populate-endpoint';
 
 export class FormsServerAppStack extends cdk.Stack {
   constructor(scope: Construct, id: string, props?: cdk.StackProps) {
@@ -38,9 +39,29 @@ export class FormsServerAppStack extends cdk.Stack {
       protocol: ApplicationProtocol.HTTPS,
       certificates: [certificate]
     });
+    const populate = new PopulateEndpoint(this, 'FormsServerPopulate', { cluster });
     const assemble = new AssembleEndpoint(this, 'FormsServerAssemble', { cluster });
     const hapi = new HapiEndpoint(this, 'FormsServerHapi', { cluster });
 
+    // Create a target for the populate service, routed from the "api/fhir/$populate" path.
+    const populateTarget = populate.service.loadBalancerTarget({
+      containerName: populate.containerName,
+      containerPort: populate.containerPort
+    });
+
+    const populateTargetGroup = new ApplicationTargetGroup(this, 'FormsServerPopulateTargetGroup', {
+      vpc,
+      port: populate.containerPort,
+      protocol: ApplicationProtocol.HTTP,
+      targets: [populateTarget],
+      healthCheck: { path: '/fhir/Questionnaire/$populate' }
+    });
+    listener.addAction('FormsServerPopulateAction', {
+      action: ListenerAction.forward([populateTargetGroup]),
+      priority: 1,
+      conditions: [ListenerCondition.pathPatterns(['/fhir/Questionnaire/$populate'])]
+    });
+
     // Create a target for the assemble service, routed from the "api/fhir/$assemble" path.
     const assembleTarget = assemble.service.loadBalancerTarget({
       containerName: assemble.containerName,
@@ -56,7 +77,7 @@ export class FormsServerAppStack extends cdk.Stack {
     });
     listener.addAction('FormsServerAssembleAction', {
       action: ListenerAction.forward([assembleTargetGroup]),
-      priority: 1,
+      priority: 2,
       conditions: [ListenerCondition.pathPatterns(['/fhir/Questionnaire/$assemble'])]
     });
 

deployment/forms-server/forms-server-app/package.json

@@ -24,6 +24,7 @@
     "constructs": "^10.3.0",
     "source-map-support": "^0.5.21",
     "forms-server-assemble-endpoint": "^0.1.0",
-    "forms-server-hapi-endpoint": "^0.1.0"
+    "forms-server-hapi-endpoint": "^0.1.0",
+    "forms-server-populate-endpoint": "^0.1.0"
   }
 }

deployment/forms-server/populate-endpoint/.gitignore

@@ -0,0 +1,8 @@
+*.js
+!jest.config.js
+*.d.ts
+node_modules
+
+# CDK asset staging directory
+.cdk.staging
+cdk.out

deployment/forms-server/populate-endpoint/.npmignore

@@ -0,0 +1,6 @@
+*.ts
+!*.d.ts
+
+# CDK asset staging directory
+.cdk.staging
+cdk.out

deployment/forms-server/populate-endpoint/README.md

@@ -0,0 +1,12 @@
+# Welcome to your CDK TypeScript Construct Library project
+
+You should explore the contents of this project. It demonstrates a CDK Construct Library that includes a construct (`PopulateEndpoint`)
+which contains an Amazon SQS queue that is subscribed to an Amazon SNS topic.
+
+The construct defines an interface (`PopulateEndpointProps`) to configure the visibility timeout of the queue.
+
+## Useful commands
+
+* `npm run build`   compile typescript to js
+* `npm run watch`   watch for changes and compile
+* `npm run test`    perform the jest unit tests

deployment/forms-server/populate-endpoint/jest.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+  testEnvironment: 'node',
+  roots: ['<rootDir>/test'],
+  testMatch: ['**/*.test.ts'],
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest'
+  }
+};

deployment/forms-server/populate-endpoint/lib/index.ts

@@ -0,0 +1,49 @@
+import {
+  AwsLogDriver,
+  Cluster,
+  Compatibility,
+  ContainerImage,
+  FargateService,
+  TaskDefinition
+} from 'aws-cdk-lib/aws-ecs';
+import { Construct } from 'constructs';
+import { RetentionDays } from 'aws-cdk-lib/aws-logs';
+
+export interface PopulateEndpointProps {
+  cluster: Cluster;
+}
+
+export class PopulateEndpoint extends Construct {
+  containerName = 'forms-server-populate';
+  containerPort = 3001;
+  service: FargateService;
+
+  constructor(scope: Construct, id: string, props: PopulateEndpointProps) {
+    super(scope, id);
+
+    const { cluster } = props;
+
+    // Create a task definition that contains both the application and cache containers.
+    const taskDefinition = new TaskDefinition(this, 'FormsServerPopulateTaskDefinition', {
+      compatibility: Compatibility.FARGATE,
+      cpu: '256',
+      memoryMiB: '512'
+    });
+
+    // Create the cache container.
+    taskDefinition.addContainer('FormsServerPopulateContainer', {
+      containerName: this.containerName,
+      image: ContainerImage.fromRegistry('aehrc/smart-forms-populate:latest'),
+      portMappings: [{ containerPort: this.containerPort }],
+      logging: AwsLogDriver.awsLogs({
+        streamPrefix: 'forms-server-populate',
+        logRetention: RetentionDays.ONE_MONTH
+      })
+    });
+
+    this.service = new FargateService(this, 'FormsServerPopulateService', {
+      cluster,
+      taskDefinition
+    });
+  }
+}

deployment/forms-server/populate-endpoint/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "forms-server-populate-endpoint",
+  "version": "0.1.0",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "scripts": {
+    "build": "tsc",
+    "watch": "tsc -w",
+    "test": "jest"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.5.12",
+    "@types/node": "20.14.2",
+    "aws-cdk-lib": "2.104.0",
+    "constructs": "^10.3.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "typescript": "~5.2.2"
+  },
+  "peerDependencies": {
+    "aws-cdk-lib": "2.104.0",
+    "constructs": "^10.3.0"
+  }
+}

deployment/forms-server/populate-endpoint/tsconfig.json

@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "commonjs",
+    "lib": ["es2020", "dom"],
+    "declaration": true,
+    "strict": true,
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "noImplicitThis": true,
+    "alwaysStrict": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": false,
+    "inlineSourceMap": true,
+    "inlineSources": true,
+    "experimentalDecorators": true,
+    "strictPropertyInitialization": false,
+    "typeRoots": ["./node_modules/@types"]
+  },
+  "exclude": ["node_modules", "cdk.out"]
+}