refactor(core): Upgrade typeorm (no-changelog) (#5423)

[Now we can use aggregate functions directly over the repository API](https://github.com/typeorm/typeorm/pull/9737)
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2023-02-09 10:44:07 +01:00 committed by GitHub
parent e0c4c25227
commit 52cb185637
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 79 additions and 67 deletions

View file

@ -193,7 +193,7 @@
"sse-channel": "^4.0.0",
"swagger-ui-express": "^4.3.0",
"syslog-client": "^1.1.1",
"typeorm": "0.3.11",
"typeorm": "^0.3.12",
"uuid": "^8.3.2",
"validator": "13.7.0",
"winston": "^3.3.3",

View file

@ -4,14 +4,8 @@ import * as Db from '@/Db';
export class LicenseService {
static async getActiveTriggerCount(): Promise<number> {
const qb = Db.collections.Workflow.createQueryBuilder('workflow')
.select('SUM(workflow.triggerCount)', 'triggerCount')
.where('workflow.active = :active', { active: true });
const results: { triggerCount: number } | undefined = await qb.getRawOne();
if (!results) {
throw new Error('Could not get active trigger count');
}
return results.triggerCount ?? 0;
const totalTriggerCount = await Db.collections.Workflow.sum('triggerCount', { active: true });
return totalTriggerCount ?? 0;
}
// Helper for getting the basic license data that we want to return

View file

@ -233,7 +233,7 @@ importers:
ts-node: ^9.1.1
tsc-alias: ^1.7.0
tsconfig-paths: ^3.14.1
typeorm: 0.3.11
typeorm: ^0.3.12
uuid: ^8.3.2
validator: 13.7.0
winston: ^3.3.3
@ -321,7 +321,7 @@ importers:
sse-channel: 4.0.0
swagger-ui-express: 4.5.0_express@4.18.2
syslog-client: 1.1.1
typeorm: 0.3.11_a77gzgdqnod3rkvxniiwirlqsi
typeorm: 0.3.12_a77gzgdqnod3rkvxniiwirlqsi
uuid: 8.3.2
validator: 13.7.0
winston: 3.8.2
@ -1048,7 +1048,7 @@ packages:
resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
engines: {node: '>=12.0.0'}
dependencies:
tslib: 2.4.0
tslib: 2.5.0
dev: false
/@azure/core-auth/1.4.0:
@ -1056,7 +1056,7 @@ packages:
engines: {node: '>=12.0.0'}
dependencies:
'@azure/abort-controller': 1.1.0
tslib: 2.4.0
tslib: 2.5.0
dev: false
/@azure/core-client/1.6.1:
@ -1069,7 +1069,7 @@ packages:
'@azure/core-tracing': 1.0.1
'@azure/core-util': 1.1.1
'@azure/logger': 1.0.3
tslib: 2.4.0
tslib: 2.5.0
transitivePeerDependencies:
- supports-color
dev: false
@ -1100,7 +1100,7 @@ packages:
node-fetch: 2.6.7
process: 0.11.10
tough-cookie: 4.1.2
tslib: 2.4.0
tslib: 2.5.0
tunnel: 0.0.6
uuid: 8.3.2
xml2js: 0.4.23
@ -1114,14 +1114,14 @@ packages:
dependencies:
'@azure/abort-controller': 1.1.0
'@azure/logger': 1.0.3
tslib: 2.4.0
tslib: 2.5.0
dev: false
/@azure/core-paging/1.3.0:
resolution: {integrity: sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==}
engines: {node: '>=12.0.0'}
dependencies:
tslib: 2.4.0
tslib: 2.5.0
dev: false
/@azure/core-rest-pipeline/1.9.2:
@ -1136,7 +1136,7 @@ packages:
form-data: 4.0.0
http-proxy-agent: 5.0.0
https-proxy-agent: 5.0.1
tslib: 2.4.0
tslib: 2.5.0
uuid: 8.3.2
transitivePeerDependencies:
- supports-color
@ -1147,14 +1147,14 @@ packages:
engines: {node: '>=12.0.0'}
dependencies:
'@opentelemetry/api': 1.2.0
tslib: 2.4.0
tslib: 2.5.0
dev: false
/@azure/core-tracing/1.0.1:
resolution: {integrity: sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==}
engines: {node: '>=12.0.0'}
dependencies:
tslib: 2.4.0
tslib: 2.5.0
dev: false
/@azure/core-util/1.1.1:
@ -1162,7 +1162,7 @@ packages:
engines: {node: '>=12.0.0'}
dependencies:
'@azure/abort-controller': 1.1.0
tslib: 2.4.0
tslib: 2.5.0
dev: false
/@azure/identity/2.1.0:
@ -1183,7 +1183,7 @@ packages:
jws: 4.0.0
open: 8.4.0
stoppable: 1.1.0
tslib: 2.4.0
tslib: 2.5.0
uuid: 8.3.2
transitivePeerDependencies:
- supports-color
@ -1203,7 +1203,7 @@ packages:
'@azure/core-tracing': 1.0.1
'@azure/core-util': 1.1.1
'@azure/logger': 1.0.3
tslib: 2.4.0
tslib: 2.5.0
transitivePeerDependencies:
- supports-color
dev: false
@ -1212,7 +1212,7 @@ packages:
resolution: {integrity: sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==}
engines: {node: '>=12.0.0'}
dependencies:
tslib: 2.4.0
tslib: 2.5.0
dev: false
/@azure/msal-browser/2.30.0:
@ -1247,7 +1247,7 @@ packages:
'@azure/core-tracing': 1.0.0-preview.13
'@azure/logger': 1.0.3
events: 3.3.0
tslib: 2.4.0
tslib: 2.5.0
transitivePeerDependencies:
- encoding
dev: false
@ -4036,7 +4036,7 @@ packages:
debug: 4.3.4
globby: 11.1.0
is-wsl: 2.2.0
tslib: 2.4.1
tslib: 2.5.0
transitivePeerDependencies:
- supports-color
dev: true
@ -4050,7 +4050,7 @@ packages:
debug: 4.3.4
globby: 11.1.0
is-wsl: 2.2.0
tslib: 2.4.0
tslib: 2.5.0
transitivePeerDependencies:
- supports-color
@ -4063,7 +4063,7 @@ packages:
debug: 4.3.4_supports-color@8.1.1
globby: 11.1.0
is-wsl: 2.2.0
tslib: 2.4.0
tslib: 2.5.0
transitivePeerDependencies:
- supports-color
dev: true
@ -4188,7 +4188,7 @@ packages:
'@oclif/errors': 1.3.6
'@oclif/linewrap': 1.0.0
chalk: 4.1.2
tslib: 2.4.0
tslib: 2.5.0
/@oclif/plugin-help/3.2.18:
resolution: {integrity: sha512-5n5Pkz4L0duknIvFwx2Ko9Xda3miT6RZP8bgaaK3Q/9fzVBrhi4bOM0u05/OThI6V+3NsSdxYS2o1NLcXToWDg==}
@ -4245,7 +4245,7 @@ packages:
open: 8.4.0
picocolors: 1.0.0
tiny-glob: 0.2.9
tslib: 2.4.0
tslib: 2.5.0
dev: true
/@rudderstack/rudder-sdk-node/1.0.6:
@ -4366,8 +4366,8 @@ packages:
'@sinonjs/commons': 1.8.3
dev: true
/@sqltools/formatter/1.2.3:
resolution: {integrity: sha512-O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg==}
/@sqltools/formatter/1.2.5:
resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
dev: false
/@storybook/addon-actions/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
@ -7977,21 +7977,21 @@ packages:
resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==}
engines: {node: '>=4'}
dependencies:
tslib: 2.4.0
tslib: 2.5.0
dev: false
/ast-types/0.14.2:
resolution: {integrity: sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==}
engines: {node: '>=4'}
dependencies:
tslib: 2.4.1
tslib: 2.5.0
dev: true
/ast-types/0.15.2:
resolution: {integrity: sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==}
engines: {node: '>=4'}
dependencies:
tslib: 2.4.1
tslib: 2.5.0
/astral-regex/2.0.0:
resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
@ -8862,7 +8862,7 @@ packages:
resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
dependencies:
pascal-case: 3.1.2
tslib: 2.4.1
tslib: 2.5.0
/camelcase-css/2.0.1:
resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
@ -8907,7 +8907,7 @@ packages:
resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
dependencies:
no-case: 3.0.4
tslib: 2.4.0
tslib: 2.5.0
upper-case-first: 2.0.2
dev: false
@ -9235,7 +9235,7 @@ packages:
strip-ansi: 6.0.1
supports-color: 8.1.1
supports-hyperlinks: 2.3.0
tslib: 2.4.0
tslib: 2.5.0
transitivePeerDependencies:
- '@oclif/config'
dev: true
@ -9784,7 +9784,7 @@ packages:
resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
dependencies:
no-case: 3.0.4
tslib: 2.4.0
tslib: 2.5.0
upper-case: 2.0.2
dev: false
@ -10795,7 +10795,7 @@ packages:
resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
dependencies:
no-case: 3.0.4
tslib: 2.4.1
tslib: 2.5.0
/dotenv-expand/5.1.0:
resolution: {integrity: sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==}
@ -12727,7 +12727,6 @@ packages:
inherits: 2.0.4
minimatch: 5.1.5
once: 1.4.0
dev: true
/global-dirs/3.0.0:
resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==}
@ -13091,7 +13090,7 @@ packages:
resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
dependencies:
capital-case: 1.0.4
tslib: 2.4.0
tslib: 2.5.0
dev: false
/heap/0.2.7:
@ -14252,7 +14251,7 @@ packages:
jest-util: 29.3.1
jest-validate: 29.3.1
prompts: 2.4.2
yargs: 17.6.0
yargs: 17.6.2
transitivePeerDependencies:
- '@types/node'
- supports-color
@ -15646,7 +15645,7 @@ packages:
/lower-case/2.0.2:
resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
dependencies:
tslib: 2.4.1
tslib: 2.5.0
/lru-cache/4.0.2:
resolution: {integrity: sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==}
@ -16192,6 +16191,12 @@ packages:
engines: {node: '>=10'}
hasBin: true
/mkdirp/2.1.3:
resolution: {integrity: sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==}
engines: {node: '>=10'}
hasBin: true
dev: false
/mlly/1.1.0:
resolution: {integrity: sha512-cwzBrBfwGC1gYJyfcy8TcZU1f+dbH/T+TuOhtYP2wLv/Fb51/uV7HJQfBPtEupZ2ORLRU1EKFS/QfS3eo9+kBQ==}
dependencies:
@ -16496,7 +16501,7 @@ packages:
resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
dependencies:
lower-case: 2.0.2
tslib: 2.4.1
tslib: 2.5.0
/nock/13.2.9:
resolution: {integrity: sha512-1+XfJNYF1cjGB+TKMWi29eZ0b82QOvQs2YoLNzbpWGqFMtRQHTa57osqdGj4FrFPgkO4D4AZinzUJR9VvW3QUA==}
@ -17267,7 +17272,7 @@ packages:
resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
dependencies:
dot-case: 3.0.4
tslib: 2.4.1
tslib: 2.5.0
/parent-module/1.0.1:
resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
@ -17384,7 +17389,7 @@ packages:
resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
dependencies:
no-case: 3.0.4
tslib: 2.4.1
tslib: 2.5.0
/pascalcase/0.1.1:
resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
@ -17433,7 +17438,7 @@ packages:
resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
dependencies:
dot-case: 3.0.4
tslib: 2.4.0
tslib: 2.5.0
dev: false
/path-dirname/1.0.2:
@ -18659,7 +18664,7 @@ packages:
ast-types: 0.14.2
esprima: 4.0.1
source-map: 0.6.1
tslib: 2.4.1
tslib: 2.5.0
dev: true
/recast/0.21.5:
@ -18680,7 +18685,7 @@ packages:
ast-types: 0.15.2
esprima: 4.0.1
source-map: 0.6.1
tslib: 2.4.1
tslib: 2.5.0
dev: true
/rechoir/0.6.2:
@ -19206,7 +19211,7 @@ packages:
/rxjs/7.5.7:
resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
dependencies:
tslib: 2.4.0
tslib: 2.5.0
dev: true
/safe-buffer/5.1.1:
@ -19490,7 +19495,7 @@ packages:
resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
dependencies:
no-case: 3.0.4
tslib: 2.4.0
tslib: 2.5.0
upper-case-first: 2.0.2
/seq-queue/0.0.5:
@ -19710,7 +19715,7 @@ packages:
resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
dependencies:
dot-case: 3.0.4
tslib: 2.4.0
tslib: 2.5.0
dev: false
/snapdragon-node/2.1.1:
@ -20575,7 +20580,7 @@ packages:
engines: {node: ^14.18.0 || >=16.0.0}
dependencies:
'@pkgr/utils': 2.3.1
tslib: 2.4.0
tslib: 2.5.0
dev: true
/syslog-client/1.1.1:
@ -21203,8 +21208,8 @@ packages:
/tslib/2.4.0:
resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
/tslib/2.4.1:
resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
/tslib/2.5.0:
resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
/tsscmp/1.0.6:
resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
@ -21360,8 +21365,8 @@ packages:
/typedarray/0.0.6:
resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
/typeorm/0.3.11_a77gzgdqnod3rkvxniiwirlqsi:
resolution: {integrity: sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==}
/typeorm/0.3.12_a77gzgdqnod3rkvxniiwirlqsi:
resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==}
engines: {node: '>= 12.9.0'}
hasBin: true
peerDependencies:
@ -21372,7 +21377,7 @@ packages:
ioredis: ^5.0.4
mongodb: ^3.6.0
mssql: ^7.3.0
mysql2: ^2.2.5
mysql2: ^2.2.5 || ^3.0.1
oracledb: ^5.1.0
pg: ^8.5.1
pg-native: ^3.0.0
@ -21418,7 +21423,7 @@ packages:
typeorm-aurora-data-api-driver:
optional: true
dependencies:
'@sqltools/formatter': 1.2.3
'@sqltools/formatter': 1.2.5
app-root-path: 3.1.0
buffer: 6.0.3
chalk: 4.1.2
@ -21426,20 +21431,20 @@ packages:
date-fns: 2.29.3
debug: 4.3.4
dotenv: 16.0.3
glob: 7.2.3
glob: 8.1.0
ioredis: 5.2.4
js-yaml: 4.1.0
mkdirp: 1.0.4
mkdirp: 2.1.3
mysql2: 2.3.3
pg: 8.8.0
reflect-metadata: 0.1.13
sha.js: 2.4.11
sqlite3: 5.1.4
ts-node: 9.1.1_typescript@4.9.4
tslib: 2.4.0
uuid: 8.3.2
tslib: 2.5.0
uuid: 9.0.0
xml2js: 0.4.23
yargs: 17.6.0
yargs: 17.6.2
transitivePeerDependencies:
- supports-color
dev: false
@ -21696,12 +21701,12 @@ packages:
/upper-case-first/2.0.2:
resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
dependencies:
tslib: 2.4.1
tslib: 2.5.0
/upper-case/2.0.2:
resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
dependencies:
tslib: 2.4.1
tslib: 2.5.0
dev: false
/uri-js/4.4.1:
@ -23331,6 +23336,19 @@ packages:
string-width: 4.2.3
y18n: 5.0.8
yargs-parser: 21.1.1
dev: false
/yargs/17.6.2:
resolution: {integrity: sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==}
engines: {node: '>=12'}
dependencies:
cliui: 8.0.1
escalade: 3.1.1
get-caller-file: 2.0.5
require-directory: 2.1.1
string-width: 4.2.3
y18n: 5.0.8
yargs-parser: 21.1.1
/yargs/7.1.2:
resolution: {integrity: sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==}