@chevre/domain 22.11.0-alpha.34 → 22.11.0-alpha.36

package/example/src/chevre/aggregation/aggregateOrderOfCustomer.ts

@@ -18,11 +18,18 @@ function createAggregation(params: {
     }) => {
         const { order, orderDateGte, orderDateLte } = params;
 
-        return repos.order.aggregateOrderOfCustomer({
-            project: { id: { $eq: PROJECT_ID } },
-            orderDate: { $gte: orderDateGte, $lte: orderDateLte },
-            customer: { email: { $eq: String(order.customer.email) } }
-        });
+        if (PROJECT_ID === '*') {
+            return repos.order.aggregateOrderOfCustomerGlobally({
+                orderDate: { $gte: orderDateGte, $lte: orderDateLte },
+                customer: { email: { $eq: String(order.customer.email) } }
+            });
+        } else {
+            return repos.order.aggregateOrderOfCustomerByProject({
+                project: { id: { $eq: PROJECT_ID } },
+                orderDate: { $gte: orderDateGte, $lte: orderDateLte },
+                customer: { email: { $eq: String(order.customer.email) } }
+            });
+        }
     };
 }
 
@@ -41,12 +48,16 @@ async function main() {
 
     const cursor = orderRepo.getCursor(
         {
-            'project.id': { $eq: PROJECT_ID },
+            ...(PROJECT_ID !== '*') ? { 'project.id': { $eq: PROJECT_ID } } : undefined,
             orderDate: {
                 $gte: orderDateGte,
                 $lte: orderDateLte
             },
-            typeOf: { $eq: chevre.factory.order.OrderType.Order }
+            typeOf: { $eq: chevre.factory.order.OrderType.Order },
+            'customer.id': { // exclude pos,tvm
+                $exists: true,
+                $in: []
+            }
         },
         {
             customer: 1,
@@ -79,11 +90,11 @@ async function main() {
         if (typeof email === 'string') {
             console.log(
                 'aggregating...',
-                order.project.id, order.orderNumber, order.orderDate, i);
+                order.project.id, order.orderNumber, email, order.orderDate, i);
             const aggregateResult = await createAggregation({ order, orderDateGte, orderDateLte })({ order: orderRepo });
             await aggregateOrderRepo.save(
                 {
-                    project: order.project,
+                    project: { id: PROJECT_ID, typeOf: chevre.factory.organizationType.Project },
                     identifier: email,
                     typeOf: chevre.factory.personType.Person
                 },
@@ -92,7 +103,7 @@ async function main() {
             updateCount += 1;
             console.log(
                 'aggregated.',
-                order.project.id, order.orderNumber, order.orderDate, i);
+                order.project.id, order.orderNumber, email, order.orderDate, i);
 
             const sumGraceTime = (typeof aggregateResult.aggregation.sumGraceTime === 'number')
                 ? aggregateResult.aggregation.sumGraceTime

package/example/src/chevre/searchProducts.ts

@@ -0,0 +1,28 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const PROJECT_ID = String(process.env.PROJECT_ID);
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
+
+    const products = await productRepo.projectFields(
+        {
+            limit: 10,
+            project: { id: { $eq: PROJECT_ID } },
+            additionalPropertyMatch: { nameEq: 'xxxxx' }
+            // seller: { id: { $eq: 'xxx' } }
+        },
+        ['additionalProperty', 'productID']
+    );
+    console.log(products);
+    console.log(products.length, 'products found');
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/mongoose/schemas/product.js

@@ -120,6 +120,15 @@ const indexes = [
                 'name.en': { $exists: true }
             }
         }
+    ],
+    [
+        { additionalProperty: 1, productID: 1 },
+        {
+            name: 'additionalProperty',
+            partialFilterExpression: {
+                additionalProperty: { $exists: true }
+            }
+        }
     ]
 ];
 exports.indexes = indexes;

package/lib/chevre/repo/order.d.ts

@@ -204,8 +204,8 @@ export declare class OrderRepo {
             emailCount?: number;
         };
     }>;
-    aggregateOrderOfCustomer(params: {
-        project: {
+    aggregateOrderOfCustomerByProject(params: {
+        project?: {
             id: {
                 $eq: string;
             };
@@ -225,5 +225,20 @@ export declare class OrderRepo {
             emailCount?: number;
         };
     }>;
+    aggregateOrderOfCustomerGlobally(params: {
+        orderDate: {
+            $gte: Date;
+            $lte: Date;
+        };
+        customer: {
+            email: {
+                $eq: string;
+            };
+        };
+    }): Promise<{
+        aggregation: Pick<IAggregation, 'orderCount'> & {
+            sumGraceTime?: never;
+        };
+    }>;
 }
 export {};

package/lib/chevre/repo/order.js

@@ -1198,17 +1198,13 @@ class OrderRepo {
             };
         });
     }
-    aggregateOrderOfCustomer(params) {
+    aggregateOrderOfCustomerByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchConditions = {
-                orderDate: {
+            var _a;
+            const matchConditions = Object.assign(Object.assign({ orderDate: {
                     $gte: params.orderDate.$gte,
                     $lte: params.orderDate.$lte
-                },
-                typeOf: { $eq: factory.order.OrderType.Order },
-                'project.id': { $eq: params.project.id.$eq },
-                'customer.email': { $exists: true, $eq: params.customer.email.$eq }
-            };
+                }, typeOf: { $eq: factory.order.OrderType.Order } }, (typeof ((_a = params.project) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string') ? { 'project.id': { $eq: params.project.id.$eq } } : undefined), { 'customer.email': { $exists: true, $eq: params.customer.email.$eq } });
             const aggregations = yield this.orderModel.aggregate([
                 { $match: matchConditions },
                 {
@@ -1250,5 +1246,48 @@ class OrderRepo {
             };
         });
     }
+    aggregateOrderOfCustomerGlobally(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchConditions = {
+                orderDate: {
+                    $gte: params.orderDate.$gte,
+                    $lte: params.orderDate.$lte
+                },
+                typeOf: { $eq: factory.order.OrderType.Order },
+                'customer.email': { $exists: true, $eq: params.customer.email.$eq }
+            };
+            const aggregations = yield this.orderModel.aggregate([
+                { $match: matchConditions },
+                {
+                    $project: {
+                        typeOf: '$typeOf'
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        orderCount: { $sum: 1 }
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        orderCount: '$orderCount'
+                    }
+                }
+            ])
+                .exec();
+            if (aggregations.length === 0) {
+                return {
+                    aggregation: {
+                        orderCount: 0
+                    }
+                };
+            }
+            return {
+                aggregation: Object.assign({}, aggregations[0])
+            };
+        });
+    }
 }
 exports.OrderRepo = OrderRepo;

package/lib/chevre/repo/product.js

@@ -48,7 +48,7 @@ class ProductRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -151,25 +151,20 @@ class ProductRepo {
             const nameRegexExp = new RegExp(nameRegex);
             andConditions.push({
                 $or: [
-                    {
-                        'name.ja': {
-                            $exists: true,
-                            $regex: nameRegexExp
-                        }
-                    },
-                    {
-                        'name.en': {
-                            $exists: true,
-                            $regex: nameRegexExp
-                        }
-                    }
+                    { 'name.ja': { $exists: true, $regex: nameRegexExp } },
+                    { 'name.en': { $exists: true, $regex: nameRegexExp } }
                 ]
             });
         }
-        // const providerIdEq = params.provider?.id?.$eq;
-        // if (typeof providerIdEq === 'string') {
-        //     andConditions.push({ 'provider.id': { $exists: true, $eq: providerIdEq } });
-        // }
+        const additionalPropertyElemMatchNameEq = (_w = params.additionalPropertyMatch) === null || _w === void 0 ? void 0 : _w.nameEq;
+        if (typeof additionalPropertyElemMatchNameEq === 'string') {
+            andConditions.push({
+                additionalProperty: {
+                    $exists: true,
+                    $elemMatch: { name: { $eq: additionalPropertyElemMatchNameEq } }
+                }
+            });
+        }
         return andConditions;
     }
     /**

package/lib/chevre/service/assetTransaction/registerService.js

@@ -56,6 +56,10 @@ function start(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
+        if (product.typeOf !== factory.product.ProductType.MembershipService
+            && product.typeOf !== factory.product.ProductType.PaymentCard) {
+            throw new factory.errors.Argument('object.itemOffered.id', `invalid product type: ${product.typeOf}`);
+        }
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');

package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js

@@ -187,22 +187,25 @@ function searchAvailableAddOns(params) {
                 const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false, includedInDataCatalog: { id: '' }, useIncludeInDataCatalog: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
                     ? { availableAt: { id: params.availableAtOrFrom.id } }
                     : undefined))(repos);
-                availableAddOns.push(...offers.map((o) => {
-                    const itemOffered4addOn = {
-                        description: product.description,
-                        id: product.id,
-                        name: product.name,
-                        productID: product.productID,
-                        typeOf: product.typeOf
-                    };
-                    const unitPriceSpec = o.priceSpecification.priceComponent.find((component) => {
-                        return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification;
-                    });
-                    if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.typeOf) !== factory.priceSpecificationType.UnitPriceSpecification) {
-                        throw new factory.errors.NotFound('UnitPriceSpecification of an addOn');
-                    }
-                    return Object.assign(Object.assign({ alternateName: o.alternateName, availability: o.availability, description: o.description, id: String(o.id), identifier: o.identifier, itemOffered: itemOffered4addOn, name: o.name, priceCurrency: o.priceCurrency, priceSpecification: unitPriceSpec, typeOf: o.typeOf }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
-                }));
+                const productType = product.typeOf;
+                if (productType === factory.product.ProductType.Product) {
+                    availableAddOns.push(...offers.map((o) => {
+                        const itemOffered4addOn = {
+                            description: product.description,
+                            id: product.id,
+                            name: product.name,
+                            productID: product.productID,
+                            typeOf: productType
+                        };
+                        const unitPriceSpec = o.priceSpecification.priceComponent.find((component) => {
+                            return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification;
+                        });
+                        if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.typeOf) !== factory.priceSpecificationType.UnitPriceSpecification) {
+                            throw new factory.errors.NotFound('UnitPriceSpecification of an addOn');
+                        }
+                        return Object.assign(Object.assign({ alternateName: o.alternateName, availability: o.availability, description: o.description, id: String(o.id), identifier: o.identifier, itemOffered: itemOffered4addOn, name: o.name, priceCurrency: o.priceCurrency, priceSpecification: unitPriceSpec, typeOf: o.typeOf }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
+                    }));
+                }
             }
         }
         return availableAddOns;

package/lib/chevre/service/offer/product.js

@@ -189,6 +189,10 @@ function fixProductAndOffers(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
+        if (product.typeOf !== factory.product.ProductType.MembershipService
+            && product.typeOf !== factory.product.ProductType.PaymentCard) {
+            throw new factory.errors.Argument('object.itemOffered.id', `invalid product type: ${product.typeOf}`);
+        }
         const { offers } = yield search(Object.assign({ ids: params.object.map((o) => String(o.id)), project: { id: params.project.id }, itemOffered: { id: String(product.id) }, onlyValid: true, includedInDataCatalog: { id: '' }, addSortIndex: false, useIncludeInDataCatalog: false }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.id) === 'string') ? { availableAt: { id: params.location.id } } : undefined))(repos);
         return { product, availableOffers: offers };
     });

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.396.0-alpha.5",
+    "@chevre/factory": "4.396.0-alpha.7",
     "@cinerino/sdk": "11.2.0-alpha.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.34"
+  "version": "22.11.0-alpha.36"
 }

package/example/src/chevre/searchProductOffers.ts

@@ -1,29 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const PROJECT_ID = String(process.env.PROJECT_ID);
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const productOfferRepo = await chevre.repository.ProductOffer.createInstance(mongoose.connection);
-
-    const offers = await productOfferRepo.search({
-        project: { id: { $eq: PROJECT_ID } }
-        // seller: { id: { $eq: 'xxx' } }
-    });
-    console.log(offers);
-    console.log(offers.length);
-
-    // await productOfferRepo.deleteOne({
-    //     project: { id: PROJECT_ID },
-    //     seller: { id: 'xxx' },
-    //     itemOffered: { id: 'xxx' }
-    // });
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/upsertProductsByProductId.ts

@@ -1,100 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const PROJECT_ID = String(process.env.PROJECT_ID);
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-
-    const result = await productRepo.upsertManyByProductId(
-        [
-            {
-                $set: {
-                    project: {
-                        typeOf: chevre.factory.organizationType.Project,
-                        id: PROJECT_ID
-                    },
-                    typeOf: chevre.factory.product.ProductType.EventService,
-                    productID: '2023122601EventService',
-                    name: {
-                        en: 'xxx',
-                        ja: 'xxx'
-                    },
-                    // hasOfferCatalog: {
-                    //     id: 'blpc770py',
-                    //     typeOf: 'OfferCatalog'
-                    // },
-                    // serviceType: {
-                    //     codeValue: '0001',
-                    //     typeOf: 'CategoryCode',
-                    //     inCodeSet: {
-                    //         identifier: chevre.factory.categoryCode.CategorySetIdentifier.ServiceType,
-                    //         typeOf: 'CategoryCodeSet'
-                    //     }
-                    // },
-                    availableChannel: {
-                        typeOf: 'ServiceChannel',
-                        credentials: {}
-                    },
-                    description: {
-                        en: 'xxx',
-                        ja: 'xxx'
-                    }
-                },
-                $unset: {
-                    hasOfferCatalog: 1,
-                    serviceType: 1
-                }
-            },
-            {
-                $set: {
-                    project: {
-                        typeOf: chevre.factory.organizationType.Project,
-                        id: PROJECT_ID
-                    },
-                    typeOf: chevre.factory.product.ProductType.EventService,
-                    productID: '2023122602EventService',
-                    name: {
-                        en: 'xxx',
-                        ja: 'xxx'
-                    },
-                    hasOfferCatalog: {
-                        // id: 'blpc770py',
-                        typeOf: 'OfferCatalog',
-                        itemListElement: [{ id: 'blpc770py' }]
-                    },
-                    // serviceType: {
-                    //     codeValue: '0001',
-                    //     typeOf: 'CategoryCode',
-                    //     inCodeSet: {
-                    //         identifier: chevre.factory.categoryCode.CategorySetIdentifier.ServiceType,
-                    //         typeOf: 'CategoryCodeSet'
-                    //     }
-                    // },
-                    availableChannel: {
-                        typeOf: 'ServiceChannel',
-                        credentials: {}
-                    },
-                    description: {
-                        en: 'xxx',
-                        ja: 'xxx'
-                    }
-                },
-                $unset: {
-                }
-            }
-        ]
-        // { replace: true }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.log(result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);