@chevre/domain 21.30.0-alpha.18 → 21.30.0-alpha.19

package/example/src/chevre/checkActions.ts

@@ -4,6 +4,7 @@ import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
+const CONSOLE_CLIENT_ID = 'xxx';
 // const project = { id: String(process.env.PROJECT_ID) };
 type IAction = chevre.factory.action.IAction<chevre.factory.action.IAttributes<chevre.factory.actionType, any, any>>;
 
@@ -15,12 +16,12 @@ async function main() {
 
     const cursor = actionRepo.getCursor(
         {
-            // typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
-            // 'object.typeOf': { $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
+            typeOf: { $eq: chevre.factory.actionType.CreateAction },
+            'object.typeOf': { $exists: true, $eq: chevre.factory.eventType.ScreeningEvent },
             startDate: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(-1, 'days')
+                    .add(-60, 'days')
                     .toDate()
             }
         },
@@ -33,19 +34,26 @@ async function main() {
     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);
-            // }
+        // 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);
+        // }
+
+        const eventCount = (Array.isArray(action.result))
+            ? action.result.filter(({ typeOf }) => typeOf === chevre.factory.eventType.ScreeningEvent)
+                .length
+            : 0;
+        if (action.instrument?.id !== CONSOLE_CLIENT_ID) {
+            console.log(eventCount, 'events created', action.project.id, action.startDate, action.instrument?.id, i);
+            // tslint:disable-next-line:no-magic-numbers
+            if (eventCount > 10) {
+                throw new Error('eventCount too large');
+            }
         }
     });
 

package/example/src/chevre/checkReplaceActions.ts

@@ -0,0 +1,65 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const CONSOLE_CLIENT_ID = 'xxx';
+// 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.ReplaceAction },
+            'object.typeOf': { $exists: true, $eq: chevre.factory.eventType.ScreeningEventSeries },
+            startDate: {
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-60, '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);
+        // }
+
+        const eventCount = (Array.isArray(action.object))
+            ? action.object.filter(({ typeOf }) => typeOf === chevre.factory.eventType.ScreeningEventSeries)
+                .length
+            : 0;
+        if (action.instrument?.id !== CONSOLE_CLIENT_ID) {
+            console.log(eventCount, 'events created', action.project.id, action.startDate, action.instrument?.id, i);
+            // tslint:disable-next-line:no-magic-numbers
+            if (eventCount > 20) {
+                throw new Error('eventCount too large');
+            }
+        }
+    });
+
+    console.log(i, 'actions checked');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/emailMessageBuilder.d.ts

@@ -6,7 +6,9 @@ export declare function createSendOrderMessage(params: {
     order: factory.order.IOrder;
     email?: factory.creativeWork.message.email.ICustomization;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
-}): Promise<factory.creativeWork.message.email.ICreativeWork>;
+}): Promise<factory.action.transfer.send.message.email.IObjectAsEmailMessage & {
+    identifier: string;
+}>;
 /**
  * 注文返品メッセージを作成する
  */

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

@@ -9,6 +9,7 @@ type IEmailMessage = factory.creativeWork.message.email.ICreativeWork & {
         typeOf: factory.organizationType.Project;
     };
 };
+type IFindByIdentifierResult = Pick<IEmailMessage, 'about' | 'identifier' | 'name' | 'sender' | 'text' | 'toRecipient' | 'typeOf'>;
 /**
  * メッセージリポジトリ
  */
@@ -19,5 +20,14 @@ export declare class MessageRepo {
      * コードをキーにしてなければ作成する(複数対応)
      */
     upsertByIdentifier(params: Pick<IEmailMessage, 'about' | 'identifier' | 'mainEntity' | 'name' | 'project' | 'sender' | 'text' | 'toRecipient'>[]): Promise<BulkWriteResult | void>;
+    /**
+     * コードで参照
+     */
+    findByIdentifier(params: {
+        identifier: string;
+        project: {
+            id: string;
+        };
+    }): Promise<IFindByIdentifierResult>;
 }
 export {};

package/lib/chevre/repo/message.js

@@ -70,5 +70,29 @@ class MessageRepo {
             }
         });
     }
