Skip to content

Commit

Permalink
Use scroll to get all matched documents.
Browse files Browse the repository at this point in the history
by default dont calculate scores of potential matche's potential matches
generating new certificates
  • Loading branch information
ashaban committed May 10, 2022
1 parent 76efe76 commit 27369c4
Show file tree
Hide file tree
Showing 17 changed files with 23,642 additions and 4,384 deletions.
Binary file modified server/clientCertificates/openmrs.p12
Binary file not shown.
38 changes: 19 additions & 19 deletions server/clientCertificates/openmrs_cert.pem
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
-----BEGIN CERTIFICATE-----
MIIDmjCCAoICAQEwDQYJKoZIhvcNAQELBQAwFDESMBAGA1UEAwwJbG9jYWxob3N0
MB4XDTIxMDQxMjE0NDk1MVoXDTIyMDQxMjE0NDk1MVowEjEQMA4GA1UEAwwHb3Bl
bm1yczCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALxY9if71eDWQQkv
Aqvrd21kr3GYs+OjFQmFuIJ+jKJkXfL6F5gfarY7p7jRAl2bUap69anrGM0RJGj+
ZUf8FJBFki/hulfiEZ3VvK1EFwARVZ19FtXoDBznhx6NQ0Vx9J2ScsTPo0z4ZZmp
rgvyTY4uIlHxbmQxebr6FkLhhc/hrIx5UaI6CeZikkPhB+ruZXp0HIdA6bOXdqU+
0lx2Jgt6ot84bAEjpJ+F6s7g7uyVv5xrZ1KWiFjiNIC93Fb2p6GjuA4aXPtiu6Q0
CRpxs4uXTAlVIfCVxylgMU9khvr7f4VHx2kguXYfqxsR8V629qU3Bkmdxuo/8DPB
ijmIadwOFPKP7y6JijuPVlxs6IW7sdiMuEBJKy0nx5xuD0pU2ZUNPHg7GSAoEkfp
4gm0X3AouW57qPkdIDsUy3NU19oIn9L94e7QoN/vs/o6GHLuJbaW376lWqHRjnIZ
+AwO4obi/vCzzSsPsQZAbM6EgFMcNmDAXzWtAeIk0XiBz6rMDdfhvfWcqub2mSCH
FNnSbC9u5L1c5hQGHLHErT5RY8flu2YObw2/0UnYdqwBVJkmwh1k7uZo/P3waTsq
njrLaaeNNpvwiRNOrZpd4ESi5FRZgr+JX8eKo43qmb6ymA7kpHzLOokLW7yMUYso
uAeWAa7HHtezC9uJulpw7lQiv8cvAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEDn
Fd3Uf6SGQKfOaS3Eq6+HCIvT8+5eswxQ+PG/RURhlDFk+X+IWP56HWv2g5QcW7Yt
sRp6xIs7S511A0HW0sbTw8dyD/hh+WiCn6t9obWBl1MHhJ6zffUO59k4028O6V67
8ANv4k2/sFMHUJz0soG+A3PDwUIbdrY706/4qCIsUjGxVfMdX9e1j90wo9tIr5W2
cIDjypcob7g15YlbahrF2pKyuqH+9IlW9k9SVWZyvcShnlt07lbuKxW8VPDhV1/5
5uJb6DtAbm1bGxjjvcB50EobRDRnA9X2Lg1q2LINeUnRQZNPhqj4C1sVl+L+A8Q4
SooGqVR9cpQgPPRsPN8=
MB4XDTIyMDUwOTA1MzMyMloXDTIzMDUwOTA1MzMyMlowEjEQMA4GA1UEAwwHb3Bl
bm1yczCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOGAayPbcQGaJy79
Ta/TZf/nypBe8m8df26hUG2qR5RexHI5BRWR9NXXeD2li7zpne0xGXMFCMn3JN5K
ot5LV57xbPEfYT4RD/9Rjm5BkU43/LiPgYEBejS1W/s0VOX3nUVk76uwxnSS75s/
yWFEQr2POcM/ca76G0Zi4c8pn9kJb/KcqRTG+9nhCPHPfsetfivk3wvJV1P7dZts
jsZ2O7XjsVMBJltON8/N1UgaOJcvyOL61hTqnk+wOxBbYxcOkkWuM6fmxBhZVLBl
zEnHGBU40dupIl+nuaOISmbgt4pnyAScJ3mleBXZMnU1RRFd2HrC5LeCP3yVnUzJ
To+v0QlaytIrbMwDUPtLnWNBaXaBfrE1TP8k9201ZsiP+4hneWs/D1+RXM0YQEMM
I0nexqEnXMqs8qxslpr+uD2FYXtGzPaNl1xD9r9nYI+cfKZlnFWFmRbikxG6PBkv
7AAdtJidLLZgW/E107t1BfbVnSYfMe3/y+jVYJCabkZhzj9W/amn6MAqEx6SCNkm
Qb0dvfIdEB3kJvwD+GO5ITdvVZ5PLpGljLgaxLHK2jZrIlbfMXN848OSjQmY8BsF
sWxWqzi01neNNQpJ/QDCsbAWYXcR6XFv3Al0eqYsYNlWum6FIlYvNNm6X/8986Aw
z9kq39dcCsK/KJcug8I3DLg+tJopAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAByA
vl8t1dzbwg52pbaA2cress+WGsQg836H4mhd5t0Zy7X//suwWt/V07NOWXLde4n3
aC6pitmClOE9Y0PyKdFR61dxWzwi8Awp77gQiScZw5CIrjLe7/z6ufY7pm1B7KTi
yk43knpSgVKFA4hVwvdVFh98sCwtXQVn9io1+NpGsTUGSOoKd3OH5ubUOda5bEQS
5qU4qSenv4SZwtMIgiwqNeuuhoifUUIeYOjw5vojhX3c8Ua1y24606grKF510tUs
CBLR0twTxAVfJks2SimWBrHJRyUYI3I5cflWwRVbi/6+OKPgwZGzf7jPxb6MXNC/
PtGcuL8ulK0djoduPrw=
-----END CERTIFICATE-----
46 changes: 23 additions & 23 deletions server/clientCertificates/openmrs_csr.pem
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
-----BEGIN CERTIFICATE REQUEST-----
MIIEVzCCAj8CAQAwEjEQMA4GA1UEAwwHb3Blbm1yczCCAiIwDQYJKoZIhvcNAQEB
BQADggIPADCCAgoCggIBALxY9if71eDWQQkvAqvrd21kr3GYs+OjFQmFuIJ+jKJk
XfL6F5gfarY7p7jRAl2bUap69anrGM0RJGj+ZUf8FJBFki/hulfiEZ3VvK1EFwAR
VZ19FtXoDBznhx6NQ0Vx9J2ScsTPo0z4ZZmprgvyTY4uIlHxbmQxebr6FkLhhc/h
rIx5UaI6CeZikkPhB+ruZXp0HIdA6bOXdqU+0lx2Jgt6ot84bAEjpJ+F6s7g7uyV
v5xrZ1KWiFjiNIC93Fb2p6GjuA4aXPtiu6Q0CRpxs4uXTAlVIfCVxylgMU9khvr7
f4VHx2kguXYfqxsR8V629qU3Bkmdxuo/8DPBijmIadwOFPKP7y6JijuPVlxs6IW7
sdiMuEBJKy0nx5xuD0pU2ZUNPHg7GSAoEkfp4gm0X3AouW57qPkdIDsUy3NU19oI
n9L94e7QoN/vs/o6GHLuJbaW376lWqHRjnIZ+AwO4obi/vCzzSsPsQZAbM6EgFMc
NmDAXzWtAeIk0XiBz6rMDdfhvfWcqub2mSCHFNnSbC9u5L1c5hQGHLHErT5RY8fl
u2YObw2/0UnYdqwBVJkmwh1k7uZo/P3waTsqnjrLaaeNNpvwiRNOrZpd4ESi5FRZ
gr+JX8eKo43qmb6ymA7kpHzLOokLW7yMUYsouAeWAa7HHtezC9uJulpw7lQiv8cv
AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEAaWItKJZTJLSB6bNDIY00cMwG4X0O
xv7uARB48L1tQMiKjWrUrWRym7xAKYoWSTX+I9AvjAjSol7plCzHO1JXPA+boWC3
wWghVVGjSQoxFDrk6y9GOmOiEkc7sgHOPYziyqunWN2c5qEw9mARIVkm/ECzu0eN
qXoWUJfidrOnI1FUFarvwAGySe/pak2AUw9wWOyI78DPZ0YFjMIbb0FkAnkkPVgn
76owTWCSRrWIPpFMcOi4zPENgINwg1f0IbK0RFcQq+Ftu2sBRnoyUQk+e27F8EVJ
L03Vo6nhBfYi1LaiXAGRJKgWqTcHVXNXkeiOVDvbd8tFbZAnWGN3BJLoqoroA+je
j9ces+LLXtdwHD+XkeRBm8sfUg8/t+kQkWLUflR9E1r9/mkarOxaaDzOr6eIVZX2
+qh0EjPeybgD1Tzo4hhlWTXbPjkJuZpGvEx4cn6Gjx6ZU8+eSosgbBnY9hu5SKzV
8+wgD3iwbfkqJDXZzqJlIemPjp1gReagMOxPN0CO4L9gx/S2JfKDYIeODvo8y6f3
2RNMDF0SP2ynSVsct2Tm6psUf/F+MzdP1zFtOSmxr8jINXqQykzsvHlRwyaOm2dj
nrvCjxYsOBrzhH6STvXtM5WPy5n8kj0xz/iMErqY2exYYxVpT9e4XNiFjWAfEyqV
DugZDrcwxBr3c3U=
BQADggIPADCCAgoCggIBAOGAayPbcQGaJy79Ta/TZf/nypBe8m8df26hUG2qR5Re
xHI5BRWR9NXXeD2li7zpne0xGXMFCMn3JN5Kot5LV57xbPEfYT4RD/9Rjm5BkU43
/LiPgYEBejS1W/s0VOX3nUVk76uwxnSS75s/yWFEQr2POcM/ca76G0Zi4c8pn9kJ
b/KcqRTG+9nhCPHPfsetfivk3wvJV1P7dZtsjsZ2O7XjsVMBJltON8/N1UgaOJcv
yOL61hTqnk+wOxBbYxcOkkWuM6fmxBhZVLBlzEnHGBU40dupIl+nuaOISmbgt4pn
yAScJ3mleBXZMnU1RRFd2HrC5LeCP3yVnUzJTo+v0QlaytIrbMwDUPtLnWNBaXaB
frE1TP8k9201ZsiP+4hneWs/D1+RXM0YQEMMI0nexqEnXMqs8qxslpr+uD2FYXtG
zPaNl1xD9r9nYI+cfKZlnFWFmRbikxG6PBkv7AAdtJidLLZgW/E107t1BfbVnSYf
Me3/y+jVYJCabkZhzj9W/amn6MAqEx6SCNkmQb0dvfIdEB3kJvwD+GO5ITdvVZ5P
LpGljLgaxLHK2jZrIlbfMXN848OSjQmY8BsFsWxWqzi01neNNQpJ/QDCsbAWYXcR
6XFv3Al0eqYsYNlWum6FIlYvNNm6X/8986Awz9kq39dcCsK/KJcug8I3DLg+tJop
AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAgEAc6MyzoVecuuit95Q4uRlNBB8fFbA
5Z0MP1dvrd24Op7XPoJ1sUnG01i3xDUueyWjuOzLQopVgLEewWCTS6JAFliIfGek
ZZj70S6NM87wbiSHDb5eIaAtjmVBoVfQVewFC+SGi5AObAfLjHkgfixMR2yuo/Gv
0mebU5DCdxgPBU6SpeDdDj0VB8eGKnXpMjTNwce/uHpzn4GON21vo9QMHOCf9FHX
mCiy+UUzSkt3sYH9h+zFOOvNjgQLg6oBDJyZ1D6AYS85zGj3L9wCac6XTLex5vfR
S2V4jQPhArbE6ARwMUt2A7tGTtIPtRcSdgidEgH3RbfoiDsUf4rE47J9rQaWTDgl
+IJQO4kaSW5nENIrDfrTT5vhquxKs05LMM1YMU5+BiiuTHq/CeYB3seEqwP+xYe7
zVLxHdV0qy6EvO8Qoi9Wh1ZQf00XZ1zpZ11vPE6j37IYjeT2TRrnusB8f5RGN/dP
0Yv4Pqrj55WvmYdtMJFRql5CidM7eFzGJU5gSiplfYvlv6gjW+oznqLWykmGGZdN
Nf/YhdExX/sYQzRQikiq1c71Z+PcUuZ6oiQbM8GPu1pbKDl/MDsX0AC4PRYR4YIq
r1o+9tIn7O3xeA4M/FgiSQIPzOuwaK8eUGVc3tIOSt097AfB8l7exjeBxzKiHKme
NIlsfE3e6id7A9w=
-----END CERTIFICATE REQUEST-----
100 changes: 50 additions & 50 deletions server/clientCertificates/openmrs_key.pem
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
-----BEGIN PRIVATE KEY-----
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
1JB05F3E7Dq2wbWHIfO3XZk6+q0yMqpv
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
AZM7rm0c9pZdQLg6sogap/y4hzvxktQ=
-----END PRIVATE KEY-----
3 changes: 2 additions & 1 deletion server/config/config_development_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
},
"matching": {
"tool": "elasticsearch",
"autoMatchPatientWithHumanAdjudTag": false
"autoMatchPatientWithHumanAdjudTag": false,
"resolvePotentialOfPotentials": false
},
"codes": {
"goldenRecord": "5c827da5-4858-4f3d-a50c-62ece001efea"
Expand Down
4 changes: 3 additions & 1 deletion server/config/config_docker_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
"reportRelationship": "patientreport"
},
"matching": {
"tool": "elasticsearch"
"tool": "elasticsearch",
"autoMatchPatientWithHumanAdjudTag": false,
"resolvePotentialOfPotentials": false
},
"clients": [
{
Expand Down
3 changes: 2 additions & 1 deletion server/config/config_production_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
},
"matching": {
"tool": "elasticsearch",
"autoMatchPatientWithHumanAdjudTag": false
"autoMatchPatientWithHumanAdjudTag": false,
"resolvePotentialOfPotentials": false
},
"codes": {
"goldenRecord": "5c827da5-4858-4f3d-a50c-62ece001efea"
Expand Down
3 changes: 2 additions & 1 deletion server/config/config_test_template.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
},
"matching": {
"tool": "elasticsearch",
"autoMatchPatientWithHumanAdjudTag": false
"autoMatchPatientWithHumanAdjudTag": false,
"resolvePotentialOfPotentials": false
},
"codes": {
"goldenRecord": "5c827da5-4858-4f3d-a50c-62ece001efea"
Expand Down
4 changes: 2 additions & 2 deletions server/config/decisionRules.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
"espath": "art"
}
},
"potentialMatchThreshold": 4,
"autoMatchThreshold": 6,
"potentialMatchThreshold": 1,
"autoMatchThreshold": 9,
"filters": {
"gender": {
"fhirpath": "gender",
Expand Down
84 changes: 68 additions & 16 deletions server/lib/esMatching.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const fhirWrapper = require('./fhir')();
const logger = require('./winston');
const config = require('./config');
const generalMixin = require('./mixins/generalMixin');
const axios = require('axios');
const fhir = new Fhir();

const refreshIndex = (callback) => {
Expand Down Expand Up @@ -186,6 +187,70 @@ const buildQuery = (sourceResource, decisionRule) => {
return esquery;
};

const getESDocument = (query, callback) => {
let error = false;
let documents = [];
if(!query) {
query = {};
}
let url = URI(config.get('elastic:server'))
.segment(config.get('elastic:index'))
.segment('_search')
.addQuery('scroll', '1m')
.addQuery('size', 1000)
.toString();
let scroll_id = null;
async.doWhilst(
(callback) => {
axios({
method: 'POST',
url,
data: query,
auth: {
username: config.get('elastic:username'),
password: config.get('elastic.password'),
}
}).then((response) => {
if(response.data.hits && response.data.hits.hits && Array.isArray(response.data.hits.hits)) {
documents = documents.concat(response.data.hits.hits);
}
if(response.data.hits.hits.length === 0 || response.data.hits.total.value == documents.length || !response.data._scroll_id) {
scroll_id = null;
} else {
scroll_id = response.data._scroll_id;
url = URI(config.get('elastic:server'))
.segment('_search')
.segment('scroll')
.toString();
query = {
scroll: '1m',
scroll_id: scroll_id
};
}
return callback(null);
}).catch((err) => {
if(err.response && err.response.status === 429) {
logger.warn('ES is overloaded with too many requests, delaying for 2 seconds');
setTimeout(() => {
return callback(null);
}, 2000);
} else {
error = err;
logger.error(err);
scroll_id = null;
return callback(null);
}
});
},
(callback) => {
return callback(null, scroll_id !== null);
},
() => {
return callback(error, documents);
}
);
};

const performMatch = ({
sourceResource,
currentGoldenLink,
Expand Down Expand Up @@ -216,27 +281,14 @@ const performMatch = ({
if (Object.keys(esquery).length === 0) {
return callback(true);
}
const url = URI(config.get('elastic:server'))
.segment(config.get('elastic:index'))
.segment('_search')
.toString();
const options = {
url,
auth: {
username: config.get('elastic:username'),
password: config.get('elastic.password'),
},
json: esquery,
};
request.get(options, (err, res, body) => {
if (!body || !body.hits || !body.hits.hits || !Array.isArray(body.hits.hits)) {
logger.error(JSON.stringify(body, 0, 2));
getESDocument(esquery, (err, documents) => {
if(documents.length === 0) {
return nxtRule();
}
const potentialHits = [];
const autoHits = [];
const conflictsHits = [];
for (const hit of body.hits.hits) {
for (const hit of documents) {
const id = hit['_id'];
if (ignoreList.includes(id)) {
continue;
Expand Down
Loading

0 comments on commit 27369c4

Please sign in to comment.