Skip to content

Commit ab8e48d

Browse files
himeshrpetmongrels
authored andcommitted
avniproject/avni-server#1099 | introduce mapper for user
1 parent 770499b commit ab8e48d

File tree

4 files changed

+29
-8
lines changed

4 files changed

+29
-8
lines changed

package-lock.json

Lines changed: 16 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"express": "^4.14.0",
1111
"safe-eval": "^0.4.1",
1212
"uuid": "^7.0.2",
13-
"avni-health-modules": "0.0.22",
14-
"openchs-models": "1.30.87",
13+
"avni-health-modules": "0.0.24",
14+
"openchs-models": "1.31.6",
1515
"rules-config": "https://github.com/avniproject/rules-config.git#fe552da405368bfd138e2f38e605c1d307e3ebe4",
1616
"lodash": "^4.17.11",
1717
"moment": "^2.22.2"

src/RuleExecutor.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
isEligibleForEntityType
1414
} from './services/RuleEvalService';
1515
import {map} from 'lodash';
16+
import {mapUser} from './models/userModel';
1617

1718
export const transformVisitScheduleDates = (visitSchedules) => {
1819
visitSchedules.forEach((visitSchedule, index, array) => {
@@ -22,6 +23,7 @@ export const transformVisitScheduleDates = (visitSchedules) => {
2223
return visitSchedules;
2324
}
2425
const mappers = {
26+
"User": mapUser,
2527
"Individual": mapIndividual,
2628
"Subject": mapIndividual,
2729
"ProgramEnrolment": mapProgramEnrolment,

src/models/userModel.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import {isNil} from 'lodash';
2+
import {UserInfo} from 'openchs-models';
3+
4+
export const mapUser = userDetails => {
5+
if (isNil(userDetails)) {
6+
return new UserInfo();
7+
}
8+
return UserInfo.fromResource(userDetails);
9+
};

0 commit comments

Comments
 (0)