@chevre/domain 20.1.0-alpha.1 → 20.1.0-alpha.11

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

@@ -17,13 +17,14 @@ 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),
-            confirmationNumber: order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
@@ -62,11 +63,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/returnPaymentMethod.js

@@ -40,12 +40,13 @@ function createReturnPaymentMethodPotentialActions(params) {
                 email: emailCustomization
             });
             const sendActionPurpose = {
-                project: order.project,
+                // project: order.project,
                 typeOf: order.typeOf,
                 seller: order.seller,
                 // mask
                 customer: (0, order_1.createMaskedCustomer)(order),
-                confirmationNumber: order.confirmationNumber,
+                // IOrderへ移行(2022-11-17~)
+                // confirmationNumber: order.confirmationNumber,
                 orderNumber: order.orderNumber,
                 price: order.price,
                 priceCurrency: order.priceCurrency,
@@ -104,12 +105,13 @@ function createReturnPaymentMethodActions(params) {
                             name: String(order.customer.name)
                         },
                         purpose: {
-                            project: order.project,
+                            // project: order.project,
                             typeOf: order.typeOf,
                             seller: order.seller,
                             // mask
                             customer: (0, order_1.createMaskedCustomer)(order),
-                            confirmationNumber: order.confirmationNumber,
+                            // IOrderへ移行(2022-11-17~)
+                            // confirmationNumber: order.confirmationNumber,
                             orderNumber: order.orderNumber,
                             price: order.price,
                             priceCurrency: order.priceCurrency,
@@ -174,12 +176,13 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
                     name: String(order.customer.name)
                 },
                 purpose: {
-                    project: order.project,
+                    // project: order.project,
                     typeOf: order.typeOf,
                     seller: order.seller,
                     // mask
                     customer: (0, order_1.createMaskedCustomer)(order),
-                    confirmationNumber: order.confirmationNumber,
+                    // IOrderへ移行(2022-11-17~)
+                    // confirmationNumber: order.confirmationNumber,
                     orderNumber: order.orderNumber,
                     price: order.price,
                     priceCurrency: order.priceCurrency,

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

@@ -47,26 +47,24 @@ 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),
-            confirmationNumber: order.confirmationNumber,
+            customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id, name: maskedCustomer.name },
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,
             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/returnOrder/potentialActions/sendEmailMessage.js

@@ -18,12 +18,13 @@ function createSendEmailMessaegActionsOnReturn(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
         const sendActionPurpose = {
-            project: order.project,
+            // project: order.project,
             typeOf: order.typeOf,
             seller: order.seller,
             // mask
             customer: (0, order_1.createMaskedCustomer)(order),
-            confirmationNumber: order.confirmationNumber,
+            // IOrderへ移行(2022-11-17~)
+            // confirmationNumber: order.confirmationNumber,
             orderNumber: order.orderNumber,
             price: order.price,
             priceCurrency: order.priceCurrency,

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.276.0-alpha.1",
-    "@cinerino/sdk": "3.132.0-alpha.0",
+    "@chevre/factory": "4.278.0-alpha.2",
+    "@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.1"
+  "version": "20.1.0-alpha.11"
 }

package/example/src/chevre/migrateEventOffersItemOfferedName.ts

@@ -1,82 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-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 eventRepo = new chevre.repository.Event(mongoose.connection);
-    const productRepo = new chevre.repository.Product(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: '' },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            startDate: {
-                $gte: moment()
-                    .add(-1, 'month')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6afd7np' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
-
-        const itemOfferedId = (<chevre.factory.event.screeningEvent.IOffer | undefined>event.offers)?.itemOffered?.id;
-        const itemOfferedName = (<any>event.offers)?.itemOffered?.name?.ja;
-
-        if (typeof itemOfferedName === 'string' && itemOfferedName.length > 0) {
-            console.log(
-                'already exist...', event.project.id, event.id, event.startDate, itemOfferedId, i);
-        } else {
-            const existingProducts = await productRepo.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: event.project.id } },
-                id: { $eq: itemOfferedId }
-            });
-            const existingProduct = existingProducts.shift();
-            if (existingProduct === undefined) {
-                // throw new Error(`product not found ${event.id}`);
-                // no op
-            } else {
-                const newItemOfferedName: string = (typeof existingProduct.name === 'string')
-                    ? existingProduct.name
-                    : String(existingProduct.name?.ja);
-                console.log(
-                    'updating event...', event.project.id, event.id, event.startDate, itemOfferedId, newItemOfferedName, i);
-                await eventRepo.updatePartiallyById({
-                    id: event.id,
-                    attributes: <any>{
-                        typeOf: event.typeOf,
-                        'offers.itemOffered.name': { ja: newItemOfferedName }
-                    }
-                });
-            }
-            updateCount += 1;
-            console.log(
-                'updated', event.project.id, event.id, event.startDate, itemOfferedId, i);
-        }
-    });
-
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

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
-//     };
-// }