@futdevpro/nts-dynamo 1.10.2 → 1.10.3
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/build/_collections/global-settings.const.d.ts.map +1 -1
- package/build/_collections/global-settings.const.js +2 -0
- package/build/_collections/global-settings.const.js.map +1 -1
- package/build/_models/control-models/endpoint-params.control-model.js +1 -1
- package/build/_models/control-models/endpoint-params.control-model.js.map +1 -1
- package/build/_models/interfaces/global-log-settings.interface.d.ts +4 -0
- package/build/_models/interfaces/global-log-settings.interface.d.ts.map +1 -1
- package/build/_models/interfaces/global-settings.interface.d.ts +4 -0
- package/build/_models/interfaces/global-settings.interface.d.ts.map +1 -1
- package/build/_modules/mock/app-extended-server.mock.d.ts +3 -3
- package/build/_modules/mock/app-extended-server.mock.d.ts.map +1 -1
- package/build/_modules/mock/app-extended-server.mock.js +8 -8
- package/build/_modules/mock/app-extended-server.mock.js.map +1 -1
- package/build/_modules/mock/app-server.mock.d.ts +2 -2
- package/build/_modules/mock/app-server.mock.d.ts.map +1 -1
- package/build/_modules/mock/app-server.mock.js +6 -6
- package/build/_modules/mock/app-server.mock.js.map +1 -1
- package/build/_modules/socket/{_services/app-extended.server.d.ts → app-extended.server.d.ts} +2 -2
- package/build/_modules/socket/app-extended.server.d.ts.map +1 -0
- package/build/_modules/socket/{_services/app-extended.server.js → app-extended.server.js} +6 -6
- package/build/_modules/socket/app-extended.server.js.map +1 -0
- package/build/_modules/socket/app-extended.server.spec.d.ts.map +1 -0
- package/build/_modules/socket/{_services/app-extended.server.spec.js → app-extended.server.spec.js} +5 -5
- package/build/_modules/socket/app-extended.server.spec.js.map +1 -0
- package/build/_modules/socket/index.d.ts +1 -1
- package/build/_modules/socket/index.d.ts.map +1 -1
- package/build/_modules/socket/index.js +1 -1
- package/build/_modules/socket/index.js.map +1 -1
- package/build/_services/base/data.service.d.ts +9 -5
- package/build/_services/base/data.service.d.ts.map +1 -1
- package/build/_services/base/data.service.js +42 -32
- package/build/_services/base/data.service.js.map +1 -1
- package/build/_services/base/db.service.d.ts +6 -1
- package/build/_services/base/db.service.d.ts.map +1 -1
- package/build/_services/base/db.service.js +49 -14
- package/build/_services/base/db.service.js.map +1 -1
- package/build/_services/core/api.service.d.ts.map +1 -1
- package/build/_services/core/api.service.js +8 -9
- package/build/_services/core/api.service.js.map +1 -1
- package/build/_services/core/api.service.spec.js +3 -3
- package/build/_services/core/api.service.spec.js.map +1 -1
- package/build/_services/core/global.service.d.ts.map +1 -1
- package/build/_services/core/global.service.js +3 -0
- package/build/_services/core/global.service.js.map +1 -1
- package/build/_services/server/app.server.d.ts +25 -0
- package/build/_services/server/app.server.d.ts.map +1 -1
- package/build/_services/server/app.server.js +1 -4
- package/build/_services/server/app.server.js.map +1 -1
- package/build/_services/server/app.server.spec.js +4 -1
- package/build/_services/server/app.server.spec.js.map +1 -1
- package/build/_services/server/env-set.d.ts +2 -0
- package/build/_services/server/env-set.d.ts.map +1 -0
- package/build/_services/server/env-set.js +20 -0
- package/build/_services/server/env-set.js.map +1 -0
- package/build/index.d.ts +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -0
- package/build/index.js.map +1 -1
- package/package.json +12 -16
- package/src/_collections/global-settings.const.ts +2 -0
- package/src/_models/control-models/endpoint-params.control-model.ts +1 -1
- package/src/_models/interfaces/global-log-settings.interface.ts +5 -0
- package/src/_models/interfaces/global-settings.interface.ts +5 -0
- package/src/_modules/mock/app-extended-server.mock.ts +13 -13
- package/src/_modules/mock/app-server.mock.ts +10 -10
- package/src/_modules/socket/{_services/app-extended.server.spec.ts → app-extended.server.spec.ts} +7 -7
- package/src/_modules/socket/{_services/app-extended.server.ts → app-extended.server.ts} +18 -13
- package/src/_modules/socket/index.ts +1 -1
- package/src/_services/base/data.service.ts +70 -35
- package/src/_services/base/db.service.ts +58 -11
- package/src/_services/core/api.service.spec.ts +11 -4
- package/src/_services/core/api.service.ts +5 -6
- package/src/_services/core/global.service.ts +3 -0
- package/src/_services/server/app.server.spec.ts +7 -2
- package/src/_services/server/app.server.ts +2 -2
- package/src/_services/server/env-set.ts +21 -0
- package/src/index.ts +1 -0
- package/build/_modules/socket/_services/app-extended.server.d.ts.map +0 -1
- package/build/_modules/socket/_services/app-extended.server.js.map +0 -1
- package/build/_modules/socket/_services/app-extended.server.spec.d.ts.map +0 -1
- package/build/_modules/socket/_services/app-extended.server.spec.js.map +0 -1
- /package/build/_modules/socket/{_services/app-extended.server.spec.d.ts → app-extended.server.spec.d.ts} +0 -0
|
@@ -163,6 +163,9 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
|
|
|
163
163
|
* also if dontSetToService is false or not setted,
|
|
164
164
|
* the data will be saved to the service, even if its not found
|
|
165
165
|
*
|
|
166
|
+
* if the data is not found, it will try to find it from the archive
|
|
167
|
+
* unless skipArchiveLoad is set to true
|
|
168
|
+
*
|
|
166
169
|
* @remarks
|
|
167
170
|
* If you need to get-save a data, if possible,
|
|
168
171
|
* use db-service update instead.
|
|
@@ -173,9 +176,15 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
|
|
|
173
176
|
*
|
|
174
177
|
* @return {T} data: T
|
|
175
178
|
*/
|
|
176
|
-
async getDataById(
|
|
179
|
+
async getDataById(
|
|
180
|
+
id?: string,
|
|
181
|
+
dontSetToService?: boolean,
|
|
182
|
+
skipArchiveLoad?: boolean
|
|
183
|
+
): Promise<T> {
|
|
177
184
|
try {
|
|
178
|
-
|
|
185
|
+
id = id ?? this.data?._id;
|
|
186
|
+
|
|
187
|
+
if (!id) {
|
|
179
188
|
throw new DyFM_Error({
|
|
180
189
|
...this._getDefaultErrorSettings(
|
|
181
190
|
'getDataById',
|
|
@@ -190,7 +199,13 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
|
|
|
190
199
|
});
|
|
191
200
|
}
|
|
192
201
|
|
|
193
|
-
|
|
202
|
+
let dataExists: T = await this.dataDBService.getDataById(id);
|
|
203
|
+
|
|
204
|
+
if (this.haveArchiveDataService && !skipArchiveLoad) {
|
|
205
|
+
const archiveDataService: DyNTS_ArchiveDataService<T> = this.getArchiveDataService();
|
|
206
|
+
|
|
207
|
+
dataExists = await archiveDataService.getDataByOriginalId(id, true);
|
|
208
|
+
}
|
|
194
209
|
|
|
195
210
|
if (!dontSetToService) {
|
|
196
211
|
this.data = dataExists;
|
|
@@ -1088,38 +1103,44 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
|
|
|
1088
1103
|
}
|
|
1089
1104
|
}
|
|
1090
1105
|
|
|
1091
|
-
async searchData(query?: DyFM_SearchQuery<T
|
|
1106
|
+
async searchData(query?: DyFM_SearchQuery<T>, dataList?: T[]): Promise<DyFM_SearchResult<T>> {
|
|
1092
1107
|
try {
|
|
1093
|
-
|
|
1094
|
-
console.log('T1');
|
|
1095
|
-
const allData: T[] = await this.getAll();
|
|
1108
|
+
const searchResult = await this.sortAndFilterDataList(query, dataList);
|
|
1096
1109
|
|
|
1097
|
-
|
|
1098
|
-
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
|
|
1110
|
+
if (query.page !== undefined && query.pageSize !== undefined) {
|
|
1111
|
+
const start = query.page * query.pageSize;
|
|
1112
|
+
const end = start + query.pageSize;
|
|
1113
|
+
|
|
1114
|
+
searchResult.results = searchResult.results.slice(start, end);
|
|
1115
|
+
}
|
|
1102
1116
|
|
|
1117
|
+
return searchResult;
|
|
1118
|
+
} catch (error) {
|
|
1119
|
+
throw new DyFM_Error({
|
|
1120
|
+
...this._getDefaultErrorSettings('searchData', error),
|
|
1121
|
+
|
|
1122
|
+
errorCode: 'NTS-DS0-SD0',
|
|
1123
|
+
});
|
|
1124
|
+
}
|
|
1125
|
+
}
|
|
1126
|
+
|
|
1127
|
+
async sortAndFilterDataList(
|
|
1128
|
+
query: DyFM_SearchQuery<T>,
|
|
1129
|
+
dataList?: T[]
|
|
1130
|
+
): Promise<DyFM_SearchResult<T>> {
|
|
1131
|
+
try {
|
|
1103
1132
|
if (!query.filterBy) {
|
|
1104
1133
|
query.filterBy = {};
|
|
1105
1134
|
}
|
|
1106
|
-
|
|
1107
|
-
/* if (!query.page && !query.pageSize && !query.sortBy) {
|
|
1108
|
-
console.log('T2');
|
|
1109
|
-
const dataFindResult: T[] = await this.dataDBService.find(query.filterBy);
|
|
1110
|
-
|
|
1111
|
-
return {
|
|
1112
|
-
results: dataFindResult,
|
|
1113
|
-
totalItems: dataFindResult.length,
|
|
1114
|
-
};
|
|
1115
|
-
} */
|
|
1116
1135
|
|
|
1117
1136
|
if (!query.page) {
|
|
1118
1137
|
query.page = 0;
|
|
1119
1138
|
}
|
|
1120
1139
|
|
|
1121
1140
|
if (!query.pageSize) {
|
|
1122
|
-
DyFM_Log.warn(
|
|
1141
|
+
DyFM_Log.warn(
|
|
1142
|
+
`searchData pageSize is not setted, setting to ${DyNTS_global_settings.defaultPageSize}.`
|
|
1143
|
+
);
|
|
1123
1144
|
query.pageSize = DyNTS_global_settings.defaultPageSize;
|
|
1124
1145
|
}
|
|
1125
1146
|
|
|
@@ -1127,16 +1148,12 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
|
|
|
1127
1148
|
query.sortBy = [{ key: '__lastModified', order: -1 }];
|
|
1128
1149
|
}
|
|
1129
1150
|
|
|
1130
|
-
console.log('T3');
|
|
1131
|
-
/* const dataFindWithPagingResult: T[] = await this.dataDBService.findWithPaging(
|
|
1132
|
-
query.filterBy,
|
|
1133
|
-
query.page,
|
|
1134
|
-
query.pageSize,
|
|
1135
|
-
query.sortBy
|
|
1136
|
-
); */
|
|
1137
1151
|
query.sortBy.reverse();
|
|
1138
|
-
|
|
1139
|
-
|
|
1152
|
+
|
|
1153
|
+
if (!dataList) {
|
|
1154
|
+
dataList = await this.getAll();
|
|
1155
|
+
}
|
|
1156
|
+
|
|
1140
1157
|
const filterKeys = Object.keys(query.filterBy);
|
|
1141
1158
|
const filterFunctionsByKey: { [key: string]: (dataProperty) => boolean } = {};
|
|
1142
1159
|
|
|
@@ -1169,7 +1186,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
|
|
|
1169
1186
|
}
|
|
1170
1187
|
}
|
|
1171
1188
|
|
|
1172
|
-
|
|
1189
|
+
protected getFilterFunctionForKey<T>(
|
|
1173
1190
|
key: string,
|
|
1174
1191
|
searchValue: T | T[] | DyFM_RangeValue<T>,
|
|
1175
1192
|
): (dataProperty) => boolean {
|
|
@@ -1201,9 +1218,27 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
|
|
|
1201
1218
|
});
|
|
1202
1219
|
}
|
|
1203
1220
|
|
|
1221
|
+
|
|
1204
1222
|
switch (this.dataParams.properties[key].type) {
|
|
1205
1223
|
case 'String':
|
|
1206
|
-
|
|
1224
|
+
if (typeof searchValue !== 'string') {
|
|
1225
|
+
throw new DyFM_Error({
|
|
1226
|
+
...this._getDefaultErrorSettings(
|
|
1227
|
+
'getFilterFunctionForKey',
|
|
1228
|
+
new Error(
|
|
1229
|
+
`getFilterFunctionForKey failed, searchValue is not a string! ` +
|
|
1230
|
+
`(${this.dataParams.dataName})`
|
|
1231
|
+
)
|
|
1232
|
+
),
|
|
1233
|
+
|
|
1234
|
+
errorCode: 'NTS-DS0-GFF3',
|
|
1235
|
+
});
|
|
1236
|
+
}
|
|
1237
|
+
|
|
1238
|
+
const lowerCaseSearchValue: string = (searchValue as string).toLowerCase();
|
|
1239
|
+
|
|
1240
|
+
return (dataProperty): boolean =>
|
|
1241
|
+
(dataProperty as string).toLowerCase().includes(lowerCaseSearchValue);
|
|
1207
1242
|
|
|
1208
1243
|
case 'Date':
|
|
1209
1244
|
if ((searchValue as DyFM_RangeValue).isRange) {
|
|
@@ -1268,7 +1303,7 @@ export class DyNTS_DataService<T extends DyFM_Metadata> {
|
|
|
1268
1303
|
}
|
|
1269
1304
|
}
|
|
1270
1305
|
|
|
1271
|
-
|
|
1306
|
+
protected getSortFunctionForKey<T>(
|
|
1272
1307
|
key: string,
|
|
1273
1308
|
sortDirection: 1 | -1 | 'asc' | 'desc' | 'ascending' | 'descending'
|
|
1274
1309
|
): (a: T, b: T) => number {
|
|
@@ -1009,14 +1009,18 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
|
|
|
1009
1009
|
*/
|
|
1010
1010
|
private getSchema(): mongoose.Schema {
|
|
1011
1011
|
this.dataParams.properties = this.addMetadataToProperties(this.dataParams.properties);
|
|
1012
|
+
|
|
1013
|
+
if (this.dataParams.dataName.includes(DyNTS_archiveSuffix)) {
|
|
1014
|
+
this.dataParams.properties = this.addArchiveMetadataToProperties(this.dataParams.properties);
|
|
1015
|
+
}
|
|
1012
1016
|
|
|
1013
|
-
|
|
1017
|
+
const schema: any = this.buildMongooseSchemaByModelParams(this.dataParams.properties);
|
|
1014
1018
|
|
|
1015
1019
|
/* schema = this.addMetadataToSchema(schema); */
|
|
1016
1020
|
|
|
1017
|
-
if (this.dataParams.dataName.includes(DyNTS_archiveSuffix)) {
|
|
1021
|
+
/* if (this.dataParams.dataName.includes(DyNTS_archiveSuffix)) {
|
|
1018
1022
|
schema = this.addArchiveMetadataToSchema(schema);
|
|
1019
|
-
}
|
|
1023
|
+
} */
|
|
1020
1024
|
|
|
1021
1025
|
if (schema['_id']) {
|
|
1022
1026
|
delete schema['_id'];
|
|
@@ -1044,12 +1048,29 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
|
|
|
1044
1048
|
return;
|
|
1045
1049
|
}
|
|
1046
1050
|
|
|
1051
|
+
if (!property.key) {
|
|
1052
|
+
throw new DyFM_Error({
|
|
1053
|
+
...this._getDefaultErrorSettings(
|
|
1054
|
+
'buildMongooseSchemaByModelParams',
|
|
1055
|
+
new Error(
|
|
1056
|
+
`property.key is undefined on ${this.dataParams.dbName} (NTS DB)`
|
|
1057
|
+
)
|
|
1058
|
+
),
|
|
1059
|
+
errorCode: 'NTS-DBS-BMSBP0',
|
|
1060
|
+
});
|
|
1061
|
+
}
|
|
1062
|
+
|
|
1047
1063
|
const beType = this.getBEType(property.type);
|
|
1048
1064
|
|
|
1065
|
+
/* TODO if (beType === Array && property.archiveable && !property.archiveListAfter) {
|
|
1066
|
+
property.archiveListAfter = DyNTS_global_settings.archiveListAfter;
|
|
1067
|
+
} */
|
|
1068
|
+
|
|
1049
1069
|
if (
|
|
1050
1070
|
beType !== Object ||
|
|
1051
1071
|
!property?.subObjectParams ||
|
|
1052
|
-
(property?.subObjectParams &&
|
|
1072
|
+
(property?.subObjectParams &&
|
|
1073
|
+
Object.keys(property.subObjectParams).length == 0)
|
|
1053
1074
|
) {
|
|
1054
1075
|
schemaSettingsObj[property.key] = {
|
|
1055
1076
|
type: beType,
|
|
@@ -1132,39 +1153,65 @@ export class DyNTS_DBService<T extends DyFM_Metadata> {
|
|
|
1132
1153
|
return schema;
|
|
1133
1154
|
} */
|
|
1134
1155
|
|
|
1156
|
+
/**
|
|
1157
|
+
* adds dynamo metadata settings to any mongoose schema building settings object
|
|
1158
|
+
* @param properties properties to update
|
|
1159
|
+
* @returns updated properties
|
|
1160
|
+
*/
|
|
1135
1161
|
private addMetadataToProperties(properties: DyFM_DataProperties<T>): DyFM_DataProperties<T> {
|
|
1162
|
+
// TOD: ezek a kikommentelt "required: true"-k kellenek, csak félő, hogy gondokat okoznak a
|
|
1163
|
+
// jelenlegi rendszerekben, ezért akkor kell majd visszarakni, ha lesz tesztelői ÉS fejlesztői kapacitás rá
|
|
1136
1164
|
if (!properties.__created) {
|
|
1137
|
-
properties.__created = { type: 'Date' };
|
|
1165
|
+
properties.__created = { key: '__created', type: 'Date'/* , required: true */ };
|
|
1138
1166
|
}
|
|
1139
1167
|
|
|
1140
1168
|
if (!properties.__createdBy) {
|
|
1141
|
-
properties.__createdBy = { type: '
|
|
1169
|
+
properties.__createdBy = { key: '__createdBy', type: 'string'/* , required: true */ };
|
|
1142
1170
|
}
|
|
1143
1171
|
|
|
1144
1172
|
if (!properties.__lastModified) {
|
|
1145
|
-
properties.__lastModified = { type: 'Date' };
|
|
1173
|
+
properties.__lastModified = { key: '__lastModified', type: 'Date'/* , required: true */ };
|
|
1146
1174
|
}
|
|
1147
1175
|
|
|
1148
1176
|
if (!properties.__lastModifiedBy) {
|
|
1149
|
-
properties.__lastModifiedBy = { type: '
|
|
1177
|
+
properties.__lastModifiedBy = { key: '__lastModifiedBy', type: 'string'/* , required: true */ };
|
|
1150
1178
|
}
|
|
1151
1179
|
|
|
1152
1180
|
if (!properties._deleted) {
|
|
1153
|
-
properties._deleted = { type: 'Date' };
|
|
1181
|
+
properties._deleted = { key: '_deleted', type: 'Date' };
|
|
1154
1182
|
}
|
|
1155
1183
|
|
|
1156
1184
|
if (!properties._deletedBy) {
|
|
1157
|
-
properties._deletedBy = { type: '
|
|
1185
|
+
properties._deletedBy = { key: '_deletedBy', type: 'string' };
|
|
1158
1186
|
}
|
|
1159
1187
|
|
|
1160
1188
|
return properties;
|
|
1161
1189
|
}
|
|
1162
1190
|
|
|
1163
|
-
private addArchiveMetadataToSchema(schema: any): any {
|
|
1191
|
+
/* private addArchiveMetadataToSchema(schema: any): any {
|
|
1164
1192
|
schema._originalId = { type: String, required: true, index: true, unique: true };
|
|
1165
1193
|
schema._archived = { type: Date, required: true };
|
|
1166
1194
|
|
|
1167
1195
|
return schema;
|
|
1196
|
+
} */
|
|
1197
|
+
|
|
1198
|
+
private addArchiveMetadataToProperties(
|
|
1199
|
+
properties: DyFM_DataProperties<T>
|
|
1200
|
+
): DyFM_DataProperties<T> {
|
|
1201
|
+
if (!properties._originalId) {
|
|
1202
|
+
properties._originalId = {
|
|
1203
|
+
key: '_originalId', type: 'string',
|
|
1204
|
+
required: true, index: true, unique: true,
|
|
1205
|
+
};
|
|
1206
|
+
}
|
|
1207
|
+
|
|
1208
|
+
if (!properties._archived) {
|
|
1209
|
+
properties._archived = {
|
|
1210
|
+
key: '_archived', type: 'Date', required: true,
|
|
1211
|
+
};
|
|
1212
|
+
}
|
|
1213
|
+
|
|
1214
|
+
return properties;
|
|
1168
1215
|
}
|
|
1169
1216
|
|
|
1170
1217
|
/**
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
|
|
2
|
-
import { DyNTS_ApiService, DyNTS_ApiCallInput_Params } from './api.service';
|
|
3
|
-
import { DyNTS_ApiCall_Params } from '../../_models/control-models/api-call-params.control-model';
|
|
4
|
-
import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
|
|
5
|
-
import { DyNTS_HttpResponseType } from '../../_enums/http/http-response-type.enum';
|
|
6
2
|
import { DyFM_Error } from '@futdevpro/fsm-dynamo';
|
|
7
3
|
import Axios from 'axios';
|
|
4
|
+
import { DyNTS_HttpCallType } from '../../_enums/http/http-call-type.enum';
|
|
5
|
+
import { DyNTS_HttpResponseType } from '../../_enums/http/http-response-type.enum';
|
|
6
|
+
import { DyNTS_ApiCall_Params } from '../../_models/control-models/api-call-params.control-model';
|
|
7
|
+
import { DyNTS_ApiCallInput_Params, DyNTS_ApiService } from './api.service';
|
|
8
8
|
|
|
9
9
|
describe('DyNTS_ApiService', () => {
|
|
10
10
|
let callParams: DyNTS_ApiCall_Params;
|
|
@@ -32,22 +32,26 @@ describe('DyNTS_ApiService', () => {
|
|
|
32
32
|
it('should make a GET request successfully', async () => {
|
|
33
33
|
callParams.type = DyNTS_HttpCallType.get;
|
|
34
34
|
const response = { data: { success: true } };
|
|
35
|
+
|
|
35
36
|
spyOn(Axios, 'create').and.returnValue({
|
|
36
37
|
get: jasmine.createSpy().and.returnValue(Promise.resolve(response)),
|
|
37
38
|
} as any);
|
|
38
39
|
|
|
39
40
|
const result = await DyNTS_ApiService.startApiCall(callParams, inputParams);
|
|
41
|
+
|
|
40
42
|
expect(result).toEqual(response.data);
|
|
41
43
|
});
|
|
42
44
|
|
|
43
45
|
it('should handle a POST request successfully', async () => {
|
|
44
46
|
callParams.type = DyNTS_HttpCallType.post;
|
|
45
47
|
const response = { data: { success: true } };
|
|
48
|
+
|
|
46
49
|
spyOn(Axios, 'create').and.returnValue({
|
|
47
50
|
post: jasmine.createSpy().and.returnValue(Promise.resolve(response)),
|
|
48
51
|
} as any);
|
|
49
52
|
|
|
50
53
|
const result = await DyNTS_ApiService.startApiCall(callParams, inputParams);
|
|
54
|
+
|
|
51
55
|
expect(result).toEqual(response.data);
|
|
52
56
|
});
|
|
53
57
|
|
|
@@ -63,6 +67,7 @@ describe('DyNTS_ApiService', () => {
|
|
|
63
67
|
const errorResponse = {
|
|
64
68
|
response: { data: { flag: 'DYNAMO', message: 'Error' } },
|
|
65
69
|
};
|
|
70
|
+
|
|
66
71
|
spyOn(Axios, 'create').and.returnValue({
|
|
67
72
|
get: jasmine.createSpy().and.returnValue(Promise.reject(errorResponse)),
|
|
68
73
|
} as any);
|
|
@@ -74,6 +79,7 @@ describe('DyNTS_ApiService', () => {
|
|
|
74
79
|
|
|
75
80
|
it('should handle DNS error', async () => {
|
|
76
81
|
const error = { code: 'ENOTFOUND' };
|
|
82
|
+
|
|
77
83
|
spyOn(Axios, 'create').and.returnValue({
|
|
78
84
|
get: jasmine.createSpy().and.returnValue(Promise.reject(error)),
|
|
79
85
|
} as any);
|
|
@@ -85,6 +91,7 @@ describe('DyNTS_ApiService', () => {
|
|
|
85
91
|
|
|
86
92
|
it('should handle connection refused error', async () => {
|
|
87
93
|
const error = { code: 'ECONNREFUSED' };
|
|
94
|
+
|
|
88
95
|
spyOn(Axios, 'create').and.returnValue({
|
|
89
96
|
get: jasmine.createSpy().and.returnValue(Promise.reject(error)),
|
|
90
97
|
} as any);
|
|
@@ -109,7 +109,7 @@ export class DyNTS_ApiService {
|
|
|
109
109
|
throw new DyFM_Error({
|
|
110
110
|
...this._getDefaultErrorSettings(
|
|
111
111
|
'startApiCall',
|
|
112
|
-
new Error(
|
|
112
|
+
new Error(`unknown api call type: ${callParams.type}`)
|
|
113
113
|
),
|
|
114
114
|
errorCode: 'NTS-API-SAC0',
|
|
115
115
|
additionalContent: {
|
|
@@ -117,16 +117,15 @@ export class DyNTS_ApiService {
|
|
|
117
117
|
inputParams,
|
|
118
118
|
},
|
|
119
119
|
});
|
|
120
|
-
//DyFM_Log.error('DYNAMO-NTS ERROR: \n wrong api call type'/* , '\n\n', new Error() */);
|
|
121
|
-
break;
|
|
122
120
|
}
|
|
123
121
|
|
|
124
|
-
|
|
125
|
-
|
|
122
|
+
return a;
|
|
123
|
+
/* if (callParams.getFullResponse) {
|
|
124
|
+
return a as T_Response Axios.AxiosResponse;
|
|
126
125
|
|
|
127
126
|
} else {
|
|
128
127
|
return a as T_Response;
|
|
129
|
-
}
|
|
128
|
+
} */
|
|
130
129
|
} catch (error) {
|
|
131
130
|
this.handleError<T_Body>(callParams, error, inputParams);
|
|
132
131
|
}
|
|
@@ -111,6 +111,9 @@ export class DyNTS_GlobalService extends DyNTS_SingletonService {
|
|
|
111
111
|
const archiveModel: DyFM_DataModel_Params<any> = new DyFM_DataModel_Params<any>({
|
|
112
112
|
...dbModel,
|
|
113
113
|
dataName: DyNTS_getArchivedDBName(dbModel.dataName),
|
|
114
|
+
properties: {
|
|
115
|
+
...dbModel.properties,
|
|
116
|
+
},
|
|
114
117
|
});
|
|
115
118
|
|
|
116
119
|
dbModels.push(archiveModel);
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
|
|
2
|
-
import { DyFM_Error, DyFM_Log, DyFM_delay } from '@futdevpro/fsm-dynamo';
|
|
2
|
+
import { DyFM_Error, DyFM_Log, DyFM_delay, second } from '@futdevpro/fsm-dynamo';
|
|
3
3
|
import { DyNTS_AppBase_Mock, DyNTS_AppFull_Mock } from '../../_modules/mock/app-server.mock';
|
|
4
4
|
|
|
5
5
|
describe('DyNTS_App AND DyNTS_AppExtended?;', (): void => {
|
|
6
|
-
|
|
6
|
+
jasmine.DEFAULT_TIMEOUT_INTERVAL = 15 * second;
|
|
7
|
+
process.setMaxListeners(20);
|
|
7
8
|
|
|
8
9
|
describe('a base instance;', (): void => {
|
|
9
10
|
let app: DyNTS_AppBase_Mock;
|
|
@@ -29,6 +30,8 @@ describe('DyNTS_App AND DyNTS_AppExtended?;', (): void => {
|
|
|
29
30
|
await app.stop();
|
|
30
31
|
|
|
31
32
|
app = null;
|
|
33
|
+
|
|
34
|
+
await DyFM_delay(100);
|
|
32
35
|
} catch (error) {
|
|
33
36
|
DyFM_Log.test('test afterEach error:', (error as DyFM_Error)?._message);
|
|
34
37
|
}
|
|
@@ -67,6 +70,8 @@ describe('DyNTS_App AND DyNTS_AppExtended?;', (): void => {
|
|
|
67
70
|
await app.stop();
|
|
68
71
|
|
|
69
72
|
app = null;
|
|
73
|
+
|
|
74
|
+
await DyFM_delay(100);
|
|
70
75
|
} catch (error) {
|
|
71
76
|
DyFM_Log.test('test afterEach error:', (error as DyFM_Error)?._message);
|
|
72
77
|
}
|
|
@@ -782,10 +782,10 @@ export abstract class DyNTS_App extends DyNTS_SingletonService {
|
|
|
782
782
|
try {
|
|
783
783
|
this.mongoose.connect(
|
|
784
784
|
this._params.dbUri,
|
|
785
|
-
{
|
|
785
|
+
/* {
|
|
786
786
|
useNewUrlParser: true,
|
|
787
787
|
useUnifiedTopology: true,
|
|
788
|
-
}
|
|
788
|
+
} */
|
|
789
789
|
);
|
|
790
790
|
} catch (error) {
|
|
791
791
|
throw new DyFM_Error({
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
|
|
2
|
+
|
|
3
|
+
export function setEnv(): void {
|
|
4
|
+
if (process.env.NODE_ENV) {
|
|
5
|
+
switch (process.env.NODE_ENV) {
|
|
6
|
+
case 'dev':
|
|
7
|
+
|
|
8
|
+
break;
|
|
9
|
+
|
|
10
|
+
case 'prod':
|
|
11
|
+
|
|
12
|
+
break;
|
|
13
|
+
|
|
14
|
+
default:
|
|
15
|
+
if (process.env.NODE_ENV) {
|
|
16
|
+
}
|
|
17
|
+
console.log('Unknown environment code:', process.env.NODE_ENV);
|
|
18
|
+
break;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app-extended.server.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/app-extended.server.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAEjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAOpE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmGG;AACH,8BAAsB,iBAAkB,SAAQ,SAAS;IAEvD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA0D;IAC5F,IAAa,OAAO,IAAI,OAAO,CAAuD;IACtF,OAAO,CAAC,yBAAyB,CAAa;IAC9C,OAAO,CAAC,wBAAwB,CAAa;IAE7C,OAAO,CAAC,cAAc,CAAsB;IAE5C,OAAO,CAAC,gBAAgB,CAAc;IAEtC;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,EAAE,yBAAyB,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;;cAwBjC,cAAc,CAAC,QAAQ,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAqExD,KAAK,CAAC,OAAO,GAAE,MAAiC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgIhE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA+CpC;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAezB;;OAEG;YACW,yBAAyB;IAuJvC;;OAEG;IACH,QAAQ,CAAC,iBAAiB,IAAI,yBAAyB,CAAC,GAAG,CAAC,EAAE;IAE9D,OAAO,CAAC,yBAAyB;CAclC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app-extended.server.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/app-extended.server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app-extended.server.spec.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/app-extended.server.spec.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app-extended.server.spec.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/app-extended.server.spec.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|