@chevre/domain 21.36.0 → 21.37.0-alpha.0

package/example/src/chevre/investigateSellers.ts

@@ -0,0 +1,53 @@
+// 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, { autoIndex: false });
+
+    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
+
+    const cursor = sellerRepo.getCursor(
+        {
+        },
+        {
+            // project: 1,
+            // typeOf: 1,
+            // startDate: 1,
+            // object: 1,
+            // result: 1
+        }
+    );
+    console.log('sellers found');
+
+    let i = 0;
+    let hasPolicyCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const seller: chevre.factory.seller.ISeller = doc.toObject();
+
+        const hasMerchantReturnPolicy = seller.hasMerchantReturnPolicy;
+        if (Array.isArray(hasMerchantReturnPolicy) && hasMerchantReturnPolicy.length > 0) {
+            hasPolicyCount += 1;
+            console.log(
+                hasMerchantReturnPolicy.length,
+                hasMerchantReturnPolicy.map(({ identifier }) => identifier)
+                    .join(','),
+                seller.branchCode, seller.project.id, i);
+        } else {
+            // console.log(
+            //     hasMerchantReturnPolicy.length,
+            //     seller.branchCode, seller.project.id, i);
+        }
+    });
+
+    console.log(i, 'sellers checked');
+    console.log(hasPolicyCount, 'sellers have policies');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFieldsInAction.ts

@@ -4,7 +4,7 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
-const DAYS = 500;
+const DAYS = 365;
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
@@ -13,15 +13,18 @@ async function main() {
 
     const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
 
+    const startIndex = 8760;
     // tslint:disable-next-line:no-magic-numbers
-    const hours = DAYS * 24;
+    const hours = (DAYS * 24) + startIndex;
     // tslint:disable-next-line:no-increment-decrement no-magic-numbers
-    for (let index = 0; index < hours; index++) {
+    for (let index = startIndex; index < hours; index++) {
+        // for (let index = 0; index < hours; index++) {
         updateResult = await actionRepo.unsetUnnecessaryFields({
             filter: {
                 // _id: { $eq: '667379e7be9a532411c29424' },
-                typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
-                'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
+                typeOf: { $eq: chevre.factory.actionType.CheckAction },
+                'object.typeOf': { $exists: true, $eq: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket },
+                actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
                 startDate: {
                     $gte: moment(now)
                         .add(-(index + 1), 'hours')
@@ -32,16 +35,8 @@ async function main() {
                 }
             },
             $unset: {
-                'object.paymentMethod': 1,
-                'object.additionalProperty': 1,
-                'object.amount': 1,
-                'object.issuedThrough': 1,
-                'object.description': 1,
-                'object.name': 1,
-                'object.fromLocation': 1,
-                'object.method': 1,
-                'object.creditCard': 1,
-                'object.movieTickets': 1
+                'result.purchaseNumberAuthIn': 1,
+                'result.purchaseNumberAuthResult': 1
             }
         });
         console.log('unset processed.', updateResult, -(index + 1), 'hours', -index, 'hours');

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts

@@ -89,6 +89,12 @@ export declare function createPotentialActions(params: factory.assetTransaction.
     reservationPackage?: factory.action.reserve.IObject;
     underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
 };
+export declare function createMoneyTransferActions(params: {
+    acceptedOffer?: factory.assetTransaction.reserve.IAcceptedOffer4object;
+    reservation: Pick<factory.assetTransaction.reserve.IObjectSubReservation, 'reservedTicket'>;
+    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
+    underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+}): import("@chevre/factory/lib/action/transfer/moneyTransfer").IAttributes[];
 export declare function createCancelPendingReservationAction(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
 }): factory.action.cancel.reservation.IAttributes | undefined;

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCancelPendingReservationAction = exports.createPotentialActions = exports.createReservation = exports.createIssuedThrough = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
+exports.createCancelPendingReservationAction = exports.createMoneyTransferActions = exports.createPotentialActions = exports.createReservation = exports.createIssuedThrough = exports.createReservationFor = exports.createAdditionalTicketText = exports.createAdditionalProperty = exports.validateAppliesToMovieTicket = exports.createReservedTicket = exports.createPointAward = exports.createStartParams = void 0;
 /**
  * 予約取引ファクトリー
  */
@@ -625,6 +625,7 @@ function createMoneyTransferActions(params) {
     }
     return moneyTransfer;
 }
+exports.createMoneyTransferActions = createMoneyTransferActions;
 function createCancelPendingReservationAction(params) {
     const transaction = params.transaction;
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];

package/lib/chevre/service/reserve/checkInReservation.js

@@ -71,8 +71,8 @@ function reserveIfNotYet(params) {
                     reservations: { id: { $in: params.object.ids } }
                 },
                 statuses: [factory.transactionStatusType.Confirmed]
-            }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
-            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. ids:', params.object.ids);
+            }, ['transactionNumber']);
+            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. ids:', params.object.ids, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
             reserveTransactions = yield repos.assetTransaction.search({
@@ -81,36 +81,35 @@ function reserveIfNotYet(params) {
                     reservationNumber: { $in: params.object.reservationNumbers }
                 },
                 statuses: [factory.transactionStatusType.Confirmed]
-            }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
-            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. reservationNumbers:', params.object.reservationNumbers);
+            }, ['transactionNumber']);
+            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. reservationNumbers:', params.object.reservationNumbers, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
         yield Promise.all(reserveTransactions.map((reserveTransaction) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (typeof ((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
-                yield (0, confirmReservation_1.confirmReservation)({
-                    actionAttributesList: [{
-                            project: reserveTransaction.project,
-                            typeOf: factory.actionType.ReserveAction,
-                            object: {
-                                typeOf: reserveTransaction.object.typeOf,
-                                reservationNumber: reserveTransaction.object.reservationNumber,
-                                reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
-                                    ? reserveTransaction.object.reservationStatus
-                                    : factory.reservationStatusType.ReservationPending,
-                                reservationFor: {
-                                    id: String(reserveTransaction.object.reservationFor.id),
-                                    typeOf: reserveTransaction.object.reservationFor.typeOf,
-                                    optimized: true
-                                } // optimize(2024-01-24~)
-                            },
-                            agent: reserveTransaction.project,
-                            purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }
-                        }],
-                    useOnReservationConfirmed: false,
-                    byTask: false
-                })(repos);
-                debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.object.reservationNumber);
-            }
+            yield (0, confirmReservation_1.confirmReservation)({
+                // optimize(2024-07-01~)
+                actionAttributesList: [{ object: { reservationNumber: reserveTransaction.transactionNumber } }],
+                // actionAttributesList: [{
+                //     project: reserveTransaction.project,
+                //     typeOf: <factory.actionType.ReserveAction>factory.actionType.ReserveAction,
+                //     object: {
+                //         typeOf: reserveTransaction.object.typeOf,
+                //         reservationNumber: reserveTransaction.object.reservationNumber,
+                //         reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
+                //             ? reserveTransaction.object.reservationStatus
+                //             : factory.reservationStatusType.ReservationPending,
+                //         reservationFor: {
+                //             id: String(reserveTransaction.object.reservationFor.id),
+                //             typeOf: reserveTransaction.object.reservationFor.typeOf,
+                //             optimized: true
+                //         } // optimize(2024-01-24~)
+                //     },
+                //     agent: reserveTransaction.project,
+                //     purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }
+                // }],
+                useOnReservationConfirmed: false,
+                byTask: false
+            })(repos);
+            debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.transactionNumber);
         })));
     });
 }

