@chevre/domain 22.6.0-alpha.9 → 22.6.0

package/lib/chevre/service/transaction/returnOrder/potentialActions/sendEmailMessage.d.ts

@@ -1,11 +1,11 @@
 import * as factory from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { ISetting } from '../../../../repo/setting';
 type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.order.IPotentialSendEmailMessageAction;
 export declare function createSendEmailMessaegActionsOnReturn(params: {
     order: Pick<factory.order.IOrder, 'confirmationNumber' | 'identifier' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
-}, settings: Settings): Promise<{
+}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessagesOnReturn: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessaegActionsOnReturn: IPotentialSendEmailMessageAction[];
 }>;

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

@@ -12,7 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessaegActionsOnReturn = void 0;
 const emailMessageBuilder = require("../../../../emailMessageBuilder");
 const factory = require("../../../../factory");
-function createSendEmailMessaegActionsOnReturn(params, settings) {
+function createSendEmailMessaegActionsOnReturn(params, 
+// settings: Settings
+setting) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
@@ -32,7 +34,7 @@ function createSendEmailMessaegActionsOnReturn(params, settings) {
                 const emailMessage = yield emailMessageBuilder.createReturnOrderMessage(Object.assign(Object.assign({ order,
                     index }, (sendEmailMessageParams.object !== undefined) ? { email: sendEmailMessageParams.object } : undefined), (params.emailMessageOnOrderReturned !== undefined)
                     ? { emailMessage: params.emailMessageOnOrderReturned }
-                    : undefined), settings);
+                    : undefined), setting);
                 emailMessagesOnReturn.push(emailMessage);
                 return {
                     // project: order.project, // optimize(2024-06-25~)

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../factory';
-import { Settings } from '../../../settings';
+import type { ISetting } from '../../../repo/setting';
 type IReturningOrder4potentialActions = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'identifier' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'project' | 'seller' | 'typeOf'>;
 declare function createPotentialActions(params: {
     dateReturned: Date;
@@ -7,7 +7,7 @@ declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'agent' | 'object'>;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
-}, settings: Settings): Promise<{
+}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     potentialActions: factory.transaction.returnOrder.IPotentialActions;
 }>;

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

@@ -11,10 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 const returnPaymentMethod_1 = require("./potentialActions/returnPaymentMethod");
 const returnPointAward_1 = require("./potentialActions/returnPointAward");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
-function createPotentialActions(params, settings) {
+function createPotentialActions(params, 
+// settings: Settings
+setting) {
     return __awaiter(this, void 0, void 0, function* () {
         let returnOrderActions = [];
         const emailMessages = [];
@@ -27,12 +30,12 @@ function createPotentialActions(params, settings) {
             }
             const returnOrderActionParams = returnOrderParams === null || returnOrderParams === void 0 ? void 0 : returnOrderParams.find((p) => { var _a; return ((_a = p.object) === null || _a === void 0 ? void 0 : _a.orderNumber) === order.orderNumber; });
             // 決済返却アクション
-            const { emailMessagesOnReturnInvoice, returnPaymentMethodActions } = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined), settings);
+            const { emailMessagesOnReturnInvoice, returnPaymentMethodActions } = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined), setting);
             emailMessages.push(...emailMessagesOnReturnInvoice);
             // ポイント特典の数だけ、返却アクションを作成
             const returnPointAwardActions = yield (0, returnPointAward_1.createReturnPointAwardActions)(Object.assign(Object.assign({}, params), { order }));
             // 返品後のEメール送信アクション
-            const { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn } = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined), settings);
+            const { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn } = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined), setting);
             emailMessages.push(...emailMessagesOnReturn);
             const potentialActionsOnReturnOrder = {
                 returnPaymentMethod: returnPaymentMethodActions,

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

@@ -10,6 +10,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { ProjectRepo } from '../../repo/project';
 import type { ReservationRepo } from '../../repo/reservation';
 import type { SellerRepo } from '../../repo/seller';
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { IStartedTransaction, TransactionRepo } from '../../repo/transaction';
 import { Settings } from '../../settings';
@@ -49,8 +50,9 @@ declare function confirm(params: factory.transaction.returnOrder.IConfirmParams
     emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     order: OrderRepo;
+    setting: SettingRepo;
     transaction: TransactionRepo;
-}, settings: Settings) => Promise<import("@chevre/factory/lib/transaction/returnOrder").IResult | undefined>;
+}) => Promise<import("@chevre/factory/lib/transaction/returnOrder").IResult | undefined>;
 /**
  * 取引のタスクを出力します
  * 複数タスクが生成されます

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

@@ -81,7 +81,9 @@ function saveMessagesIfNeeded(params) {
  * 取引確定
  */
 function confirm(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const transaction = yield repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
         if (transaction.status === factory.transactionStatusType.Confirmed) {
@@ -124,8 +126,14 @@ function confirm(params) {
             });
             emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
         }
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
+        if (typeof (setting === null || setting === void 0 ? void 0 : setting.defaultSenderEmail) !== 'string') {
+            throw new factory.errors.NotFound('setting.defaultSenderEmail');
+        }
         const result = {};
