@chevre/domain 21.2.0-alpha.4 → 21.2.0-alpha.41

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -78,7 +78,35 @@ function createTasks(params) {
             object: transaction
         }
     };
-    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask);
+    // 確定取引にも決済承認中止タスクを追加(2023-05-03~)
+    const voidPaymentTaskAttributes = {
+        project: transaction.project,
+        name: factory.taskName.VoidPayTransaction,
+        status: factory.taskStatus.Ready,
+        runsAt: taskRunsAt,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data: {
+            project: transaction.project,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id }
+        }
+    };
+    // 確定取引にも興行オファー承認中止タスクを追加(2023-05-09~)
+    const voidReserveTaskAttributes = {
+        project: transaction.project,
+        name: factory.taskName.VoidReserveTransaction,
+        status: factory.taskStatus.Ready,
+        runsAt: taskRunsAt,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data: {
+            project: transaction.project,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id }
+        }
+    };
+    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask, voidPaymentTaskAttributes, voidReserveTaskAttributes);
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
             const potentialActions = transaction.potentialActions;
@@ -107,22 +135,8 @@ function createTasks(params) {
             };
             taskAttributes.push(placeOrderTaskAttributes);
             break;
-        // 期限切れor中止の場合は、タスクリストを作成する
         case factory.transactionStatusType.Canceled:
         case factory.transactionStatusType.Expired:
-            const voidReserveTaskAttributes = {
-                project: transaction.project,
-                name: factory.taskName.VoidReserveTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    project: transaction.project,
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                }
-            };
             const voidRegisterServiceTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.VoidRegisterServiceTransaction,
@@ -136,19 +150,6 @@ function createTasks(params) {
                     purpose: { typeOf: transaction.typeOf, id: transaction.id }
                 }
             };
-            const voidPaymentTaskAttributes = {
-                project: transaction.project,
-                name: factory.taskName.VoidPayTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    project: transaction.project,
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                }
-            };
             const voidMoneyTransferTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.VoidMoneyTransferTransaction,
@@ -162,7 +163,7 @@ function createTasks(params) {
                     purpose: { typeOf: transaction.typeOf, id: transaction.id }
                 }
             };
-            taskAttributes.push(voidReserveTaskAttributes, voidRegisterServiceTaskAttributes, voidPaymentTaskAttributes, voidMoneyTransferTaskAttributes);
+            taskAttributes.push(voidRegisterServiceTaskAttributes, voidMoneyTransferTaskAttributes);
             break;
         default:
             throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);

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

