@chevre/domain 21.30.0-alpha.15 → 21.30.0-alpha.17

package/example/src/chevre/checkActions.ts

@@ -0,0 +1,57 @@
+// 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) };
+type IAction = chevre.factory.action.IAction<chevre.factory.action.IAttributes<chevre.factory.actionType, any, any>>;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+
+    const cursor = actionRepo.getCursor(
+        {
+            // typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
+            // 'object.typeOf': { $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
+            startDate: {
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-1, 'days')
+                    .toDate()
+            }
+        },
+        {
+        }
+    );
+    console.log('actions found');
+
+    let i = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const action = <IAction>doc.toObject();
+        const size = JSON.stringify(action).length;
+        // console.log(JSON.stringify(action).length);
+        if (action.typeOf !== chevre.factory.actionType.InformAction
+            && action.typeOf !== chevre.factory.actionType.AuthorizeAction
+            && action.typeOf !== chevre.factory.actionType.CheckAction
+            && size > 2000) {
+            console.log(action.typeOf, action.object?.typeOf);
+            console.log(size);
+
+            // if (action.typeOf === chevre.factory.actionType.PayAction) {
+            //     console.log(action);
+            //     console.log(size);
+            // }
+        }
+    });
+
+    console.log(i, 'actions checked');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/optimizeActions.ts

