@nmshd/runtime 2.0.0-alpha.30 → 2.0.0-alpha.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/buildInformation.js +5 -5
- package/dist/types/transport/MessageDTO.d.ts +0 -1
- package/dist/types/transport/MessageWithAttachmentsDTO.d.ts +0 -1
- package/dist/types/transport/RecipientDTO.d.ts +1 -0
- package/dist/useCases/transport/messages/GetMessages.js +6 -6
- package/dist/useCases/transport/messages/GetMessages.js.map +1 -1
- package/dist/useCases/transport/messages/MessageMapper.js +5 -6
- package/dist/useCases/transport/messages/MessageMapper.js.map +1 -1
- package/lib-web/nmshd.runtime.js +24 -25
- package/lib-web/nmshd.runtime.js.map +1 -1
- package/lib-web/nmshd.runtime.min.js +1 -1
- package/lib-web/nmshd.runtime.min.js.map +1 -1
- package/package.json +3 -3
package/dist/buildInformation.js
CHANGED
|
@@ -7,11 +7,11 @@ const content_1 = require("@nmshd/content");
|
|
|
7
7
|
const crypto_1 = require("@nmshd/crypto");
|
|
8
8
|
const transport_1 = require("@nmshd/transport");
|
|
9
9
|
exports.buildInformation = {
|
|
10
|
-
version: "2.0.0-alpha.
|
|
11
|
-
build: "
|
|
12
|
-
date: "2022-07-
|
|
13
|
-
commit: "
|
|
14
|
-
dependencies: {"@js-soft/docdb-querytranslator":"1.0
|
|
10
|
+
version: "2.0.0-alpha.31",
|
|
11
|
+
build: "80",
|
|
12
|
+
date: "2022-07-12T11:09:31+00:00",
|
|
13
|
+
commit: "a4e1ba821bc6600bdbfff992b94d11992df005d6",
|
|
14
|
+
dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.3","@js-soft/ts-utils":"^1.1.2","@nmshd/consumption":"2.0.0-alpha.29","@nmshd/content":"2.0.0-alpha.44","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-alpha.3","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^2.4.0","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
|
|
15
15
|
libraries: {
|
|
16
16
|
serval: ts_serval_1.buildInformation,
|
|
17
17
|
consumption: consumption_1.buildInformation,
|
|
@@ -46,7 +46,7 @@ GetMessagesUseCase.queryTranslator = new docdb_querytranslator_1.QueryTranslator
|
|
|
46
46
|
[`${(0, ts_simple_nameof_1.nameof)((m) => m.content)}.body`]: true,
|
|
47
47
|
[`${(0, ts_simple_nameof_1.nameof)((m) => m.content)}.subject`]: true,
|
|
48
48
|
[(0, ts_simple_nameof_1.nameof)((m) => m.attachments)]: true,
|
|
49
|
-
[(0, ts_simple_nameof_1.nameof)((m) => m.
|
|
49
|
+
[`${(0, ts_simple_nameof_1.nameof)((m) => m.recipients)}.${(0, ts_simple_nameof_1.nameof)((r) => r.relationshipId)}`]: true,
|
|
50
50
|
participant: true
|
|
51
51
|
},
|
|
52
52
|
alias: {
|
|
@@ -60,9 +60,9 @@ GetMessagesUseCase.queryTranslator = new docdb_querytranslator_1.QueryTranslator
|
|
|
60
60
|
[(0, ts_simple_nameof_1.nameof)((m) => m.attachments)]: `${(0, ts_simple_nameof_1.nameof)((m) => m.cache)}.${(0, ts_simple_nameof_1.nameof)((m) => m.attachments)}`
|
|
61
61
|
},
|
|
62
62
|
custom: {
|
|
63
|
-
|
|
64
|
-
query[
|
|
65
|
-
$
|
|
63
|
+
[`${(0, ts_simple_nameof_1.nameof)((m) => m.recipients)}.${(0, ts_simple_nameof_1.nameof)((r) => r.relationshipId)}`]: (query, input) => {
|
|
64
|
+
query[(0, ts_simple_nameof_1.nameof)((m) => m.relationshipIds)] = {
|
|
65
|
+
$containsAny: Array.isArray(input) ? input : [input]
|
|
66
66
|
};
|
|
67
67
|
},
|
|
68
68
|
participant: (query, input) => {
|
|
@@ -75,8 +75,8 @@ GetMessagesUseCase.queryTranslator = new docdb_querytranslator_1.QueryTranslator
|
|
|
75
75
|
for (const value of input) {
|
|
76
76
|
const parsed = GetMessagesUseCase.queryTranslator.parseString(value, true);
|
|
77
77
|
switch (parsed.field) {
|
|
78
|
-
case "$
|
|
79
|
-
case "$
|
|
78
|
+
case "$containsAny":
|
|
79
|
+
case "$containsNone":
|
|
80
80
|
participantQuery[parsed.field] = participantQuery[parsed.field] || [];
|
|
81
81
|
participantQuery[parsed.field].push(parsed.value);
|
|
82
82
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GetMessages.js","sourceRoot":"","sources":["../../../../src/useCases/transport/messages/GetMessages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0EAAiE;AACjE,gDAA2C;AAC3C,gDAAuG;AACvG,uDAA0C;AAC1C,mDAAwC;AAExC,yCAAyD;AACzD,mDAAgD;AAMhD,MAAM,2BAA4B,SAAQ,yBAAoC;IAC1E;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;CACJ;AAED,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,gBAAyC;IAyE7E,YAA4C,iBAAoC,EAAU,SAAsC;QAC5H,KAAK,CAAC,SAAS,CAAC,CAAC;QADuB,sBAAiB,GAAjB,iBAAiB,CAAmB;IAEhF,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAA2B;QACvD,MAAM,KAAK,GAAG,kBAAkB,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEjE,OAAO,iBAAM,CAAC,EAAE,CAAC,6BAAa,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/D,CAAC;CACJ,CAAA;AAnF2B,kCAAe,GAAG,IAAI,uCAAe,CAAC;IAC1D,SAAS,EAAE;QACP,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI;QAC9C,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI;QACpD,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI;QAC9C,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,IAAA,yBAAM,EAAe,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI;QAC9F,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI;QACvD,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI;QACtD,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI;QACzD,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI;QAChD,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"GetMessages.js","sourceRoot":"","sources":["../../../../src/useCases/transport/messages/GetMessages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0EAAiE;AACjE,gDAA2C;AAC3C,gDAAuG;AACvG,uDAA0C;AAC1C,mDAAwC;AAExC,yCAAyD;AACzD,mDAAgD;AAMhD,MAAM,2BAA4B,SAAQ,yBAAoC;IAC1E;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;CACJ;AAED,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,gBAAyC;IAyE7E,YAA4C,iBAAoC,EAAU,SAAsC;QAC5H,KAAK,CAAC,SAAS,CAAC,CAAC;QADuB,sBAAiB,GAAjB,iBAAiB,CAAmB;IAEhF,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAA2B;QACvD,MAAM,KAAK,GAAG,kBAAkB,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAEtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEjE,OAAO,iBAAM,CAAC,EAAE,CAAC,6BAAa,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/D,CAAC;CACJ,CAAA;AAnF2B,kCAAe,GAAG,IAAI,uCAAe,CAAC;IAC1D,SAAS,EAAE;QACP,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI;QAC9C,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,IAAI;QACpD,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI;QAC9C,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,IAAA,yBAAM,EAAe,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI;QAC9F,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI;QACvD,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI;QACtD,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI;QACzD,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI;QAChD,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,IAAA,yBAAM,EAAe,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,IAAI;QACrG,WAAW,EAAE,IAAI;KACpB;IAED,KAAK,EAAE;QACH,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE;QAC3H,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,GAAG,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE;QACvI,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE;QAC3H,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,IAAA,yBAAM,EAAe,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,GAAG,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAClI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CACtB,IAAI,IAAA,yBAAM,EAA2B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE;QACzD,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ;QACxI,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO;QACtI,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,GAAG,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU;QAC5I,CAAC,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,GAAG,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE;KAClI;IAED,MAAM,EAAE;QACJ,CAAC,GAAG,IAAA,yBAAM,EAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,IAAA,yBAAM,EAAe,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,KAAU,EAAE,KAAU,EAAE,EAAE;YACxH,KAAK,CAAC,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,GAAG;gBAC/C,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;aACvD,CAAC;QACN,CAAC;QACD,WAAW,EAAE,CAAC,KAAU,EAAE,KAAU,EAAE,EAAE;YACpC,IAAI,gBAAqB,CAAC;YAE1B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACtB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oBACpB,OAAO;iBACV;gBAED,gBAAgB,GAAG,EAAE,CAAC;gBAEtB,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE;oBACvB,MAAM,MAAM,GAAkC,kBAAkB,CAAC,eAAe,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;oBAE1G,QAAQ,MAAM,CAAC,KAAK,EAAE;wBAClB,KAAK,cAAc,CAAC;wBACpB,KAAK,eAAe;4BAChB,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;4BACtE,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;4BAClD,MAAM;wBACV;4BACI,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;qBACrD;iBACJ;aACJ;iBAAM;gBACH,gBAAgB,GAAG,kBAAkB,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;aAC/E;YAED,KAAK,CAAC,KAAK,CAAC,GAAG;gBACX;oBACI,CAAC,GAAG,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,gBAAgB;iBACxG;gBACD;oBACI,CAAC,GAAG,IAAA,yBAAM,EAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAA,yBAAM,EAAgB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,IAAA,yBAAM,EAA2B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,gBAAgB;iBAC/J;aACJ,CAAC;QACN,CAAC;KACJ;CACJ,CAAE,CAAA;AAvEM,kBAAkB;IAyEP,WAAA,uBAAM,CAAA;IAAyD,WAAA,uBAAM,CAAA;qCAA1B,6BAAiB,EAAqB,2BAA2B;GAzEvH,kBAAkB,CAoF9B;AApFY,gDAAkB"}
|
|
@@ -24,9 +24,8 @@ class MessageMapper {
|
|
|
24
24
|
content: message.cache.content.toJSON(),
|
|
25
25
|
createdBy: message.cache.createdBy.toString(),
|
|
26
26
|
createdByDevice: message.cache.createdByDevice.toString(),
|
|
27
|
-
recipients: message.cache.recipients.map((r) => this.toRecipient(r)),
|
|
27
|
+
recipients: message.cache.recipients.map((r, i) => this.toRecipient(r, message.relationshipIds[i])),
|
|
28
28
|
createdAt: message.cache.createdAt.toString(),
|
|
29
|
-
relationshipIds: message.relationshipIds.map((r) => r.toString()),
|
|
30
29
|
attachments: attachments.map((f) => FileMapper_1.FileMapper.toFileDTO(f))
|
|
31
30
|
};
|
|
32
31
|
}
|
|
@@ -39,8 +38,7 @@ class MessageMapper {
|
|
|
39
38
|
content: message.cache.content.toJSON(),
|
|
40
39
|
createdBy: message.cache.createdBy.toString(),
|
|
41
40
|
createdByDevice: message.cache.createdByDevice.toString(),
|
|
42
|
-
recipients: message.cache.recipients.map((r) => this.toRecipient(r)),
|
|
43
|
-
relationshipIds: message.relationshipIds.map((r) => r.toString()),
|
|
41
|
+
recipients: message.cache.recipients.map((r, i) => this.toRecipient(r, message.relationshipIds[i])),
|
|
44
42
|
createdAt: message.cache.createdAt.toString(),
|
|
45
43
|
attachments: message.cache.attachments.map((a) => a.toString())
|
|
46
44
|
};
|
|
@@ -48,11 +46,12 @@ class MessageMapper {
|
|
|
48
46
|
static toMessageDTOList(messages) {
|
|
49
47
|
return messages.map((message) => this.toMessageDTO(message));
|
|
50
48
|
}
|
|
51
|
-
static toRecipient(recipient) {
|
|
49
|
+
static toRecipient(recipient, relationshipId) {
|
|
52
50
|
return {
|
|
53
51
|
address: recipient.address.toString(),
|
|
54
52
|
receivedAt: recipient.receivedAt?.toString(),
|
|
55
|
-
receivedByDevice: recipient.receivedByDevice?.toString()
|
|
53
|
+
receivedByDevice: recipient.receivedByDevice?.toString(),
|
|
54
|
+
relationshipId: relationshipId.toString()
|
|
56
55
|
};
|
|
57
56
|
}
|
|
58
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MessageMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/messages/MessageMapper.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"MessageMapper.js","sourceRoot":"","sources":["../../../../src/useCases/transport/messages/MessageMapper.ts"],"names":[],"mappings":"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"}
|
package/lib-web/nmshd.runtime.js
CHANGED
|
@@ -435,11 +435,11 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
|
|
|
435
435
|
const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
|
|
436
436
|
const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
|
|
437
437
|
exports.buildInformation = {
|
|
438
|
-
version: "2.0.0-alpha.
|
|
439
|
-
build: "
|
|
440
|
-
date: "2022-07-
|
|
441
|
-
commit: "
|
|
442
|
-
dependencies: {"@js-soft/docdb-querytranslator":"1.0
|
|
438
|
+
version: "2.0.0-alpha.31",
|
|
439
|
+
build: "80",
|
|
440
|
+
date: "2022-07-12T11:09:31+00:00",
|
|
441
|
+
commit: "a4e1ba821bc6600bdbfff992b94d11992df005d6",
|
|
442
|
+
dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.3","@js-soft/ts-utils":"^1.1.2","@nmshd/consumption":"2.0.0-alpha.29","@nmshd/content":"2.0.0-alpha.44","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-alpha.3","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^2.4.0","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
|
|
443
443
|
libraries: {
|
|
444
444
|
serval: ts_serval_1.buildInformation,
|
|
445
445
|
consumption: consumption_1.buildInformation,
|
|
@@ -16256,7 +16256,7 @@ GetMessagesUseCase.queryTranslator = new docdb_querytranslator_1.QueryTranslator
|
|
|
16256
16256
|
[`${(0, ts_simple_nameof_1.nameof)((m) => m.content)}.body`]: true,
|
|
16257
16257
|
[`${(0, ts_simple_nameof_1.nameof)((m) => m.content)}.subject`]: true,
|
|
16258
16258
|
[(0, ts_simple_nameof_1.nameof)((m) => m.attachments)]: true,
|
|
16259
|
-
[(0, ts_simple_nameof_1.nameof)((m) => m.
|
|
16259
|
+
[`${(0, ts_simple_nameof_1.nameof)((m) => m.recipients)}.${(0, ts_simple_nameof_1.nameof)((r) => r.relationshipId)}`]: true,
|
|
16260
16260
|
participant: true
|
|
16261
16261
|
},
|
|
16262
16262
|
alias: {
|
|
@@ -16270,9 +16270,9 @@ GetMessagesUseCase.queryTranslator = new docdb_querytranslator_1.QueryTranslator
|
|
|
16270
16270
|
[(0, ts_simple_nameof_1.nameof)((m) => m.attachments)]: `${(0, ts_simple_nameof_1.nameof)((m) => m.cache)}.${(0, ts_simple_nameof_1.nameof)((m) => m.attachments)}`
|
|
16271
16271
|
},
|
|
16272
16272
|
custom: {
|
|
16273
|
-
|
|
16274
|
-
query[
|
|
16275
|
-
$
|
|
16273
|
+
[`${(0, ts_simple_nameof_1.nameof)((m) => m.recipients)}.${(0, ts_simple_nameof_1.nameof)((r) => r.relationshipId)}`]: (query, input) => {
|
|
16274
|
+
query[(0, ts_simple_nameof_1.nameof)((m) => m.relationshipIds)] = {
|
|
16275
|
+
$containsAny: Array.isArray(input) ? input : [input]
|
|
16276
16276
|
};
|
|
16277
16277
|
},
|
|
16278
16278
|
participant: (query, input) => {
|
|
@@ -16285,8 +16285,8 @@ GetMessagesUseCase.queryTranslator = new docdb_querytranslator_1.QueryTranslator
|
|
|
16285
16285
|
for (const value of input) {
|
|
16286
16286
|
const parsed = GetMessagesUseCase.queryTranslator.parseString(value, true);
|
|
16287
16287
|
switch (parsed.field) {
|
|
16288
|
-
case "$
|
|
16289
|
-
case "$
|
|
16288
|
+
case "$containsAny":
|
|
16289
|
+
case "$containsNone":
|
|
16290
16290
|
participantQuery[parsed.field] = participantQuery[parsed.field] || [];
|
|
16291
16291
|
participantQuery[parsed.field].push(parsed.value);
|
|
16292
16292
|
break;
|
|
@@ -16352,9 +16352,8 @@ class MessageMapper {
|
|
|
16352
16352
|
content: message.cache.content.toJSON(),
|
|
16353
16353
|
createdBy: message.cache.createdBy.toString(),
|
|
16354
16354
|
createdByDevice: message.cache.createdByDevice.toString(),
|
|
16355
|
-
recipients: message.cache.recipients.map((r) => this.toRecipient(r)),
|
|
16355
|
+
recipients: message.cache.recipients.map((r, i) => this.toRecipient(r, message.relationshipIds[i])),
|
|
16356
16356
|
createdAt: message.cache.createdAt.toString(),
|
|
16357
|
-
relationshipIds: message.relationshipIds.map((r) => r.toString()),
|
|
16358
16357
|
attachments: attachments.map((f) => FileMapper_1.FileMapper.toFileDTO(f))
|
|
16359
16358
|
};
|
|
16360
16359
|
}
|
|
@@ -16367,8 +16366,7 @@ class MessageMapper {
|
|
|
16367
16366
|
content: message.cache.content.toJSON(),
|
|
16368
16367
|
createdBy: message.cache.createdBy.toString(),
|
|
16369
16368
|
createdByDevice: message.cache.createdByDevice.toString(),
|
|
16370
|
-
recipients: message.cache.recipients.map((r) => this.toRecipient(r)),
|
|
16371
|
-
relationshipIds: message.relationshipIds.map((r) => r.toString()),
|
|
16369
|
+
recipients: message.cache.recipients.map((r, i) => this.toRecipient(r, message.relationshipIds[i])),
|
|
16372
16370
|
createdAt: message.cache.createdAt.toString(),
|
|
16373
16371
|
attachments: message.cache.attachments.map((a) => a.toString())
|
|
16374
16372
|
};
|
|
@@ -16376,11 +16374,12 @@ class MessageMapper {
|
|
|
16376
16374
|
static toMessageDTOList(messages) {
|
|
16377
16375
|
return messages.map((message) => this.toMessageDTO(message));
|
|
16378
16376
|
}
|
|
16379
|
-
static toRecipient(recipient) {
|
|
16377
|
+
static toRecipient(recipient, relationshipId) {
|
|
16380
16378
|
return {
|
|
16381
16379
|
address: recipient.address.toString(),
|
|
16382
16380
|
receivedAt: recipient.receivedAt?.toString(),
|
|
16383
|
-
receivedByDevice: recipient.receivedByDevice?.toString()
|
|
16381
|
+
receivedByDevice: recipient.receivedByDevice?.toString(),
|
|
16382
|
+
relationshipId: relationshipId.toString()
|
|
16384
16383
|
};
|
|
16385
16384
|
}
|
|
16386
16385
|
}
|
|
@@ -18324,7 +18323,7 @@ class QueryTranslator {
|
|
|
18324
18323
|
valRegex;
|
|
18325
18324
|
arrRegex;
|
|
18326
18325
|
constructor(options = {}) {
|
|
18327
|
-
this.ops = options.ops ?? ["!", "^", "$", "~", ">", "<", "$
|
|
18326
|
+
this.ops = options.ops ?? ["!", "^", "$", "~", ">", "<", "$containsAny", "$containsNone"];
|
|
18328
18327
|
this.alias = options.alias ?? {};
|
|
18329
18328
|
this.blacklist = options.blacklist ?? {};
|
|
18330
18329
|
this.whitelist = options.whitelist ?? {};
|
|
@@ -18355,7 +18354,7 @@ class QueryTranslator {
|
|
|
18355
18354
|
switch (op) {
|
|
18356
18355
|
case "!":
|
|
18357
18356
|
if (array) {
|
|
18358
|
-
ret.field = "$
|
|
18357
|
+
ret.field = "$containsNone";
|
|
18359
18358
|
}
|
|
18360
18359
|
else if (org === "") {
|
|
18361
18360
|
ret.field = "$exists";
|
|
@@ -18393,7 +18392,7 @@ class QueryTranslator {
|
|
|
18393
18392
|
ret.op = op = "";
|
|
18394
18393
|
ret.value = this.parseStringVal(org);
|
|
18395
18394
|
if (array) {
|
|
18396
|
-
ret.field = "$
|
|
18395
|
+
ret.field = "$containsAny";
|
|
18397
18396
|
}
|
|
18398
18397
|
else if (org === "") {
|
|
18399
18398
|
ret.field = "$exists";
|
|
@@ -18460,14 +18459,14 @@ class QueryTranslator {
|
|
|
18460
18459
|
}
|
|
18461
18460
|
// Handle array key
|
|
18462
18461
|
if (Array.isArray(val)) {
|
|
18463
|
-
if (this.ops.includes("$
|
|
18462
|
+
if (this.ops.includes("$containsAny") && val.length > 0) {
|
|
18464
18463
|
res[key] = {};
|
|
18465
18464
|
for (const item of val) {
|
|
18466
18465
|
if (this.ops.includes(item[0])) {
|
|
18467
18466
|
const parsed = this.parseString(item, true);
|
|
18468
18467
|
switch (parsed.field) {
|
|
18469
|
-
case "$
|
|
18470
|
-
case "$
|
|
18468
|
+
case "$containsAny":
|
|
18469
|
+
case "$containsNone":
|
|
18471
18470
|
res[key][parsed.field] = res[key][parsed.field] || [];
|
|
18472
18471
|
res[key][parsed.field].push(parsed.value);
|
|
18473
18472
|
break;
|
|
@@ -18480,8 +18479,8 @@ class QueryTranslator {
|
|
|
18480
18479
|
}
|
|
18481
18480
|
}
|
|
18482
18481
|
else {
|
|
18483
|
-
res[key].$
|
|
18484
|
-
res[key].$
|
|
18482
|
+
res[key].$containsAny = res[key].$containsAny || [];
|
|
18483
|
+
res[key].$containsAny.push(this.parseStringVal(item));
|
|
18485
18484
|
}
|
|
18486
18485
|
}
|
|
18487
18486
|
}
|