@chevre/domain 20.1.0-alpha.4 → 20.1.0-alpha.6

package/example/src/chevre/deleteEvents.ts

@@ -1,4 +1,5 @@
 // tslint:disable:no-console
+import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
@@ -13,7 +14,14 @@ async function main() {
     const cursor = eventRepo.getCursor(
         {
             'project.id': { $eq: project.id },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent }
+            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
+            // 'superEvent.location.branchCode': { $eq: '118', $exists: true },
+            endDate: {
+                $exists: true,
+                $lt: moment()
+                    .add(-1, 'month')
+                    .toDate()
+            }
         },
         {
             // _id: 1,

package/lib/chevre/repo/mongoose/model/place.js

@@ -89,6 +89,24 @@ schema.index({ 'parentOrganization.id': 1, branchCode: 1 }, {
         'parentOrganization.id': { $exists: true }
     }
 });
+schema.index({ 'containsPlace.branchCode': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceBranchCode',
+    partialFilterExpression: {
+        'containsPlace.branchCode': { $exists: true }
+    }
+});
+schema.index({ 'containsPlace.containsPlace.branchCode': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceContainsPlaceBranchCode',
+    partialFilterExpression: {
+        'containsPlace.containsPlace.branchCode': { $exists: true }
+    }
+});
+schema.index({ 'containsPlace.containsPlace.containsPlace.branchCode': 1, branchCode: 1 }, {
+    name: 'searchByContainsPlaceContainsPlaceContainsPlaceBranchCode',
+    partialFilterExpression: {
+        'containsPlace.containsPlace.containsPlace.branchCode': { $exists: true }
+    }
+});
 mongoose.model(modelName, schema)
     .on('index', 
 // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/service/delivery/factory.js

@@ -63,7 +63,8 @@ function createAcquiredFrom(params) {
     // 最低限の情報に絞る
     const seller = params.order.seller;
     return {
-        project: { typeOf: params.order.project.typeOf, id: params.order.project.id },
+        // 最適化(2022-11-15~)
+        // project: { typeOf: params.order.project.typeOf, id: params.order.project.id },
         id: seller.id,
         typeOf: seller.typeOf,
         name: (typeof seller.name === 'string')

package/lib/chevre/service/offer.js

@@ -40,12 +40,11 @@ function addOffers2Seat(params) {
                     && categoryCode.inCodeSet.identifier === factory.categoryCode.CategorySetIdentifier.SeatingType;
             });
     }));
+    // 最適化(2022-11-15~)
     const priceSpecification = {
-        // 不要な属性を除外(2022-11-02~)
-        // project: params.project,
         typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
-        priceCurrency: factory.priceCurrency.JPY,
-        valueAddedTaxIncluded: true,
+        // priceCurrency: factory.priceCurrency.JPY,
+        // valueAddedTaxIncluded: true,
         priceComponent: priceComponent
     };
     let availability = (unavailableOffer !== undefined)
