@chevre/domain 20.1.0-alpha.3 → 20.1.0-alpha.5

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/service/assetTransaction/pay/potentialActions.js

@@ -10,12 +10,13 @@ function createPayActions(params) {
     const payObject = createPayObject(params);
     const informPaymentActions = createInformPaymentActions(params);
     if (payObject !== undefined) {
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
             // 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/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

@@ -33,7 +33,7 @@ function getOrderWithToken(params) {
             ? {
                 id: params.order.customer.id,
                 name: '****',
-                project: params.order.customer.project,
+                // project: params.order.customer.project,
                 typeOf: params.order.customer.typeOf
             }
             : {

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

@@ -24,11 +24,11 @@ const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let tasks = [];
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
             seller: params.order.seller,
-            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/order/placeOrder.js

@@ -89,11 +89,12 @@ function placeOrderWithoutTransaction(params) {
         //     orderNumber: params.object.orderNumber
         // })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const simpleOrder = {
             // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
-            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,
@@ -148,11 +149,12 @@ function placeOrder(params) {
             orderNumber: params.object.orderNumber
         })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
         const simpleOrder = {
             // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
-            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,

package/lib/chevre/service/order/sendOrder.js

@@ -42,11 +42,12 @@ function sendOrder(params) {
             }
             // SendOrderアクションを作成する
             // minimizeする(2022-04-18~)
+            const maskedCustomer = (0, order_1.createMaskedCustomer)(order);
             const simpleOrder = {
                 // project: order.project,
                 typeOf: order.typeOf,
                 seller: order.seller,
-                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,

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/potentialActions.js

@@ -34,12 +34,13 @@ function createPotentialActions(params) {
         const givePointAwardActions = yield (0, givePointAward_1.createGivePointAwardActions)(params);
         // 注文配送メール送信設定
         const sendEmailMessageActions = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
+        const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order);
         const simpleOrder = {
             // 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/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/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.276.0",
+    "@chevre/factory": "4.277.0-alpha.1",
     "@cinerino/sdk": "3.132.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.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.3"
+  "version": "20.1.0-alpha.5"
 }

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/confirmReservation.d.ts

@@ -1,11 +0,0 @@
-import * as factory from '../../../../factory';
-export declare type IAuthorizeSeatReservationOffer = factory.action.authorize.offer.seatReservation.IAction<factory.service.webAPI.Identifier>;
-/**
- * 予約確定アクションを作成する
- */
-/**
- * 予約確定オブジェクトを作成する
- */
-/**
- * 予約確定オブジェクトを作成する
- */

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

@@ -1,187 +0,0 @@
-"use strict";
-// import { PhoneNumberFormat, PhoneNumberUtil } from 'google-libphonenumber';
-// import { format } from 'util';
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * 予約確定アクションを作成する
- */
-// export async function createConfirmReservationActions(params: {
-//     order: factory.order.IOrder;
-//     transaction: factory.transaction.placeOrder.ITransaction;
-//     createConfirmReserveActions: boolean;
-// }): Promise<factory.action.interact.confirm.reservation.IAttributes<factory.service.webAPI.Identifier>[]> {
-//     const confirmReservationActions: factory.action.interact.confirm.reservation.IAttributes<factory.service.webAPI.Identifier>[] = [];
-//     const seatReservationAuthorizeActions = <IAuthorizeSeatReservationOffer[]>
-//         params.transaction.object.authorizeActions
-//             .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
-//             .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
-//     const purpose: factory.order.ISimpleOrder = createPurpose({ order: params.order });
-//     seatReservationAuthorizeActions.forEach((a) => {
-//         const actionResult = a.result;
-//         if (a.instrument === undefined) {
-//             a.instrument = {
-//                 typeOf: 'WebAPI',
-//                 identifier: factory.service.webAPI.Identifier.Chevre
-//             };
-//         }
-//         if (actionResult !== undefined) {
-//             const responseBody = actionResult.responseBody;
-//             let confirmReservationObject: factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>
-//                 | factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA>;
-//             switch (a.instrument.identifier) {
-//                 case factory.service.webAPI.Identifier.COA:
-//                     confirmReservationObject = createConfirmReservationActionObject4COA({
-//                         order: params.order,
-//                         // tslint:disable-next-line:max-line-length
-// tslint:disable-next-line:max-line-length
-//                         reserveTransaction: <factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.COA>>responseBody,
-//                         requestBody: actionResult.requestBody,
-//                         price: Number(actionResult.price),
-//                         acceptedOffers: <factory.action.authorize.offer.seatReservation.IAcceptedOffer4COA[]>a.object.acceptedOffer
-//                     });
-//                     break;
-//                 default:
-//                     const reserveTransactionNumber = a.object.pendingTransaction?.transactionNumber;
-//                     if (typeof reserveTransactionNumber !== 'string') {
-//                         throw new factory.errors.NotFound('AuthorizaAction.object.pendingTransaction.transactionNumber');
-//                     }
-//                     confirmReservationObject = createConfirmReservationActionObject({
-//                         order: params.order,
-//                         // transaction: params.transaction,
-//                         // tslint:disable-next-line:max-line-length
-// tslint:disable-next-line:max-line-length
-//                         // reserveTransaction: <factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.Chevre>>responseBody,
-//                         reserveTransactionNumber
-//                     });
-//             }
-//             if (params.createConfirmReserveActions) {
-//                 confirmReservationActions.push({
-//                     project: params.transaction.project,
-//                     typeOf: <factory.actionType.ConfirmAction>factory.actionType.ConfirmAction,
-//                     object: confirmReservationObject,
-//                     // agent: Projectに統一(2022-05-16~)
-//                     agent: params.transaction.project,
-//                     // agent: params.transaction.agent,
-//                     purpose: purpose,
-//                     instrument: a.instrument
-//                 });
-//             }
-//         }
-//     });
-//     return confirmReservationActions;
-// }
-// function createPurpose(params: {
-//     order: factory.order.IOrder;
-// }): factory.order.ISimpleOrder {
-//     return {
-//         project: params.order.project,
-//         typeOf: params.order.typeOf,
-//         seller: params.order.seller,
-//         // mask
-//         customer: createMaskedCustomer(params.order),
-//         confirmationNumber: params.order.confirmationNumber,
-//         orderNumber: params.order.orderNumber,
-//         price: params.order.price,
-//         priceCurrency: params.order.priceCurrency,
-//         orderDate: params.order.orderDate
-//     };
-// }
-/**
- * 予約確定オブジェクトを作成する
- */
-// function createConfirmReservationActionObject4COA(params: {
-//     order: factory.order.IOrder;
-//     reserveTransaction: factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.COA>;
-//     requestBody: any;
-//     price: number;
-//     acceptedOffers: factory.action.authorize.offer.seatReservation.IAcceptedOffer4COA[];
-// }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.COA> {
-//     const price = params.price;
-//     const customer = params.order.customer;
-//     const updTmpReserveSeatArgs = params.requestBody;
-//     const updTmpReserveSeatResult = params.reserveTransaction;
-//     // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
-//     const phoneUtil = PhoneNumberUtil.getInstance();
-//     const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
-//     let telNum = phoneUtil.format(phoneNumber, PhoneNumberFormat.NATIONAL);
-//     // COAでは数字のみ受け付けるので数字以外を除去
-//     telNum = telNum.replace(/[^\d]/g, '');
-//     const mailAddr = customer.email;
-//     if (mailAddr === undefined) {
-//         throw new factory.errors.Argument('order', 'order.customer.email undefined');
-//     }
-//     return {
-//         theaterCode: updTmpReserveSeatArgs.theaterCode,
-//         dateJouei: updTmpReserveSeatArgs.dateJouei,
-//         titleCode: updTmpReserveSeatArgs.titleCode,
-//         titleBranchNum: updTmpReserveSeatArgs.titleBranchNum,
-//         timeBegin: updTmpReserveSeatArgs.timeBegin,
-//         tmpReserveNum: updTmpReserveSeatResult.tmpReserveNum,
-// tslint:disable-next-line:no-irregular-whitespace
-//         reserveName: format('%s　%s', customer.familyName, customer.givenName),
-// tslint:disable-next-line:no-irregular-whitespace
-//         reserveNameJkana: format('%s　%s', customer.familyName, customer.givenName),
-//         telNum: telNum,
-//         mailAddr: mailAddr,
-//         reserveAmount: price, // デフォルトのpriceCurrencyがJPYなのでこれでよし
-//         listTicket: params.acceptedOffers.map((o) => o.ticketInfo),
-//         transactionNumber: String(updTmpReserveSeatResult.tmpReserveNum),
-//         typeOf: 'COAReserveTransaction'
-//     };
-// }
-/**
- * 予約確定オブジェクトを作成する
- */
-// function createConfirmReservationActionObject(params: {
-//     order: factory.order.IOrder;
-//     reserveTransactionNumber: string;
-// }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre> {
-//     return {
-//         typeOf: factory.assetTransactionType.Reserve,
-//         transactionNumber: params.reserveTransactionNumber,
-//         potentialActions: {
-//             reserve: {
-//                 purpose: {
-//                     confirmationNumber: params.order.confirmationNumber,
-//                     orderNumber: params.order.orderNumber,
-//                     typeOf: params.order.typeOf
-//                 }
-//             }
-//         }
-//     };
-// }
-// function createReservationUnderNameIdentifier(params: {
-//     order: factory.order.IOrder;
-//     transaction: factory.transaction.placeOrder.ITransaction;
-// }): factory.propertyValue.IPropertyValue<string>[] {
-//     const order = params.order;
-//     const customer = order.customer;
-//     // 予約のunderName.identifierを決定する
-//     return [
-//         { name: 'orderNumber', value: order.orderNumber },
-//         // 不要なので廃止(2022-05-24~)
-//         // { name: 'transaction', value: params.transaction.id },
-//         // ↓legacy-reservationの印刷アウトプットで使用(2022-02-09廃止)
-//         // { name: 'paymentMethod', value: paymentMethodNames },
-//         ...(Array.isArray(customer.identifier)) ? customer.identifier : []
-//     ];
-// }
-// function createReservationUnderName(params: {
-//     order: factory.order.IOrder;
-//     identifier: factory.propertyValue.IPropertyValue<string>[];
-// }): factory.reservation.IUnderName<factory.reservationType.EventReservation> {
-//     return {
-//         identifier: params.identifier,
-//         name: String(params.order.customer.name),
-//         typeOf: params.order.customer.typeOf,
-//         ...(typeof params.order.customer.address === 'string') ? { address: params.order.customer.address } : undefined,
-//         ...(typeof params.order.customer.age === 'string') ? { age: params.order.customer.age } : undefined,
-//         ...(typeof params.order.customer.email === 'string') ? { email: params.order.customer.email } : undefined,
-//         ...(typeof params.order.customer.familyName === 'string') ? { familyName: params.order.customer.familyName } : undefined,
-//         ...(typeof params.order.customer.gender === 'string') ? { gender: params.order.customer.gender } : undefined,
-//         ...(typeof params.order.customer.givenName === 'string') ? { givenName: params.order.customer.givenName } : undefined,
-//         ...(typeof params.order.customer.id === 'string') ? { id: params.order.customer.id } : undefined,
-//         ...(typeof params.order.customer.telephone === 'string') ? { telephone: params.order.customer.telephone } : undefined,
-//         ...(typeof params.order.customer.url === 'string') ? { url: params.order.customer.url } : undefined
-//     };
-// }