@chevre/domain 21.35.0-alpha.17 → 21.35.0-alpha.19

package/example/src/chevre/checkReserveTransactionSizes.ts

@@ -0,0 +1,46 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const assetTransactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
+    const cursor = assetTransactionRepo.getCursor(
+        {
+            // typeOf: { $eq: chevre.factory.assetTransactionType.Pay },
+            status: { $eq: chevre.factory.transactionStatusType.Confirmed },
+            startDate: {
+                // $lte: moment()
+                //     // tslint:disable-next-line:no-magic-numbers
+                //     .add(-28, 'days'),
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-180, 'days')
+            }
+        },
+        {
+        }
+    );
+    console.log('transactions found');
+
+    let i = 0;
+    // tslint:disable-next-line:max-func-body-length
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const reserveTransaction = <chevre.factory.assetTransaction.reserve.ITransaction>doc.toObject();
+        console.log(
+            'size:', JSON.stringify(reserveTransaction).length,
+            reserveTransaction.typeOf, reserveTransaction.project.id, reserveTransaction.transactionNumber,
+            reserveTransaction.startDate, i);
+    });
+
+    console.log(i, 'transactions checked');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -3,6 +3,7 @@ import * as factory from '../factory';
 type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'> & {
     typeOf: factory.transactionType.PlaceOrder;
     acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    customer?: factory.order.ICustomer;
 };
 export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | 'customer' | 'identifier' | 'isGift' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf' | 'url'>;
 /**
@@ -37,6 +38,9 @@ export declare class MongoRepository {
             };
         };
     }): Promise<import("mongodb").UpdateResult | undefined>;
+    setCustomer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
+        customer: factory.order.ICustomer;
+    }): Promise<import("mongodb").UpdateResult>;
     deleteByOrderNumber(params: {
         orderNumber: string;
     }): Promise<import("mongodb").DeleteResult>;

package/lib/chevre/repo/orderInTransaction.js

@@ -143,6 +143,26 @@ class MongoRepository {
             }
         });
     }
+    setCustomer(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { customer, orderNumber, project } = params;
+            const filter = {
+                typeOf: { $eq: factory.transactionType.PlaceOrder },
+                orderNumber: { $eq: orderNumber }
+            };
+            const setOnInsert = {
+                typeOf: factory.transactionType.PlaceOrder,
+                orderNumber,
+                project
+            };
+            const setKeys = { customer };
+            return this.orderModel.updateOne(filter, {
+                $setOnInsert: setOnInsert,
+                $set: setKeys
+            }, { upsert: true })
+                .exec();
+        });
+    }
     deleteByOrderNumber(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.orderModel.deleteOne({

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

@@ -104,7 +104,7 @@ export declare class MongoRepository {
     updateAgent<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
-        agent: Pick<factory.transaction.IAgent, 'id' | 'typeOf' | 'name'>;
+        agent: Pick<factory.transaction.IAgent, 'id'>;
         object?: {
             customer?: factory.order.ICustomer;
         };

package/lib/chevre/repo/transaction.js

@@ -408,7 +408,7 @@ class MongoRepository {
                 typeOf: { $eq: params.typeOf },
                 status: { $eq: factory.transactionStatusType.InProgress }
             }, {
-                $set: Object.assign(Object.assign({ 'agent.id': params.agent.id }, (typeof params.agent.name === 'string') ? { 'agent.name': params.agent.name } : undefined), (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.customer) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { 'object.customer': params.object.customer } : undefined)
+                $set: Object.assign({ 'agent.id': params.agent.id }, (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.customer) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { 'object.customer': params.object.customer } : undefined)
             }, {
                 projection: { _id: 1 }
             })

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.d.ts

@@ -1,4 +1,5 @@
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
+import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/code';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MongoRepository as EmailMessageRepo } from '../../../repo/emailMessage';
@@ -11,6 +12,7 @@ import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IConfirmOperationRepos {
     action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     emailMessage?: EmailMessageRepo;
     message: MessageRepo;

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

@@ -83,11 +83,22 @@ function confirm(params) {
         // orderInTransactionから検索する(2024-03-04~)
         acceptedOffers = (yield repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
+        // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
+        let payTransactions = [];
+        const payTransactionNumbers = authorizePaymentActions.map(({ instrument }) => instrument.transactionNumber);
+        if (payTransactionNumbers.length > 0) {
+            payTransactions = yield repos.assetTransaction.search({
+                typeOf: factory.assetTransactionType.Pay,
+                transactionNumber: { $in: payTransactionNumbers }
+            }, ['object']);
+            debug('confirming placeOrder...', transaction.id, 'payTransactions found.', JSON.stringify(payTransactions));
+        }
         const { paymentMethods, result, eventId, reservationIds } = createResult(Object.assign(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizePaymentActions,
             authorizeEventServiceOfferActions,
             authorizeMoneyTansferActions,
             authorizeProductOfferActions,
-            acceptedOffers }), (typeof code === 'string') ? { code } : undefined));
+            acceptedOffers,
+            payTransactions }), (typeof code === 'string') ? { code } : undefined));
         const customer = (0, result_1.createCustomer)({ transaction });
         const seller = (0, result_1.createSeller)({ transaction });
         // デフォルトEメールメッセージを検索
@@ -278,7 +289,7 @@ function createResult(params) {
         }
     });
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, params.authorizeMoneyTansferActions, params.authorizeProductOfferActions, eventReservationAcceptedOffers);
+    (0, validation_1.validateTransaction)(transaction, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, params.authorizeMoneyTansferActions, params.authorizeProductOfferActions, eventReservationAcceptedOffers, params.payTransactions);
     const { paymentMethods, price } = (0, result_1.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers,

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -3,11 +3,12 @@ import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
 export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
 export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
-export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'object' | 'result' | 'endDate'>;
+export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'object' | 'result' | 'endDate' | 'instrument'>;
+export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[]): void;
+export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[], payTransactions: IPayTransaction[]): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証

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

@@ -13,7 +13,7 @@ const debug = createDebug('chevre-domain:service:transaction');
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, eventReservationAcceptedOffers) {
+function validateTransaction(transaction, authorizePaymentActions, authorizeEventServiceOfferActions, authorizeMoneyTansferActions, authorizeProductOfferActions, eventReservationAcceptedOffers, payTransactions) {
     validateProfile(transaction);
     validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions);
     // 利用可能な通貨単位に対して取引検証
@@ -33,10 +33,22 @@ function validateTransaction(transaction, authorizePaymentActions, authorizeEven
                         // 決済方法区分は必ず存在するはず(2023-08-15~)
                         && ((_a = resultAsInvoice.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.typeOf) === paymentMethodType;
                 });
+                // 決済承認アクションobject.movieTicketsではなく、payTransaction.object参照で再実装(2024-06-20~)
                 const authorizedMovieTickets = [];
-                authorizeMovieTicketActions.forEach((a) => {
-                    authorizedMovieTickets.push(...(Array.isArray(a.object.movieTickets)) ? a.object.movieTickets : []);
-                });
+                if (settings_1.USE_EXPERIMENTAL_FEATURE) {
+                    const payTransactionNumbers = authorizeMovieTicketActions.map(({ instrument }) => instrument.transactionNumber);
+                    payTransactions.filter(({ object }) => payTransactionNumbers.includes(object.paymentMethodId))
+                        .forEach(({ object }) => {
+                        if (Array.isArray(object.paymentMethod.movieTickets)) {
+                            authorizedMovieTickets.push(...object.paymentMethod.movieTickets);
+                        }
+                    });
+                }
+                else {
+                    authorizeMovieTicketActions.forEach((a) => {
+                        authorizedMovieTickets.push(...(Array.isArray(a.object.movieTickets)) ? a.object.movieTickets : []);
+                    });
+                }
                 debug(authorizedMovieTickets.length, 'movie tickets authorized', 'transaction:', transaction.id);
                 // validateMovieTicket(paymentMethodType, { id: transaction.id }, authorizePaymentActions, eventReservationAcceptedOffers);
                 (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, { id: transaction.id }, authorizedMovieTickets, eventReservationAcceptedOffers);

package/lib/chevre/service/transaction.d.ts

@@ -1,4 +1,7 @@
 import * as factory from '../factory';
+import type { MongoRepository as OrderInTransactionRepo } from '../repo/orderInTransaction';
+import type { RedisRepository as OrderNumberRepo } from '../repo/orderNumber';
+import type { MongoRepository as ProjectRepo } from '../repo/project';
 import type { MongoRepository as TaskRepo } from '../repo/task';
 import type { MongoRepository as TransactionRepo } from '../repo/transaction';
 import { deleteTransaction } from './transaction/deleteTransaction';
@@ -19,11 +22,19 @@ export { deleteTransaction };
  */
 export declare function updateAgent(params: {
     typeOf: factory.transactionType;
+    /**
+     * 取引ID
+     */
     id: string;
     agent: factory.transaction.placeOrder.ICustomer & {
         telephoneRegion?: string;
     };
-}): ITransactionOperation<factory.transaction.placeOrder.ICustomer>;
+}): (repos: {
+    orderInTransaction: OrderInTransactionRepo;
+    orderNumber: OrderNumberRepo;
+    project: ProjectRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
 export type IExportTasksOperation<T> = (repos: {
     task: TaskRepo;
     transaction: TransactionRepo;

package/lib/chevre/service/transaction.js

@@ -26,11 +26,7 @@ exports.moneyTransfer = MoneyTransferTransactionService;
 exports.placeOrder = PlaceOrderTransactionService;
 exports.placeOrderInProgress = PlaceOrderInProgressTransactionService;
 exports.returnOrder = ReturnOrderTransactionService;
-/**
- * 取引人プロフィール更新
- */
-function updateAgent(params) {
-    // tslint:disable-next-line:cyclomatic-complexity
+function fixCustomer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         let formattedTelephone;
@@ -48,15 +44,10 @@ function updateAgent(params) {
         const transaction = yield repos.transaction.findInProgressById({
             typeOf: params.typeOf,
             id: params.id
-        }, ['agent', 'object', 'typeOf']);
+        }, ['agent', 'object', 'typeOf', 'project']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        // 新プロフィール作成
-        const newAgent = {
-            typeOf: transaction.agent.typeOf,
-            id: transaction.agent.id
-        };
         // 注文取引の場合、object.customerにも適用
         let customer;
         if (transaction.typeOf === factory.transactionType.PlaceOrder) {
@@ -68,8 +59,41 @@ function updateAgent(params) {
                     : undefined), (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 } : {});
             }
         }
+        return { customer, transaction };
+    });
+}
+/**
+ * 取引人プロフィール更新
+ */
+function updateAgent(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { customer, transaction } = yield fixCustomer(params)(repos);
+        const newAgent = {
+            // typeOf: transaction.agent.typeOf,
+            id: transaction.agent.id
+        };
         yield repos.transaction.updateAgent(Object.assign({ typeOf: params.typeOf, id: params.id, agent: newAgent }, (customer !== undefined) ? { object: { customer } } : undefined));
-        return newAgent;
+        // also save in orderInTransaction(2024-06-20~)
+        if (customer !== undefined) {
+            const orderNumber = yield PlaceOrderInProgressTransactionService.publishOrderNumberIfNotExist({
+                project: { id: transaction.project.id },
+                id: params.id,
+                object: { orderDate: new Date() }
+            })(repos);
+            const customerName = (typeof customer.name === 'string' && customer.name !== '')
+                ? customer.name
+                : (typeof customer.givenName === 'string' && typeof customer.familyName === 'string'
+                    && customer.givenName !== '' && customer.familyName !== '')
+                    ? `${customer.givenName} ${customer.familyName}`
+                    : undefined;
+            const customerInOrder = Object.assign(Object.assign(Object.assign({}, customer), { identifier: (Array.isArray(customer.identifier)) ? customer.identifier : [] }), (typeof customerName === 'string') ? { name: customerName } : undefined);
+            yield repos.orderInTransaction.setCustomer({
+                orderNumber,
+                project: transaction.project,
+                customer: customerInOrder
+            });
+        }
+        // return newAgent;
     });
 }
 exports.updateAgent = updateAgent;

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.35.0-alpha.17"
+  "version": "21.35.0-alpha.19"
 }