@@ -55,9 +54,10 @@ function addOffers2Seat(params) {
         availability = params.availability;
     }
     return Object.assign(Object.assign({}, params.seat), { offers: [{
-                project: params.project,
+                // 最適化(2022-11-15~)
+                // project: params.project,
                 typeOf: factory.offerType.Offer,
-                priceCurrency: factory.priceCurrency.JPY,
+                // priceCurrency: factory.priceCurrency.JPY,
                 availability: availability,
                 priceSpecification: priceSpecification
             }] });

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -42,7 +42,8 @@ function getOrderWithToken(params) {
             };
         const seller4orderToken = {
             id: params.order.seller.id,
-            project: params.order.seller.project,
+            // 最適化(2022-11-15~)
+            // project: params.order.seller.project,
             typeOf: params.order.seller.typeOf
         };
         const order4token = {

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -120,9 +120,6 @@ function createStartPlaceOrderInProgressParams(params) {
         id: customer.id,
         identifier: customer.identifier,
         memberOf: customer.memberOf
-        // ↓不要なので廃止(2022-05-26~)
-        // paramsにadditionalPropertyの指定があれば反映する
-        // ...(Array.isArray(params.agent.additionalProperty)) ? { additionalProperty: params.agent.additionalProperty } : []
     };
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/sendEmailMessage.js

@@ -19,12 +19,12 @@ function createSendEmailMessageActions(params) {
         // 注文配送メール送信設定
         const sendEmailMessageActions = [];
         const project = params.transaction.project;
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const sendActionPurpose = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(params.order),
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
             confirmationNumber: params.order.confirmationNumber,
             orderNumber: params.order.orderNumber,
             price: params.order.price,

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -34,13 +34,11 @@ function createSeller(params) {
     var _a;
     const seller = params.transaction.seller;
     return {
-        project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
+        // 最適化(2022-11-15~)
+        // project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
         id: seller.id,
         name: (typeof seller.name === 'string') ? seller.name : String((_a = seller.name) === null || _a === void 0 ? void 0 : _a.ja),
         typeOf: seller.typeOf
-        // ↓最適化(2022-05-20~)
-        // ...(typeof seller.telephone === 'string') ? { telephone: seller.telephone } : undefined,
-        // ...(typeof seller.url === 'string') ? { url: seller.url } : undefined
     };
 }
 function createCustomer(params) {

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnMoneyTransfer.js

@@ -17,12 +17,12 @@ function createReturnMoneyTransferActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
         const returnMoneyTransferActions = [];
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const purpose = {
-            // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(order),
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
             confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
@@ -62,11 +62,9 @@ function createReturnMoneyTransferActions(params) {
                     },
                     agent: order.project,
                     recipient: {
-                        // project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
                         typeOf: order.seller.typeOf,
                         id: order.seller.id,
                         name: order.seller.name
-                        // url: order.seller.url
                     },
                     potentialActions: {},
                     purpose,

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPointAward.js

@@ -47,14 +47,13 @@ function createReturnPointAwardActions(params) {
                 console.error('JSON.parse(awardAccountsStr) throws', error);
             }
         }
-        // const transaction = params.transaction;
         const order = params.order;
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const purpose = {
-            // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
             // mask
-            customer: (0, order_1.createMaskedCustomer)(order),
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
             confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
@@ -62,11 +61,9 @@ function createReturnPointAwardActions(params) {
             orderDate: order.orderDate
         };
         const recipient = {
-            // project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
             typeOf: order.seller.typeOf,
             id: order.seller.id,
             name: order.seller.name
-            // url: order.seller.url
         };
         // ポイントインセンティブの数だけ、返却アクションを作成
         returnPointAwardActions.push(...pointAwardIdentifiers.map((pointAwardIdentifier) => {

package/lib/chevre/service/transaction.js

@@ -53,26 +53,13 @@ function updateAgent(params) {
         const newAgent = {
             typeOf: transaction.agent.typeOf,
             id: transaction.agent.id
-            // 不要なので廃止(2022-05-26~)
-            // ...(Array.isArray(params.agent.additionalProperty)) ? { additionalProperty: params.agent.additionalProperty } : {},
-            // ...(typeof params.agent.age === 'string') ? { age: params.agent.age } : {},
-            // ...(typeof params.agent.address === 'string') ? { address: params.agent.address } : {},
-            // ...(typeof params.agent.email === 'string') ? { email: params.agent.email } : {},
-            // ...(typeof params.agent.familyName === 'string') ? { familyName: params.agent.familyName } : {},
-            // ...(typeof params.agent.gender === 'string') ? { gender: params.agent.gender } : {},
-            // ...(typeof params.agent.givenName === 'string') ? { givenName: params.agent.givenName } : {},
-            // ...(typeof params.agent.name === 'string') ? { name: params.agent.name } : {},
-            // ...(typeof formattedTelephone === 'string') ? { telephone: formattedTelephone } : {},
-            // ...(typeof params.agent.url === 'string') ? { url: params.agent.url } : {}
         };
         // 注文取引の場合、object.customerにも適用
         let customer;
         if (transaction.typeOf === factory.transactionType.PlaceOrder) {
             // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
             if (typeof ((_a = transaction.object.customer) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
-                customer = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: transaction.object.customer.typeOf, id: transaction.object.customer.id }, (transaction.object.customer.typeOf === factory.organizationType.Organization)
-                    ? { project: transaction.object.customer.project }
-                    : undefined), (Array.isArray(transaction.object.customer.identifier))
+                customer = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: transaction.object.customer.typeOf, id: transaction.object.customer.id }, (Array.isArray(transaction.object.customer.identifier))
                     ? { identifier: transaction.object.customer.identifier }
                     : undefined), (transaction.object.customer.typeOf === factory.personType.Person
                     && typeof ((_b = transaction.object.customer.memberOf) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.277.0-alpha.0",
-    "@cinerino/sdk": "3.132.0",
+    "@chevre/factory": "4.277.0",
+    "@cinerino/sdk": "3.132.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.4"
+  "version": "20.1.0-alpha.6"
 }