@chevre/domain 21.26.0-alpha.1 → 21.26.0-alpha.2

package/example/src/chevre/migrateDeleteTransactionTasks.ts

@@ -20,11 +20,11 @@ async function main() {
             runsAt: {
                 $gte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(290, 'days')
+                    .add(329, 'days')
                     .toDate(),
                 $lte: moment()
                     // tslint:disable-next-line:no-magic-numbers
-                    .add(330, 'days')
+                    .add(365, 'days')
                     .toDate()
             }
             // _id: { $eq: '64aba5f37b8b8ef9eca60be5' }

package/lib/chevre/service/offer/moneyTransfer/authorize.js

@@ -152,7 +152,10 @@ function createAuthorizeMoneyTransferOfferActionattributes(params) {
                 ? seller.name
                 : String((_b = seller.name) === null || _b === void 0 ? void 0 : _b.ja)
         },
-        recipient: transaction.agent,
+        recipient: {
+            id: transaction.agent.id,
+            typeOf: transaction.agent.typeOf
+        },
         purpose: { typeOf: transaction.typeOf, id: transaction.id }
     };
 }

package/lib/chevre/service/offer/product/factory.js

@@ -44,7 +44,6 @@ function createActionAttributes(params) {
     return {
         project: transaction.project,
         typeOf: factory.actionType.AuthorizeAction,
-        // Chevreサービス登録取引を使用して
         instrument: {
             typeOf: factory.assetTransactionType.RegisterService,
             transactionNumber: params.transactionNumber
@@ -57,7 +56,10 @@ function createActionAttributes(params) {
                 ? transaction.seller.name
                 : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
         },
-        recipient: transaction.agent,
+        recipient: {
+            id: transaction.agent.id,
+            typeOf: transaction.agent.typeOf
+        },
         purpose: { typeOf: transaction.typeOf, id: transaction.id }
     };
 }

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

@@ -80,12 +80,12 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                     object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
                     agent: order.project,
                     purpose: Object.assign(Object.assign({}, simpleOrder), { confirmationNumber: order.confirmationNumber }),
-                    instrument: {
-                        // typeOf: 'WebAPI',
-                        typeOf: factory.assetTransactionType.Pay,
-                        identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre,
-                        transactionNumber: invoice.paymentMethodId
-                    },
+                    // 廃止(2024-03-12~)
+                    // instrument: {
+                    //     typeOf: factory.assetTransactionType.Pay, // 産取引化(2024-03-11~)
+                    //     identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre,
+                    //     transactionNumber: invoice.paymentMethodId
+                    // },
                     processOrder: order.orderStatus === factory.orderStatus.OrderPaymentDue,
                     useOnOrderStatusChanged: true
                 };

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

@@ -136,8 +136,10 @@ function fixOrderAsPurpose(params) {
 function confirmReserveTransaction(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let confirmActionObject;
-        switch (params.instrument.identifier) {
-            case factory.service.webAPI.Identifier.COA:
+        switch (params.object.typeOf) {
+            // switch (params.instrument.identifier) {
+            case 'COAReserveTransaction':
+                // case factory.service.webAPI.Identifier.COA:
                 // 最適化されたタスクに対応するため、ここでIObject4COAを注文から生成する(2024-01-24~)
                 const order = yield fixOrderAsPurpose({
                     project: { id: params.project.id },
@@ -171,8 +173,10 @@ function confirmReserveTransaction(params, options) {
         let updReserveResult;
         try {
             const object = confirmActionAttributes.object;
-            switch (params.instrument.identifier) {
-                case factory.service.webAPI.Identifier.COA:
+            switch (object.typeOf) {
+                // switch (params.instrument.identifier) {
+                case 'COAReserveTransaction':
+                    // case factory.service.webAPI.Identifier.COA:
                     // COA本予約
                     updReserveResult = yield COAReserveService.confirm({
                         project: { id: confirmActionAttributes.project.id },

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.362.0-alpha.1",
+    "@chevre/factory": "4.362.0-alpha.2",
     "@cinerino/sdk": "5.14.0-alpha.0",
     "@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.26.0-alpha.1"
+  "version": "21.26.0-alpha.2"
 }