@chevre/domain 20.1.0-alpha.8 → 20.1.0

package/lib/chevre/repository.d.ts

@@ -2,11 +2,11 @@
  * リポジトリ
  */
 import { MongoRepository as AccountRepo } from './repo/account';
-import { MongoRepository as AccountActionRepo } from './repo/accountAction';
 import { MongoRepository as AccountingReportRepo } from './repo/accountingReport';
 import { MongoRepository as AccountTitleRepo } from './repo/accountTitle';
 import { MongoRepository as AccountTransactionRepo } from './repo/accountTransaction';
 import { MongoRepository as ActionRepo } from './repo/action';
+import { MongoRepository as AdditionalPropertyRepo } from './repo/additionalProperty';
 import { MongoRepository as AssetTransactionRepo } from './repo/assetTransaction';
 import { MongoRepository as CategoryCodeRepo } from './repo/categoryCode';
 import { MongoRepository as CodeRepo } from './repo/code';
@@ -49,8 +49,6 @@ export declare class Account extends AccountRepo {
 /**
  * 口座アクションリポジトリ
  */
-export declare class AccountAction extends AccountActionRepo {
-}
 /**
  * 経理レポートリポジトリ
  */
@@ -65,6 +63,11 @@ export declare class AccountTransaction extends AccountTransactionRepo {
 }
 export declare class Action extends ActionRepo {
 }
+/**
+ * 追加特性リポジトリ
+ */
+export declare class AdditionalProperty extends AdditionalPropertyRepo {
+}
 export declare namespace action {
     class RegisterServiceInProgress extends RegisterServiceActionInProgress {
     }

package/lib/chevre/repository.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.itemAvailability = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.AccountAction = exports.Account = void 0;
+exports.rateLimit = exports.itemAvailability = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
  */
 const account_1 = require("./repo/account");
-const accountAction_1 = require("./repo/accountAction");
+// import { MongoRepository as AccountActionRepo } from './repo/accountAction';
 const accountingReport_1 = require("./repo/accountingReport");
 const accountTitle_1 = require("./repo/accountTitle");
 const accountTransaction_1 = require("./repo/accountTransaction");
 const action_1 = require("./repo/action");
+const additionalProperty_1 = require("./repo/additionalProperty");
 const assetTransaction_1 = require("./repo/assetTransaction");
 const categoryCode_1 = require("./repo/categoryCode");
 const code_1 = require("./repo/code");
@@ -54,9 +55,7 @@ exports.Account = Account;
 /**
  * 口座アクションリポジトリ
  */
-class AccountAction extends accountAction_1.MongoRepository {
-}
-exports.AccountAction = AccountAction;
+// export class AccountAction extends AccountActionRepo { }
 /**
  * 経理レポートリポジトリ
  */
@@ -75,6 +74,12 @@ exports.AccountTransaction = AccountTransaction;
 class Action extends action_1.MongoRepository {
 }
 exports.Action = Action;
+/**
+ * 追加特性リポジトリ
+ */
+class AdditionalProperty extends additionalProperty_1.MongoRepository {
+}
+exports.AdditionalProperty = AdditionalProperty;
 var action;
 (function (action) {
     class RegisterServiceInProgress extends registerServiceInProgress_1.RedisRepository {

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

@@ -4,7 +4,6 @@
  */
 import * as factory from '../factory';
 import { MongoRepository as AccountRepo } from '../repo/account';
-import { MongoRepository as AccountActionRepo } from '../repo/accountAction';
 import { MongoRepository as AccountTransactionRepo } from '../repo/accountTransaction';
 export declare type IOpenOperation<T> = (repos: {
     account: AccountRepo;
@@ -52,8 +51,6 @@ export declare function close(params: {
  */
 export declare function transferMoney(actionAttributes: factory.account.action.moneyTransfer.IAttributes): (repos: {
     account: AccountRepo;
-    accountAction: AccountActionRepo;
-    accountTransaction: AccountTransactionRepo;
 }) => Promise<void>;
 /**
  * 転送取消
@@ -66,6 +63,5 @@ export declare function cancelMoneyTransfer(params: {
     };
 }): (repos: {
     account: AccountRepo;
-    accountAction: AccountActionRepo;
     accountTransaction: AccountTransactionRepo;
 }) => Promise<void>;

package/lib/chevre/service/account.js

@@ -53,11 +53,13 @@ exports.close = close;
  */
 function transferMoney(actionAttributes) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        let action = yield repos.accountAction.startByIdentifier(actionAttributes);
+        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
+        // let action = await repos.accountAction.startByIdentifier<factory.actionType.MoneyTransfer>(actionAttributes);
         // すでに完了していれば何もしない
-        if (action.actionStatus === factory.actionStatusType.CompletedActionStatus) {
-            return;
-        }
+        // if (action.actionStatus === factory.actionStatusType.CompletedActionStatus) {
+        //     return;
+        // }
+        const action = actionAttributes;
         let fromAccountNumber;
         let toAccountNumber;
         try {
@@ -80,18 +82,17 @@ function transferMoney(actionAttributes) {
         }
         catch (error) {
             // actionにエラー結果を追加
-            try {
-                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                yield repos.accountAction.giveUp(action.typeOf, action.id, actionError);
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
+            // try {
+            //     const actionError = { ...error, message: error.message, name: error.name };
+            //     await repos.accountAction.giveUp(action.typeOf, action.id, actionError);
+            // } catch (__) {
+            //     // 失敗したら仕方ない
+            // }
             throw error;
         }
         // アクション完了
-        const actionResult = {};
-        action = yield repos.accountAction.complete(action.typeOf, action.id, actionResult);
+        // const actionResult: factory.account.action.moneyTransfer.IResult = {};
+        // action = await repos.accountAction.complete(action.typeOf, action.id, actionResult);
     });
 }
 exports.transferMoney = transferMoney;
@@ -132,16 +133,17 @@ function cancelMoneyTransfer(params) {
                 : transaction.object.amount.value,
             transactionId: transaction.id
         });
+        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
         // アクション取得
-        const actions = yield repos.accountAction.searchTransferActions({
-            purpose: {
-                typeOf: { $eq: transaction.typeOf },
-                id: { $eq: transaction.id }
-            }
-        });
-        yield Promise.all(actions.map((action) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.accountAction.cancel(action.typeOf, action.id);
-        })));
+        // const actions = await repos.accountAction.searchTransferActions({
+        //     purpose: {
+        //         typeOf: { $eq: transaction.typeOf },
+        //         id: { $eq: transaction.id }
+        //     }
+        // });
+        // await Promise.all(actions.map(async (action) => {
+        //     await repos.accountAction.cancel(action.typeOf, action.id);
+        // }));
     });
 }
 exports.cancelMoneyTransfer = cancelMoneyTransfer;

package/lib/chevre/service/accountTransaction/deposit.d.ts

@@ -3,11 +3,9 @@
  */
 import * as factory from '../../factory';
 import { MongoRepository as AccountRepo } from '../../repo/account';
-import { MongoRepository as AccountActionRepo } from '../../repo/accountAction';
 import { MongoRepository as AccountTransactionRepo } from '../../repo/accountTransaction';
 export declare type IStartOperation<T> = (repos: {
     account: AccountRepo;
-    accountAction: AccountActionRepo;
     accountTransaction: AccountTransactionRepo;
 }) => Promise<T>;
 /**

package/lib/chevre/service/accountTransaction/deposit.js

@@ -14,7 +14,6 @@ exports.start = void 0;
  * 入金取引サービス
  */
 const factory = require("../../factory");
-const factory_1 = require("./factory");
 /**
  * 取引開始
  */
@@ -64,9 +63,10 @@ function start(params) {
             accountNumber: params.object.toLocation.accountNumber,
             transaction: pendingTransaction
         });
+        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
         // アクション開始
-        const moneyTransferActionAttributes = (0, factory_1.createMoneyTransferActionAttributes)({ transaction });
-        yield repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
+        // const moneyTransferActionAttributes = createMoneyTransferActionAttributes({ transaction });
+        // await repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
         // 結果返却
         return transaction;
     });

