pg-mvc-service 2.0.118 → 2.0.120
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.
|
@@ -207,11 +207,11 @@ class RequestType extends ReqResType_1.default {
|
|
|
207
207
|
break;
|
|
208
208
|
}
|
|
209
209
|
errorMessage = errorMessage.replace("{property}", keys.join('.'));
|
|
210
|
-
if (value === undefined) {
|
|
211
|
-
errorMessage = errorMessage.replace("{value}", value);
|
|
210
|
+
if (value === undefined || value === '') {
|
|
211
|
+
errorMessage = errorMessage.replace("({value})", value);
|
|
212
212
|
}
|
|
213
213
|
else {
|
|
214
|
-
errorMessage = errorMessage.replace("{value}",
|
|
214
|
+
errorMessage = errorMessage.replace("{value}", value);
|
|
215
215
|
}
|
|
216
216
|
return errorMessage;
|
|
217
217
|
}
|
|
@@ -1022,8 +1022,11 @@ class RequestType extends ReqResType_1.default {
|
|
|
1022
1022
|
return ymlString;
|
|
1023
1023
|
}
|
|
1024
1024
|
getInputErrorList(method, code) {
|
|
1025
|
+
let isA = false;
|
|
1025
1026
|
let errorList = [];
|
|
1026
1027
|
for (const [key, property] of Object.entries(this.properties)) {
|
|
1028
|
+
if (key === 'attendeeList')
|
|
1029
|
+
isA = true;
|
|
1027
1030
|
if (property.type.endsWith('?') === false) {
|
|
1028
1031
|
const errorCode = property.type === 'array' && ['GET', 'DELETE'].includes(method) ? 'REQUIRE_00' : 'REQUIRE_01';
|
|
1029
1032
|
errorList.push({
|
|
@@ -1050,6 +1053,9 @@ class RequestType extends ReqResType_1.default {
|
|
|
1050
1053
|
description: this.createErrorMessage('ARRAY_01', [key])
|
|
1051
1054
|
});
|
|
1052
1055
|
errorList = [...errorList, ...this.getErrorArray([key], code)];
|
|
1056
|
+
if (isA) {
|
|
1057
|
+
console.log(errorList);
|
|
1058
|
+
}
|
|
1053
1059
|
break;
|
|
1054
1060
|
case 'map':
|
|
1055
1061
|
case 'map?':
|
|
@@ -1092,6 +1098,7 @@ class RequestType extends ReqResType_1.default {
|
|
|
1092
1098
|
break;
|
|
1093
1099
|
}
|
|
1094
1100
|
}
|
|
1101
|
+
console.log("last", errorList);
|
|
1095
1102
|
return errorList;
|
|
1096
1103
|
}
|
|
1097
1104
|
getErrorObject(keys, code) {
|
package/package.json
CHANGED
|
@@ -248,11 +248,12 @@ export class RequestType extends ReqResType {
|
|
|
248
248
|
}
|
|
249
249
|
|
|
250
250
|
errorMessage = errorMessage.replace("{property}", keys.join('.'));
|
|
251
|
-
if (value === undefined) {
|
|
252
|
-
errorMessage = errorMessage.replace("{value}", value);
|
|
251
|
+
if (value === undefined || value === '') {
|
|
252
|
+
errorMessage = errorMessage.replace("({value})", value);
|
|
253
253
|
} else {
|
|
254
|
-
errorMessage = errorMessage.replace("{value}",
|
|
254
|
+
errorMessage = errorMessage.replace("{value}", value);
|
|
255
255
|
}
|
|
256
|
+
|
|
256
257
|
|
|
257
258
|
return errorMessage;
|
|
258
259
|
}
|
|
@@ -1123,8 +1124,10 @@ export class RequestType extends ReqResType {
|
|
|
1123
1124
|
}
|
|
1124
1125
|
|
|
1125
1126
|
public getInputErrorList(method: string, code: string): Array<IError> {
|
|
1127
|
+
let isA = false;
|
|
1126
1128
|
let errorList: Array<IError> = [];
|
|
1127
1129
|
for (const [key, property] of Object.entries(this.properties)) {
|
|
1130
|
+
if (key === 'attendeeList') isA = true;
|
|
1128
1131
|
if (property.type.endsWith('?') === false) {
|
|
1129
1132
|
const errorCode = property.type === 'array' && ['GET', 'DELETE'].includes(method) ? 'REQUIRE_00' : 'REQUIRE_01';
|
|
1130
1133
|
errorList.push({
|
|
@@ -1154,6 +1157,9 @@ export class RequestType extends ReqResType {
|
|
|
1154
1157
|
});
|
|
1155
1158
|
|
|
1156
1159
|
errorList = [...errorList, ...this.getErrorArray([key], code)];
|
|
1160
|
+
if (isA) {
|
|
1161
|
+
console.log(errorList);
|
|
1162
|
+
}
|
|
1157
1163
|
break;
|
|
1158
1164
|
case 'map':
|
|
1159
1165
|
case 'map?':
|
|
@@ -1197,6 +1203,7 @@ export class RequestType extends ReqResType {
|
|
|
1197
1203
|
}
|
|
1198
1204
|
}
|
|
1199
1205
|
|
|
1206
|
+
console.log("last", errorList);
|
|
1200
1207
|
return errorList;
|
|
1201
1208
|
}
|
|
1202
1209
|
|