@serene-dev/la-nest-library 0.0.220 → 0.0.222
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/libs/la-library/src/enums/search.enum.d.ts +1 -0
- package/dist/libs/la-library/src/enums/search.enum.js +1 -0
- package/dist/libs/la-library/src/enums/search.enum.js.map +1 -1
- package/dist/libs/la-library/src/interfaces/search.interface.d.ts +1 -0
- package/dist/libs/la-library/src/modules/wallet/wallet-transaction.service.d.ts +13 -0
- package/dist/libs/la-library/src/modules/wallet/wallet-transaction.service.js +20 -0
- package/dist/libs/la-library/src/modules/wallet/wallet-transaction.service.js.map +1 -1
- package/dist/libs/la-library/src/modules/wallet/wallet.controller.d.ts +3 -1
- package/dist/libs/la-library/src/modules/wallet/wallet.controller.js +7 -3
- package/dist/libs/la-library/src/modules/wallet/wallet.controller.js.map +1 -1
- package/dist/libs/la-library/src/modules/wallet/wallet.dto.d.ts +1 -0
- package/dist/libs/la-library/src/modules/wallet/wallet.dto.js +13 -4
- package/dist/libs/la-library/src/modules/wallet/wallet.dto.js.map +1 -1
- package/dist/libs/la-library/src/modules/wallet/wallet.entity.js +1 -1
- package/dist/libs/la-library/src/modules/wallet/wallet.entity.js.map +1 -1
- package/dist/libs/la-library/src/services/search.service.js +15 -9
- package/dist/libs/la-library/src/services/search.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -16,6 +16,7 @@ var ESearchCondition;
|
|
|
16
16
|
ESearchCondition["contains"] = "contains";
|
|
17
17
|
ESearchCondition["between"] = "between";
|
|
18
18
|
ESearchCondition["leftJoin"] = "leftJoin";
|
|
19
|
+
ESearchCondition["in"] = "in";
|
|
19
20
|
ESearchCondition["inArray"] = "inArray";
|
|
20
21
|
})(ESearchCondition || (exports.ESearchCondition = ESearchCondition = {}));
|
|
21
22
|
var ESearchJoinCondition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.enum.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/enums/search.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,yBAAW,CAAA;IACX,2BAAa,CAAA;AACf,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AACD,IAAY,
|
|
1
|
+
{"version":3,"file":"search.enum.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/enums/search.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,yBAAW,CAAA;IACX,2BAAa,CAAA;AACf,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AACD,IAAY,gBAWX;AAXD,WAAY,gBAAgB;IAC1B,qCAAiB,CAAA;IACjB,6CAAyB,CAAA;IACzB,kCAAc,CAAA;IACd,0CAAsB,CAAA;IACtB,+BAAW,CAAA;IACX,yCAAqB,CAAA;IACrB,uCAAmB,CAAA;IACnB,yCAAqB,CAAA;IACrB,6BAAS,CAAA;IACT,uCAAmB,CAAA;AACrB,CAAC,EAXW,gBAAgB,gCAAhB,gBAAgB,QAW3B;AAED,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,mCAAW,CAAA;IACX,iCAAS,CAAA;AACX,CAAC,EAHW,oBAAoB,oCAApB,oBAAoB,QAG/B"}
|
|
@@ -3,10 +3,23 @@ import { BaseService } from '../../services/base.service';
|
|
|
3
3
|
import { CreateWalletTransactionDTO, WalletTransactionSearchDTO } from './wallet.dto';
|
|
4
4
|
import { EntityManager, Repository } from 'typeorm';
|
|
5
5
|
import { WalletService } from './wallet.service';
|
|
6
|
+
import { ETransMethod } from './wallet.enum';
|
|
6
7
|
export declare class WalletTransactionService extends BaseService<WalletTransactionEntity, WalletTransactionSearchDTO> {
|
|
7
8
|
protected repo: Repository<WalletTransactionEntity>;
|
|
8
9
|
protected walletService: WalletService;
|
|
10
|
+
protected _blackListedMethods: {
|
|
11
|
+
[method in ETransMethod]?: boolean;
|
|
12
|
+
};
|
|
9
13
|
constructor(repo: Repository<WalletTransactionEntity>, walletService: WalletService);
|
|
14
|
+
blacklistTransMethod(methods: ETransMethod[]): void;
|
|
15
|
+
whiteListTransMethod(methods: ETransMethod[]): void;
|
|
16
|
+
get blackListedMethods(): {
|
|
17
|
+
System?: boolean;
|
|
18
|
+
Manual?: boolean;
|
|
19
|
+
"Bank Wire"?: boolean;
|
|
20
|
+
Fincra?: boolean;
|
|
21
|
+
Paystack?: boolean;
|
|
22
|
+
};
|
|
10
23
|
create(walletID: string, data: CreateWalletTransactionDTO, config?: {
|
|
11
24
|
entityManager?: EntityManager;
|
|
12
25
|
}): Promise<WalletTransactionEntity>;
|
|
@@ -28,6 +28,7 @@ let WalletTransactionService = class WalletTransactionService extends base_servi
|
|
|
28
28
|
super(repo, base_enum_1.ETableName.wallet);
|
|
29
29
|
this.repo = repo;
|
|
30
30
|
this.walletService = walletService;
|
|
31
|
+
this._blackListedMethods = {};
|
|
31
32
|
this.queryStruct = [
|
|
32
33
|
{ field: 'amount', upperRange: 'amountFrom', lowerRange: 'amountTo' },
|
|
33
34
|
{ field: 'amount' },
|
|
@@ -41,10 +42,24 @@ let WalletTransactionService = class WalletTransactionService extends base_servi
|
|
|
41
42
|
{ field: 'isFailed' },
|
|
42
43
|
{ field: 'transactionReference' },
|
|
43
44
|
{ field: 'walletId' },
|
|
45
|
+
{
|
|
46
|
+
field: 'walletIds',
|
|
47
|
+
actualField: 'walletId',
|
|
48
|
+
condition: search_enum_1.ESearchCondition.in,
|
|
49
|
+
},
|
|
44
50
|
{ field: 'refCat' },
|
|
45
51
|
{ field: 'userID' },
|
|
46
52
|
];
|
|
47
53
|
}
|
|
54
|
+
blacklistTransMethod(methods) {
|
|
55
|
+
methods?.forEach((m) => (this._blackListedMethods[m] = true));
|
|
56
|
+
}
|
|
57
|
+
whiteListTransMethod(methods) {
|
|
58
|
+
methods?.forEach((m) => (this._blackListedMethods[m] = false));
|
|
59
|
+
}
|
|
60
|
+
get blackListedMethods() {
|
|
61
|
+
return { ...this._blackListedMethods };
|
|
62
|
+
}
|
|
48
63
|
async create(walletID, data, config) {
|
|
49
64
|
await this.walletService.checkIfExistsById(walletID, {
|
|
50
65
|
errorMessage: `Wallet could not be found`,
|
|
@@ -55,6 +70,11 @@ let WalletTransactionService = class WalletTransactionService extends base_servi
|
|
|
55
70
|
message: `Wallet could not be found`,
|
|
56
71
|
statusCode: 404,
|
|
57
72
|
});
|
|
73
|
+
if (this._blackListedMethods[data.transMethod])
|
|
74
|
+
utility_service_1.UtilityClass.throwError({
|
|
75
|
+
statusCode: 400,
|
|
76
|
+
message: `Transaction method ${data.transMethod} is not allowed`,
|
|
77
|
+
});
|
|
58
78
|
if (data.type == wallet_enum_1.ETransactionType.debit &&
|
|
59
79
|
data.amount > wallet.grossBalance)
|
|
60
80
|
if (!wallet.allowOverdraft)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet-transaction.service.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet-transaction.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAA0D;AAC1D,8DAA0D;AAK1D,qDAAmD;AACnD,6CAAmD;AACnD,qCAAoD;AACpD,yDAA2D;AAC3D,qDAAiD;AACjD,oEAA8D;AAC9D,+
|
|
1
|
+
{"version":3,"file":"wallet-transaction.service.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet-transaction.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,11 @@ import { WalletService } from './wallet.service';
|
|
|
4
4
|
import { ETransactionType, ECurrency, ETransMethod } from './wallet.enum';
|
|
5
5
|
import { BaseController } from '../../controllers/base.controller';
|
|
6
6
|
import { WalletEntity } from './wallet.entity';
|
|
7
|
+
import { WalletTransactionService } from './wallet-transaction.service';
|
|
7
8
|
export declare class WalletController extends BaseController<WalletEntity, WalletSearchDTO> {
|
|
8
9
|
service: WalletService;
|
|
9
|
-
|
|
10
|
+
transService: WalletTransactionService;
|
|
11
|
+
constructor(service: WalletService, transService: WalletTransactionService);
|
|
10
12
|
getTransactionTypes(): string | ETransactionType[];
|
|
11
13
|
getCurrencies(): string | ECurrency.naira[];
|
|
12
14
|
getTransactionMethods(): string | ETransMethod[];
|
|
@@ -22,10 +22,12 @@ const wallet_service_1 = require("./wallet.service");
|
|
|
22
22
|
const wallet_enum_1 = require("./wallet.enum");
|
|
23
23
|
const search_dto_1 = require("../../dtos/search.dto");
|
|
24
24
|
const base_controller_1 = require("../../controllers/base.controller");
|
|
25
|
+
const wallet_transaction_service_1 = require("./wallet-transaction.service");
|
|
25
26
|
let WalletController = class WalletController extends base_controller_1.BaseController {
|
|
26
|
-
constructor(service) {
|
|
27
|
+
constructor(service, transService) {
|
|
27
28
|
super(service);
|
|
28
29
|
this.service = service;
|
|
30
|
+
this.transService = transService;
|
|
29
31
|
}
|
|
30
32
|
getTransactionTypes() {
|
|
31
33
|
try {
|
|
@@ -49,8 +51,9 @@ let WalletController = class WalletController extends base_controller_1.BaseCont
|
|
|
49
51
|
}
|
|
50
52
|
getTransactionMethods() {
|
|
51
53
|
try {
|
|
54
|
+
const blackListedMethods = this.transService.blackListedMethods;
|
|
52
55
|
return utility_service_1.UtilityClass.handleSuccess({
|
|
53
|
-
data: Object.values(wallet_enum_1.ETransMethod),
|
|
56
|
+
data: Object.values(wallet_enum_1.ETransMethod).filter((x) => !blackListedMethods[x] && x != wallet_enum_1.ETransMethod.system),
|
|
54
57
|
});
|
|
55
58
|
}
|
|
56
59
|
catch (error) {
|
|
@@ -181,6 +184,7 @@ exports.WalletController = WalletController = __decorate([
|
|
|
181
184
|
(0, swagger_1.ApiTags)(wallet_service_1.WalletRoutePath.tag),
|
|
182
185
|
(0, common_1.Controller)(wallet_service_1.WalletRoutePath.path),
|
|
183
186
|
(0, swagger_1.ApiBearerAuth)(),
|
|
184
|
-
__metadata("design:paramtypes", [wallet_service_1.WalletService
|
|
187
|
+
__metadata("design:paramtypes", [wallet_service_1.WalletService,
|
|
188
|
+
wallet_transaction_service_1.WalletTransactionService])
|
|
185
189
|
], WalletController);
|
|
186
190
|
//# sourceMappingURL=wallet.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.controller.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAgF;AAChF,6CAAsE;AACtE,6CAIsB;AACtB,kDAA4C;AAC5C,oEAA8D;AAC9D,qDAAkE;AAClE,+CAA0E;AAC1E,sDAA0D;AAC1D,uEAAmE;
|
|
1
|
+
{"version":3,"file":"wallet.controller.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ const swagger_1 = require("@nestjs/swagger");
|
|
|
14
14
|
const class_validator_1 = require("class-validator");
|
|
15
15
|
const search_dto_1 = require("../../dtos/search.dto");
|
|
16
16
|
const wallet_enum_1 = require("./wallet.enum");
|
|
17
|
+
const class_transformer_1 = require("class-transformer");
|
|
17
18
|
class CreateWalletDTO {
|
|
18
19
|
}
|
|
19
20
|
exports.CreateWalletDTO = CreateWalletDTO;
|
|
@@ -348,7 +349,7 @@ __decorate([
|
|
|
348
349
|
], WalletTransactionSearchDTO.prototype, "refCat", void 0);
|
|
349
350
|
__decorate([
|
|
350
351
|
(0, swagger_1.ApiPropertyOptional)({ type: 'string' }),
|
|
351
|
-
(0, class_validator_1.
|
|
352
|
+
(0, class_validator_1.IsUUID)(),
|
|
352
353
|
(0, class_validator_1.IsOptional)(),
|
|
353
354
|
__metadata("design:type", String)
|
|
354
355
|
], WalletTransactionSearchDTO.prototype, "userID", void 0);
|
|
@@ -360,14 +361,16 @@ __decorate([
|
|
|
360
361
|
], WalletTransactionSearchDTO.prototype, "transMethod", void 0);
|
|
361
362
|
__decorate([
|
|
362
363
|
(0, swagger_1.ApiPropertyOptional)({ type: 'boolean' }),
|
|
363
|
-
(0, class_validator_1.
|
|
364
|
+
(0, class_validator_1.IsBoolean)(),
|
|
364
365
|
(0, class_validator_1.IsOptional)(),
|
|
366
|
+
(0, class_transformer_1.Type)(() => Boolean),
|
|
365
367
|
__metadata("design:type", Boolean)
|
|
366
368
|
], WalletTransactionSearchDTO.prototype, "isVerified", void 0);
|
|
367
369
|
__decorate([
|
|
368
370
|
(0, swagger_1.ApiPropertyOptional)({ type: 'boolean' }),
|
|
369
|
-
(0, class_validator_1.
|
|
371
|
+
(0, class_validator_1.IsBoolean)(),
|
|
370
372
|
(0, class_validator_1.IsOptional)(),
|
|
373
|
+
(0, class_transformer_1.Type)(() => Boolean),
|
|
371
374
|
__metadata("design:type", Boolean)
|
|
372
375
|
], WalletTransactionSearchDTO.prototype, "isFailed", void 0);
|
|
373
376
|
__decorate([
|
|
@@ -378,8 +381,14 @@ __decorate([
|
|
|
378
381
|
], WalletTransactionSearchDTO.prototype, "transactionReference", void 0);
|
|
379
382
|
__decorate([
|
|
380
383
|
(0, swagger_1.ApiPropertyOptional)(),
|
|
381
|
-
(0, class_validator_1.
|
|
384
|
+
(0, class_validator_1.IsUUID)(),
|
|
382
385
|
(0, class_validator_1.IsOptional)(),
|
|
383
386
|
__metadata("design:type", String)
|
|
384
387
|
], WalletTransactionSearchDTO.prototype, "walletId", void 0);
|
|
388
|
+
__decorate([
|
|
389
|
+
(0, swagger_1.ApiPropertyOptional)(),
|
|
390
|
+
(0, class_validator_1.IsString)({ each: true }),
|
|
391
|
+
(0, class_validator_1.IsOptional)(),
|
|
392
|
+
__metadata("design:type", Array)
|
|
393
|
+
], WalletTransactionSearchDTO.prototype, "walletIds", void 0);
|
|
385
394
|
//# sourceMappingURL=wallet.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.dto.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAgF;AAMhF,
|
|
1
|
+
{"version":3,"file":"wallet.dto.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ __decorate([
|
|
|
22
22
|
__metadata("design:type", String)
|
|
23
23
|
], WalletEntity.prototype, "name", void 0);
|
|
24
24
|
__decorate([
|
|
25
|
-
(0, typeorm_1.Column)({
|
|
25
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
26
26
|
__metadata("design:type", String)
|
|
27
27
|
], WalletEntity.prototype, "userID", void 0);
|
|
28
28
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.entity.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAOiB;AACjB,qDAAmD;AACnD,4DAAwD;AACxD,+CAA0E;AAGnE,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,wBAAwB;CAqBzD,CAAA;AArBY,oCAAY;AAEvB;IADC,IAAA,gBAAM,GAAE;;0CACK;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"wallet.entity.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,30 +14,36 @@ class SearchService {
|
|
|
14
14
|
queryBuild.leftJoinAndSelect(prefix, queryParam.tableAlias);
|
|
15
15
|
else {
|
|
16
16
|
_tableName = queryParam.tableAlias || tableName;
|
|
17
|
-
const joinerFunc = (query) => queryParam.joinCondition == search_enum_1.ESearchJoinCondition.or
|
|
18
|
-
? queryBuild.orWhere(query)
|
|
19
|
-
: queryBuild.andWhere(query);
|
|
17
|
+
const joinerFunc = (query, parameters) => queryParam.joinCondition == search_enum_1.ESearchJoinCondition.or
|
|
18
|
+
? queryBuild.orWhere(query, parameters)
|
|
19
|
+
: queryBuild.andWhere(query, parameters);
|
|
20
20
|
if (queryParam.condition == search_enum_1.ESearchCondition.between) {
|
|
21
21
|
if (query[queryParam.upperRange] != null &&
|
|
22
22
|
query[queryParam.lowerRange] != null)
|
|
23
23
|
joinerFunc(`${prefix} BETWEEN '${query[queryParam.lowerRange]}' AND '${query[queryParam.upperRange]}'`);
|
|
24
24
|
}
|
|
25
25
|
else if (query[queryParam.field] != null) {
|
|
26
|
-
let
|
|
26
|
+
let prefixed = `${_tableName}.${(queryParam.actualField || queryParam.field)?.toString()}`;
|
|
27
27
|
if (queryParam.subFields?.length)
|
|
28
|
-
|
|
28
|
+
prefixed = `${_tableName}.${queryParam.subFields[0]} ${queryParam.subFields
|
|
29
29
|
.slice(1)
|
|
30
30
|
.map((x, index) => `->${index + 2 == queryParam.subFields.length ? '>' : ''} '${x?.toString()}'`)
|
|
31
31
|
.join(' ')}`;
|
|
32
32
|
if (queryParam.condition == search_enum_1.ESearchCondition.contains)
|
|
33
|
-
joinerFunc(`${
|
|
33
|
+
joinerFunc(`${prefixed} LIKE '%${query[queryParam.field]}%'`);
|
|
34
|
+
else if (queryParam.condition == search_enum_1.ESearchCondition.in) {
|
|
35
|
+
const value = query[queryParam.field];
|
|
36
|
+
joinerFunc(`${prefixed} IN (:...${queryParam.field})`, {
|
|
37
|
+
[queryParam.field]: Array.isArray(value) ? value : [value],
|
|
38
|
+
});
|
|
39
|
+
}
|
|
34
40
|
else if (queryParam.condition == search_enum_1.ESearchCondition.inArray)
|
|
35
41
|
if (queryParam.subFields?.length)
|
|
36
|
-
joinerFunc(`(${
|
|
42
|
+
joinerFunc(`(${prefixed})::jsonb ? '${query[queryParam.field]}'`);
|
|
37
43
|
else
|
|
38
|
-
joinerFunc(`'${query[queryParam.field]}'=ANY(${
|
|
44
|
+
joinerFunc(`'${query[queryParam.field]}'=ANY(${prefixed})`);
|
|
39
45
|
else
|
|
40
|
-
joinerFunc(`${
|
|
46
|
+
joinerFunc(`${prefixed} ${queryParam.condition || '='} '${this.formatValue(query[queryParam.field], queryParam)}'`);
|
|
41
47
|
}
|
|
42
48
|
}
|
|
43
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.service.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/services/search.service.ts"],"names":[],"mappings":";;;AACA,sDAI8B;AAM9B,+DAA4C;AAG5C,MAAa,aAAa;IAqDxB,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,EACE,UAAU,EACV,SAAS,GAC0C,EACrD,KAAoC,EACpC,WAA8C;QAG9C,MAAM,UAAU,GAAG,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAE5D,MAAM,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC/D,KAAK,MAAM,UAAU,IAAI,EAAE,EAAE,CAAC;YAC5B,IAAI,UAAU,GAAG,SAAS,CAAC;YAC3B,MAAM,MAAM,GAAG,GAAG,UAAU,IAAI,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC;YAC/D,IAAI,UAAU,CAAC,SAAS,IAAI,8BAAgB,CAAC,QAAQ;gBACnD,UAAU,CAAC,iBAAiB,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;iBACzD,CAAC;gBACJ,UAAU,GAAG,UAAU,CAAC,UAAU,IAAI,SAAS,CAAC;gBAChD,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"search.service.js","sourceRoot":"","sources":["../../../../../libs/la-library/src/services/search.service.ts"],"names":[],"mappings":"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"}
|