@campxdev/server-shared 1.5.11 → 1.5.13
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/data-imports-manager/data-import-manager.service.d.ts +11 -10
- package/dist/data-imports-manager/data-import-manager.service.d.ts.map +1 -1
- package/dist/data-imports-manager/data-import-manager.service.js +14 -2
- package/dist/data-imports-manager/data-import-manager.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,26 +1,26 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { DataImport, GlobalDataImportRepository } from '../domain';
|
|
3
3
|
import { DataImportResource } from './data-import.resource';
|
|
4
|
-
export type DataImportFieldDetails = {
|
|
4
|
+
export type DataImportFieldDetails<T = any> = {
|
|
5
5
|
requiredForCreate: boolean;
|
|
6
6
|
requiredForUpdate: boolean;
|
|
7
|
-
validation: (value: unknown | null, required: boolean) => {
|
|
7
|
+
validation: (value: unknown | null, required: boolean, currentValue: Partial<T>) => {
|
|
8
8
|
value: unknown | null;
|
|
9
9
|
errors: string[];
|
|
10
10
|
};
|
|
11
11
|
};
|
|
12
|
-
export type DataImportField = DataImportFieldDetails & {
|
|
12
|
+
export type DataImportField<T = any> = DataImportFieldDetails<T> & {
|
|
13
13
|
name: string;
|
|
14
14
|
};
|
|
15
|
-
export type DataImportFields<T> = {
|
|
16
|
-
[key in keyof Required<T>]: DataImportFieldDetails
|
|
15
|
+
export type DataImportFields<T = any> = {
|
|
16
|
+
[key in keyof Required<T>]: DataImportFieldDetails<T>;
|
|
17
17
|
};
|
|
18
18
|
export type DataImportFieldError = {
|
|
19
19
|
index: number;
|
|
20
20
|
field: string;
|
|
21
21
|
messages: string[];
|
|
22
22
|
};
|
|
23
|
-
export type DataImportValidationResult<T> = {
|
|
23
|
+
export type DataImportValidationResult<T = any> = {
|
|
24
24
|
fields: Array<DataImportFieldDetails & {
|
|
25
25
|
name: string;
|
|
26
26
|
}>;
|
|
@@ -38,7 +38,7 @@ export declare function validateData<T>(props: {
|
|
|
38
38
|
}): {
|
|
39
39
|
data: T[];
|
|
40
40
|
errors: DataImportFieldError[];
|
|
41
|
-
fields: (DataImportFieldDetails & {
|
|
41
|
+
fields: (DataImportFieldDetails<any> & {
|
|
42
42
|
name: string;
|
|
43
43
|
})[];
|
|
44
44
|
};
|
|
@@ -47,15 +47,16 @@ export declare function validateFileData<T>(props: {
|
|
|
47
47
|
forced: boolean;
|
|
48
48
|
fields: DataImportField[];
|
|
49
49
|
}): Promise<{
|
|
50
|
-
fields: (DataImportFieldDetails & {
|
|
50
|
+
fields: (DataImportFieldDetails<any> & {
|
|
51
51
|
name: string;
|
|
52
52
|
})[];
|
|
53
53
|
data: T[];
|
|
54
54
|
errors: DataImportFieldError[];
|
|
55
55
|
}>;
|
|
56
|
-
export
|
|
56
|
+
export declare function uniqDataImportFieldErrors(errors: DataImportFieldError[]): DataImportFieldError[];
|
|
57
|
+
export interface IDataImportService<T = any> {
|
|
57
58
|
fieldValidations(): DataImportFields<T>;
|
|
58
|
-
fields(): Array<DataImportField
|
|
59
|
+
fields(): Array<DataImportField<T>>;
|
|
59
60
|
validate(doc: DataImport, forced?: boolean): Promise<{
|
|
60
61
|
success: boolean;
|
|
61
62
|
data: T[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-import-manager.service.d.ts","sourceRoot":"","sources":["../../src/data-imports-manager/data-import-manager.service.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"data-import-manager.service.d.ts","sourceRoot":"","sources":["../../src/data-imports-manager/data-import-manager.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.DataImportManagerService = exports.validateFileData = exports.validateData = exports.getDataFields = exports.getFile = void 0;
|
|
15
|
+
exports.DataImportManagerService = exports.uniqDataImportFieldErrors = exports.validateFileData = exports.validateData = exports.getDataFields = exports.getFile = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const axios_1 = __importDefault(require("axios"));
|
|
18
|
+
const lodash_1 = require("lodash");
|
|
18
19
|
const domain_1 = require("../domain");
|
|
19
20
|
const utils_1 = require("../utils");
|
|
20
21
|
const data_import_resource_1 = require("./data-import.resource");
|
|
@@ -45,7 +46,7 @@ function validateData(props) {
|
|
|
45
46
|
const required = importType === domain_1.DataImportImportTypes.INSERT
|
|
46
47
|
? field.requiredForCreate
|
|
47
48
|
: field.requiredForUpdate;
|
|
48
|
-
const { value: validatedValue, errors: validatedErrors } = field.validation(value, required);
|
|
49
|
+
const { value: validatedValue, errors: validatedErrors } = field.validation(value, required, validatedDataItem);
|
|
49
50
|
validatedDataItem[field.name] = validatedValue;
|
|
50
51
|
if (validatedErrors.length) {
|
|
51
52
|
fieldErrors.push({
|
|
@@ -92,6 +93,17 @@ async function validateFileData(props) {
|
|
|
92
93
|
};
|
|
93
94
|
}
|
|
94
95
|
exports.validateFileData = validateFileData;
|
|
96
|
+
function uniqDataImportFieldErrors(errors) {
|
|
97
|
+
const values = (0, lodash_1.groupBy)(errors, (error) => `${error.index}-${error.field}`);
|
|
98
|
+
return Object.values(values).map((value) => {
|
|
99
|
+
return {
|
|
100
|
+
index: value[0].index,
|
|
101
|
+
field: value[0].field,
|
|
102
|
+
messages: (0, lodash_1.uniq)(value.flatMap((error) => error.messages)),
|
|
103
|
+
};
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
exports.uniqDataImportFieldErrors = uniqDataImportFieldErrors;
|
|
95
107
|
let DataImportManagerService = class DataImportManagerService {
|
|
96
108
|
constructor(dataImportRepo, dataImportResource) {
|
|
97
109
|
this.dataImportRepo = dataImportRepo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-import-manager.service.js","sourceRoot":"","sources":["../../src/data-imports-manager/data-import-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,kDAA0B;AAC1B,sCAKmB;AACnB,oCAA4C;AAC5C,iEAA4D;
|
|
1
|
+
{"version":3,"file":"data-import-manager.service.js","sourceRoot":"","sources":["../../src/data-imports-manager/data-import-manager.service.ts"],"names":[],"mappings":"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"}
|