@@ -16,8 +16,9 @@ async function main() {
     for (let index = 0; index < 24 * 1000; index++) {
         const updateResult = await actionRepo.unsetUnnecessaryFields({
             filter: {
-                typeOf: { $eq: chevre.factory.actionType.SendAction },
-                // 'agent.typeOf': { $exists: true, $eq: chevre.factory.creativeWorkType.WebApplication },
+                typeOf: { $eq: chevre.factory.actionType.ReturnAction },
+                'object.typeOf': { $exists: true, $eq: 'Invoice' },
+                actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
                 startDate: {
                     // $exists: true,
                     $gte: moment()
@@ -30,12 +31,24 @@ async function main() {
                 // _id: { $eq: '61da235d94a80f000af85f6b' }
             },
             $unset: {
-                'recipient.identifier': 1,
-                'recipient.memberOf': 1,
-                'recipient.email': 1,
-                'recipient.familyName': 1,
-                'recipient.givenName': 1,
-                'recipient.telephone': 1
+                'result.refundTransaction.project': 1,
+                'result.refundTransaction.status': 1,
+                'result.refundTransaction.agent': 1,
+                'result.refundTransaction.recipient': 1,
+                'result.refundTransaction.object': 1,
+                'result.refundTransaction.expires': 1,
+                'result.refundTransaction.startDate': 1,
+                'result.refundTransaction.tasksExportAction': 1,
+                'result.refundTransaction.tasksExportationStatus': 1,
+                'result.refundTransaction._id': 1,
+                'result.refundTransaction.createdAt': 1,
+                'result.refundTransaction.updatedAt': 1
+                // 'recipient.identifier': 1,
+                // 'recipient.memberOf': 1,
+                // 'recipient.email': 1,
+                // 'recipient.familyName': 1,
+                // 'recipient.givenName': 1,
+                // 'recipient.telephone': 1
                 // 'object.project': 1,
                 // 'object.seller': 1,
                 // 'object.customer': 1,

package/lib/chevre/repo/mongoose/schemas/messages.d.ts

@@ -0,0 +1,5 @@
+import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
+declare const modelName = "Message";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
+export { modelName, indexes, createSchema };

package/lib/chevre/repo/mongoose/schemas/messages.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSchema = exports.indexes = exports.modelName = void 0;
+const mongoose_1 = require("mongoose");
+const writeConcern_1 = require("../writeConcern");
+const settings_1 = require("../../../settings");
+const modelName = 'Message';
+exports.modelName = modelName;
+const schemaDefinition = {
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    typeOf: {
+        type: String,
+        required: true
+    },
+    identifier: String,
+    name: mongoose_1.SchemaTypes.Mixed,
+    about: mongoose_1.SchemaTypes.Mixed,
+    sender: mongoose_1.SchemaTypes.Mixed,
+    text: String,
+    toRecipient: mongoose_1.SchemaTypes.Mixed
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'messages',
+    id: true,
+    read: settings_1.MONGO_READ_PREFERENCE,
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: {
+        createdAt: 'createdAt',
+        updatedAt: 'updatedAt'
+    },
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { createdAt: 1 },
+        { name: 'searchByCreatedAt' }
+    ],
+    [
+        { updatedAt: 1 },
+        { name: 'searchByUpdatedAt' }
+    ]
+];
+exports.indexes = indexes;
+/**
+ * メッセージスキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

package/lib/chevre/service/task/returnPayTransaction.js

@@ -87,12 +87,13 @@ function returnPayTransaction(params) {
                     paymentServiceType,
                     refundFee, seller: order.seller }));
                 const refundPurpose = createRefundPurpose(params, order);
-                refundTransaction = yield RefundTransactionService.start(startRefundTransactionParams)({
+                const { id, typeOf } = yield RefundTransactionService.start(startRefundTransactionParams)({
                     action: repos.action,
                     paymentService: repos.paymentService,
                     product: repos.product,
                     assetTransaction: repos.assetTransaction
                 });
+                refundTransaction = { id, transactionNumber, typeOf };
                 yield RefundTransactionService.confirm({
                     transactionNumber,
                     potentialActions: { refund: { purpose: refundPurpose } }
@@ -110,7 +111,8 @@ function returnPayTransaction(params) {
             }
             throw error;
         }
-        const result = { refundTransaction };
+        // const result: factory.action.transfer.returnAction.paymentMethod.IResult = { refundTransaction };
+        const result = Object.assign({}, (typeof (refundTransaction === null || refundTransaction === void 0 ? void 0 : refundTransaction.id) === 'string') ? { refundTransaction } : undefined); // optimize(2024-04-27~)
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         // 潜在アクション
         yield onRefund(refundActionAttributes)({ task: repos.task });

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

@@ -33,6 +33,7 @@ type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
          * 取引検証時にorderInTransactionからオファーを検索するかどうか
          */
         useAcceptedOffersFromOrderInTransaction: boolean;
+        useSaveMessages: boolean;
     };
 };
 /**

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

@@ -97,9 +97,13 @@ function confirm(params) {
             emailMessageOnOrderSent = searchEmailMessagesResult.shift();
         }
         // ポストアクションを作成
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ order: result.order, 
+        const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ order: result.order, 
             // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
             transaction: transaction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined));
+        // メッセージ保管(2024-04-28~)
+        if (params.options.useSaveMessages) {
+            debug('saving', emailMessages.length, 'emailMessages...', emailMessages);
+        }
         // ステータス変更
         try {
             yield repos.transaction.confirm({

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

@@ -3,4 +3,7 @@ export declare function createSendEmailMessageActions(params: {
     order: factory.order.IOrder;
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
-}): Promise<factory.action.transfer.send.message.email.IAttributes[]>;
+}): Promise<{
+    emailMessages: factory.creativeWork.message.email.ICreativeWork[];
+    sendEmailMessageActions: factory.action.transfer.send.message.email.IAttributes[];
+}>;

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

@@ -17,6 +17,7 @@ function createSendEmailMessageActions(params) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
         // 注文配送メール送信設定
+        const emailMessages = [];
         const sendEmailMessageActions = [];
         // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
         const sendActionPurpose = {
@@ -37,6 +38,7 @@ function createSendEmailMessageActions(params) {
         if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
             yield Promise.all(sendEmailMessageOnOrderSentParams.map((s) => __awaiter(this, void 0, void 0, function* () {
                 const emailMessage = yield emailMessageBuilder.createSendOrderMessage(Object.assign(Object.assign({ order: params.order }, (s.object !== undefined) ? { email: s.object } : undefined), (params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined));
+                emailMessages.push(emailMessage);
                 sendEmailMessageActions.push({
                     project: params.order.project,
                     typeOf: factory.actionType.SendAction,
@@ -52,7 +54,7 @@ function createSendEmailMessageActions(params) {
                 });
             })));
         }
-        return sendEmailMessageActions;
+        return { sendEmailMessageActions, emailMessages };
     });
 }
 exports.createSendEmailMessageActions = createSendEmailMessageActions;

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

@@ -7,4 +7,7 @@ export declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     transaction: factory.transaction.placeOrder.ITransaction;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
-}): Promise<factory.transaction.placeOrder.IPotentialActions>;
+}): Promise<{
+    potentialActions: factory.transaction.placeOrder.IPotentialActions;
+    emailMessages: factory.creativeWork.message.email.ICreativeWork[];
+}>;

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

@@ -19,7 +19,7 @@ function createPotentialActions(params) {
         // ポイントインセンティブに対する承認アクションの分だけ、ポイントインセンティブ付与アクションを作成する
         // const givePointAwardActions = await createGivePointAwardActions(params); // 完全廃止(2024-03-12~)
         // 注文配送メール送信設定
-        const sendEmailMessageActions = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
+        const { emailMessages, sendEmailMessageActions } = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
         const sendOrderActionAttributes = {
             potentialActions: {
                 // moneyTransfer: moneyTransferActions, // 廃止(2024-01-29~)
@@ -27,12 +27,15 @@ function createPotentialActions(params) {
                 sendEmailMessage: sendEmailMessageActions
             }
         };
-        // optimize(2024-01-22~)
         return {
-            order: {
-                potentialActions: {
-                    // givePointAward: givePointAwardActions, // 完全廃止(2024-03-12~)
-                    sendOrder: sendOrderActionAttributes // optimize(2024-01-16~)
+            emailMessages,
+            // optimize(2024-01-22~)
+            potentialActions: {
+                order: {
+                    potentialActions: {
+                        // givePointAward: givePointAwardActions, // 完全廃止(2024-03-12~)
+                        sendOrder: sendOrderActionAttributes // optimize(2024-01-16~)
+                    }
                 }
             }
         };

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.30.0-alpha.15"
+  "version": "21.30.0-alpha.17"
 }