@builder6/tables 0.6.2 → 0.6.5
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/tables/meta.service.d.ts +1 -1
- package/dist/tables/meta.service.js +33 -7
- package/dist/tables/meta.service.js.map +1 -1
- package/dist/tables/tables.controller.d.ts +1 -1
- package/dist/tables/tables.controller.js +12 -19
- package/dist/tables/tables.controller.js.map +1 -1
- package/dist/tables/tables.service.d.ts +17 -17
- package/dist/tables/tables.service.js +64 -34
- package/dist/tables/tables.service.js.map +1 -1
- package/package.json +4 -5
|
@@ -2,5 +2,5 @@ import { MongodbService } from '@builder6/core';
|
|
|
2
2
|
export declare class MetaService {
|
|
3
3
|
private readonly mongodbService;
|
|
4
4
|
constructor(mongodbService: MongodbService);
|
|
5
|
-
getTableMeta(baseId: string, tableId: string): Promise<
|
|
5
|
+
getTableMeta(baseId: string, tableId: string): Promise<any>;
|
|
6
6
|
}
|
|
@@ -65,13 +65,6 @@ let MetaService = class MetaService {
|
|
|
65
65
|
options: `华炎\n建华\n中国移动`,
|
|
66
66
|
},
|
|
67
67
|
{ _id: 'fld007', name: 'birthdate', label: '生日', type: 'date' },
|
|
68
|
-
{
|
|
69
|
-
_id: 'fld008',
|
|
70
|
-
name: 'created',
|
|
71
|
-
label: '创建时间',
|
|
72
|
-
type: 'datetime',
|
|
73
|
-
default_value: '2024-12-11T09:22:09.045Z',
|
|
74
|
-
},
|
|
75
68
|
{ _id: 'fld009', name: 'valid', label: '启用', type: 'boolean' },
|
|
76
69
|
{
|
|
77
70
|
_id: 'fld010',
|
|
@@ -80,6 +73,39 @@ let MetaService = class MetaService {
|
|
|
80
73
|
type: 'formula',
|
|
81
74
|
formula: 'name + age',
|
|
82
75
|
},
|
|
76
|
+
{
|
|
77
|
+
_id: 'owner',
|
|
78
|
+
name: 'owner',
|
|
79
|
+
label: '所有者',
|
|
80
|
+
type: 'lookup',
|
|
81
|
+
reference_to: 'users',
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
_id: 'created',
|
|
85
|
+
name: 'created',
|
|
86
|
+
label: '创建日期',
|
|
87
|
+
type: 'datetime',
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
_id: 'created_by',
|
|
91
|
+
name: 'created_by',
|
|
92
|
+
label: '创建人',
|
|
93
|
+
type: 'lookup',
|
|
94
|
+
reference_to: 'users',
|
|
95
|
+
},
|
|
96
|
+
{
|
|
97
|
+
_id: 'modified',
|
|
98
|
+
name: 'modified',
|
|
99
|
+
label: '修改日期',
|
|
100
|
+
type: 'datetime',
|
|
101
|
+
},
|
|
102
|
+
{
|
|
103
|
+
_id: 'modified_by',
|
|
104
|
+
name: 'modified_by',
|
|
105
|
+
label: '修改人',
|
|
106
|
+
type: 'lookup',
|
|
107
|
+
reference_to: 'users',
|
|
108
|
+
},
|
|
83
109
|
],
|
|
84
110
|
verifications: [
|
|
85
111
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meta.service.js","sourceRoot":"","sources":["../../src/tables/meta.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,yCAAgD;AAChD,2CAA4C;AAGrC,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAE/D,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,OAAe;QAChD,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE;YACzD,GAAG,EAAE,OAAO;SACb,CAAC,CAAC;QACH,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAC3C,WAAW,EACX;gBACE,QAAQ,EAAE,OAAO;aAClB,EACD,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CACzB,CAAC;YACF,KAAK,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBACtE,KAAK,EAAE,OAAO;aACf,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,KAAK,GAAG;gBACN,GAAG,EAAE,OAAO;gBACZ,OAAO,EAAE,MAAM;gBACf,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,gBAAgB;gBAC7B,MAAM,EAAE;oBACN;wBACE,GAAG,EAAE,QAAQ;wBACb,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,IAAI;wBACX,IAAI,EAAE,MAAM;wBACZ,aAAa,EAAE,MAAM;qBACtB;oBACD;wBACE,GAAG,EAAE,QAAQ;wBACb,IAAI,EAAE,KAAK;wBACX,KAAK,EAAE,IAAI;wBACX,IAAI,EAAE,QAAQ;wBACd,aAAa,EAAE,EAAE;qBAClB;oBACD;wBACE,GAAG,EAAE,QAAQ;wBACb,IAAI,EAAE,UAAU;wBAChB,KAAK,EAAE,IAAI;wBACX,IAAI,EAAE,QAAQ;wBACd,SAAS,EAAE,CAAC;qBACb;oBACD,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE;oBAC9D;wBACE,GAAG,EAAE,QAAQ;wBACb,IAAI,EAAE,SAAS;wBACf,KAAK,EAAE,IAAI;wBACX,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,cAAc;qBACxB;oBAQD,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE;oBAC/D;wBACE,GAAG,EAAE,QAAQ;wBACb,IAAI,EAAE,SAAS;wBACf,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"meta.service.js","sourceRoot":"","sources":["../../src/tables/meta.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export declare class TablesController {
|
|
|
6
6
|
private readonly metaService;
|
|
7
7
|
constructor(tablesService: TablesService, metaService: MetaService);
|
|
8
8
|
create(baseId: string, tableId: string, record: object, req: Request, res: Response): Promise<void>;
|
|
9
|
-
find(req: Request, res: Response, baseId: string, tableId: string, fields?: any,
|
|
9
|
+
find(req: Request, res: Response, baseId: string, tableId: string, fields?: any, filters?: any, sort?: any, skip?: number, top?: number): Promise<void>;
|
|
10
10
|
findOne(baseId: string, tableId: string, recordId: string, res: Response): Promise<Response<any, Record<string, any>>>;
|
|
11
11
|
update(baseId: string, tableId: string, recordId: string, body: object, req: Request, res: Response): Promise<Response<any, Record<string, any>>>;
|
|
12
12
|
remove(baseId: string, tableId: string, recordId: string, res: Response): Promise<Response<any, Record<string, any>>>;
|
|
@@ -27,7 +27,7 @@ let TablesController = class TablesController {
|
|
|
27
27
|
async create(baseId, tableId, record, req, res) {
|
|
28
28
|
const user = req['user'];
|
|
29
29
|
try {
|
|
30
|
-
const result = await this.tablesService.
|
|
30
|
+
const result = await this.tablesService.recordInsertOne(baseId, tableId, {
|
|
31
31
|
...record,
|
|
32
32
|
owner: user._id,
|
|
33
33
|
created_by: user._id,
|
|
@@ -43,7 +43,7 @@ let TablesController = class TablesController {
|
|
|
43
43
|
res.status(500).send(error);
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
|
-
async find(req, res, baseId, tableId, fields,
|
|
46
|
+
async find(req, res, baseId, tableId, fields, filters, sort, skip = 0, top = 20) {
|
|
47
47
|
try {
|
|
48
48
|
const options = (0, query_mongodb_1.getOptions)(req.query, {
|
|
49
49
|
areaKM2: 'int',
|
|
@@ -68,15 +68,7 @@ let TablesController = class TablesController {
|
|
|
68
68
|
loadOptions.select = fields.split(',');
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
-
|
|
72
|
-
try {
|
|
73
|
-
loadOptions.expands = JSON.parse(expands);
|
|
74
|
-
}
|
|
75
|
-
catch {
|
|
76
|
-
loadOptions.expands = expands.split(',');
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
const results = await this.tablesService.getRecords(baseId, tableId, loadOptions, options.processingOptions);
|
|
71
|
+
const results = await this.tablesService.recordFind(baseId, tableId, loadOptions, options.processingOptions);
|
|
80
72
|
res.status(200).send(results);
|
|
81
73
|
}
|
|
82
74
|
catch (error) {
|
|
@@ -86,7 +78,7 @@ let TablesController = class TablesController {
|
|
|
86
78
|
}
|
|
87
79
|
async findOne(baseId, tableId, recordId, res) {
|
|
88
80
|
try {
|
|
89
|
-
const result = await this.tablesService.
|
|
81
|
+
const result = await this.tablesService.recordFindOne(baseId, tableId, {
|
|
90
82
|
_id: recordId,
|
|
91
83
|
});
|
|
92
84
|
if (!result) {
|
|
@@ -106,7 +98,9 @@ let TablesController = class TablesController {
|
|
|
106
98
|
modified_by: req['user']._id,
|
|
107
99
|
modified: new Date(),
|
|
108
100
|
};
|
|
109
|
-
const result = await this.tablesService.
|
|
101
|
+
const result = await this.tablesService.recordFindOneAndUpdate(baseId, tableId, {
|
|
102
|
+
_id: recordId,
|
|
103
|
+
}, record);
|
|
110
104
|
if (!result) {
|
|
111
105
|
return res.status(404).send();
|
|
112
106
|
}
|
|
@@ -231,13 +225,12 @@ __decorate([
|
|
|
231
225
|
__param(2, (0, common_1.Param)('baseId')),
|
|
232
226
|
__param(3, (0, common_1.Param)('tableId')),
|
|
233
227
|
__param(4, (0, common_1.Query)('fields')),
|
|
234
|
-
__param(5, (0, common_1.Query)('
|
|
235
|
-
__param(6, (0, common_1.Query)('
|
|
236
|
-
__param(7, (0, common_1.Query)('
|
|
237
|
-
__param(8, (0, common_1.Query)('
|
|
238
|
-
__param(9, (0, common_1.Query)('top', new common_1.ParseIntPipe())),
|
|
228
|
+
__param(5, (0, common_1.Query)('filters')),
|
|
229
|
+
__param(6, (0, common_1.Query)('sort')),
|
|
230
|
+
__param(7, (0, common_1.Query)('skip', new common_1.ParseIntPipe())),
|
|
231
|
+
__param(8, (0, common_1.Query)('top', new common_1.ParseIntPipe())),
|
|
239
232
|
__metadata("design:type", Function),
|
|
240
|
-
__metadata("design:paramtypes", [Object, Object, String, String, Object, Object, Object,
|
|
233
|
+
__metadata("design:paramtypes", [Object, Object, String, String, Object, Object, Object, Number, Number]),
|
|
241
234
|
__metadata("design:returntype", Promise)
|
|
242
235
|
], TablesController.prototype, "find", null);
|
|
243
236
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables.controller.js","sourceRoot":"","sources":["../../src/tables/tables.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAewB;AACxB,qDAAiD;AAEjD,2DAAqD;AACrD,6CAKyB;AACzB,yCAA2C;AAC3C,iDAA6C;AAMtC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,aAA4B,EAC5B,WAAwB;QADxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAeE,AAAN,KAAK,CAAC,MAAM,CACO,MAAc,EACb,OAAe,EACzB,MAAc,EACf,GAAY,EACZ,GAAa;QAEpB,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"tables.controller.js","sourceRoot":"","sources":["../../src/tables/tables.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,29 +2,29 @@ import 'regenerator-runtime/runtime';
|
|
|
2
2
|
import { Collection } from 'mongodb';
|
|
3
3
|
import { ConfigService } from '@nestjs/config';
|
|
4
4
|
import { MongodbService } from '@builder6/core';
|
|
5
|
+
import { MetaService } from './meta.service';
|
|
5
6
|
export declare class TablesService {
|
|
6
7
|
private configService;
|
|
7
8
|
private readonly mongodbService;
|
|
9
|
+
private readonly metaService;
|
|
8
10
|
private db;
|
|
9
11
|
private loaders;
|
|
10
12
|
private readonly logger;
|
|
11
|
-
constructor(configService: ConfigService, mongodbService: MongodbService);
|
|
13
|
+
constructor(configService: ConfigService, mongodbService: MongodbService, metaService: MetaService);
|
|
12
14
|
getCollection(baseId: string, tableId: string): Collection;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
find(baseId: string, tableId: string, query: object, options?: object): Promise<
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
insertOne(baseId: string, tableId: any, data: any): Promise<any>;
|
|
16
|
+
recordInsertOne(baseId: string, tableId: any, data: any): Promise<any>;
|
|
17
|
+
find(baseId: string, tableId: string, query: object, options?: object): Promise<any>;
|
|
18
|
+
recordFind(baseId: string, tableId: string, loadOptions: any, processingOptions: any): Promise<any>;
|
|
19
|
+
findOne(baseId: string, tableId: string, query: object): Promise<any>;
|
|
20
|
+
recordFindOne(baseId: string, tableId: string, query: object): Promise<any>;
|
|
21
|
+
findOneAndUpdate(baseId: string, tableId: string, query: object, data: any): Promise<any>;
|
|
22
|
+
recordFindOneAndUpdate(baseId: string, tableId: string, query: object, data: any): Promise<any>;
|
|
23
|
+
deleteOne(baseId: string, tableId: string, query: object): Promise<any>;
|
|
24
|
+
deleteMany(baseId: string, tableId: string, query: object): Promise<any>;
|
|
20
25
|
getMongodbDataLoader(collectionName: any, fields?: string[]): Promise<any>;
|
|
21
|
-
getTableField(baseId: any, tableId: any, fieldName: any): Promise<
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
} | {
|
|
26
|
-
name: any;
|
|
27
|
-
reference_to: any;
|
|
28
|
-
type?: undefined;
|
|
29
|
-
}>;
|
|
26
|
+
getTableField(baseId: any, tableId: any, fieldName: any): Promise<any>;
|
|
27
|
+
getTableLookupFields(baseId: any, tableId: any): Promise<any>;
|
|
28
|
+
convertRecordLookupFields(record: any, lookupFields: any): Promise<any>;
|
|
29
|
+
roolbackRecordLookupFields(record: any, lookupFields: any): Promise<any>;
|
|
30
30
|
}
|
|
@@ -19,10 +19,12 @@ const query_mongodb_1 = require("@builder6/query-mongodb");
|
|
|
19
19
|
const config_1 = require("@nestjs/config");
|
|
20
20
|
const DataLoader = require("dataloader");
|
|
21
21
|
const core_1 = require("@builder6/core");
|
|
22
|
+
const meta_service_1 = require("./meta.service");
|
|
22
23
|
let TablesService = TablesService_1 = class TablesService {
|
|
23
|
-
constructor(configService, mongodbService) {
|
|
24
|
+
constructor(configService, mongodbService, metaService) {
|
|
24
25
|
this.configService = configService;
|
|
25
26
|
this.mongodbService = mongodbService;
|
|
27
|
+
this.metaService = metaService;
|
|
26
28
|
this.loaders = new Map();
|
|
27
29
|
this.logger = new common_1.Logger(TablesService_1.name);
|
|
28
30
|
const mongoUrl = configService.get('tables.mongo.url') || configService.get('mongo.url');
|
|
@@ -41,58 +43,60 @@ let TablesService = TablesService_1 = class TablesService {
|
|
|
41
43
|
const collectionName = `t_${baseId}_${tableId}`;
|
|
42
44
|
return this.db.collection(collectionName);
|
|
43
45
|
}
|
|
44
|
-
async
|
|
46
|
+
async insertOne(baseId, tableId, data) {
|
|
45
47
|
const collection = this.getCollection(baseId, tableId);
|
|
46
48
|
const entry = { _id: (0, uuid_1.v4)(), ...data };
|
|
47
49
|
await collection.insertOne(entry);
|
|
48
50
|
return entry;
|
|
49
51
|
}
|
|
50
|
-
async
|
|
52
|
+
async recordInsertOne(baseId, tableId, data) {
|
|
53
|
+
const lookupFields = await this.getTableLookupFields(baseId, tableId);
|
|
54
|
+
await this.roolbackRecordLookupFields(data, lookupFields);
|
|
55
|
+
const record = await this.insertOne(baseId, tableId, data);
|
|
56
|
+
await this.convertRecordLookupFields(record, lookupFields);
|
|
57
|
+
return record;
|
|
58
|
+
}
|
|
59
|
+
async find(baseId, tableId, query, options = {}) {
|
|
60
|
+
const collection = this.getCollection(baseId, tableId);
|
|
61
|
+
return await collection.find(query, options).toArray();
|
|
62
|
+
}
|
|
63
|
+
async recordFind(baseId, tableId, loadOptions, processingOptions) {
|
|
51
64
|
const collection = this.getCollection(baseId, tableId);
|
|
52
65
|
const result = await (0, query_mongodb_1.querySimple)(collection, loadOptions, {
|
|
53
66
|
replaceIds: false,
|
|
54
67
|
...processingOptions,
|
|
55
68
|
});
|
|
56
69
|
const records = result.data;
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
const { reference_to } = await this.getTableField(baseId, tableId, expand);
|
|
61
|
-
console.log('query expand fields', expand, reference_to);
|
|
62
|
-
if (reference_to) {
|
|
63
|
-
const loader = await this.getMongodbDataLoader(reference_to, [
|
|
64
|
-
'_id',
|
|
65
|
-
'name',
|
|
66
|
-
]);
|
|
67
|
-
for (const record of records) {
|
|
68
|
-
if (record[expand]) {
|
|
69
|
-
const expandedRecord = (await loader.load(record[expand])) || {
|
|
70
|
-
_id: expand,
|
|
71
|
-
};
|
|
72
|
-
console.log('expandedRecord', expand, expandedRecord);
|
|
73
|
-
record[expand] = expandedRecord;
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
}
|
|
70
|
+
const lookupFields = await this.getTableLookupFields(baseId, tableId);
|
|
71
|
+
for (const record of records) {
|
|
72
|
+
await this.convertRecordLookupFields(record, lookupFields);
|
|
77
73
|
}
|
|
78
74
|
return {
|
|
79
75
|
...result,
|
|
80
76
|
data: records,
|
|
81
77
|
};
|
|
82
78
|
}
|
|
83
|
-
async find(baseId, tableId, query, options = {}) {
|
|
84
|
-
const collection = this.getCollection(baseId, tableId);
|
|
85
|
-
return await collection.find(query, options).toArray();
|
|
86
|
-
}
|
|
87
79
|
async findOne(baseId, tableId, query) {
|
|
88
80
|
const collection = this.getCollection(baseId, tableId);
|
|
89
81
|
return await collection.findOne(query);
|
|
90
82
|
}
|
|
91
|
-
async
|
|
83
|
+
async recordFindOne(baseId, tableId, query) {
|
|
84
|
+
const record = await this.findOne(baseId, tableId, query);
|
|
85
|
+
await this.convertRecordLookupFields(record, await this.getTableLookupFields(baseId, tableId));
|
|
86
|
+
return record;
|
|
87
|
+
}
|
|
88
|
+
async findOneAndUpdate(baseId, tableId, query, data) {
|
|
92
89
|
const collection = this.getCollection(baseId, tableId);
|
|
93
|
-
const result = await collection.findOneAndUpdate(
|
|
90
|
+
const result = await collection.findOneAndUpdate(query, { $set: data }, { returnDocument: 'after' });
|
|
94
91
|
return result.value;
|
|
95
92
|
}
|
|
93
|
+
async recordFindOneAndUpdate(baseId, tableId, query, data) {
|
|
94
|
+
const lookupFields = await this.getTableLookupFields(baseId, tableId);
|
|
95
|
+
await this.roolbackRecordLookupFields(data, lookupFields);
|
|
96
|
+
const record = await this.findOneAndUpdate(baseId, tableId, query, data);
|
|
97
|
+
await this.convertRecordLookupFields(record, lookupFields);
|
|
98
|
+
return record;
|
|
99
|
+
}
|
|
96
100
|
async deleteOne(baseId, tableId, query) {
|
|
97
101
|
const collection = this.getCollection(baseId, tableId);
|
|
98
102
|
const result = await collection.deleteOne(query);
|
|
@@ -126,6 +130,7 @@ let TablesService = TablesService_1 = class TablesService {
|
|
|
126
130
|
return loader;
|
|
127
131
|
}
|
|
128
132
|
async getTableField(baseId, tableId, fieldName) {
|
|
133
|
+
const table = await this.metaService.getTableMeta(baseId, tableId);
|
|
129
134
|
if (fieldName === 'created_by' || fieldName === 'modified_by') {
|
|
130
135
|
return {
|
|
131
136
|
type: 'lookup',
|
|
@@ -133,16 +138,41 @@ let TablesService = TablesService_1 = class TablesService {
|
|
|
133
138
|
reference_to: 'users',
|
|
134
139
|
};
|
|
135
140
|
}
|
|
136
|
-
return
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
141
|
+
return table.fields.find((field) => field.name === fieldName);
|
|
142
|
+
}
|
|
143
|
+
async getTableLookupFields(baseId, tableId) {
|
|
144
|
+
const table = await this.metaService.getTableMeta(baseId, tableId);
|
|
145
|
+
return table.fields.filter((field) => field.type === 'lookup');
|
|
146
|
+
}
|
|
147
|
+
async convertRecordLookupFields(record, lookupFields) {
|
|
148
|
+
for (const field of lookupFields) {
|
|
149
|
+
const loader = await this.getMongodbDataLoader(field.reference_to, [
|
|
150
|
+
'_id',
|
|
151
|
+
'name',
|
|
152
|
+
]);
|
|
153
|
+
if (record[field.name]) {
|
|
154
|
+
const expandedRecord = (await loader.load(record[field.name])) || {
|
|
155
|
+
_id: field.name,
|
|
156
|
+
};
|
|
157
|
+
record[field.name] = expandedRecord;
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
return record;
|
|
161
|
+
}
|
|
162
|
+
async roolbackRecordLookupFields(record, lookupFields) {
|
|
163
|
+
for (const field of lookupFields) {
|
|
164
|
+
if (record[field.name] && record[field.name]._id) {
|
|
165
|
+
record[field.name] = record[field.name]._id;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
return record;
|
|
140
169
|
}
|
|
141
170
|
};
|
|
142
171
|
exports.TablesService = TablesService;
|
|
143
172
|
exports.TablesService = TablesService = TablesService_1 = __decorate([
|
|
144
173
|
(0, common_1.Injectable)(),
|
|
145
174
|
__metadata("design:paramtypes", [config_1.ConfigService,
|
|
146
|
-
core_1.MongodbService
|
|
175
|
+
core_1.MongodbService,
|
|
176
|
+
meta_service_1.MetaService])
|
|
147
177
|
], TablesService);
|
|
148
178
|
//# sourceMappingURL=tables.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables.service.js","sourceRoot":"","sources":["../../src/tables/tables.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,uCAAqC;AAErC,2CAAoD;AACpD,qCAAsD;AACtD,+BAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"tables.service.js","sourceRoot":"","sources":["../../src/tables/tables.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/tables",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.5",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -11,12 +11,11 @@
|
|
|
11
11
|
"build:watch": "rm -rf dist && tsc --watch"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@builder6/core": "^0.6.
|
|
15
|
-
"dataloader": "^2.2.3"
|
|
16
|
-
"nodemailer": "^6.9.16"
|
|
14
|
+
"@builder6/core": "^0.6.5",
|
|
15
|
+
"dataloader": "^2.2.3"
|
|
17
16
|
},
|
|
18
17
|
"publishConfig": {
|
|
19
18
|
"access": "public"
|
|
20
19
|
},
|
|
21
|
-
"gitHead": "
|
|
20
|
+
"gitHead": "b4f7ff4cfa74b8d192b54e6488a136141d6ee661"
|
|
22
21
|
}
|