-        const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ dateReturned: params.object.order.dateReturned, orders: returningOrders, transaction: transaction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined), settings);
+        const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ dateReturned: params.object.order.dateReturned, orders: returningOrders, transaction: transaction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined), 
+        // settings
+        setting);
         // save messages(2024-06-27~)
         yield saveMessagesIfNeeded({
             project: { id: transaction.project.id },

package/lib/chevre/settings.d.ts

@@ -1,17 +1,4 @@
-import * as factory from './factory';
 import { AggregationSettings, ICallableTaskOperation, ICallResult, IOperationExecute } from './settings/aggregation';
-interface IOnOrderStatusChanged {
-    /**
-     * AggService通知先
-     */
-    informOrder?: factory.project.IInformParams[];
-}
-interface IOnReservationStatusChanged {
-    /**
-     * AggService通知先
-     */
-    informReservation?: factory.project.IInformParams[];
-}
 interface IWebhookSettings {
     /**
      * リクエストタイムアウト
@@ -27,19 +14,26 @@ interface IWebhookSettings {
      */
     headerIdentifier?: string;
 }
-interface IOnEventChanged {
-    informEvent?: factory.project.IInformParams[];
-    informEvent2agg?: factory.project.IInformParams[];
+interface ISurfrockSettings {
+    /**
+     * 着券時タイムアウト
+     */
+    timeout: number;
+    /**
+     * 認証時タイムアウト
+     */
+    timeoutCheck: number;
+    /**
+     * 決済と返金の最小間隔(ms)
+     */
+    minIntervalBetweenPayAndRefund: number;
+    /**
+     * surfrockクライアント認証情報保管期限
+     * 0の場合、保管しない
+     */
+    credentialsExpireInSeconds?: number;
 }
 interface IOptions {
-    onOrderStatusChanged: IOnOrderStatusChanged;
-    onEventChanged: IOnEventChanged;
-    onReservationStatusChanged: IOnReservationStatusChanged;
-    onResourceUpdated: {
-        informResource?: factory.project.IInformParams[];
-    };
-    userPoolIdOld: string;
-    userPoolIdNew: string;
     abortedTasksWithoutReport: string[];
     numTryConfirmReserveTransaction: number;
     transaction: {
@@ -55,7 +49,6 @@ interface IOptions {
          */
         canceledStoragePeriodInDays: number;
     };
-    defaultSenderEmail: string;
     deliverOrderLimit: number;
     coa: {
         timeout: number;
@@ -65,37 +58,14 @@ interface IOptions {
         timeoutBackground: number;
         useFetch: boolean;
     };
-    movieticketReserve: {
-        /**
-         * 着券時タイムアウト
-         */
-        timeout: number;
-        /**
-         * 認証時タイムアウト
-         */
-        timeoutCheck: number;
-        /**
-         * 決済と返金の最小間隔(ms)
-         */
-        minIntervalBetweenPayAndRefund: number;
-    };
-    useAssetTransactionSyncProcessing: boolean;
+    movieticketReserve: ISurfrockSettings;
     useExperimentalFeature: boolean;
-    useNotificationCheckedInAsPackage?: boolean;
     notification: IWebhookSettings;
 }
 /**
  * domain settings
  */
 declare class Settings {
-    readonly onOrderStatusChanged: IOnOrderStatusChanged;
-    readonly onEventChanged: IOnEventChanged;
-    readonly onReservationStatusChanged: IOnReservationStatusChanged;
-    readonly onResourceUpdated: {
-        informResource?: factory.project.IInformParams[];
-    };
-    readonly userPoolIdOld: string;
-    readonly userPoolIdNew: string;
     readonly abortedTasksWithoutReport: string[];
     readonly numTryConfirmReserveTransaction: number;
     readonly transaction: {
@@ -114,7 +84,6 @@ declare class Settings {
          */
         canceledStoragePeriodInDays: number;
     };
-    readonly defaultSenderEmail: string;
     readonly deliverOrderLimit: number;
     readonly coa: {
         timeout: number;
@@ -124,23 +93,8 @@ declare class Settings {
         timeoutBackground: number;
         useFetch: boolean;
     };
-    readonly movieticketReserve: {
-        /**
-         * 着券時タイムアウト
-         */
-        timeout: number;
-        /**
-         * 認証時タイムアウト
-         */
-        timeoutCheck: number;
-        /**
-         * 決済と返金の最小間隔(ms)
-         */
-        minIntervalBetweenPayAndRefund: number;
-    };
-    readonly useAssetTransactionSyncProcessing: boolean;
+    readonly movieticketReserve: ISurfrockSettings;
     readonly useExperimentalFeature: boolean;
-    readonly useNotificationCheckedInAsPackage: boolean;
     /**
      * 通知設定
      */

package/lib/chevre/settings.js

@@ -1,4 +1,5 @@
 "use strict";
+// import * as factory from './factory';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Settings = exports.AggregationSettings = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = void 0;
 const aggregation_1 = require("./settings/aggregation");
@@ -8,24 +9,34 @@ Object.defineProperty(exports, "AggregationSettings", { enumerable: true, get: f
  */
 class Settings {
     constructor(options) {
-        const { onEventChanged, onOrderStatusChanged, onResourceUpdated, onReservationStatusChanged, userPoolIdOld, userPoolIdNew, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, useNotificationCheckedInAsPackage, notification } = options;
-        this.onEventChanged = onEventChanged;
-        this.onOrderStatusChanged = onOrderStatusChanged;
-        this.onResourceUpdated = onResourceUpdated;
-        this.onReservationStatusChanged = onReservationStatusChanged;
-        this.userPoolIdOld = userPoolIdOld;
-        this.userPoolIdNew = userPoolIdNew;
+        const { 
+        // onEventChanged,
+        // onOrderStatusChanged,
+        // onResourceUpdated,
+        // onReservationStatusChanged,
+        // userPoolIdOld,
+        // userPoolIdNew,
+        abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, 
+        // defaultSenderEmail,
+        deliverOrderLimit, coa, gmo, movieticketReserve, 
+        // useAssetTransactionSyncProcessing,
+        useExperimentalFeature, notification } = options;
+        // this.onEventChanged = onEventChanged;
+        // this.onOrderStatusChanged = onOrderStatusChanged;
+        // this.onResourceUpdated = onResourceUpdated;
+        // this.onReservationStatusChanged = onReservationStatusChanged;
+        // this.userPoolIdOld = userPoolIdOld;
+        // this.userPoolIdNew = userPoolIdNew;
         this.abortedTasksWithoutReport = abortedTasksWithoutReport;
         this.numTryConfirmReserveTransaction = numTryConfirmReserveTransaction;
         this.transaction = transaction;
-        this.defaultSenderEmail = defaultSenderEmail;
+        // this.defaultSenderEmail = defaultSenderEmail;
         this.deliverOrderLimit = deliverOrderLimit;
         this.coa = coa;
         this.gmo = gmo;
         this.movieticketReserve = movieticketReserve;
-        this.useAssetTransactionSyncProcessing = useAssetTransactionSyncProcessing;
+        // this.useAssetTransactionSyncProcessing = useAssetTransactionSyncProcessing;
         this.useExperimentalFeature = useExperimentalFeature;
-        this.useNotificationCheckedInAsPackage = useNotificationCheckedInAsPackage === true;
         this.notification = notification;
     }
 }

package/package.json

@@ -11,12 +11,12 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.389.0-alpha.7",
-    "@cinerino/sdk": "10.16.0-alpha.7",
-    "@motionpicture/coa-service": "9.5.0",
+    "@chevre/factory": "4.390.0",
+    "@cinerino/sdk": "10.19.0-alpha.0",
+    "@motionpicture/coa-service": "9.6.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
-    "@surfrock/sdk": "1.3.0",
+    "@surfrock/sdk": "1.4.0-alpha.1",
     "cdigit": "2.6.7",
     "debug": "^3.2.7",
     "google-libphonenumber": "^3.2.18",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.6.0-alpha.9"
+  "version": "22.6.0"
 }

package/example/src/chevre/searchAssetTransactions.ts

@@ -1,38 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const indexes = await mongoose.connection.db.collection('assetTransactions')
-        .indexes();
-    // console.log(indexes);
-    console.log(indexes.length, 'indexes found');
-
-    const assetTransactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
-
-    const assetTransactions = await assetTransactionRepo.search<chevre.factory.assetTransactionType.CancelReservation>(
-        {
-            limit: 10,
-            project: { id: { $eq: project.id } },
-            object: { reservationNumber: { $in: ['792955671389309', '439371836213743'] } },
-            typeOf: chevre.factory.assetTransactionType.CancelReservation
-        },
-        ['transactionNumber'],
-        []
-    );
-    console.log('assetTransactions found', assetTransactions);
-    console.log(assetTransactions.length, 'assetTransactions found');
-}
-
-main()
-    .then()
-    .catch(console.error);