Merge branch 'main' into 18-upload-progress-bar

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cht-user-management",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "main": "dist/index.js",
   "dependencies": {
     "@fastify/autoload": "^5.8.0",

src/config/chis-ug/config.json

@@ -2,16 +2,25 @@
 {
   "domains": [
     {
-      "friendly": "UG VHT",
+      "friendly": "eCHIS Uganda",
       "domain": "echis.health.go.ug"
+    },
+    {
+      "friendly": "eCHIS Uganda Dev",
+      "domain": "vhtapp-4x.dev.medicmobile.org"
+    },
+    {
+      "friendly": "eCHIS Uganda Training",
+      "domain": "moh-ug-test.dev.medicmobile.org"
     }
   ],
+
   "contact_types": [
     {
       "name": "health_center",
       "friendly": "VHT Area",
       "contact_type": "person",
-      "user_role": "district_admin",
+      "user_role": "vht",
       "username_from_place": true,
       "hierarchy": [
         {
@@ -34,9 +43,10 @@
           "friendly_name": "VHT Area Name",
           "property_name": "name",
           "type": "name",
-          "parameter": [],
+          "parameter": ["\\sArea", "\\s\\(.*\\)"],
           "required": true
         },
+
         {
           "friendly_name": "District",
           "property_name": "district",
@@ -82,7 +92,7 @@
           "required": true
         },
         {
-          "friendly_name": "VHT Phone",
+          "friendly_name": "Phone Number",
           "property_name": "phone",
           "type": "phone",
           "parameter": "UG",

src/config/chis-ug/gross.ts

@@ -0,0 +1,12 @@
+import { PlacePayload } from '../../lib/cht-api';
+
+export default async function mutate(payload: PlacePayload): Promise<PlacePayload> {
+  if (payload.contact_type === 'health_center') {
+    // during replacement, the name is optional
+    if (payload.name) {
+      payload.name += ` Area (${payload.village})`;
+    }
+  }
+
+  return payload;
+}

src/config/chis-ug/index.ts

@@ -1,8 +1,10 @@
 import { PartnerConfig } from '..';
 import config from './config.json';
+import mutate from './gross';
 
 const partnerConfig: PartnerConfig = {
-  config
+  config,
+  mutate,
 };
 
 export default partnerConfig;

src/lib/validator-gender.ts

@@ -16,14 +16,14 @@ export default class ValidatorGender implements IValidator {
   }
 
   get defaultError(): string {
-    return `Must be either 'Male' or 'Female'`;
+    return `Must be either 'male' or 'female'`;
   }
 
   private parseGenders(input: string): { gender: string; isValid: boolean } {
     const isFemale = input?.match(/[fw]/i);
     const isMale = input?.match(/m(?<!fem|wom)/i);
     const isValid = (!!isFemale || !!isMale) && !(isFemale && isMale);
-    const gender = isMale ? 'Male' : 'Female';
+    const gender = isMale ? 'male' : 'female';
     return { isValid, gender };
   }
 }

src/services/upload-manager.ts

@@ -72,7 +72,7 @@ export class UploadManager extends EventEmitter {
       console.log(`successfully created ${JSON.stringify(place.creationDetails)}`);
       this.eventedPlaceStateChange(place, PlaceUploadState.SUCCESS);
     } catch (err: any) {
-      const errorDetails = err.response?.data.toString() || err.toString();
+      const errorDetails = err.response?.data.error || err.toString();
       console.log('error when creating user', errorDetails);
       place.uploadError = errorDetails;
       this.eventedPlaceStateChange(place, PlaceUploadState.FAILURE);

test/lib/validation.spec.ts

@@ -38,12 +38,12 @@ const scenarios: Scenario[] = [
   { type: 'name', prop: 'Sam\'s CHU', propertyParameter: ['CHU', 'Comm Unit'], isValid: true, altered: 'Sam\'s' },
   { type: 'name', prop: 'Jonathan M.Barasa', isValid: true, altered: 'Jonathan M Barasa' },
 
-  { type: 'gender', prop: 'Man', isValid: true, altered: 'Male' },
-  { type: 'gender', prop: 'male', isValid: true, altered: 'Male' },
-  { type: 'gender', prop: 'F', isValid: true, altered: 'Female' },
-  { type: 'gender', prop: 'Female', isValid: true, altered: 'Female' },
-  { type: 'gender', prop: 'Woman', isValid: true, altered: 'Female' },
-  { type: 'gender', prop: 'X', isValid: false, error: 'Male' },
+  { type: 'gender', prop: 'Man', isValid: true, altered: 'male' },
+  { type: 'gender', prop: 'male', isValid: true, altered: 'male' },
+  { type: 'gender', prop: 'F', isValid: true, altered: 'female' },
+  { type: 'gender', prop: 'Female', isValid: true, altered: 'female' },
+  { type: 'gender', prop: 'Woman', isValid: true, altered: 'female' },
+  { type: 'gender', prop: 'X', isValid: false, error: 'male' },
 ];
 
 describe('lib/validation', () => {