@aldb2b/common 1.0.453 → 1.0.454
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.
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AggregateConvertor = void 0;
|
|
4
|
-
const mongoose = require("mongoose");
|
|
5
4
|
const moment = require("moment");
|
|
6
|
-
const
|
|
5
|
+
const mongoose_1 = require("mongoose");
|
|
7
6
|
class AggregateConvertor {
|
|
8
7
|
constructor(findDto, populateFields, nonArrayAttributes = []) {
|
|
9
8
|
this.findDto = findDto;
|
|
@@ -113,7 +112,7 @@ class AggregateConvertor {
|
|
|
113
112
|
for (const item in query) {
|
|
114
113
|
if (this.isValidObjectId(query[item]) && this.hasLookupIndex(item)) {
|
|
115
114
|
const moduleName = `${item}._id`;
|
|
116
|
-
query[moduleName] = new ObjectId(query[item]);
|
|
115
|
+
query[moduleName] = new mongoose_1.Types.ObjectId(query[item]);
|
|
117
116
|
delete query[item];
|
|
118
117
|
}
|
|
119
118
|
else if (typeof query[item] == 'object' &&
|
|
@@ -122,7 +121,7 @@ class AggregateConvertor {
|
|
|
122
121
|
}
|
|
123
122
|
else if (this.isValidObjectId(query[item]) &&
|
|
124
123
|
!this.hasLookupIndex(item)) {
|
|
125
|
-
query[item] = new ObjectId(query[item]);
|
|
124
|
+
query[item] = new mongoose_1.Types.ObjectId(query[item]);
|
|
126
125
|
}
|
|
127
126
|
else if (moment(query[item], moment.ISO_8601, true).isValid() &&
|
|
128
127
|
String(query[item]).includes('-')) {
|
|
@@ -134,11 +133,11 @@ class AggregateConvertor {
|
|
|
134
133
|
}
|
|
135
134
|
}
|
|
136
135
|
isValidObjectId(id) {
|
|
137
|
-
if (!ObjectId.isValid(id)) {
|
|
136
|
+
if (!mongoose_1.Types.ObjectId.isValid(id)) {
|
|
138
137
|
return false;
|
|
139
138
|
}
|
|
140
139
|
else {
|
|
141
|
-
const newId = new ObjectId(id);
|
|
140
|
+
const newId = new mongoose_1.Types.ObjectId(id);
|
|
142
141
|
return String(newId) === id;
|
|
143
142
|
}
|
|
144
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AggregateConvertor.js","sourceRoot":"","sources":["../../../src/db/aggregate/AggregateConvertor.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"AggregateConvertor.js","sourceRoot":"","sources":["../../../src/db/aggregate/AggregateConvertor.ts"],"names":[],"mappings":"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"}
|