@chevre/domain 21.2.0-alpha.2 → 21.2.0-alpha.21

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

package/lib/chevre/service/transaction.js

@@ -77,15 +77,10 @@ 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
-        });
+        const transaction = yield repos.transaction.startExportTasks(Object.assign({ project: params.project, typeOf: params.typeOf, status: params.status }, (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 +104,6 @@ function exportTasks(params) {
             default:
         }
         yield repos.transaction.setTasksExportedById({ id: transaction.id });
-        // return tasks;
     });
 }
 exports.exportTasks = exportTasks;

package/lib/chevre/settings.d.ts

@@ -30,7 +30,8 @@ export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: 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_ORDER_NUMBER_KEY_FROM: moment.Moment;
+export declare const USE_NEW_CONFIRMATION_NUMBER_KEY_FROM: moment.Moment;
+export declare const USE_EVENT_EMITTERS: boolean;
 /**
  * グローバル設定
  */

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_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.USE_EVENT_EMITTERS = 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;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -48,10 +48,11 @@ exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTIO
 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_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-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.USE_EVENT_EMITTERS = process.env.USE_EVENT_EMITTERS === '1';
 /**
  * グローバル設定
  */

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.2"
+  "version": "21.2.0-alpha.21"
 }

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/repo/itemAvailability/screeningEvent.js

@@ -1,193 +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.RedisRepository = void 0;
-const createDebug = require("debug");
-const moment = require("moment");
-const factory = require("../../factory");
-const settings_1 = require("../../settings");
-const debug = createDebug('chevre-domain:repo');
-/**
- * イベントストックホルダーリポジトリ
- */
-class RedisRepository {
-    constructor(redisClient) {
-        this.redisClient = redisClient;
-    }
-    static offer2field(params) {
-        var _a, _b;
-        // 予約IDをfieldにする場合
-        const serviceOutputId = (_b = (_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id;
-        if (typeof serviceOutputId === 'string') {
-            return serviceOutputId;
-        }
-        return `${params.seatSection}:${params.seatNumber}`;
-    }
-    static createKey(params) {
-        const useNewKey = params.startDate instanceof Date
-            && moment(params.startDate)
-                .isSameOrAfter(settings_1.USE_NEW_EVENT_AVAILABILITY_KEY_FROM);
-        if (useNewKey) {
-            return `${RedisRepository.KEY_PREFIX_NEW}:${params.eventId}`;
-        }
-        else {
-            return `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
-        }
-    }
-    /**
-     * 座席をロックする(maxキャパシティチェック有)
-     */
-    lockIfNotLimitExceeded(lockKey, maximum) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-            yield this.redisClient.watch(key);
-            const hashCount = yield this.redisClient.hLen(key);
-            // Process result
-            // Heavy and time consuming operation here
-            debug('checking hash count...hashCount:', hashCount);
-            if (hashCount + lockKey.offers.length > maximum) {
-                throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
-            }
-            yield this.lock(lockKey);
-        });
-    }
-    /**
-     * 座席をロックする
-     */
-    lock(lockKey) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-            const value = lockKey.holder;
-            const multi = this.redisClient.multi();
-            const fields = lockKey.offers.map((offer) => RedisRepository.offer2field(offer));
-            fields.forEach((field) => {
-                multi.hSetNX(key, field, value);
-            });
-            const results = yield multi.expireAt(key, moment(lockKey.expires)
-                .unix())
-                .exec();
-            debug('results:', results);
-            const lockedFields = [];
-            if (Array.isArray(results)) {
-                results.slice(0, fields.length)
-                    .forEach((r, index) => {
-                    if (r === 1 || r === true) {
-                        lockedFields.push(fields[index]);
-                    }
-                });
-            }
-            debug('locked fields:', lockedFields);
-            const lockedAll = lockedFields.length === fields.length;
-            debug('lockedAll?', lockedAll);
-            if (!lockedAll) {
-                if (lockedFields.length > 0) {
-                    // 全て仮押さえできなければ仮押さえできたものは解除
-                    yield this.redisClient.multi()
-                        .hDel(key, lockedFields)
-                        .exec();
-                }
-                throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
-            }
-        });
-    }
-    /**
-     * 座席ロックを解除する
-     */
-    unlock(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-            const field = RedisRepository.offer2field(params.offer);
-            yield this.redisClient.multi()
-                .hDel(key, field)
-                .exec();
-        });
-    }
-    /**
-     * 空席でない座席を検索する
-     */
-    findUnavailableOffersByEventId(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-            const reply = yield this.redisClient.hGetAll(key);
-            let offers = [];
-            if (reply !== null) {
-                offers = Object.keys(reply)
-                    .map((field) => {
-                    const seatSection = field.split(':')[0];
-                    const seatNumber = field.split(':')[1];
-                    return { seatSection, seatNumber };
-                });
-            }
-            return offers;
-        });
-    }
-    /**
-     * 空席でない座席をカウントする
-     */
-    countUnavailableOffers(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: params.event.id, startDate: params.event.startDate });
-            const reply = yield this.redisClient.hLen(key);
-            let fieldCount = 0;
-            if (typeof reply === 'number') {
-                fieldCount = Number(reply);
-            }
-            return fieldCount;
-        });
-    }
-    /**
-     * 保持者を取得する
-     */
-    getHolder(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-            const field = RedisRepository.offer2field(params.offer);
-            return this.redisClient.hGet(key, field);
-        });
-    }
-    /**
-     * 在庫状況を検索する
-     * offers.lengthが0だと"ERR wrong number of arguments for 'hmget' command"となるので注意
-     */
-    searchAvailability(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-            const fields = params.offers.map((o) => {
-                return RedisRepository.offer2field(o);
-            });
-            // Array reply: list of values associated with the given fields, in the same order as they are requested.
-            const result = yield this.redisClient.hmGet(key, fields);
-            if (!Array.isArray(result)) {
-                throw new factory.errors.ServiceUnavailable(`searchAvailability got non-array: ${typeof result}`);
-            }
-            // return params.offers.map((o, index) => {
-            //     const value4offer = result[index];
-            //     return {
-            //         ...o,
-            //         availability: (typeof value4offer === 'string')
-            //             ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
-            //             : factory.itemAvailability.InStock
-            //     };
-            // });
-            // availabilityのみ返却(2023-04-17~)
-            return result.map((holder) => {
-                return {
-                    availability: (typeof holder === 'string')
-                        ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
-                        : factory.itemAvailability.InStock
-                };
-            });
-        });
-    }
-}
-RedisRepository.KEY_PREFIX_NEW = 'stockHolder';
-RedisRepository.KEY_PREFIX = 'chevre:itemAvailability:screeningEvent';
-exports.RedisRepository = RedisRepository;