+    /**
+     * コードで参照
+     */
+    findByIdentifier(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.messageModel.findOne({
+                'project.id': { $eq: params.project.id },
+                identifier: { $eq: params.identifier }
+            }, {
+                typeOf: 1,
+                identifier: 1,
+                name: 1,
+                about: 1,
+                sender: 1,
+                text: 1,
+                toRecipient: 1
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.creativeWorkType.EmailMessage);
+            }
+            return doc.toObject();
+        });
+    }
 }
 exports.MessageRepo = MessageRepo;

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

@@ -1,5 +1,6 @@
 import * as factory from '../factory';
 import type { MongoRepository as ActionRepo } from '../repo/action';
+import type { MessageRepo } from '../repo/message';
 import type { MongoRepository as ProjectRepo } from '../repo/project';
 export type IReport2developersOperation<T> = (repos: {
     accessToken: string;
@@ -11,6 +12,7 @@ export type IReport2developersOperation<T> = (repos: {
  */
 export declare function sendEmailMessage(params: factory.action.transfer.send.message.email.IAttributes): (repos: {
     action: ActionRepo;
+    message: MessageRepo;
     project: ProjectRepo;
 }) => Promise<void>;
 /**

package/lib/chevre/service/notification.js

@@ -43,7 +43,17 @@ function sendEmailMessage(params) {
                 throw new factory.errors.ServiceUnavailable('API Key not found');
             }
             sgMail.setApiKey(apiKey);
-            const emailMessage = params.object;
+            let emailMessage;
+            if (typeof params.object.text === 'string') {
+                emailMessage = params.object;
+            }
+            else {
+                // メッセージリポジトリに対応(2024-04-29~)
+                emailMessage = yield repos.message.findByIdentifier({
+                    identifier: params.object.identifier,
+                    project: { id: action.project.id }
+                });
+            }
             const emailMessageFrom = {
                 name: emailMessage.sender.name,
                 email: emailMessage.sender.email

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const action_1 = require("../../repo/action");
+const message_1 = require("../../repo/message");
 const project_1 = require("../../repo/project");
 const NotificationService = require("../notification");
 /**
@@ -20,6 +21,7 @@ function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield NotificationService.sendEmailMessage(data.actionAttributes)({
             action: new action_1.MongoRepository(settings.connection),
+            message: new message_1.MessageRepo(settings.connection),
             project: new project_1.MongoRepository(settings.connection)
         });
     });

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

@@ -36,6 +36,7 @@ type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
          */
         useAcceptedOffersFromOrderInTransaction: boolean;
         useSaveMessages: boolean;
+        useOptimizedSendEmailAction: boolean;
     };
 };
 /**

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

@@ -99,7 +99,7 @@ function confirm(params) {
         // ポストアクションを作成
         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));
+            transaction: transaction, useOptimizedSendEmailAction: params.options.useOptimizedSendEmailAction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined));
         // メッセージ保管(2024-04-28~)
         yield saveMessagesIfNeeded({ options: params.options }, result.order, emailMessages)(repos);
         // ステータス変更

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

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

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

@@ -39,10 +39,18 @@ function createSendEmailMessageActions(params) {
             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);
+                let sendEmailMessageActionObject = emailMessage;
+                // 送信アクション最適化に対応(2024-04-29~)
+                if (params.useOptimizedSendEmailAction) {
+                    sendEmailMessageActionObject = {
+                        identifier: emailMessage.identifier,
+                        typeOf: factory.creativeWorkType.EmailMessage
+                    };
+                }
                 sendEmailMessageActions.push({
                     project: params.order.project,
                     typeOf: factory.actionType.SendAction,
-                    object: emailMessage,
+                    object: sendEmailMessageActionObject,
                     agent: params.order.project,
                     recipient: {
                         typeOf: params.order.customer.typeOf,

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

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

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.368.0-alpha.3",
+    "@chevre/factory": "4.369.0-alpha.1",
     "@cinerino/sdk": "5.17.1",
     "@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.30.0-alpha.18"
+  "version": "21.30.0-alpha.19"
 }