package/lib/chevre/service/accountTransaction/transfer.d.ts

@@ -3,11 +3,9 @@
  */
 import * as factory from '../../factory';
 import { MongoRepository as AccountRepo } from '../../repo/account';
-import { MongoRepository as AccountActionRepo } from '../../repo/accountAction';
 import { MongoRepository as AccountTransactionRepo } from '../../repo/accountTransaction';
 export declare type IStartOperation<T> = (repos: {
     account: AccountRepo;
-    accountAction: AccountActionRepo;
     accountTransaction: AccountTransactionRepo;
 }) => Promise<T>;
 /**

package/lib/chevre/service/accountTransaction/transfer.js

@@ -14,7 +14,6 @@ exports.start = void 0;
  * 転送取引サービス
  */
 const factory = require("../../factory");
-const factory_1 = require("./factory");
 /**
  * 取引開始
  */
@@ -96,9 +95,10 @@ function start(params) {
             accountNumber: params.object.toLocation.accountNumber,
             transaction: pendingTransaction
         });
+        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
         // アクション開始
-        const moneyTransferActionAttributes = (0, factory_1.createMoneyTransferActionAttributes)({ transaction });
-        yield repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
+        // const moneyTransferActionAttributes = createMoneyTransferActionAttributes({ transaction });
+        // await repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
         // 結果返却
         return transaction;
     });

package/lib/chevre/service/accountTransaction/withdraw.d.ts

