feat(meditrakApp): RN-1361: User type question

packages/central-server/src/apiV2/meditrakApp/getChanges.js

@@ -7,7 +7,6 @@ import keyBy from 'lodash.keyby';
 import groupBy from 'lodash.groupby';
 import { respond, DatabaseError } from '@tupaia/utils';
 import { RECORDS } from '@tupaia/database';
-import { camel } from 'case';
 import { getColumnsForMeditrakApp } from './utilities';
 import {
   supportsPermissionsBasedSync,
@@ -33,10 +32,11 @@ function getRecordForSync(models, record, recordType, appVersion) {
     }
   });
 
+  const model = models.getModelForDatabaseRecord(recordType);
+
   // Translate values in columns based on meditrak app version
-  const selectedModel = models[camel(recordType)];
-  const translatedRecord = selectedModel?.meditrakConfig.translateRecordForSync
-    ? selectedModel.meditrakConfig.translateRecordForSync(recordWithoutNulls, appVersion)
+  const translatedRecord = model?.meditrakConfig.translateRecordForSync
+    ? model.meditrakConfig.translateRecordForSync(recordWithoutNulls, appVersion)
     : recordWithoutNulls;
   return translatedRecord;
 }

packages/central-server/src/apiV2/meditrakApp/meditrakSync/permissionsBasedMeditrakSyncQuery.js

@@ -17,7 +17,7 @@ import {
   supportsPermissionsBasedSync,
 } from './supportsPermissionsBasedSync';
 
-const recordTypesToAlwaysSync = ['country', 'permission_group'];
+const recordTypesToAlwaysSync = ['country', 'permission_group', 'user_account'];
 const entityTypesToAlwaysSync = ['world', 'country'];
 
 // TODO: Tidy this up as part of RN-502

packages/central-server/src/database/meditrakSyncQueue/MeditrakSyncQueue.js

