@steedos/data-import 3.0.0-beta.30 → 3.0.0-beta.33
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/lib/index.d.ts +2 -2
- package/lib/index.js +17 -13
- package/lib/index.js.map +1 -1
- package/package.json +5 -5
package/lib/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { userSessionType } from
|
|
2
|
-
export { importWithCmsFile } from
|
|
1
|
+
import { userSessionType } from "./types";
|
|
2
|
+
export { importWithCmsFile } from "./objectImport";
|
|
3
3
|
export declare function getUserSession(spaceId?: string): Promise<userSessionType | any>;
|
|
4
4
|
export declare function preCreateCollection(dbManager: any, results: readFileResult[]): Promise<void>;
|
|
5
5
|
export type readFileResult = {
|
package/lib/index.js
CHANGED
|
@@ -23,14 +23,14 @@ async function getUserSession(spaceId) {
|
|
|
23
23
|
await dbManager.connect();
|
|
24
24
|
const selector = {};
|
|
25
25
|
if (spaceId) {
|
|
26
|
-
selector[
|
|
26
|
+
selector["_id"] = spaceId;
|
|
27
27
|
}
|
|
28
|
-
const space = await dbManager.findOne(
|
|
28
|
+
const space = await dbManager.findOne("spaces", selector, false);
|
|
29
29
|
if (!space) {
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
32
|
const spaceOwner = space.owner;
|
|
33
|
-
const spaceUser = await dbManager.findOne(
|
|
33
|
+
const spaceUser = await dbManager.findOne("space_users", { space: space._id, user: spaceOwner }, false);
|
|
34
34
|
if (!spaceUser) {
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
@@ -38,7 +38,7 @@ async function getUserSession(spaceId) {
|
|
|
38
38
|
spaceId: space._id,
|
|
39
39
|
userId: spaceOwner,
|
|
40
40
|
company_id: spaceUser.company_id,
|
|
41
|
-
company_ids: spaceUser.company_ids
|
|
41
|
+
company_ids: spaceUser.company_ids,
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
44
|
catch (error) {
|
|
@@ -51,13 +51,15 @@ async function getUserSession(spaceId) {
|
|
|
51
51
|
}
|
|
52
52
|
async function preCreateCollection(dbManager, results) {
|
|
53
53
|
const db = dbManager.client.db();
|
|
54
|
-
const collectionInfos = await db
|
|
55
|
-
|
|
54
|
+
const collectionInfos = await db
|
|
55
|
+
.listCollections({}, { nameOnly: true })
|
|
56
|
+
.toArray();
|
|
57
|
+
const collectionsMap = (0, lodash_1.keyBy)(collectionInfos, "name");
|
|
56
58
|
const config = (0, objectql_1.getSteedosConfig)();
|
|
57
|
-
const datasourceConfig = config.datasources[
|
|
58
|
-
const locale = datasourceConfig.locale ||
|
|
59
|
+
const datasourceConfig = config.datasources["default"];
|
|
60
|
+
const locale = datasourceConfig.locale || "zh";
|
|
59
61
|
const options = {
|
|
60
|
-
|
|
62
|
+
collation: { locale: locale },
|
|
61
63
|
};
|
|
62
64
|
for (const result of results) {
|
|
63
65
|
const objectName = result.objectName;
|
|
@@ -72,7 +74,9 @@ async function preCreateCollection(dbManager, results) {
|
|
|
72
74
|
}
|
|
73
75
|
function formatResults(results, userSession) {
|
|
74
76
|
const { spaceId, userId } = userSession;
|
|
75
|
-
return JSON.parse(JSON.stringify(results)
|
|
77
|
+
return JSON.parse(JSON.stringify(results)
|
|
78
|
+
.replace(/\${space_id}/g, spaceId)
|
|
79
|
+
.replace(/\${space_owner_id}/g, userId));
|
|
76
80
|
}
|
|
77
81
|
async function importData(data, onlyInsert = true, spaceId) {
|
|
78
82
|
const userSession = await getUserSession(spaceId);
|
|
@@ -89,11 +93,11 @@ async function importData(data, onlyInsert = true, spaceId) {
|
|
|
89
93
|
const csvData = (data === null || data === void 0 ? void 0 : data.csv) || [];
|
|
90
94
|
const jsonData = (data === null || data === void 0 ? void 0 : data.json) || [];
|
|
91
95
|
if (onlyInsert) {
|
|
92
|
-
|
|
96
|
+
const dbManager = new dbManager_1.DbManager(userSession);
|
|
93
97
|
try {
|
|
94
98
|
await dbManager.connect();
|
|
95
99
|
for (const result of csvData) {
|
|
96
|
-
for (
|
|
100
|
+
for (const record of result.records) {
|
|
97
101
|
const dbRecord = await dbManager.findOne(result.objectName, { _id: record._id }, true);
|
|
98
102
|
if (dbRecord) {
|
|
99
103
|
throw new Error(`停止导入数据：${result.objectName}对象的${record._id}记录已存在`);
|
|
@@ -104,7 +108,7 @@ async function importData(data, onlyInsert = true, spaceId) {
|
|
|
104
108
|
for (const result of jsonResult) {
|
|
105
109
|
const objectName = result.objectName;
|
|
106
110
|
const records = result.records;
|
|
107
|
-
const recordsIds = lodash_2.default.map(records,
|
|
111
|
+
const recordsIds = lodash_2.default.map(records, "_id");
|
|
108
112
|
const dbRecords = await dbManager.find(objectName, { _id: { $in: recordsIds } }, false, 0, { projection: { _id: 1 } });
|
|
109
113
|
if (dbRecords.length > 0) {
|
|
110
114
|
throw new Error(`停止导入数据：${result.objectName}对象已存在${dbRecords.length}条记录`);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAUA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/data-import",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.33",
|
|
4
4
|
"main": "package.service.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"build": "rm -rf ./lib && tsc"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@steedos/metadata-api": "3.0.0-beta.
|
|
11
|
-
"@steedos/metadata-core": "3.0.0-beta.
|
|
12
|
-
"@steedos/objectql": "3.0.0-beta.
|
|
10
|
+
"@steedos/metadata-api": "3.0.0-beta.33",
|
|
11
|
+
"@steedos/metadata-core": "3.0.0-beta.33",
|
|
12
|
+
"@steedos/objectql": "3.0.0-beta.33",
|
|
13
13
|
"bson": "4.6.4",
|
|
14
14
|
"csvtojson": "~2.0.10",
|
|
15
15
|
"dotenv-flow": "^3.1.0",
|
|
@@ -23,5 +23,5 @@
|
|
|
23
23
|
"publishConfig": {
|
|
24
24
|
"access": "public"
|
|
25
25
|
},
|
|
26
|
-
"gitHead": "
|
|
26
|
+
"gitHead": "240a409b40d5e5e25cf2451b63e611ba7b8e4533"
|
|
27
27
|
}
|