pg-mvc-service 2.1.32 → 2.1.34
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/models/TableModel.d.ts +2 -2
- package/dist/models/TableModel.d.ts.map +1 -1
- package/dist/models/TableModel.js +11 -3
- package/dist/reqestResponse/ReqResType.d.ts +1 -1
- package/dist/reqestResponse/ReqResType.d.ts.map +1 -1
- package/dist/reqestResponse/ReqResType.js +1 -1
- package/dist/reqestResponse/RequestType.d.ts +3 -1
- package/dist/reqestResponse/RequestType.d.ts.map +1 -1
- package/dist/reqestResponse/RequestType.js +40 -3
- package/package.json +1 -1
|
@@ -166,7 +166,7 @@ export declare class TableModel {
|
|
|
166
166
|
isLastData: boolean;
|
|
167
167
|
}>;
|
|
168
168
|
protected readonly language: "ja" | "en";
|
|
169
|
-
protected
|
|
169
|
+
protected get errorMessages(): TOptionErrorMessage;
|
|
170
170
|
private throwException;
|
|
171
171
|
protected throwDbCoflictException(code: string, message: string): never;
|
|
172
172
|
protected throwUnprocessableException(code: string, message: string): never;
|
|
@@ -180,7 +180,7 @@ export declare class TableModel {
|
|
|
180
180
|
[key: string]: any;
|
|
181
181
|
}): Promise<void>;
|
|
182
182
|
update(pkOrId: string | number | boolean | {
|
|
183
|
-
[key: string]:
|
|
183
|
+
[key: string]: string | number | boolean;
|
|
184
184
|
}, options: {
|
|
185
185
|
[key: string]: any;
|
|
186
186
|
}): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableModel.d.ts","sourceRoot":"","sources":["../../src/models/TableModel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TableModel.d.ts","sourceRoot":"","sources":["../../src/models/TableModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -124,7 +124,6 @@ class TableModel {
|
|
|
124
124
|
this.sortExpression = [];
|
|
125
125
|
this.vars = [];
|
|
126
126
|
this.language = "en";
|
|
127
|
-
this.errorMessages = this.language === 'ja' ? MessageUtil_1.default.optionErrorMessageJapan : MessageUtil_1.default.optionErrorMessageEnglish;
|
|
128
127
|
this.client = client;
|
|
129
128
|
if (tableAlias !== undefined && tableAlias.trim() !== '') {
|
|
130
129
|
this.tableAlias = tableAlias;
|
|
@@ -394,6 +393,9 @@ class TableModel {
|
|
|
394
393
|
};
|
|
395
394
|
});
|
|
396
395
|
}
|
|
396
|
+
get errorMessages() {
|
|
397
|
+
return this.language === 'ja' ? MessageUtil_1.default.optionErrorMessageJapan : MessageUtil_1.default.optionErrorMessageEnglish;
|
|
398
|
+
}
|
|
397
399
|
throwException(code, type, columnName, value) {
|
|
398
400
|
var _a, _b, _c;
|
|
399
401
|
const column = this.getColumn(columnName);
|
|
@@ -537,7 +539,6 @@ class TableModel {
|
|
|
537
539
|
}
|
|
538
540
|
update(pkOrId, options) {
|
|
539
541
|
return __awaiter(this, void 0, void 0, function* () {
|
|
540
|
-
var _a;
|
|
541
542
|
yield this.validateOptions(options, false, pkOrId);
|
|
542
543
|
const updateSetQuery = UpdateExpression_1.default.createUpdateSet(this, options);
|
|
543
544
|
let whereQuery;
|
|
@@ -551,7 +552,14 @@ class TableModel {
|
|
|
551
552
|
const sql = updateSetQuery.expression + ' WHERE ' + whereQuery.expression;
|
|
552
553
|
const data = yield this.executeQuery(sql, whereQuery.vars);
|
|
553
554
|
if (data.rowCount !== 1) {
|
|
554
|
-
|
|
555
|
+
let pkValues;
|
|
556
|
+
if (typeof pkOrId === 'string' || typeof pkOrId === 'number' || typeof pkOrId === 'boolean') {
|
|
557
|
+
pkValues = pkOrId.toString();
|
|
558
|
+
}
|
|
559
|
+
else {
|
|
560
|
+
pkValues = Object.values(pkOrId).map((d) => d.toString()).join(',');
|
|
561
|
+
}
|
|
562
|
+
this.throwUnprocessableException("201", this.errorMessages.find.replace('{pks}', pkValues));
|
|
555
563
|
}
|
|
556
564
|
});
|
|
557
565
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
type PrimitiveKeyType = 'boolean' | 'date' | 'datetime' | 'time' | 'uuid' | 'mail' | 'https' | 'base64' | 'boolean?' | 'date?' | 'datetime?' | 'time?' | 'uuid?' | 'mail?' | 'https?' | 'base64?';
|
|
1
|
+
type PrimitiveKeyType = 'boolean' | 'date' | 'datetime' | 'time' | 'uuid' | 'mail' | 'https' | 'base64' | 'file' | 'boolean?' | 'date?' | 'datetime?' | 'time?' | 'uuid?' | 'mail?' | 'https?' | 'base64?' | 'file?';
|
|
2
2
|
export type PrimitiveType = {
|
|
3
3
|
type: PrimitiveKeyType;
|
|
4
4
|
description?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReqResType.d.ts","sourceRoot":"","sources":["../../src/reqestResponse/ReqResType.ts"],"names":[],"mappings":"AAAA,KAAK,gBAAgB,GACrB,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"ReqResType.d.ts","sourceRoot":"","sources":["../../src/reqestResponse/ReqResType.ts"],"names":[],"mappings":"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"}
|
|
@@ -176,7 +176,7 @@ class ReqResType {
|
|
|
176
176
|
}
|
|
177
177
|
propertyType = propertyType.replace('?', '');
|
|
178
178
|
propertyType = propertyType.replace('number', 'integer');
|
|
179
|
-
propertyType = propertyType.replace(/datetime|date|time|uuid|mail|https|base64/g, 'string');
|
|
179
|
+
propertyType = propertyType.replace(/datetime|date|time|uuid|mail|https|base64|file/g, 'string');
|
|
180
180
|
return propertyType;
|
|
181
181
|
}
|
|
182
182
|
}
|
|
@@ -25,12 +25,14 @@ export interface ErrorMessageType {
|
|
|
25
25
|
INVALID_MAP_NUMBER: string;
|
|
26
26
|
INVALID_MAP_STRING: string;
|
|
27
27
|
INVALID_MAP_BOOL: string;
|
|
28
|
+
INVALID_FILE: string;
|
|
28
29
|
}
|
|
29
30
|
export declare class RequestType extends ReqResType {
|
|
31
|
+
protected readonly isFormRequest: boolean;
|
|
30
32
|
protected readonly language: "ja" | "en";
|
|
31
33
|
private readonly ERROR_MESSAGE_ENGLISH;
|
|
32
34
|
private readonly ERROR_MESSAGE_JAPAN;
|
|
33
|
-
protected
|
|
35
|
+
protected get ERROR_MESSAGE(): ErrorMessageType;
|
|
34
36
|
protected paramProperties: Array<(PrimitiveType | StringType | NumberType | EnumType) & {
|
|
35
37
|
key: string;
|
|
36
38
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestType.d.ts","sourceRoot":"","sources":["../../src/reqestResponse/RequestType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,UAAU,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;AAIzG,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,yBAAyB,EAAE,MAAM,CAAC;IAClC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"RequestType.d.ts","sourceRoot":"","sources":["../../src/reqestResponse/RequestType.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ const type_utils_n_daira_1 = require("type-utils-n-daira");
|
|
|
20
20
|
class RequestType extends ReqResType_1.default {
|
|
21
21
|
constructor() {
|
|
22
22
|
super(...arguments);
|
|
23
|
+
this.isFormRequest = false;
|
|
23
24
|
this.language = "en";
|
|
24
25
|
// *****************************************
|
|
25
26
|
// Input Error Message
|
|
@@ -50,6 +51,7 @@ class RequestType extends ReqResType_1.default {
|
|
|
50
51
|
INVALID_MAP_NUMBER: '{property} must be a valid number for a map key. ({value})',
|
|
51
52
|
INVALID_MAP_STRING: '{property} must be a valid string for a map key. ({value})',
|
|
52
53
|
INVALID_MAP_BOOL: '{property} must be a valid boolean for a map key. ({value})',
|
|
54
|
+
INVALID_FILE: '{property} must be of type File. ({value})',
|
|
53
55
|
};
|
|
54
56
|
this.ERROR_MESSAGE_JAPAN = {
|
|
55
57
|
REQUIRED: '{property}は必須項目です。',
|
|
@@ -74,10 +76,13 @@ class RequestType extends ReqResType_1.default {
|
|
|
74
76
|
INVALID_MAP_NUMBER: '{property} は有効な数値のマップキーでなければなりません。({value})',
|
|
75
77
|
INVALID_MAP_STRING: '{property} は有効な文字列のマップキーでなければなりません。({value})',
|
|
76
78
|
INVALID_MAP_BOOL: '{property} は有効なboolのマップキーでなければなりません。({value})',
|
|
79
|
+
INVALID_FILE: '{property} はファイル形式（File型）で入力してください。（{value}）',
|
|
77
80
|
};
|
|
78
|
-
this.ERROR_MESSAGE = this.language === 'ja' ? this.ERROR_MESSAGE_JAPAN : this.ERROR_MESSAGE_ENGLISH;
|
|
79
81
|
this.paramProperties = [];
|
|
80
82
|
}
|
|
83
|
+
get ERROR_MESSAGE() {
|
|
84
|
+
return this.language === 'ja' ? this.ERROR_MESSAGE_JAPAN : this.ERROR_MESSAGE_ENGLISH;
|
|
85
|
+
}
|
|
81
86
|
get paramPath() {
|
|
82
87
|
return this.paramProperties.map(property => `/{${property.key}}`).join("");
|
|
83
88
|
}
|
|
@@ -194,6 +199,8 @@ class RequestType extends ReqResType_1.default {
|
|
|
194
199
|
"DATETIME_92": this.ERROR_MESSAGE.INVALID_DATETIME,
|
|
195
200
|
"HTTPS_91": this.ERROR_MESSAGE.INVALID_HTTPS,
|
|
196
201
|
"BASE64_91": this.ERROR_MESSAGE.INVALID_BASE64,
|
|
202
|
+
"FILE_21": this.ERROR_MESSAGE.INVALID_FILE,
|
|
203
|
+
"FILE_91": this.ERROR_MESSAGE.INVALID_FILE,
|
|
197
204
|
};
|
|
198
205
|
let errorMessage = list[code];
|
|
199
206
|
const property = this.getProperty(keys);
|
|
@@ -270,8 +277,24 @@ class RequestType extends ReqResType_1.default {
|
|
|
270
277
|
}
|
|
271
278
|
}
|
|
272
279
|
else {
|
|
273
|
-
|
|
274
|
-
|
|
280
|
+
if (this.isFormRequest) {
|
|
281
|
+
const data = {}; // ループ内でthis.dataに直接入れたかったが、型エラーになるため、
|
|
282
|
+
(yield c.req.formData()).forEach((formValue, formKey) => {
|
|
283
|
+
if (formKey in data === false) {
|
|
284
|
+
data[formKey] = formValue;
|
|
285
|
+
}
|
|
286
|
+
else if (Array.isArray(data[formKey])) {
|
|
287
|
+
data[formKey].push(formValue);
|
|
288
|
+
}
|
|
289
|
+
else {
|
|
290
|
+
data[formKey] = [data[formKey], formValue];
|
|
291
|
+
}
|
|
292
|
+
});
|
|
293
|
+
this.data = data;
|
|
294
|
+
}
|
|
295
|
+
else {
|
|
296
|
+
this.data = yield c.req.json();
|
|
297
|
+
}
|
|
275
298
|
}
|
|
276
299
|
}
|
|
277
300
|
if (this.data === undefined) {
|
|
@@ -845,6 +868,12 @@ class RequestType extends ReqResType_1.default {
|
|
|
845
868
|
return value;
|
|
846
869
|
}
|
|
847
870
|
this.throwInputError(isRequestBody ? "BASE64_21" : "BASE64_91", keys, value);
|
|
871
|
+
case 'file':
|
|
872
|
+
case 'file?':
|
|
873
|
+
if (value && typeof value === 'object' && value.name !== undefined && value.size !== undefined) {
|
|
874
|
+
return value;
|
|
875
|
+
}
|
|
876
|
+
this.throwInputError(isRequestBody ? "FILE_21" : "FILE_91", keys, value);
|
|
848
877
|
}
|
|
849
878
|
return value;
|
|
850
879
|
}
|
|
@@ -1418,6 +1447,14 @@ class RequestType extends ReqResType_1.default {
|
|
|
1418
1447
|
description: this.createErrorMessage(isRequestBody ? "BASE64_21" : "BASE64_91", keys)
|
|
1419
1448
|
});
|
|
1420
1449
|
break;
|
|
1450
|
+
case 'file':
|
|
1451
|
+
case 'file?':
|
|
1452
|
+
errorList.push({
|
|
1453
|
+
status: 400,
|
|
1454
|
+
code: isRequestBody ? "FILE_21" : "FILE_91",
|
|
1455
|
+
description: this.createErrorMessage(isRequestBody ? "FILE_21" : "FILE_91", keys)
|
|
1456
|
+
});
|
|
1457
|
+
break;
|
|
1421
1458
|
}
|
|
1422
1459
|
return errorList;
|
|
1423
1460
|
}
|