@chevre/domain 22.11.0-alpha.35 → 22.11.0-alpha.37

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/example/src/chevre/task/emitRunning.ts

@@ -0,0 +1,89 @@
+// tslint:disable:no-console no-magic-numbers
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+const delayInSeconds = 60;
+const numExecuteByRequest = 50;
+const selfName = 'sample';
+
+const excludedTaskNames = [
+    chevre.factory.taskName.DeleteTransaction,
+    chevre.factory.taskName.ImportEventCapacitiesFromCOA,
+    chevre.factory.taskName.ImportEventsFromCOA,
+    chevre.factory.taskName.AcceptCOAOffer,
+    chevre.factory.taskName.CheckMovieTicket,
+    chevre.factory.taskName.AuthorizePayment,
+    chevre.factory.taskName.PublishPaymentUrl
+];
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false, appName: 'sample' });
+
+    const now = new Date();
+    const runsAtLt = moment(now)
+        .add(-delayInSeconds, 'seconds')
+        .toDate();
+
+    let allTaskNames = Object.values(chevre.factory.taskName);
+    allTaskNames = allTaskNames.filter((name) => !excludedTaskNames.includes(name));
+    console.log('allTaskNames:', allTaskNames, allTaskNames.length);
+
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+
+    const delayedTask: Pick<chevre.factory.task.ITask<chevre.factory.taskName>, 'id' | 'name'>[] = [];
+
+    // const { count } = await taskRepo.countPotentiallyRunning({
+    //     name: { $in: allTaskNames },
+    //     runsAt: { $lt: runsAtLt },
+    //     limit: numExecuteByRequest
+    // });
+    // console.log('countPotentiallyRunning:', count);
+    // const executeCount: number = Math.min(count, numExecuteByRequest);
+    const executeCount: number = numExecuteByRequest;
+    const sort: {
+        numberOfTried?: chevre.factory.sortType;
+        runsAt?: chevre.factory.sortType;
+    } = {
+        numberOfTried: chevre.factory.sortType.Ascending, // numberOfTriedソートを加えるとどうなるのか？
+        runsAt: chevre.factory.sortType.Ascending
+    };
+
+    for (let i = 0; i < executeCount; i += 1) {
+        const runningTask = await taskRepo.emitRunningIfExists(
+            {
+                name: { $in: allTaskNames },
+                runsAt: { $lt: runsAtLt },
+                sort,
+                executor: {
+                    name: selfName
+                },
+                nameFilterBeforeRunsAt: false
+            }
+        );
+        console.log('runningTask found', JSON.stringify(runningTask), i, now);
+        if (runningTask !== null) {
+            delayedTask.push(runningTask);
+        }
+    }
+}
+
+const interval = setInterval(
+    () => {
+        main()
+            .then()
+            .catch(console.error);
+    },
+    1000
+);
+
+setTimeout(
+    () => {
+        clearInterval(interval);
+        console.log('interval cleared');
+    },
+    600000
+);

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/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,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.396.0-alpha.6",
-    "@cinerino/sdk": "11.2.0-alpha.0",
+    "@chevre/factory": "4.396.0-alpha.8",
+    "@cinerino/sdk": "11.2.0-alpha.2",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/client": "8.1.4",
@@ -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.35"
+  "version": "22.11.0-alpha.37"
 }

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);