package/lib/chevre/service/reserve/confirmReservation.d.ts

@@ -7,7 +7,7 @@ import type { MongoRepository as TaskRepo } from '../../repo/task';
  * 予約を確定する
  */
 export declare function confirmReservation(params: {
-    actionAttributesList: factory.action.reserve.IAttributes[];
+    actionAttributesList: factory.task.reserve.IPotentialReserveAction[];
     useOnReservationConfirmed: boolean;
     byTask: boolean;
 }): (repos: {
@@ -16,3 +16,8 @@ export declare function confirmReservation(params: {
     reservation: ReservationRepo;
     task: TaskRepo;
 }) => Promise<void>;
+type IReserveActionAttributes = Pick<factory.action.reserve.IAttributes, 'agent' | 'object' | 'potentialActions' | 'project' | 'purpose' | 'typeOf'>;
+export declare function reserveTransaction2action(params: {
+    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
+}): IReserveActionAttributes;
+export {};

package/lib/chevre/service/reserve/confirmReservation.js

@@ -9,9 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirmReservation = void 0;
+exports.reserveTransaction2action = exports.confirmReservation = void 0;
 const createDebug = require("debug");
 const factory = require("../../factory");
+const factory_1 = require("../assetTransaction/reserve/factory");
 const onReservationConfirmed_1 = require("./potentialActions/onReservationConfirmed");
 const debug = createDebug('chevre-domain:service:reserve:confirmReservation');
 /**
@@ -20,8 +21,8 @@ const debug = createDebug('chevre-domain:service:reserve:confirmReservation');
 function confirmReservation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (params.actionAttributesList.length > 0) {
-            yield Promise.all(params.actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-                yield reserveIfNotYet(actionAttributes, { byTask: params.byTask })(repos);
+            yield Promise.all(params.actionAttributesList.map((potentialReserveAction) => __awaiter(this, void 0, void 0, function* () {
+                const actionAttributes = yield reserveIfNotYet(potentialReserveAction, { byTask: params.byTask })(repos);
                 if (params.useOnReservationConfirmed) {
                     yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
                 }
@@ -48,41 +49,90 @@ function confirmReservation(params) {
     });
 }
 exports.confirmReservation = confirmReservation;
-function reserveIfNotYet(params, options) {
+function reserveTransaction2action(params) {
+    var _a;
+    const transaction = params.transaction;
+    const reservationFor = transaction.object.reservationFor;
+    if (reservationFor === undefined) {
+        throw new factory.errors.NotFound('transaction.object.reservationFor');
+    }
+    let underName;
+    if (typeof ((_a = transaction.object.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+        underName = transaction.object.underName;
+    }
+    const moneyTransferActions = [];
+    const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
+    pendingReservations.forEach((reservation) => {
+        var _a;
+        const acceptedOffer4reservation = (_a = transaction.object.acceptedOffer) === null || _a === void 0 ? void 0 : _a.find((o) => { var _a, _b; return ((_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id) === reservation.id; });
+        moneyTransferActions.push(...(0, factory_1.createMoneyTransferActions)({
+            acceptedOffer: acceptedOffer4reservation,
+            reservation,
+            transaction: params.transaction,
+            underName
+        }));
+    });
+    const reservationPackage = {
+        reservationFor: {
+            id: String(reservationFor.id),
+            typeOf: reservationFor.typeOf,
+            optimized: true
+        },
+        reservationNumber: transaction.object.reservationNumber,
+        reservationStatus: (typeof params.transaction.object.reservationStatus === 'string')
+            ? params.transaction.object.reservationStatus
+            : factory.reservationStatusType.ReservationPending,
+        typeOf: factory.reservationType.ReservationPackage
+    };
+    return {
+        project: transaction.project,
+        typeOf: factory.actionType.ReserveAction,
+        object: reservationPackage,
+        agent: transaction.project,
+        potentialActions: {
+            moneyTransfer: moneyTransferActions
+        },
+        purpose: { typeOf: transaction.typeOf, id: transaction.id }
+    };
+}
+exports.reserveTransaction2action = reserveTransaction2action;
+function reserveIfNotYet(
+// params: factory.action.reserve.IAttributes,
+params, options) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const reservationPackage = params.object;
+        const reserveTransaction = (yield repos.assetTransaction.search({
+            limit: 1,
+            page: 1,
+            typeOf: factory.assetTransactionType.Reserve,
+            transactionNumber: { $eq: reservationPackage.reservationNumber }
+        })).shift();
+        if (reserveTransaction === undefined) {
+            throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
+        }
+        const actionAttributes = reserveTransaction2action({ transaction: reserveTransaction });
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
         const completedActions = yield repos.action.search({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-            typeOf: { $eq: params.typeOf },
+            typeOf: { $eq: actionAttributes.typeOf },
             object: {
-                typeOf: { $eq: params.object.typeOf }
+                typeOf: { $eq: actionAttributes.object.typeOf }
                 // reservationNumber: { $eq: params.object.reservationNumber }
             },
             purpose: {
-                id: { $in: [params.purpose.id] },
-                typeOf: { $in: [params.purpose.typeOf] }
+                id: { $in: [actionAttributes.purpose.id] },
+                typeOf: { $in: [actionAttributes.purpose.typeOf] }
             }
         }, ['_id'], []);
         debug(completedActions.length, 'completed reserveAction found. byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
         if (completedActions.length === 0) {
-            const action = yield repos.action.start(params);
+            const action = yield repos.action.start(actionAttributes);
             try {
-                const reserveTransactions = yield repos.assetTransaction.search({
-                    limit: 1,
-                    page: 1,
-                    typeOf: factory.assetTransactionType.Reserve,
-                    transactionNumber: { $eq: reservationPackage.reservationNumber }
-                });
-                const reserveTransaction = reserveTransactions.shift();
-                if (reserveTransaction === undefined) {
-                    throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
-                }
                 let underName;
                 // 予約取引に保管されたunderNameを使用する(2023-05-30~)
                 if (typeof ((_a = reserveTransaction.object.underName) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
@@ -92,7 +142,7 @@ function reserveIfNotYet(params, options) {
                     //     underName = reservationPackage.underName;
                 }
                 // ReservationPackageに対応(2022-12-22~)
-                if (reservationPackage.typeOf === factory.reservationType.ReservationPackage) {
+                if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
                     // Pendingの予約が存在しないバージョンに対応する(2023-05-29~)
                     if (reserveTransaction.object.disablePendingReservations === true) {
                         const reservationFor = reserveTransaction.object.reservationFor;
@@ -127,7 +177,7 @@ function reserveIfNotYet(params, options) {
                 }
                 else {
                     // 廃止(2023-01-18)
-                    throw new factory.errors.Forbidden(`${reservationPackage.typeOf} not acceptable`);
+                    throw new factory.errors.Forbidden(`${actionAttributes.object.typeOf} not acceptable`);
                 }
             }
             catch (error) {
@@ -139,9 +189,9 @@ function reserveIfNotYet(params, options) {
                 }
                 throw error;
             }
-            // アクション完了
             const actionResult = {};
             yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
+        return actionAttributes;
     });
 }

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.d.ts

@@ -7,7 +7,7 @@ type IEventReservation = factory.reservation.IReservation<factory.reservationTyp
 /**
  * 予約確定後のアクション
  */
-export declare function onReservationConfirmedByAction(actionAttributes: factory.action.reserve.IAttributes): (repos: {
+export declare function onReservationConfirmedByAction(actionAttributes: Pick<factory.action.reserve.IAttributes, 'potentialActions'>): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
 export declare function onReservationConfirmed(confirmedReservations: IEventReservation[]): (repos: {

package/lib/chevre/service/reserve/useReservation.js

@@ -86,36 +86,35 @@ function reserveIfNotYet(params) {
                     reservations: { id: { $in: [params.object.id] } }
                 },
                 statuses: [factory.transactionStatusType.Confirmed]
-            }, ['_id', 'transactionNumber', 'object', 'project', 'typeOf']);
-            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. id:', params.object.id);
+            }, ['transactionNumber']);
+            debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. id:', params.object.id, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
         yield Promise.all(reserveTransactions.map((reserveTransaction) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (typeof ((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
-                yield (0, confirmReservation_1.confirmReservation)({
-                    actionAttributesList: [{
-                            project: reserveTransaction.project,
-                            typeOf: factory.actionType.ReserveAction,
-                            object: {
-                                typeOf: reserveTransaction.object.typeOf,
-                                reservationNumber: reserveTransaction.object.reservationNumber,
-                                reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
-                                    ? reserveTransaction.object.reservationStatus
-                                    : factory.reservationStatusType.ReservationPending,
-                                reservationFor: {
-                                    id: String(reserveTransaction.object.reservationFor.id),
-                                    typeOf: reserveTransaction.object.reservationFor.typeOf,
-                                    optimized: true
-                                } // optimize(2024-01-24~)
-                            },
-                            agent: reserveTransaction.project,
-                            purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }
-                        }],
-                    useOnReservationConfirmed: false,
-                    byTask: false
-                })(repos);
-                debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.object.reservationNumber);
-            }
+            yield (0, confirmReservation_1.confirmReservation)({
+                // optimize(2024-07-01~)
+                actionAttributesList: [{ object: { reservationNumber: reserveTransaction.transactionNumber } }],
+                // actionAttributesList: [{
+                //     project: reserveTransaction.project,
+                //     typeOf: <factory.actionType.ReserveAction>factory.actionType.ReserveAction,
+                //     object: {
+                //         typeOf: reserveTransaction.object.typeOf,
+                //         reservationNumber: reserveTransaction.object.reservationNumber,
+                //         reservationStatus: (typeof reserveTransaction.object.reservationStatus === 'string')
+                //             ? reserveTransaction.object.reservationStatus
+                //             : factory.reservationStatusType.ReservationPending,
+                //         reservationFor: {
+                //             id: String(reserveTransaction.object.reservationFor.id),
+                //             typeOf: reserveTransaction.object.reservationFor.typeOf,
+                //             optimized: true
+                //         } // optimize(2024-01-24~)
+                //     },
+                //     agent: reserveTransaction.project,
+                //     purpose: { typeOf: reserveTransaction.typeOf, id: reserveTransaction.id }
+                // }],
+                useOnReservationConfirmed: false,
+                byTask: false
+            })(repos);
+            debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.transactionNumber);
         })));
     });
 }

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.376.0",
+    "@chevre/factory": "4.377.0-alpha.0",
     "@cinerino/sdk": "8.0.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.36.0"
+  "version": "21.37.0-alpha.0"
 }