Merge pull request #532 from aurelianware/claude/fix-portal-rollout-timeout-eTHyI

Claude/fix portal rollout timeout e t hy i

Author: aurelianware

src/portal/CloudHealthOffice.Portal/k8s/portal-deployment.yaml

@@ -244,7 +244,7 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: portal
-  minReplicas: 2  # Safe with Redis-backed session + token cache
+  minReplicas: 1  # Safe with Redis-backed session + token cache
   maxReplicas: 5
   metrics:
   - type: Resource

src/services/claims-scrubbing-service/k8s/claims-scrubbing-service-deployment.yaml

@@ -12,9 +12,9 @@ data:
   CLEAN_CLAIMS_TOPIC: "claims.clean"
   FLAGGED_CLAIMS_TOPIC: "claims.flagged"
   REJECTED_CLAIMS_TOPIC: "claims.rejected"
-  COSMOS_DATABASE: "CloudHealthOffice"
-  COSMOS_RULES_CONTAINER: "ScrubRules"
-  COSMOS_AUDIT_CONTAINER: "ScrubAudit"
+  MONGODB_DATABASE: "CloudHealthOffice"
+  MONGODB_RULES_COLLECTION: "ScrubRules"
+  MONGODB_AUDIT_COLLECTION: "ScrubAudit"
   CLAIMS_CONTAINER: "claims-archive"
   PARALLEL_RULES: "true"
   MAX_RULE_CONCURRENCY: "10"
@@ -72,11 +72,11 @@ spec:
               name: kafka-secret
               key: saslPassword
               optional: true
-        - name: COSMOS_ENDPOINT
+        - name: MONGODB_CONNECTION_STRING
           valueFrom:
             secretKeyRef:
-              name: cosmos-db-secret
-              key: endpoint
+              name: mongodb-secret
+              key: connectionString
         - name: STORAGE_CONNECTION_STRING
           valueFrom:
             secretKeyRef:

src/services/claims-scrubbing-service/package.json

@@ -33,10 +33,10 @@
   "author": "Cloud Health Office Team",
   "license": "Apache-2.0",
   "dependencies": {
-    "@azure/cosmos": "^4.2.0",
     "@azure/identity": "^4.13.0",
     "@azure/keyvault-secrets": "^4.9.0",
     "@azure/storage-blob": "^12.30.0",
+    "mongodb": "^6.12.0",
     "kafkajs": "^2.2.4",
     "uuid": "^13.0.0"
   },

src/services/claims-scrubbing-service/src/claims-scrubber.ts

@@ -8,12 +8,12 @@
  * - Configurable validation rule engine
  * - Standard and custom rule support
  * - Kafka integration for claim routing
- * - Cosmos DB for rule storage and audit
+ * - MongoDB for rule storage and audit
  * - First-pass rate metrics tracking
  */
 
 import { Kafka, Producer, Consumer, logLevel } from 'kafkajs';
-import { CosmosClient, Container, Database } from '@azure/cosmos';
+import { MongoClient, Db, Collection } from 'mongodb';
 import { BlobServiceClient, ContainerClient } from '@azure/storage-blob';
 import { DefaultAzureCredential } from '@azure/identity';
 import { v4 as uuidv4 } from 'uuid';
@@ -43,10 +43,10 @@ export class ClaimsScrubberService {
   private kafka: Kafka | null = null;
   private producer: Producer | null = null;
   private consumer: Consumer | null = null;
-  private cosmosClient: CosmosClient | null = null;
-  private database: Database | null = null;
-  private rulesContainer: Container | null = null;
-  private auditContainer: Container | null = null;
+  private mongoClient: MongoClient | null = null;
+  private database: Db | null = null;
+  private rulesCollection: Collection | null = null;
+  private auditCollection: Collection | null = null;
   private blobServiceClient: BlobServiceClient | null = null;
   private archiveContainer: ContainerClient | null = null;
   private startTime: number;
@@ -104,14 +104,12 @@ export class ClaimsScrubberService {
       });
     }
 
