@chevre/domain 20.4.0-alpha.1 → 20.4.0-alpha.10

package/lib/chevre/service/permit.js

@@ -78,33 +78,40 @@ exports.activate = activate;
 function search(project, params, projection) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        let serviceOutputs;
+        let permitsWithAccountDetail;
         // アウトプット検索条件のプロジェクトは強制的に上書き
         const searchConditions = Object.assign(Object.assign({}, params), { project: { id: { $eq: project.id } } });
         const productType = (_b = (_a = params.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === null || _b === void 0 ? void 0 : _b.$eq;
         switch (productType) {
             case factory.product.ProductType.PaymentCard:
-                serviceOutputs = yield repos.serviceOutput.search(searchConditions, projection);
+                const permits = yield repos.serviceOutput.search(searchConditions, projection);
+                permitsWithAccountDetail = permits;
                 // 口座詳細取得
-                const accountNumbers = serviceOutputs.map((s) => { var _a; return (_a = s.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber; })
-                    .filter((a) => typeof a === 'string');
+                const accountNumbers = permits.map((permit) => { var _a; return (_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber; })
+                    .filter((accountNumber) => typeof accountNumber === 'string');
                 if (accountNumbers.length > 0) {
                     const accounts = yield repos.account.search({
                         project: { id: { $eq: project.id } },
                         accountNumbers: accountNumbers
                     });
-                    serviceOutputs = serviceOutputs.map((s) => {
-                        const account = accounts.find((a) => { var _a; return a.accountNumber === ((_a = s.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber); });
-                        return Object.assign(Object.assign({}, s), (account !== undefined)
-                            ? { paymentAccount: account }
-                            : undefined);
+                    permitsWithAccountDetail = permits.map((permit) => {
+                        const account = accounts.find((a) => { var _a; return a.accountNumber === ((_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber); });
+                        const paymentAccount = (typeof (account === null || account === void 0 ? void 0 : account.typeOf) === 'string')
+                            ? {
+                                accountNumber: account.accountNumber,
+                                availableBalance: account.availableBalance,
+                                balance: account.balance,
+                                typeOf: account.typeOf
+                            }
+                            : undefined;
+                        return Object.assign(Object.assign({}, permit), { paymentAccount });
                     });
                 }
                 break;
             default:
-                serviceOutputs = yield repos.serviceOutput.search(searchConditions, projection);
+                permitsWithAccountDetail = (yield repos.serviceOutput.search(searchConditions, projection));
         }
-        return serviceOutputs;
+        return permitsWithAccountDetail;
     });
 }
 exports.search = search;

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

@@ -328,7 +328,6 @@ function processMoneyTransferTransaction(params) {
                     toLocation,
                     pendingTransaction: {
                         typeOf: factory.account.transactionType.Transfer,
-                        id: '',
                         transactionNumber: params.transactionNumber
                     },
                     force: false

package/lib/chevre/settings.d.ts

@@ -21,6 +21,7 @@ export declare type ISettings = factory.project.ISettings & {
     userPoolIdOld: string;
     userPoolIdNew: string;
     maxNumCreditCardPaymentMethod?: number;
+    useEventWorkPerformed: boolean;
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;

package/lib/chevre/settings.js

@@ -54,7 +54,7 @@ exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TR
 /**
  * グローバル設定
  */
-exports.settings = Object.assign({ transactionWebhookUrls, onOrderStatusChanged: {
+exports.settings = Object.assign(Object.assign({ transactionWebhookUrls, onOrderStatusChanged: {
         informOrder: informOrderUrls
             .filter((url) => url.length > 0)
             .map((url) => {
@@ -94,4 +94,4 @@ exports.settings = Object.assign({ transactionWebhookUrls, onOrderStatusChanged:
         timeout: triggerWebhookTimeout
     }, maximumReservationGracePeriodInDays: MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS, userPoolIdOld: String(process.env.USERPOOL_ID_OLD), userPoolIdNew: String(process.env.USERPOOL_ID_NEW) }, (typeof MAX_NUM_CREDIT_CARD_PAYMENT_METHOD === 'number')
     ? { maxNumCreditCardPaymentMethod: MAX_NUM_CREDIT_CARD_PAYMENT_METHOD }
-    : undefined);
+    : undefined), { useEventWorkPerformed: process.env.USE_EVENT_WORK_PERFORMED === '1' });

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.289.0-alpha.2",
-    "@cinerino/sdk": "3.140.0-alpha.1",
+    "@chevre/factory": "4.289.0-alpha.9",
+    "@cinerino/sdk": "3.140.0-alpha.11",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.1"
+  "version": "20.4.0-alpha.10"
 }

package/example/src/chevre/migrateAccountTitleAdditionalProperties.ts

@@ -1,157 +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 accountTitleRepo = new chevre.repository.AccountTitle(mongoose.connection);
-
-    const cursor = accountTitleRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID }
-            // typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries },
-            // starDate: { $gte: new Date() }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('accountTitles found');
-
-    const additionalPropertyNamesOnCategories: string[] = [];
-    const additionalPropertyNames: string[] = [];
-    const additionalPropertyNamesOnTitles: string[] = [];
-    const projectIdsOnCategories: string[] = [];
-    const projectIds: string[] = [];
-    const projectIdsOnTitles: string[] = [];
-    const unexpextedprojectIdsOnCategories: string[] = [];
-    const unexpextedprojectIds: string[] = [];
-    const unexpextedprojectIdsOnTitles: string[] = [];
-
-    let i = 0;
-    let updateCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const accountTitleCategory: chevre.factory.accountTitle.IAccountTitle = doc.toObject();
-
-        const additionalPropertyNamesOnCategory = accountTitleCategory.additionalProperty?.map((p) => p.name);
-        console.log(
-            (Array.isArray(additionalPropertyNamesOnCategory)) ? additionalPropertyNamesOnCategory.length : 0,
-            'additionalPropertyNamesOnCategory found',
-            accountTitleCategory.project.id,
-            accountTitleCategory.codeValue
-        );
-        if (Array.isArray(additionalPropertyNamesOnCategory) && additionalPropertyNamesOnCategory.length > 0) {
-            console.log(
-                additionalPropertyNamesOnCategory.length,
-                'additionalPropertyNamesOnResource found',
-                accountTitleCategory.project.id,
-                accountTitleCategory.codeValue
-            );
-            additionalPropertyNamesOnCategories.push(...additionalPropertyNamesOnCategory);
-            projectIdsOnCategories.push(accountTitleCategory.project.id);
-            additionalPropertyNamesOnCategory.forEach((name) => {
-                if (!name.match(/^[a-zA-Z]*$/)) {
-                    // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                    unexpextedprojectIdsOnCategories.push(accountTitleCategory.project.id);
-                }
-                // tslint:disable-next-line:no-magic-numbers
-                if (name.length < 5) {
-                    // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                    unexpextedprojectIdsOnCategories.push(accountTitleCategory.project.id);
-                }
-            });
-        }
-
-        if (Array.isArray(accountTitleCategory.hasCategoryCode)) {
-            accountTitleCategory.hasCategoryCode.forEach((accountTitleSet) => {
-                const additionalPropertyNamesOnResource = accountTitleSet.additionalProperty?.map((p) => p.name);
-                console.log(
-                    (Array.isArray(additionalPropertyNamesOnResource)) ? additionalPropertyNamesOnResource.length : 0,
-                    'additionalPropertyNamesOnResource found',
-                    accountTitleCategory.project.id,
-                    accountTitleCategory.codeValue
-                );
-                if (Array.isArray(additionalPropertyNamesOnResource) && additionalPropertyNamesOnResource.length > 0) {
-                    console.log(
-                        additionalPropertyNamesOnResource.length,
-                        'additionalPropertyNamesOnResource found',
-                        accountTitleCategory.project.id,
-                        accountTitleCategory.codeValue
-                    );
-                    additionalPropertyNames.push(...additionalPropertyNamesOnResource);
-                    projectIds.push(accountTitleCategory.project.id);
-                    additionalPropertyNamesOnResource.forEach((name) => {
-                        if (!name.match(/^[a-zA-Z]*$/)) {
-                            // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                            unexpextedprojectIds.push(accountTitleCategory.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(accountTitleCategory.project.id);
-                        }
-                    });
-                }
-
-                if (Array.isArray(accountTitleSet.hasCategoryCode)) {
-                    accountTitleSet.hasCategoryCode.forEach((accountTitl) => {
-                        const additionalPropertyNamesOnSection = accountTitl.additionalProperty?.map((p) => p.name);
-                        console.log(
-                            (Array.isArray(additionalPropertyNamesOnSection)) ? additionalPropertyNamesOnSection.length : 0,
-                            'additionalPropertyNamesOnSection found',
-                            accountTitleCategory.project.id,
-                            accountTitleCategory.codeValue
-                        );
-                        if (Array.isArray(additionalPropertyNamesOnSection) && additionalPropertyNamesOnSection.length > 0) {
-                            console.log(
-                                additionalPropertyNamesOnSection.length,
-                                'additionalPropertyNamesOnSection found',
-                                accountTitleCategory.project.id,
-                                accountTitleCategory.codeValue
-                            );
-                            additionalPropertyNamesOnTitles.push(...additionalPropertyNamesOnSection);
-                            projectIdsOnTitles.push(accountTitleCategory.project.id);
-                            additionalPropertyNamesOnSection.forEach((name) => {
-                                if (!name.match(/^[a-zA-Z]*$/)) {
-                                    // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                                    unexpextedprojectIdsOnTitles.push(accountTitleCategory.project.id);
-                                }
-                                // tslint:disable-next-line:no-magic-numbers
-                                if (name.length < 5) {
-                                    // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                                    unexpextedprojectIdsOnTitles.push(accountTitleCategory.project.id);
-                                }
-                            });
-                        }
-                    });
-                }
-            });
-        }
-    });
-    console.log(i, 'places checked');
-    console.log(updateCount, 'places updated');
-    console.log([...new Set(additionalPropertyNamesOnCategories)], 'categories');
-    console.log([...new Set(projectIdsOnCategories)], 'categories');
-    console.log([...new Set(unexpextedprojectIdsOnCategories)], 'categories');
-    console.log([...new Set(additionalPropertyNames)], 'sets');
-    console.log([...new Set(projectIds)], 'sets');
-    console.log([...new Set(unexpextedprojectIds)], 'sets');
-    console.log([...new Set(additionalPropertyNamesOnTitles)], 'titles');
-    console.log([...new Set(projectIdsOnTitles)], 'titles');
-    console.log([...new Set(unexpextedprojectIdsOnTitles)], 'titles');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateProjectSubscription.ts

@@ -1,51 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const projectRepo = new chevre.repository.Project(mongoose.connection);
-
-    const cursor = projectRepo.getCursor(
-        {
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('projects found');
-
-    let i = 0;
-    let updateCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const project: chevre.factory.project.IProject = doc.toObject();
-
-        const useEventServiceAsProduct = project.subscription?.useEventServiceAsProduct;
-        const alreadyMigrated = useEventServiceAsProduct === true;
-
-        if (alreadyMigrated) {
-            console.log('already migrated.', project.id, i);
-        } else {
-            console.log(
-                'updating product...', project.id, i);
-            await projectRepo.findByIdAndIUpdate({
-                id: project.id,
-                subscription: { useEventServiceAsProduct: true }
-            });
-            updateCount += 1;
-            console.log('updated...', project.id, i);
-        }
-    });
-    console.log(i, 'projects checked');
-    console.log(updateCount, 'projects updated');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/example/src/chevre/migrateSection.ts

@@ -1,105 +0,0 @@
-// tslint:disable:no-console no-magic-numbers
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-import * as redis from 'redis';
-
-import { chevre } from '../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const client = redis.createClient({
-        host: <string>process.env.REDIS_HOST,
-        port: Number(process.env.REDIS_PORT),
-        password: <string>process.env.REDIS_KEY
-    });
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const events = await eventRepo.search({
-        typeOf: chevre.factory.eventType.ScreeningEvent,
-        project: { id: { $eq: '' } },
-        startFrom: new Date()
-        // startThrough: moment().add(4, 'day').toDate()
-    });
-    console.log(events.length, 'events found');
-
-    const sectionCode = 'Default';
-    await Promise.all(events.map(async (event) => {
-        await new Promise<void>((resolve) => {
-            const key = `chevre:itemAvailability:screeningEvent:${event.id}`;
-            client.hgetall(key, async (__, reply) => {
-                if (reply !== null && Object.keys(reply).length > 0) {
-
-                    const fieldAndValues = reply;
-                    for (const field of Object.keys(fieldAndValues)) {
-                        // セクションがなければキーを更新
-                        if (field.slice(0, 7) !== sectionCode) {
-                            console.log(event.id, field);
-                            const newField = `${sectionCode}${field}`;
-                            const newValue = fieldAndValues[field];
-                            console.log('saving...', newField, newValue);
-
-                            await new Promise<void>((resolveSet) => {
-                                client.hsetnx(key, newField, newValue, (___, setReply) => {
-                                    console.log('set', setReply, newField, newValue);
-
-                                    resolveSet();
-                                });
-                            });
-
-                            // 元のフィールドを削除
-                            await new Promise<void>((resolveSet) => {
-                                client.hdel(key, field, (___, setReply) => {
-                                    console.log('deleted', setReply, field);
-
-                                    resolveSet();
-                                });
-                            });
-                        }
-                    }
-                }
-
-                resolve();
-                // if (err !== null) {
-                //     reject(err);
-                // } else {
-                //     if (reply !== null) {
-                //         client.ttl(targetKey, (ttlErr, ttl) => {
-                //             console.log('ttl:', ttl);
-                //             const args = Object.keys(reply)
-                //                 .reduce(
-                //                     (a, b) => {
-                //                         return [...a, b, reply[b]];
-                //                     },
-                //                     []
-                //                 );
-                //             console.log(args.length, 'args ready');
-
-                //             newClient.multi()
-                //                 .hmset(newKey, ...args)
-                //                 .expire(newKey, ttl)
-                //                 .exec((hmsetErr, reply) => {
-                //                     console.log('hmset result:', hmsetErr, reply);
-                //                     resolve();
-                //                 });
-                //         });
-                //     } else {
-                //         console.error('targetKey not found');
-                //     }
-                // }
-            });
-        });
-    }));
-
-    // client.keys('chevre:itemAvailability:screeningEvent:*', async (err, reply) => {
-    //     console.log(err, reply.length, 'keys found');
-    //     const targetKeys = reply;
-
-    // });
-
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/lib/chevre/repo/accountAction.d.ts

@@ -1,42 +0,0 @@
-import { Connection } from 'mongoose';
-import * as factory from '../factory';
-import { modelName } from './mongoose/model/accountAction';
-export { modelName };
-export declare type IAction<T extends factory.actionType> = T extends factory.actionType.MoneyTransfer ? factory.account.action.moneyTransfer.IAction : never;
-/**
- * 口座アクションリポジトリ
- */
-export declare class MongoRepository {
-    private readonly actionModel;
-    constructor(connection: Connection);
-    /**
-     * アクション開始
-     */
-    /**
-     * アクション完了
-     */
-    /**
-     * アクション中止
-     */
-    /**
-     * アクション失敗
-     */
-    /**
-     * アクション検索
-     */
-    /**
-     * 転送アクションを検索する
-     */
-    /**
-     * アクションを検索する
-     * @param searchConditions 検索条件
-     */
-    clean(params: {
-        project?: {
-            id?: string;
-        };
-        startDate: {
-            $lt: Date;
-        };
-    }): Promise<void>;
-}