@chevre/domain 21.2.0-alpha.10 → 21.2.0-alpha.101

package/lib/chevre/settings.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = 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.MONGO_MAX_TIME_MS = 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 = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
     : [];
+const informEventUrls = (typeof process.env.INFORM_EVENT_URL === 'string')
+    ? process.env.INFORM_EVENT_URL.split(' ')
+    : [];
 const informOrderUrls = (typeof process.env.INFORM_ORDER_URL === 'string')
     ? process.env.INFORM_ORDER_URL.split(' ')
     : [];
@@ -14,6 +17,12 @@ const informReservationUrls = (typeof process.env.INFORM_RESERVATION_URL === 'st
     : [];
 // tslint:disable-next-line:no-magic-numbers
 const triggerWebhookTimeout = (process.env.TRIGGER_WEBHOOK_TIMEOUT !== undefined) ? Number(process.env.TRIGGER_WEBHOOK_TIMEOUT) : 15000;
+exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = (typeof process.env.TRIGGER_WEBHOOK_MAX_RETRY_COUNT === 'string')
+    ? Number(process.env.TRIGGER_WEBHOOK_MAX_RETRY_COUNT)
+    : 0;
+exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = (typeof process.env.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS === 'string')
+    ? Number(process.env.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS)
+    : 0;
 const MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = (typeof process.env.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS === 'string')
     ? Number(process.env.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS)
     // tslint:disable-next-line:no-magic-numbers
@@ -34,7 +43,10 @@ exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = (typeof process.env.ASSET_TRA
 /**
  * 取引保管期間(Confirmed)
  */
-exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = 365;
+exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = (typeof process.env.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS === 'string')
+    ? Number(process.env.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS)
+    // tslint:disable-next-line:no-magic-numbers
+    : 365;
 /**
  * 取引保管期間(Canceled)
  */
@@ -44,18 +56,35 @@ 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-08-31T15: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.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.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
+    ? Number(process.env.MONGO_MAX_TIME_MS)
+    // tslint:disable-next-line:no-magic-numbers
+    : 10000;
 /**
  * グローバル設定
  */
-exports.settings = Object.assign(Object.assign({ transactionWebhookUrls, onOrderStatusChanged: {
+exports.settings = Object.assign(Object.assign({ transactionWebhookUrls, onEventChanged: {
+        informEvent: informEventUrls
+            .filter((url) => url.length > 0)
+            .map((url) => {
+            return {
+                recipient: {
+                    typeOf: factory.creativeWorkType.WebApplication,
+                    name: 'Global HUB',
+                    url
+                }
+            };
+        })
+    }, onOrderStatusChanged: {
         informOrder: informOrderUrls
             .filter((url) => url.length > 0)
             .map((url) => {

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.311.0",
-    "@cinerino/sdk": "3.154.0",
+    "@chevre/factory": "4.313.0-alpha.29",
+    "@cinerino/sdk": "3.157.0-alpha.9",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.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.10"
+  "version": "21.2.0-alpha.101"
 }

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);

package/lib/chevre/service/task/deleteAssetTransaction.d.ts

@@ -1,12 +0,0 @@
-import { IOperation } from '../task';
-import * as factory from '../../factory';
-import { MongoRepository as ActionRepo } from '../../repo/action';
-import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
-/**
- * タスク実行関数
- */
-export declare function call(data: factory.task.IData<factory.taskName.DeleteAssetTransaction>): IOperation<void>;
-export declare function deleteAssetTransaction(params: factory.task.IData<factory.taskName.DeleteAssetTransaction>): (repos: {
-    action: ActionRepo;
-    assetTransaction: AssetTransactionRepo;
-}) => Promise<void>;

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

@@ -1,65 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteAssetTransaction = exports.call = void 0;
-const factory = require("../../factory");
-const action_1 = require("../../repo/action");
-const assetTransaction_1 = require("../../repo/assetTransaction");
-/**
- * タスク実行関数
- */
-function call(data) {
-    return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        yield deleteAssetTransaction(data)({
-            action: actionRepo,
-            assetTransaction: assetTransactionRepo
-        });
-    });
-}
-exports.call = call;
-function deleteAssetTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const assetTransaction = params.object;
-        // アクションを作成(logとしての意味合いも含めて)
-        const actionAttributes = {
-            typeOf: factory.actionType.DeleteAction,
-            project: assetTransaction.project,
-            object: assetTransaction,
-            agent: assetTransaction.project
-        };
-        const action = yield repos.action.start(actionAttributes);
-        try {
-            const assetTransactionTypeOf = assetTransaction.typeOf;
-            switch (assetTransactionTypeOf) {
-                default:
-                    // 取引削除
-                    yield repos.assetTransaction.findByIdAndDelete({ id: assetTransaction.id });
-            }
-        }
-        catch (error) {
-            // actionにエラー結果を追加
-            try {
-                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
-        }
-        // アクション完了
-        const actionResult = {};
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-    });
-}
-exports.deleteAssetTransaction = deleteAssetTransaction;

package/lib/chevre/service/task/deleteOrder.d.ts

@@ -1,6 +0,0 @@
-import { IOperation } from '../task';
-import * as factory from '../../factory';
-/**
- * タスク実行関数
- */
-export declare function call(data: factory.task.IData<factory.taskName.DeleteOrder>): IOperation<void>;