-    // Initialize Cosmos DB
-    this.cosmosClient = new CosmosClient({
-      endpoint: this.config.cosmosDb.endpoint,
-      aadCredentials: credential,
-    });
-    this.database = this.cosmosClient.database(this.config.cosmosDb.databaseName);
-    this.rulesContainer = this.database.container(this.config.cosmosDb.rulesContainerName);
-    this.auditContainer = this.database.container(this.config.cosmosDb.auditContainerName);
+    // Initialize MongoDB
+    this.mongoClient = new MongoClient(this.config.mongoDb.connectionString);
+    await this.mongoClient.connect();
+    this.database = this.mongoClient.db(this.config.mongoDb.databaseName);
+    this.rulesCollection = this.database.collection(this.config.mongoDb.rulesCollectionName);
+    this.auditCollection = this.database.collection(this.config.mongoDb.auditCollectionName);
 
     // Initialize Blob Storage
     if (this.config.storage.connectionString) {
@@ -127,29 +125,26 @@ export class ClaimsScrubberService {
       this.archiveContainer = this.blobServiceClient.getContainerClient(this.config.storage.containerName);
     }
 
-    // Load custom rules from Cosmos DB
+    // Load custom rules from MongoDB
     await this.loadCustomRules();
   }
 
   /**
-   * Load custom rules from Cosmos DB
+   * Load custom rules from MongoDB
    */
   private async loadCustomRules(): Promise<void> {
-    if (!this.rulesContainer) return;
+    if (!this.rulesCollection) return;
 
     try {
-      const query = {
-        query: 'SELECT * FROM c WHERE c.type = @type AND c.enabled = true',
-        parameters: [{ name: '@type', value: 'custom' }],
-      };
-
-      const { resources } = await this.rulesContainer.items.query<CustomRule>(query).fetchAll();
+      const resources = await this.rulesCollection
+        .find<CustomRule>({ type: 'custom', enabled: true })
+        .toArray();
 
       for (const rule of resources) {
         this.ruleEngine.addCustomRule(rule);
       }
 
-      console.log(`Loaded ${resources.length} custom rules from Cosmos DB`);
+      console.log(`Loaded ${resources.length} custom rules from MongoDB`);
     } catch (error) {
       console.error('Failed to load custom rules:', error);
     }
@@ -376,18 +371,17 @@ export class ClaimsScrubberService {
   }
 
   /**
-   * Audit the validation to Cosmos DB
+   * Audit the validation to MongoDB
    */
   private async auditValidation(
     claim: X12_837_Claim,
     result: ClaimValidationResult,
     correlationId: string
   ): Promise<void> {
-    if (!this.auditContainer) return;
+    if (!this.auditCollection) return;
 
     try {
       const auditRecord = {
-        id: uuidv4(),
         claimId: claim.claimId,
         claimType: claim.claimType,
         patientControlNumber: claim.claimHeader.patientControlNumber,
@@ -405,11 +399,11 @@ export class ClaimsScrubberService {
           .map(r => r.editCode),
         validationTimeMs: result.totalValidationTimeMs,
         correlationId,
-        timestamp: new Date().toISOString(),
-        ttl: 90 * 24 * 60 * 60, // 90 days TTL
+        timestamp: new Date(),
+        expireAt: new Date(Date.now() + 90 * 24 * 60 * 60 * 1000), // 90 days TTL
       };
 
-      await this.auditContainer.items.create(auditRecord);
+      await this.auditCollection.insertOne(auditRecord);
     } catch (error) {
       console.error('Failed to audit claim', { claimId: claim.claimId }, error);
     }
@@ -419,9 +413,9 @@ export class ClaimsScrubberService {
    * Add a custom validation rule
    */
   async addCustomRule(rule: CustomRule): Promise<void> {
-    // Save to Cosmos DB
-    if (this.rulesContainer) {
-      await this.rulesContainer.items.create(rule);
+    // Save to MongoDB
+    if (this.rulesCollection) {
+      await this.rulesCollection.insertOne(rule);
     }
 
     // Add to in-memory rule engine
@@ -448,7 +442,7 @@ export class ClaimsScrubberService {
   async getHealth(): Promise<HealthStatus> {
     const checks: HealthStatus['checks'] = {
       kafka: await this.checkKafkaHealth(),
-      cosmosDb: await this.checkCosmosDbHealth(),
+      mongoDb: await this.checkMongoDbHealth(),
       storage: await this.checkStorageHealth(),
       ruleEngine: this.checkRuleEngineHealth(),
     };
@@ -515,19 +509,19 @@ export class ClaimsScrubberService {
   }
 
   /**
-   * Check Cosmos DB health
+   * Check MongoDB health
    */
-  private async checkCosmosDbHealth(): Promise<ComponentHealth> {
+  private async checkMongoDbHealth(): Promise<ComponentHealth> {
     const start = Date.now();
     try {
       if (!this.database) {
         return {
           status: 'unhealthy',
           lastCheck: new Date().toISOString(),
-          error: 'Cosmos DB client not initialized',
+          error: 'MongoDB client not initialized',
         };
       }
-      await this.database.read();
+      await this.database.command({ ping: 1 });
       return {
         status: 'healthy',
         latencyMs: Date.now() - start,
@@ -629,6 +623,7 @@ export class ClaimsScrubberService {
   async close(): Promise<void> {
     if (this.consumer) await this.consumer.disconnect();
     if (this.producer) await this.producer.disconnect();
+    if (this.mongoClient) await this.mongoClient.close();
   }
 }
 

src/services/claims-scrubbing-service/src/index.ts

@@ -49,11 +49,11 @@ function getConfig(): ClaimsScrubberConfig {
       containerName: process.env.CLAIMS_CONTAINER || 'claims-archive',
       archivePathPattern: '{claimType}/{status}/{yyyy}/{MM}/{dd}',
     },
-    cosmosDb: {
-      endpoint: process.env.COSMOS_ENDPOINT || '',
-      databaseName: process.env.COSMOS_DATABASE || 'claims-scrubbing',
-      rulesContainerName: process.env.COSMOS_RULES_CONTAINER || 'validation-rules',
-      auditContainerName: process.env.COSMOS_AUDIT_CONTAINER || 'validation-audit',
+    mongoDb: {
+      connectionString: process.env.MONGODB_CONNECTION_STRING || '',
+      databaseName: process.env.MONGODB_DATABASE || 'CloudHealthOffice',
+      rulesCollectionName: process.env.MONGODB_RULES_COLLECTION || 'ScrubRules',
+      auditCollectionName: process.env.MONGODB_AUDIT_COLLECTION || 'ScrubAudit',
     },
     ruleEngine: {
       parallelExecution: process.env.PARALLEL_RULES === 'true',
@@ -357,11 +357,11 @@ async function start(): Promise<void> {
     // Initialize service (connect to Azure resources)
     // Skip initialization in development mode without Azure resources
     const config = getConfig();
-    if (config.cosmosDb.endpoint) {
+    if (config.mongoDb.connectionString) {
       await svc.initialize();
       console.log('Claims Scrubbing Service initialized');
     } else {
-      console.log('Running in development mode (no Azure resources)');
+      console.log('Running in development mode (no database configured)');
     }
 
     server.listen(PORT, () => {

src/services/claims-scrubbing-service/src/types.ts

@@ -652,12 +652,12 @@ export interface ClaimsScrubberConfig {
     /** Archive path pattern */
     archivePathPattern: string;
   };
-  /** Cosmos DB for rule storage and audit */
-  cosmosDb: {
-    endpoint: string;
+  /** MongoDB for rule storage and audit */
+  mongoDb: {
+    connectionString: string;
     databaseName: string;
-    rulesContainerName: string;
-    auditContainerName: string;
+    rulesCollectionName: string;
+    auditCollectionName: string;
   };
   /** Rule engine configuration */
   ruleEngine: {
@@ -770,7 +770,7 @@ export interface HealthStatus {
   timestamp: string;
   checks: {
     kafka: ComponentHealth;
-    cosmosDb: ComponentHealth;
+    mongoDb: ComponentHealth;
     storage: ComponentHealth;
     ruleEngine: ComponentHealth;
     dapr?: ComponentHealth;

src/services/encounter-service/k8s/encounter-service-deployment.yaml

@@ -5,8 +5,7 @@ metadata:
   namespace: cloudhealthoffice
 data:
   ASPNETCORE_ENVIRONMENT: "Production"
-  CosmosDb__DatabaseName: "CloudHealthOffice"
-  CosmosDb__ContainerName: "Encounters"
+  MongoDb__DatabaseName: "CloudHealthOffice"
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -18,7 +17,7 @@ metadata:
     tier: backend
     component: encounter-processing
 spec:
-  replicas: 3
+  replicas: 1
   selector:
     matchLabels:
       app: encounter-service
@@ -40,34 +39,18 @@ spec:
         - name: MongoDb__ConnectionString
           valueFrom:
             secretKeyRef:
-              name: encounter-service-secret
-              key: MongoDb__ConnectionString
-              optional: true
+              name: mongodb-secret
+              key: connectionString
         - name: ASPNETCORE_ENVIRONMENT
           valueFrom:
             configMapKeyRef:
               name: encounter-service-config
               key: ASPNETCORE_ENVIRONMENT
-        - name: CosmosDb__DatabaseName
+        - name: MongoDb__DatabaseName
           valueFrom:
             configMapKeyRef:
               name: encounter-service-config
-              key: CosmosDb__DatabaseName
-        - name: CosmosDb__ContainerName
-          valueFrom:
-            configMapKeyRef:
-              name: encounter-service-config
-              key: CosmosDb__ContainerName
-        - name: CosmosDb__Endpoint
-          valueFrom:
-            secretKeyRef:
-              name: cosmos-db-secret
-              key: endpoint
-        - name: CosmosDb__Key
-          valueFrom:
-            secretKeyRef:
-              name: cosmos-db-secret
-              key: key
+              key: MongoDb__DatabaseName
         resources:
           requests:
             cpu: 200m
@@ -115,7 +98,7 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: encounter-service
-  minReplicas: 3
+  minReplicas: 1
   maxReplicas: 20
   metrics:
   - type: Resource

src/services/reference-data-service/k8s/reference-data-service-deployment.yaml

@@ -90,7 +90,7 @@ metadata:
   name: reference-data-service
   namespace: cloudhealthoffice
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: reference-data-service
@@ -155,7 +155,7 @@ spec:
     apiVersion: apps/v1
     kind: Deployment
     name: reference-data-service
-  minReplicas: 2
+  minReplicas: 1
   maxReplicas: 10
   metrics:
   - type: Resource