@chevre/domain 21.36.0-alpha.2 → 21.36.0-alpha.4

package/example/src/chevre/investigateTransaction.ts

@@ -0,0 +1,54 @@
+// 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) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
+
+    const cursor = transactionRepo.getCursor(
+        {
+            // typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
+            status: { $eq: chevre.factory.transactionStatusType.Confirmed },
+            startDate: {
+                $gte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-1, 'days')
+                    .toDate()
+            }
+        },
+        {
+            // project: 1,
+            // typeOf: 1,
+            // startDate: 1,
+            // object: 1,
+            // result: 1
+        }
+    );
+    console.log('transactions found');
+
+    let i = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const transaction: chevre.factory.transaction.ITransaction<chevre.factory.transactionType> = doc.toObject();
+
+        const size = JSON.stringify(transaction).length;
+        // tslint:disable-next-line:no-magic-numbers
+        if (size > 4000) {
+            console.log(
+                'size:', JSON.stringify(transaction).length,
+                transaction.typeOf, transaction.project.id, transaction.startDate, transaction.id, i);
+        }
+    });
+
+    console.log(i, 'transactions checked');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/person.js

@@ -109,7 +109,7 @@ class CognitoRepository {
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore if */
                 if (!phoneUtil.isValidNumber(phoneNumber)) {
-                    throw new Error('Invalid phone number');
+                    throw new factory.errors.Argument('telephone', 'Invalid phone number');
                 }
                 formatedPhoneNumber = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
             }
@@ -153,7 +153,7 @@ class CognitoRepository {
                         // tslint:disable-next-line:no-single-line-block-comment
                         /* istanbul ignore if */
                         if (!phoneUtil.isValidNumber(phoneNumber)) {
-                            throw new Error('Invalid phone number');
+                            throw new factory.errors.Argument('custom:telephone', 'Invalid phone number');
                         }
                         userAttributesValue = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
                     }

package/lib/chevre/service/assetTransaction/moneyTransfer.js