@@ -3,11 +3,9 @@
  */
 import * as factory from '../../factory';
 import { MongoRepository as AccountRepo } from '../../repo/account';
-import { MongoRepository as AccountActionRepo } from '../../repo/accountAction';
 import { MongoRepository as AccountTransactionRepo } from '../../repo/accountTransaction';
 export declare type IStartOperation<T> = (repos: {
     account: AccountRepo;
-    accountAction: AccountActionRepo;
     accountTransaction: AccountTransactionRepo;
 }) => Promise<T>;
 /**

package/lib/chevre/service/accountTransaction/withdraw.js

@@ -14,7 +14,6 @@ exports.start = void 0;
  * 出金取引サービス
  */
 const factory = require("../../factory");
-const factory_1 = require("./factory");
 /**
  * 取引開始
  */
@@ -75,9 +74,10 @@ function start(params) {
             transaction: pendingTransaction,
             force: forcibly
         });
+        // 口座取引におけるAccountAction管理を廃止(2022-11-28~)
         // アクション開始
-        const moneyTransferActionAttributes = (0, factory_1.createMoneyTransferActionAttributes)({ transaction });
-        yield repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
+        // const moneyTransferActionAttributes = createMoneyTransferActionAttributes({ transaction });
+        // await repos.accountAction.startByIdentifier(moneyTransferActionAttributes);
         // 結果返却
         return transaction;
     });

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