@@ -10,7 +10,7 @@ import { ChangeHandler } from '@tupaia/database';
 import { MeditrakSyncRecordUpdater } from './MeditrakSyncRecordUpdater';
 
 const modelValidator = model => {
-  if (!model.meditrakConfig.minAppVersion) {
+  if (!model.meditrakConfig?.minAppVersion) {
     throw new Error(
       `Model for ${model.databaseRecord} must have a meditrakConfig.minAppVersion property`,
     );
@@ -33,6 +33,7 @@ export class MeditrakSyncQueue extends ChangeHandler {
     super(models, 'meditrak-sync-queue');
 
     const typesToSync = models.getTypesToSyncWithMeditrak();
+
     const modelNamesToSync = Object.entries(models)
       .filter(([, model]) => typesToSync.includes(model.databaseRecord))
       .map(([modelName]) => modelName);

packages/central-server/src/database/meditrakSyncQueue/createPermissionsBasedMeditrakSyncQueue.js

@@ -37,7 +37,8 @@ SELECT msq.*,
 		${groupToFlatArrayOrNull('ssc_ss_s.country_ids')},
 		${groupToFlatArrayOrNull('q_ssc_ss_s.country_ids')},
 		${groupToFlatArrayOrNull('os_q_ssc_ss_s.country_ids')},
-		${groupToFlatArrayOrNull('o_os_q_ssc_ss_s.country_ids')}
+		${groupToFlatArrayOrNull('o_os_q_ssc_ss_s.country_ids')},
+		${groupToArrayOrNull('uep_e_co.id')}
 	) as country_ids,
 
 	COALESCE(
@@ -48,7 +49,8 @@ SELECT msq.*,
 		${groupToArrayOrNull('ssc_ss_s_pg."name"')},
 		${groupToArrayOrNull('q_ssc_ss_s_pg."name"')},
 		${groupToArrayOrNull('os_q_ssc_ss_s_pg."name"')},
-		${groupToArrayOrNull('o_os_q_ssc_ss_s_pg."name"')}
+		${groupToArrayOrNull('o_os_q_ssc_ss_s_pg."name"')},
+		${groupToArrayOrNull('uep_pg."name"')}
 	) as permission_groups
 FROM meditrak_sync_queue msq 
 LEFT JOIN country co ON msq.record_id = co.id
@@ -87,6 +89,10 @@ LEFT JOIN survey_screen_component o_os_q_ssc ON o_os_q_ssc.question_id = o_os_q.
 LEFT JOIN survey_screen o_os_q_ssc_ss ON o_os_q_ssc.screen_id = o_os_q_ssc_ss.id
 LEFT JOIN survey o_os_q_ssc_ss_s ON o_os_q_ssc_ss.survey_id  = o_os_q_ssc_ss_s.id 
 LEFT JOIN permission_group o_os_q_ssc_ss_s_pg ON o_os_q_ssc_ss_s.permission_group_id = o_os_q_ssc_ss_s_pg.id
+LEFT JOIN user_entity_permission uep ON msq.record_id = uep.id
+LEFT JOIN entity uep_e ON uep.entity_id = uep_e.id 
+LEFT JOIN country uep_e_co ON uep_e_co.code = uep_e.country_code  
+LEFT JOIN permission_group uep_pg ON uep.permission_group_id = uep_pg.id
 GROUP BY msq.id;
 CREATE UNIQUE INDEX permissions_based_meditrak_sync_queue_id_idx ON permissions_based_meditrak_sync_queue (id); 
 `);

packages/central-server/src/database/models/User.js

@@ -5,6 +5,22 @@
 
 import { UserRecord as CommonUserRecord, UserModel as CommonUserModel } from '@tupaia/database';
 
+// Internal users who should be flagged in the meditrak app to exclude from user lists
+const INTERNAL_USERS = [
+  'edmofro@gmail.com', // Edwin
+  'kahlinda.mahoney@gmail.com', // Kahlinda
+  'lparish1980@gmail.com', // Lewis
+  'sus.lake@gmail.com', // Susie
+  'michaelnunan@hotmail.com', // Michael
+  'vanbeekandrew@gmail.com', // Andrew
+  'gerardckelly@gmail.com', // Gerry K
+  'geoffreyfisher@hotmail.com', // Geoff F
+  'josh@sussol.net', // mSupply API Client
+  'unicef.laos.edu@gmail.com', // Laos Schools Data Collector
+];
+
+const INTERNAL_EMAIL_REGEXP = /((@bes.au)|(@tupaia.org)|(@beyondessential.com.au))/;
+
 // Currently our pattern is that session tables don't have models
 // in the generic database package, this is a quick and dirty way to get
 // context for them into central-server
@@ -30,6 +46,35 @@ class UserRecord extends CommonUserRecord {
 }
 
 export class UserModel extends CommonUserModel {
+  meditrakConfig = {
+    // only sync id and first and last name
+    ignorableFields: [
+      'gender',
+      'creation_date',
+      'employer',
+      'position',
+      'mobile_number',
+      'password_hash',
+      'password_salt',
+      'verified_email',
+      'profile_image',
+      'primary_platform',
+      'preferences',
+      'full_name', // ignore this because it isn't a real field, it's a derived field
+    ],
+    translateRecordForSync: record => {
+      const { email, ...restOfRecord } = record;
+      const isInternal = INTERNAL_USERS.includes(email) || INTERNAL_EMAIL_REGEXP.test(email);
+
+      // Flag internal users. These will be filtered out in meditrak-app
+      if (isInternal) {
+        return { ...restOfRecord, internal: true };
+      }
+      return restOfRecord;
+    },
+    minAppVersion: '1.14.143',
+  };
+
   get DatabaseRecordClass() {
     return UserRecord;
   }

packages/central-server/src/database/models/UserEntityPermission.js

@@ -7,6 +7,10 @@ import { UserEntityPermissionModel as CommonUserEntityPermissionModel } from '@t
 import { sendEmail } from '@tupaia/server-utils';
 
 export class UserEntityPermissionModel extends CommonUserEntityPermissionModel {
+  meditrakConfig = {
+    minAppVersion: '1.14.143',
+  };
+
   notifiers = [onUpsertSendPermissionGrantEmail, expireAccess];
 }
 

packages/database/src/migrations/20240730032928-AddUserEntityPermissionsToSyncQueue-modifies-data.js

@@ -0,0 +1,52 @@
+'use strict';
+
+import { getSyncQueueChangeTime } from '@tupaia/tsutils';
+import { generateId } from '../utilities/generateId';
+
+var dbm;
+var type;
+var seed;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function (options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+};
+
+// Get the IDs of all user entity permissions that are not already in the sync queue
+const getAllUserEntityPermissionIds = async db => {
+  const result = await db.runSql(`
+    SELECT user_entity_permission.id FROM user_entity_permission
+    LEFT JOIN meditrak_sync_queue on meditrak_sync_queue.record_id = user_entity_permission.id
+    WHERE meditrak_sync_queue.id IS NULL
+  `);
+  return result.rows.map(row => row.id);
+};
+
+exports.up = async function (db) {
+  const userEntityPermissionIds = await getAllUserEntityPermissionIds(db);
+  await db.runSql(`
+    INSERT INTO meditrak_sync_queue (id, type, record_type, record_id, change_time)
+    VALUES ${userEntityPermissionIds
+      .map(
+        (id, i) =>
+          // the timestamp is incremented by i to ensure that each record has a unique timestamp
+          `('${generateId()}', 'update', 'user_entity_permission', '${id}', ${getSyncQueueChangeTime(
+            i,
+          )})`,
+      )
+      .join(',\n')};
+  `);
+};
+
+exports.down = function (db) {
+  return null;
+};
+
+exports._meta = {
+  version: 1,
+};

packages/database/src/migrations/20240730033844-AddUsersToSyncQueue-modifies-data.js

@@ -0,0 +1,49 @@
+'use strict';
+
+import { getSyncQueueChangeTime } from '@tupaia/tsutils';
+import { generateId } from '../utilities/generateId';
+
+var dbm;
+var type;
+var seed;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function (options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+};
+
+const getAllUserIds = async db => {
+  const result = await db.runSql(`
+    SELECT user_account.id FROM user_account
+    LEFT JOIN meditrak_sync_queue ON meditrak_sync_queue.record_id = user_account.id
+    WHERE meditrak_sync_queue.id IS NULL
+  `);
+  return result.rows.map(row => row.id);
+};
+
+exports.up = async function (db) {
+  const userIds = await getAllUserIds(db);
+  await db.runSql(`
+    INSERT INTO meditrak_sync_queue (id, type, record_type, record_id, change_time)
+    VALUES ${userIds
+      .map(
+        (id, i) =>
+          // the timestamp is incremented by i to ensure that each record has a unique timestamp
+          `('${generateId()}', 'update', 'user_account', '${id}', ${getSyncQueueChangeTime(i)})`,
+      )
+      .join(',\n')};
+  `);
+};
+
+exports.down = function (db) {
+  return null;
+};
+
+exports._meta = {
+  version: 1,
+};

packages/meditrak-app/android/app/build.gradle

@@ -84,8 +84,8 @@ android {
         applicationId "com.tupaiameditrak"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 142
-        versionName "1.14.142"
+        versionCode 143
+        versionName "1.14.143"
     }
     signingConfigs {
         debug {

packages/meditrak-app/app/assessment/Question.jsx

@@ -29,6 +29,7 @@ import {
   ArithmeticQuestion,
   ConditionQuestion,
   CodeGeneratorQuestion,
+  UserQuestion,
 } from './specificQuestions';
 
 const QUESTION_TYPES = {
@@ -54,6 +55,7 @@ const QUESTION_TYPES = {
   Arithmetic: ArithmeticQuestion,
   Condition: ConditionQuestion,
   File: FileQuestion,
+  User: UserQuestion,
 };
 
 const TYPES_CONTROLLING_QUESTION_TEXT = ['Instruction', 'Checkbox'];