@@ -36,11 +36,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     await repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -311,7 +311,7 @@ function authorizeAward(params) {
         if (Array.isArray(givePointAwardParams)) {
             const pointAwardIdentifiers = givePointAwardParams.map((g) => { var _a; return String((_a = g.object) === null || _a === void 0 ? void 0 : _a.identifier); });
             // 取引にインセンティブ付与アクションパラメータを保管する
-            yield repos.transaction.findByIdAndUpdate({
+            yield repos.transaction.findByIdAndUpdateInProgress({
                 id: transaction.id,
                 update: {
                     $set: {
@@ -339,7 +339,7 @@ function voidAward(params) {
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        yield repos.transaction.findByIdAndUpdate({
+        yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
             update: {
                 $unset: {

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

@@ -384,11 +384,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     await repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -45,6 +45,12 @@ export declare function exportTasks<T extends factory.transactionType>(params: {
     typeOf?: {
         $in: T[];
     };
+    id?: string;
+    tasksExportAction?: {
+        agent: {
+            name: string;
+        };
+    };
 }): IExportTasksOperation<void>;
 /**
  * 取引に関わるリソースを削除する

package/lib/chevre/service/transaction.js

@@ -19,6 +19,7 @@ const MoneyTransferTransactionService = require("./transaction/moneyTransfer");
 const PlaceOrderTransactionService = require("./transaction/placeOrder");
 const PlaceOrderInProgressTransactionService = require("./transaction/placeOrderInProgress");
 const ReturnOrderTransactionService = require("./transaction/returnOrder");
+const settings_1 = require("../settings");
 exports.moneyTransfer = MoneyTransferTransactionService;
 exports.placeOrder = PlaceOrderTransactionService;
 exports.placeOrderInProgress = PlaceOrderInProgressTransactionService;
@@ -77,15 +78,17 @@ exports.updateAgent = updateAgent;
  */
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.startExportTasks({
-            project: params.project,
-            typeOf: params.typeOf,
-            status: params.status
-        });
+        var _a;
+        const transaction = yield repos.transaction.startExportTasks(Object.assign({ project: params.project, typeOf: params.typeOf, status: params.status, tasksExportAction: {
+                agent: {
+                    name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
+                        ? params.tasksExportAction.agent.name
+                        : settings_1.DEFAULT_TASKS_EXPORT_AGENT_NAME
+                }
+            } }, (typeof params.id === 'string') ? { id: params.id } : undefined));
         if (transaction === null) {
             return;
         }
-        // let tasks: factory.task.ITask<factory.taskName>[] = [];
         // 失敗してもここでは戻さない(RUNNINGのまま待機)
         switch (transaction.typeOf) {
             case factory.transactionType.MoneyTransfer:
@@ -109,7 +112,6 @@ function exportTasks(params) {
             default:
         }
         yield repos.transaction.setTasksExportedById({ id: transaction.id });
-        // return tasks;
     });
 }
 exports.exportTasks = exportTasks;

package/lib/chevre/settings.d.ts

@@ -27,11 +27,12 @@ export type ISettings = factory.project.ISettings & {
     useOfferRateLimitProjects: string[];
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
+export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
-export declare const USE_NEW_CONFIRMATION_NUMBER_KEY_FROM: moment.Moment;
-export declare const USE_NEW_ORDER_NUMBER_KEY_FROM: moment.Moment;
+export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
+export declare const MAX_RETRY_COUNT_TRIGGER_WEBHOOK: number;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.USE_NEW_ORDER_NUMBER_KEY_FROM = exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
+exports.settings = exports.MAX_RETRY_COUNT_TRIGGER_WEBHOOK = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -44,17 +44,18 @@ exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = (typeof process.env.TRANSA
     : 7;
 exports.DEFAULT_SENDER_EMAIL = process.env.DEFAULT_SENDER_EMAIL;
 exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = String(process.env.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD);
+exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
 exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
-    : moment('2023-07-23T15:00:00Z');
-exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = (typeof process.env.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM === 'string')
-    ? moment(process.env.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM)
-    : moment('2023-04-30T15:00:00Z');
-exports.USE_NEW_ORDER_NUMBER_KEY_FROM = (typeof process.env.USE_NEW_ORDER_NUMBER_KEY_FROM === 'string')
-    ? moment(process.env.USE_NEW_ORDER_NUMBER_KEY_FROM)
-    : moment('2023-04-18T15:00:00Z');
+    : moment('2023-08-31T15:00:00Z');
+exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
+    ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
+    : 0;
+exports.MAX_RETRY_COUNT_TRIGGER_WEBHOOK = (typeof process.env.MAX_RETRY_COUNT_TRIGGER_WEBHOOK === 'string')
+    ? Number(process.env.MAX_RETRY_COUNT_TRIGGER_WEBHOOK)
+    : 0;
 /**
  * グローバル設定
  */

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.310.0",
+    "@chevre/factory": "4.311.0",
     "@cinerino/sdk": "3.154.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -58,7 +58,7 @@
     "googleapis": "^85.0.0",
     "json2csv": "4.5.4",
     "mocha": "^5.2.0",
-    "mongoose": "6.10.4",
+    "mongoose": "7.0.5",
     "nock": "^9.6.1",
     "nyc": "^15.1.0",
     "power-assert": "^1.6.1",
@@ -74,7 +74,7 @@
   },
   "peerDependencies": {
     "aws-sdk": "^2.0.0",
-    "mongoose": "^6.0.0",
+    "mongoose": "^7.0.5",
     "redis": "^4.6.5"
   },
   "engines": {
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.4"
+  "version": "21.2.0-alpha.41"
 }

package/example/src/chevre/migrateMoneyTransferPendingTransactionIdentifier.ts

@@ -1,96 +0,0 @@
-// 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) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const accountTransactionRepo = new chevre.repository.AccountTransaction(mongoose.connection);
-    const assetTransactionRepo = new chevre.repository.AssetTransaction(mongoose.connection);
-
-    const cursor = assetTransactionRepo.getCursor(
-        {
-            'project.id': { $eq: project.id },
-            typeOf: { $eq: chevre.factory.assetTransactionType.MoneyTransfer },
-            startDate: {
-                $gte: moment('2023-02-17T15:00:00Z')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('assetTransactions found');
-
-    let i = 0;
-    let updateCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const moneyTransferTransaction: chevre.factory.assetTransaction.moneyTransfer.ITransaction = doc.toObject();
-
-        const description = moneyTransferTransaction.object.description;
-        if (description !== '鑑賞' && description !== '受け取り') {
-            console.log(
-                'no operation needed',
-                description,
-                moneyTransferTransaction.project.id,
-                moneyTransferTransaction.transactionNumber,
-                moneyTransferTransaction.startDate
-            );
-        } else {
-            const pendingTransactionIdentifier = moneyTransferTransaction.object.pendingTransaction?.identifier;
-            if (typeof pendingTransactionIdentifier === 'string' && pendingTransactionIdentifier.length > 0) {
-                console.log(
-                    'pendingTransactionIdentifier found',
-                    description,
-                    moneyTransferTransaction.project.id,
-                    moneyTransferTransaction.transactionNumber,
-                    moneyTransferTransaction.startDate
-                );
-            } else {
-                // 口座取引からidentifierを取得
-                const accountTransaction =
-                    await accountTransactionRepo.findByTransactionNumber({ transactionNumber: moneyTransferTransaction.transactionNumber });
-                console.log(
-                    'updating identifier...',
-                    accountTransaction.identifier,
-                    description,
-                    moneyTransferTransaction.project.id,
-                    moneyTransferTransaction.transactionNumber,
-                    moneyTransferTransaction.startDate
-                );
-                if (typeof accountTransaction.identifier === 'string') {
-                    await assetTransactionRepo.findByIdAndUpdate({
-                        id: moneyTransferTransaction.id,
-                        update: {
-                            'object.pendingTransaction.identifier': accountTransaction.identifier
-                        }
-                    });
-                }
-                console.log(
-                    'ientifier updated',
-                    accountTransaction.identifier,
-                    description,
-                    moneyTransferTransaction.project.id,
-                    moneyTransferTransaction.transactionNumber,
-                    moneyTransferTransaction.startDate
-                );
-                updateCount += 1;
-            }
-        }
-    });
-    console.log(i, 'assetTransactions checked');
-    console.log(updateCount, 'assetTransactions updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateMovieAdditionalProperties.ts

@@ -1,98 +0,0 @@
-// 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) };
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const additionalPropertyRepo = new chevre.repository.AdditionalProperty(mongoose.connection);
-    const creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
-
-    const cursor = creativeWorkRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('movies found');
-
-    const additionalPropertyNames: string[] = [];
-    const projectIds: string[] = [];
-    const unexpextedprojectIds: string[] = [];
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const movie: chevre.factory.creativeWork.movie.ICreativeWork = doc.toObject();
-
-        const additionalPropertyNamesOnEvent = movie.additionalProperty?.map((p) => p.name);
-        if (Array.isArray(additionalPropertyNamesOnEvent) && additionalPropertyNamesOnEvent.length > 0) {
-            console.log(
-                additionalPropertyNamesOnEvent.length,
-                'additionalPropertyNamesOnEvent found',
-                movie.project.id,
-                movie.id
-            );
-            additionalPropertyNames.push(...additionalPropertyNamesOnEvent);
-            projectIds.push(movie.project.id);
-            additionalPropertyNamesOnEvent.forEach((name) => {
-                if (!name.match(/^[a-zA-Z]*$/)) {
-                    // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                    unexpextedprojectIds.push(movie.project.id);
-                }
-                // tslint:disable-next-line:no-magic-numbers
-                if (name.length < 5) {
-                    // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                    unexpextedprojectIds.push(movie.project.id);
-                }
-            });
-
-            for (const additionalPropertyNameOnEvent of additionalPropertyNamesOnEvent) {
-                const existings = await additionalPropertyRepo.search({
-                    project: { id: { $eq: movie.project.id } },
-                    limit: 1,
-                    page: 1,
-                    name: { $regex: `^${additionalPropertyNameOnEvent}$` }
-                });
-                if (existings.length > 0) {
-                    console.log('already existed', additionalPropertyNameOnEvent, movie.id, movie.project.id);
-                } else {
-                    updateCount += 1;
-                    const newAdditionalProperty: chevre.factory.additionalProperty.IAdditionalProperty = {
-                        project: movie.project,
-                        typeOf: 'CategoryCode',
-                        codeValue: additionalPropertyNameOnEvent,
-                        inCodeSet: {
-                            typeOf: 'CategoryCodeSet',
-                            identifier: <chevre.factory.creativeWorkType.Movie>movie.typeOf
-                        },
-                        name: { ja: additionalPropertyNameOnEvent }
-                    };
-                    await additionalPropertyRepo.save({
-                        attributes: newAdditionalProperty
-                    });
-                    console.log('created', additionalPropertyNameOnEvent, movie.id, movie.project.id);
-                }
-            }
-        }
-    });
-    console.log(i, 'events checked');
-    console.log(updateCount, 'properties updated');
-    console.log('additionalPropertyNames:', [...new Set(additionalPropertyNames)]);
-    console.log('projectIds:', [...new Set(projectIds)]);
-    console.log('unexpextedprojectIds:', [...new Set(unexpextedprojectIds)]);
-}
-
-main()
-    .then()
-    .catch(console.error);