@@ -6,11 +6,38 @@ const factory = require("../../../factory");
  * 取引開始パラメータ作成
  */
 function createStartParams(params) {
-    const cancelReservationObject = {
-        clientUser: params.paramsWithoutDetail.object.clientUser,
-        transaction: params.transaction,
-        reservations: params.reservations
-    };
+    var _a;
+    let reserveTransactionAsObject;
+    let eventReservationsAsObject;
+    if (typeof ((_a = params.transaction) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+        const reservationFor = params.transaction.object.reservationFor;
+        if (typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.typeOf) !== 'string') {
+            throw new factory.errors.NotFound('transaction.object.reservationFor');
+        }
+        reserveTransactionAsObject = {
+            id: params.transaction.id,
+            transactionNumber: params.transaction.transactionNumber,
+            typeOf: params.transaction.typeOf,
+            object: {
+                reservationFor: {
+                    id: reservationFor.id,
+                    typeOf: reservationFor.typeOf
+                }
+            }
+        };
+    }
+    if (Array.isArray(params.reservations)) {
+        eventReservationsAsObject = params.reservations.map((r) => {
+            return {
+                id: r.id,
+                issuedThrough: r.issuedThrough,
+                reservationFor: { id: r.reservationFor.id, typeOf: r.reservationFor.typeOf },
+                reservationNumber: r.reservationNumber,
+                typeOf: r.typeOf
+            };
+        });
+    }
+    const cancelReservationObject = Object.assign(Object.assign({ clientUser: params.paramsWithoutDetail.object.clientUser }, (typeof (reserveTransactionAsObject === null || reserveTransactionAsObject === void 0 ? void 0 : reserveTransactionAsObject.typeOf) === 'string') ? { transaction: reserveTransactionAsObject } : undefined), (Array.isArray(eventReservationsAsObject)) ? { reservations: eventReservationsAsObject } : undefined);
     return {
         project: { id: params.project.id, typeOf: params.project.typeOf },
         transactionNumber: params.transactionNumber,
@@ -24,49 +51,66 @@ exports.createStartParams = createStartParams;
 function createPotentialActions(params) {
     var _a, _b;
     const transaction = params.transaction;
-    let targetReservations = [];
+    let cancelReservationActionAttributes = [];
+    // 予約番号指定であれば予約番号単位でアクション生成(2022-12-27~)
     // 予約番号指定の取消取引であれば、予約取引から取消対象予約リストを作成する
-    const reservationForByReserveTransaction = (_a = transaction.object.transaction) === null || _a === void 0 ? void 0 : _a.object.reservationFor;
-    const subReservationByReserveTransaction = (_b = transaction.object.transaction) === null || _b === void 0 ? void 0 : _b.object.subReservation;
-    if (reservationForByReserveTransaction !== undefined && Array.isArray(subReservationByReserveTransaction)) {
-        targetReservations = subReservationByReserveTransaction.map((r) => {
-            return Object.assign(Object.assign({}, r), { reservationFor: reservationForByReserveTransaction });
-        });
-    }
-    else if (Array.isArray(transaction.object.reservations)) {
-        targetReservations = transaction.object.reservations;
-    }
-    // 予約取消アクション属性作成
-    const cancelReservationActionAttributes = targetReservations.map((reservation) => {
-        var _a;
-        // 最適化(2022-06-06~)
+    const reservationNumber = (_a = transaction.object.transaction) === null || _a === void 0 ? void 0 : _a.transactionNumber;
+    const reservationForByReserveTransaction = (_b = transaction.object.transaction) === null || _b === void 0 ? void 0 : _b.object.reservationFor;
+    if (reservationForByReserveTransaction !== undefined && typeof reservationNumber === 'string') {
         const cancelObject = {
-            typeOf: reservation.typeOf,
-            id: reservation.id,
-            issuedThrough: {
-                typeOf: (_a = reservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
-            },
             reservationFor: {
-                typeOf: reservation.reservationFor.typeOf,
-                id: reservation.reservationFor.id
+                typeOf: reservationForByReserveTransaction.typeOf,
+                id: reservationForByReserveTransaction.id
             },
-            reservationNumber: reservation.reservationNumber,
+            reservationNumber,
             // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
-            reservationStatus: factory.reservationStatusType.ReservationConfirmed
-        };
-        return {
-            project: transaction.project,
-            typeOf: factory.actionType.CancelAction,
-            // result: {},
-            object: cancelObject,
-            agent: transaction.project,
-            potentialActions: {},
-            purpose: {
-                typeOf: transaction.typeOf,
-                id: transaction.id
-            }
+            reservationStatus: factory.reservationStatusType.ReservationConfirmed,
+            typeOf: factory.reservationType.ReservationPackage
         };
-    });
+        cancelReservationActionAttributes = [{
+                project: transaction.project,
+                typeOf: factory.actionType.CancelAction,
+                object: cancelObject,
+                agent: transaction.project,
+                potentialActions: {},
+                purpose: {
+                    typeOf: transaction.typeOf,
+                    id: transaction.id
+                }
+            }];
+    }
+    else if (Array.isArray(transaction.object.reservations)) {
+        // 予約取消アクション属性作成
+        cancelReservationActionAttributes = transaction.object.reservations.map((reservation) => {
+            var _a;
+            // 最適化(2022-06-06~)
+            const cancelObject = {
+                typeOf: reservation.typeOf,
+                id: reservation.id,
+                issuedThrough: {
+                    typeOf: (_a = reservation.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf
+                },
+                reservationFor: {
+                    typeOf: reservation.reservationFor.typeOf,
+                    id: reservation.reservationFor.id
+                },
+                reservationNumber: reservation.reservationNumber,
+                // ReservationConfirmed->ReservationCancelledのみ処理されるように保証する
+                reservationStatus: factory.reservationStatusType.ReservationConfirmed
+            };
+            return {
+                project: transaction.project,
+                typeOf: factory.actionType.CancelAction,
+                object: cancelObject,
+                agent: transaction.project,
+                potentialActions: {},
+                purpose: {
+                    typeOf: transaction.typeOf,
+                    id: transaction.id
+                }
+            };
+        });
+    }
     return {
         cancelReservation: cancelReservationActionAttributes
     };

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
 const factory = require("../../../factory");
 const order_1 = require("../../../factory/order");
-const USE_NEW_PRICE_SPEC_ON_INFORM_PAY_ACTION = process.env.USE_NEW_PRICE_SPEC_ON_INFORM_PAY_ACTION === '1';
 function createPayActions(params) {
     var _a;
     const payActions = [];
@@ -123,8 +122,7 @@ function createPayObjectServiceOutput(params) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {
                     var _a;
                     const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType));
-                    return Object.assign({ identifier: movieTicket.identifier }, (typeof reservation4invoice.price === 'number'
-                        || typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+                    return Object.assign({ identifier: movieTicket.identifier }, (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
                         ? {
                             serviceOutput: reservation4invoice
                         }
@@ -139,7 +137,6 @@ function createPayObjectServiceOutput(params) {
 }
 function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType) {
     var _a, _b;
-    let reservationPrice;
     let priceComponents4invoice = [];
     // Orderから対象予約を取得
     const reservationOffer = (_a = order === null || order === void 0 ? void 0 : order.acceptedOffers) === null || _a === void 0 ? void 0 : _a.find((o) => {
@@ -174,7 +171,6 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
     if (reservationOffer !== undefined) {
         const priceComponent = (_b = reservationOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent;
         if (Array.isArray(priceComponent)) {
-            reservationPrice = priceComponent.reduce((a, b) => a + Number(b.price), 0);
             priceComponents4invoice = priceComponent.map((component) => {
                 var _a;
                 const accounting = (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')
@@ -194,19 +190,12 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
             });
         }
     }
-    if (USE_NEW_PRICE_SPEC_ON_INFORM_PAY_ACTION) {
-        return {
-            priceSpecification: {
-                typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
-                priceComponent: priceComponents4invoice
-            }
-        };
-    }
-    else {
-        return {
-            price: reservationPrice
-        };
-    }
+    return {
+        priceSpecification: {
+            typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
+            priceComponent: priceComponents4invoice
+        }
+    };
 }
 function createInformPaymentActions(params) {
     var _a;