@@ -292,7 +292,7 @@ function createPermitServiceCredentials(params) {
         || typeof permitServiceAuthorizeServerDomain !== 'string' || permitServiceAuthorizeServerDomain.length === 0
         || typeof permitServiceClientId !== 'string' || permitServiceClientId.length === 0
         || typeof permitServiceClientSecret !== 'string' || permitServiceClientSecret.length === 0) {
-        throw new Error('membershipService availableChannel invalid');
+        throw new factory.errors.Internal('membershipService availableChannel invalid');
     }
     return {
         permitServiceEndpoint,

package/lib/chevre/service/assetTransaction/registerService.js

@@ -155,7 +155,7 @@ function createPermitService(params) {
             || typeof permitServiceAuthorizeServerDomain !== 'string' || permitServiceAuthorizeServerDomain.length === 0
             || typeof permitServiceClientId !== 'string' || permitServiceClientId.length === 0
             || typeof permitServiceClientSecret !== 'string' || permitServiceClientSecret.length === 0) {
-            throw new Error('product availableChannel invalid');
+            throw new factory.errors.Internal('product availableChannel invalid');
         }
         return new (yield pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,

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

@@ -695,7 +695,7 @@ function createPermitService(params) {
             || typeof permitServiceAuthorizeServerDomain !== 'string' || permitServiceAuthorizeServerDomain.length === 0
             || typeof permitServiceClientId !== 'string' || permitServiceClientId.length === 0
             || typeof permitServiceClientSecret !== 'string' || permitServiceClientSecret.length === 0) {
-            throw new Error('product availableChannel invalid');
+            throw new factory.errors.Internal('product availableChannel invalid');
         }
         return new (yield pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,

package/lib/chevre/service/moneyTransfer.js

@@ -348,7 +348,7 @@ function createPermitServiceCredentials(params) {
             || typeof permitServiceAuthorizeServerDomain !== 'string' || permitServiceAuthorizeServerDomain.length === 0
             || typeof permitServiceClientId !== 'string' || permitServiceClientId.length === 0
             || typeof permitServiceClientSecret !== 'string' || permitServiceClientSecret.length === 0) {
-            throw new Error('membershipService availableChannel invalid');
+            throw new factory.errors.Internal('membershipService availableChannel invalid');
         }
         return {
             permitServiceEndpoint,

package/lib/chevre/service/notification.js

@@ -106,7 +106,7 @@ function sendEmailMessage(params) {
             const response = yield sgMail.sendMultiple(msg);
             // check the response.
             if (response[0].statusCode !== http_status_1.ACCEPTED) {
-                throw new Error(`sendgrid request not accepted. response is ${util.inspect(response)}`);
+                throw new factory.errors.Internal(`sendgrid request not accepted. response is ${util.inspect(response)}`);
             }
             const { statusCode, statusMessage } = response[0];
             result = { statusCode, statusMessage };
@@ -130,7 +130,7 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
         var _a;
         const LINE_NOTIFY_URL = credentials_1.credentials.lineNotify.url;
         if (typeof LINE_NOTIFY_URL !== 'string') {
-            throw new Error('Environment variable LINE_NOTIFY_URL not set');
+            throw new factory.errors.Internal('Environment variable LINE_NOTIFY_URL not set');
         }
         let accessToken;
         switch (logLevel) {
@@ -144,7 +144,7 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
                 accessToken = credentials_1.credentials.lineNotify.accessToken;
         }
         if (typeof accessToken !== 'string') {
-            throw new Error('credentials.lineNotify.accessToken not set');
+            throw new factory.errors.Internal('credentials.lineNotify.accessToken not set');
         }
         const shortSubject = (subject.length > MAX_LINE_NOTIFY_SUBJECT_LENGTH)
             ? `${subject.slice(0, MAX_LINE_NOTIFY_SUBJECT_LENGTH)}...`
@@ -178,7 +178,7 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
                     case http_status_1.OK:
                         break;
                     default:
-                        throw new Error(`${res.status} ${body === null || body === void 0 ? void 0 : body.message}`);
+                        throw new factory.errors.Internal(`${res.status} ${body === null || body === void 0 ? void 0 : body.message}`);
                 }
             }
             catch (err) {
@@ -267,7 +267,7 @@ function processInformAction(params) {
                                 };
                                 break;
                             default:
-                                throw new Error(`statusCode: ${res.status} body: ${body}`);
+                                throw new factory.errors.Internal(`statusCode: ${res.status} body: ${body}`);
                         }
                     }
                     catch (err) {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.d.ts

@@ -1,9 +1,7 @@
 import type { MongoRepository as TaskRepo } from '../../../../repo/task';
 import * as factory from '../../../../factory';
 declare function createSendEmailMessageTaskIfNotExist(params: {
-    potentialActions?: {
-        sendEmailMessage?: Pick<factory.action.transfer.send.message.email.IAttributes, 'object'>[];
-    };
+    sendEmailMessage?: Pick<factory.action.transfer.send.message.email.IAttributes, 'object'>[];
     order: Pick<factory.order.IOrder, 'customer' | 'orderDate' | 'orderNumber' | 'price' | 'priceCurrency' | 'project' | 'typeOf'>;
 }): (repos: {
     task: TaskRepo;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js

@@ -14,8 +14,7 @@ const util = require("util");
 const factory = require("../../../../factory");
 function createSendEmailMessageTaskIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const sendEmailMessageActions = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.sendEmailMessage;
+        const sendEmailMessageActions = params.sendEmailMessage;
         const now = new Date();
         if (Array.isArray(sendEmailMessageActions)) {
             yield Promise.all(sendEmailMessageActions.map((sendEmailMessageAction, index) => __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -22,10 +22,11 @@ const factory_1 = require("./onOrderProcessing/factory");
 const debug = createDebug('chevre-domain:service:order');
 function onOrderProcessing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
-        const sendOrderPotentialActions = (_e = (_d = (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions;
+        const sendEmailMessageByOrderPotentialActions = (_f = (_e = (_d = (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions) === null || _f === void 0 ? void 0 : _f.sendEmailMessage;
+        const sendEmailMessageByOnOrderProcessing = (_k = (_j = (_h = (_g = params.placeOrderTransaction) === null || _g === void 0 ? void 0 : _g.potentialActions) === null || _h === void 0 ? void 0 : _h.order) === null || _j === void 0 ? void 0 : _j.onOrderProcessing) === null || _k === void 0 ? void 0 : _k.sendEmailMessage;
         // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,
@@ -70,7 +71,10 @@ function onOrderProcessing(params) {
                 // })(repos);
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
                 yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
-                    potentialActions: sendOrderPotentialActions,
+                    sendEmailMessage: [
+                        ...(Array.isArray(sendEmailMessageByOrderPotentialActions)) ? sendEmailMessageByOrderPotentialActions : [],
+                        ...(Array.isArray(sendEmailMessageByOnOrderProcessing)) ? sendEmailMessageByOnOrderProcessing : []
+                    ],
                     order: params.order
                 })(repos);
                 break;

package/lib/chevre/service/order/placeOrder.js

@@ -54,7 +54,7 @@ function placeOrder(params) {
         const orderActionAttributes = {
             agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : placeOrderTransaction.project,
             object: simpleOrder,
-            potentialActions: {},
+            // potentialActions: {}, // discontinue(2024-06-28~)
             project: placeOrderTransaction.project,
             purpose: orderActionPurpose,
             typeOf: factory.actionType.OrderAction

package/lib/chevre/service/order/placeOrderWithoutTransaction.js

@@ -34,7 +34,7 @@ function placeOrderWithoutTransaction(params) {
         const orderActionAttributes = {
             agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
             object: simpleOrder,
-            potentialActions: {},
+            // potentialActions: {}, // discontinue(2024-06-28~)
             project: order.project,
             // purpose: { typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id },
             typeOf: factory.actionType.OrderAction

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onPaid.js

@@ -36,7 +36,7 @@ function onReturnFeePaid(params, project) {
         var _a, _b;
         const orderNumber = (_b = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.object) === null || _b === void 0 ? void 0 : _b.orderNumber;
         if (typeof orderNumber !== 'string') {
-            throw new Error('params.purpose.object.orderNumber not string');
+            throw new factory.errors.Internal('params.purpose.object.orderNumber not string');
         }
         // 経理レポートに決済アクションを追加
         const action4save = Object.assign(Object.assign(Object.assign({}, params), { startDate: moment(params.startDate)
@@ -59,7 +59,7 @@ function onOrderPaid(params, project) {
         var _a;
         const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
         if (typeof orderNumber !== 'string') {
-            throw new Error('params.purpose.orderNumber not string');
+            throw new factory.errors.Internal('params.purpose.orderNumber not string');
         }
         // 経理レポートに決済アクションを追加
         const action4save = Object.assign(Object.assign(Object.assign({}, params), { startDate: moment(params.startDate)

package/lib/chevre/service/payment/any/onPaymentStatusChanged/onRefunded.js

@@ -32,7 +32,7 @@ function onOrderRefunded(params, project) {
         var _a, _b;
         const orderNumber = (_b = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.object) === null || _b === void 0 ? void 0 : _b.orderNumber;
         if (typeof orderNumber !== 'string') {
-            throw new Error('params.purpose.orderNumber not string');
+            throw new factory.errors.Internal('params.purpose.orderNumber not string');
         }
         // 経理レポートに決済アクションを追加
         const action4save = Object.assign(Object.assign(Object.assign({}, params), { startDate: moment(params.startDate)

package/lib/chevre/service/task.js

@@ -97,7 +97,7 @@ function execute(task) {
                 const taskExpired = moment(now)
                     .isAfter(task.expires);
                 if (taskExpired) {
-                    throw new Error(`task expired [expires:${task.expires}]`);
+                    throw new factory.errors.Internal(`task expired [expires:${task.expires}]`);
                 }
             }
             // タスク名の関数が定義されていなければ、TypeErrorとなる

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

@@ -9,5 +9,5 @@ export declare function createSendEmailMessageActions(params: {
     useOptimizedSendEmailAction: boolean;
 }): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
-    sendEmailMessageActions: factory.action.trade.order.IPotentialSendEmailMessageAction[];
+    sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[];
 }>;

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

@@ -11,32 +11,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
+const settings_1 = require("../../../settings");
 /**
  * 取引のポストアクションを作成する
  */
 function createPotentialActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        // ポイントインセンティブに対する承認アクションの分だけ、ポイントインセンティブ付与アクションを作成する
-        // const givePointAwardActions = await createGivePointAwardActions(params); // 完全廃止(2024-03-12~)
-        // 注文配送メール送信設定
+        // 注文処理開始メール送信設定
         const { emailMessages, sendEmailMessageActions } = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params);
         const sendOrderActionAttributes = {
-            potentialActions: {
-                // moneyTransfer: moneyTransferActions, // 廃止(2024-01-29~)
-                // registerService: registerServiceActions, // 廃止(2024-01-30~)
-                sendEmailMessage: sendEmailMessageActions
-            }
+            potentialActions: { sendEmailMessage: sendEmailMessageActions }
         };
         return {
             emailMessages,
-            // optimize(2024-01-22~)
             potentialActions: {
-                order: {
-                    potentialActions: {
-                        // givePointAward: givePointAwardActions, // 完全廃止(2024-03-12~)
-                        sendOrder: sendOrderActionAttributes // optimize(2024-01-16~)
-                    }
-                }
+                order: Object.assign({}, (settings_1.USE_EXPERIMENTAL_FEATURE)
+                    ? { onOrderProcessing: { sendEmailMessage: sendEmailMessageActions } }
+                    : { potentialActions: { sendOrder: sendOrderActionAttributes } } // optimize(2024-01-16~)
+                )
             }
         };
     });

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

@@ -297,7 +297,7 @@ function getReturnPolicyByProject(params) {
             });
             let body;
             try {
-                body = yield res.json();
+                body = (yield res.json());
             }
             catch (error) {
                 // no op
@@ -309,7 +309,7 @@ function getReturnPolicyByProject(params) {
                 case http_status_1.ACCEPTED:
                 case http_status_1.NO_CONTENT:
                     if (typeof ((_a = body === null || body === void 0 ? void 0 : body.restockingFee) === null || _a === void 0 ? void 0 : _a.value) !== 'number') {
-                        throw new Error('invalid return policy');
+                        throw new factory.errors.Internal('invalid return policy');
                     }
                     else {
                         returnPolicy = Object.assign({ typeOf: 'MerchantReturnPolicy', restockingFee: {

package/lib/chevre/service/transaction.js

@@ -34,7 +34,7 @@ function fixCustomer(params) {
             const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
             const phoneNumber = phoneUtil.parse(params.agent.telephone, params.agent.telephoneRegion);
             if (!phoneUtil.isValidNumber(phoneNumber)) {
-                throw new Error('Invalid phone number');
+                throw new factory.errors.Argument('telephone', 'Invalid phone number');
             }
             formattedTelephone = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.E164);
         }

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.376.0-alpha.0",
-    "@cinerino/sdk": "8.0.0-alpha.2",
+    "@chevre/factory": "4.376.0-alpha.2",
+    "@cinerino/sdk": "8.0.0-alpha.3",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.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-alpha.2"
+  "version": "21.36.0-alpha.4"
 }