@reachu/database 1.0.108 → 1.0.110
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.
|
@@ -19,6 +19,7 @@ const Request_1 = __importDefault(require("../../../entity/Request"));
|
|
|
19
19
|
const ImportedProduct_1 = __importDefault(require("../../../entity/ImportedProduct"));
|
|
20
20
|
const OrderItem_1 = __importDefault(require("../../../entity/OrderItem"));
|
|
21
21
|
const Product_entity_1 = require("../../../entity/Product.entity");
|
|
22
|
+
const entity_1 = require("../../../entity");
|
|
22
23
|
const find = (page = 0, size = 10, filters = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
24
|
logger_1.logger.debug(`[productService.find] (page ${page}, size ${size}) by filters ${JSON.stringify(filters)}`);
|
|
24
25
|
const { categories, channels, text, priceFrom, priceTo, user, hiddenUserId, referralFeeFrom, referralFeeTo, shipTo, status, loggedUserId, imported, } = filters;
|
|
@@ -167,6 +168,7 @@ const findById = (id, loggedUser) => __awaiter(void 0, void 0, void 0, function*
|
|
|
167
168
|
.leftJoinAndSelect('product.options', 'option')
|
|
168
169
|
.leftJoinAndSelect('product.user', 'user')
|
|
169
170
|
.leftJoinAndSelect('product.images', 'image')
|
|
171
|
+
.leftJoinAndSelect('variant.images', 'vimages')
|
|
170
172
|
.leftJoinAndSelect('product.channels', 'channel')
|
|
171
173
|
.leftJoinAndSelect('product.flatRate', 'flatRate')
|
|
172
174
|
.leftJoinAndSelect('flatRate.countries', 'flatRateCountry')
|
|
@@ -175,6 +177,16 @@ const findById = (id, loggedUser) => __awaiter(void 0, void 0, void 0, function*
|
|
|
175
177
|
.where('product.id = :productId', { productId: id })
|
|
176
178
|
.getOne();
|
|
177
179
|
logger_1.logger.debug(`[productService.findById] Adding statistic information to product ${id}`);
|
|
180
|
+
if (product) {
|
|
181
|
+
const categorieData = yield typeorm_1.getRepository(entity_1.ProductCategory).find({
|
|
182
|
+
where: { product: { id: product.id } },
|
|
183
|
+
relations: ['category'],
|
|
184
|
+
});
|
|
185
|
+
const categories = categorieData.map((c) => {
|
|
186
|
+
return { id: c.category.id, name: c.category.name };
|
|
187
|
+
});
|
|
188
|
+
product['categories'] = categories;
|
|
189
|
+
}
|
|
178
190
|
return Object.assign({}, product);
|
|
179
191
|
});
|
|
180
192
|
exports.findById = findById;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/helpers/products/storage/search.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAkD;AAClD,2CAAwC;AAExC,sEAA8C;AAC9C,sFAA8D;AAC9D,0EAAkD;AAClD,mEAAyD;
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/helpers/products/storage/search.ts"],"names":[],"mappings":"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"}
|
|
@@ -2972,7 +2972,7 @@
|
|
|
2972
2972
|
"affectsGlobalScope": false
|
|
2973
2973
|
},
|
|
2974
2974
|
"../src/helpers/products/storage/search.ts": {
|
|
2975
|
-
"version": "
|
|
2975
|
+
"version": "86559e9248f12404f40e1178ba1f06be96eb2092c10fad478dbef4196a0f6df3",
|
|
2976
2976
|
"signature": "5fa34362b2f18f0df3727649a39c4c1f75d575a7c08c6135d33d3571efd7ceb1",
|
|
2977
2977
|
"affectsGlobalScope": false
|
|
2978
2978
|
},
|
|
@@ -6130,6 +6130,7 @@
|
|
|
6130
6130
|
"../node_modules/@reachu/logger/dist/index.d.ts",
|
|
6131
6131
|
"../node_modules/typeorm/index.d.ts",
|
|
6132
6132
|
"../src/entity/importedproduct.ts",
|
|
6133
|
+
"../src/entity/index.ts",
|
|
6133
6134
|
"../src/entity/orderitem.ts",
|
|
6134
6135
|
"../src/entity/product.entity.ts",
|
|
6135
6136
|
"../src/entity/request.ts"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reachu/database",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.110",
|
|
4
4
|
"description": "reachu-database",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
"author": "reachu",
|
|
22
22
|
"license": "ISC",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@reachu/logger": "1.0.
|
|
25
|
-
"@reachu/utils": "1.0.
|
|
24
|
+
"@reachu/logger": "1.0.110",
|
|
25
|
+
"@reachu/utils": "1.0.110",
|
|
26
26
|
"dotenv": "8.0.0",
|
|
27
27
|
"express": "4.17.1",
|
|
28
28
|
"mysql2": "1.5.2",
|
|
@@ -5,6 +5,7 @@ import Request from '../../../entity/Request';
|
|
|
5
5
|
import ImportedProduct from '../../../entity/ImportedProduct';
|
|
6
6
|
import OrderItem from '../../../entity/OrderItem';
|
|
7
7
|
import { Product } from '../../../entity/Product.entity';
|
|
8
|
+
import { ProductCategory } from '../../../entity';
|
|
8
9
|
|
|
9
10
|
export const find = async (page = 0, size = 10, filters = {}) => {
|
|
10
11
|
logger.debug(
|
|
@@ -224,6 +225,7 @@ export const findById = async (id, loggedUser) => {
|
|
|
224
225
|
.leftJoinAndSelect('product.options', 'option')
|
|
225
226
|
.leftJoinAndSelect('product.user', 'user')
|
|
226
227
|
.leftJoinAndSelect('product.images', 'image')
|
|
228
|
+
.leftJoinAndSelect('variant.images', 'vimages')
|
|
227
229
|
.leftJoinAndSelect('product.channels', 'channel')
|
|
228
230
|
.leftJoinAndSelect('product.flatRate', 'flatRate')
|
|
229
231
|
.leftJoinAndSelect('flatRate.countries', 'flatRateCountry')
|
|
@@ -245,5 +247,15 @@ export const findById = async (id, loggedUser) => {
|
|
|
245
247
|
.getOne();
|
|
246
248
|
logger.debug(`[productService.findById] Adding statistic information to product ${id}`);
|
|
247
249
|
// const user = await userService.addStatistics(product.user);
|
|
250
|
+
if (product) {
|
|
251
|
+
const categorieData = await getRepository(ProductCategory).find({
|
|
252
|
+
where: { product: { id: product.id } },
|
|
253
|
+
relations: ['category'],
|
|
254
|
+
});
|
|
255
|
+
const categories = categorieData.map((c) => {
|
|
256
|
+
return { id: c.category.id, name: c.category.name };
|
|
257
|
+
});
|
|
258
|
+
product['categories'] = categories;
|
|
259
|
+
}
|
|
248
260
|
return { ...product /*, user */ };
|
|
249
261
|
};
|