@chevre/domain 20.4.0-alpha.7 → 20.4.0-alpha.9

package/example/src/chevre/createManyEventsIfNotExist.ts

@@ -31,16 +31,16 @@ async function main() {
                     .toDate(),
                 endDate: moment('2023-02-01T06:00:00.000Z')
                     .toDate(),
-                workPerformed: {
-                    typeOf: chevre.factory.creativeWorkType.Movie,
-                    identifier: '1622100',
-                    id: '5bfb841d5a78d7948369980a',
-                    name: {
-                        en: 'Pet',
-                        ja: 'ペット'
-                    },
-                    duration: 'PT2H3M'
-                },
+                // workPerformed: {
+                //     typeOf: chevre.factory.creativeWorkType.Movie,
+                //     identifier: '1622100',
+                //     id: '5bfb841d5a78d7948369980a',
+                //     name: {
+                //         en: 'Pet',
+                //         ja: 'ペット'
+                //     },
+                //     duration: 'PT2H3M'
+                // },
                 location: {
                     typeOf: chevre.factory.placeType.ScreeningRoom,
                     branchCode: '10',

package/example/src/chevre/migrateMoneyTransferPendingTransactionIdentifier.ts

@@ -0,0 +1,96 @@
+// 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/lib/chevre/repo/assetTransaction.d.ts

@@ -144,6 +144,7 @@ export declare class MongoRepository {
     findByIdAndDelete(params: {
         id: string;
     }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
     aggregateAssetTransaction(params: {
         project?: {
             id?: {

package/lib/chevre/repo/assetTransaction.js

@@ -536,6 +536,11 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.transactionModel.find(conditions, projection)
+            .sort({ startDate: factory.sortType.Ascending })
+            .cursor();
+    }
     aggregateAssetTransaction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -62,20 +62,29 @@ function start(params) {
             recipient: params.recipient,
             object: Object.assign(Object.assign({ amount,
                 fromLocation,
-                toLocation, pendingTransaction: Object.assign({ typeOf: transactionType, id: '', transactionNumber: transactionNumber }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined) }, (typeof params.object.description === 'string') ? { description: params.object.description } : {}), { force: params.object.force === true }),
+                toLocation, pendingTransaction: Object.assign({ typeOf: transactionType, transactionNumber: transactionNumber }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined) }, (typeof params.object.description === 'string') ? { description: params.object.description } : {}), { force: params.object.force === true }),
             expires: params.expires
         };
         // 取引開始
         let transaction;
         try {
             transaction = yield repos.assetTransaction.start(startParams);
-            const pendingTransaction = yield authorizeAccount({ transaction })(repos);
-            yield repos.assetTransaction.findByIdAndUpdate({
-                id: transaction.id,
-                update: {
-                    'object.pendingTransaction': Object.assign({ typeOf: pendingTransaction.typeOf, id: pendingTransaction.id, transactionNumber: pendingTransaction.transactionNumber }, (typeof pendingTransaction.identifier === 'string') ? { identifier: pendingTransaction.identifier } : undefined)
-                }
-            });
+            // const pendingTransaction = await authorizeAccount({ transaction })(repos);
+            yield authorizeAccount({ transaction })(repos);
+            // 更新不要(2023-02-20~)
+            // await repos.assetTransaction.findByIdAndUpdate<factory.assetTransactionType.MoneyTransfer>({
+            //     id: transaction.id,
+            //     update: {
+            //         'object.pendingTransaction': {
+            //             typeOf: pendingTransaction.typeOf,
+            //             id: pendingTransaction.id,
+            //             transactionNumber: pendingTransaction.transactionNumber,
+            //             ...(typeof pendingTransaction.identifier === 'string')
+            //                 ? { identifier: pendingTransaction.identifier }
+            //                 : undefined
+            //         }
+            //     }
+            // });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment

package/lib/chevre/service/delivery.js

@@ -88,7 +88,10 @@ function createGivePointAwardStartParams4moneyTransfer(params, transactionNumber
                 : params.purpose.typeOf,
             fromLocation: agent,
             toLocation,
-            pendingTransaction: { typeOf: factory.account.transactionType.Deposit, id: '', transactionNumber }
+            pendingTransaction: {
+                typeOf: factory.account.transactionType.Deposit,
+                transactionNumber
+            }
         } }, (typeof params.object.identifier === 'string') ? { identifier: params.object.identifier } : undefined);
 }
 /**
@@ -181,7 +184,10 @@ function processReturnPointAwardByTransactionIdentifier(params) {
                     fromLocation,
                     toLocation: depositTransaction.object.fromLocation,
                     description: `[Return Award]${depositTransaction.object.description}`,
-                    pendingTransaction: { typeOf: factory.account.transactionType.Withdraw, id: '', transactionNumber },
+                    pendingTransaction: {
+                        typeOf: factory.account.transactionType.Withdraw,
+                        transactionNumber
+                    },
                     force: true
                 }
             })(repos);
@@ -260,7 +266,10 @@ function processReturnPointAwardByTransactionFromLocationIdentifier(params) {
                         // },
                         toLocation,
                         description: `[Return Award]${returningTransaction.object.description}`,
-                        pendingTransaction: { typeOf: factory.account.transactionType.Transfer, id: '', transactionNumber },
+                        pendingTransaction: {
+                            typeOf: factory.account.transactionType.Transfer,
+                            transactionNumber
+                        },
                         force: true
                     }
                 })(repos);

package/lib/chevre/service/event.js

@@ -21,6 +21,7 @@ const difference = require("lodash.difference");
 const moment = require("moment-timezone");
 const credentials_1 = require("../credentials");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 const offer_1 = require("./offer");
 // const customsearch = google.customsearch('v1');
 const debug = createDebug('chevre-domain:service:event');
@@ -449,32 +450,11 @@ function createScreeningEventFromCOA(params) {
         priceCurrency: factory.priceCurrency.JPY
     };
     const { additionalProperty, coaInfo } = createScreeningEventAdditionalPropertyFromCOA(params);
-    return {
-        project: { typeOf: params.project.typeOf, id: params.project.id },
-        typeOf: factory.eventType.ScreeningEvent,
-        id: id,
-        identifier: id,
-        name: params.superEvent.name,
-        eventStatus: factory.eventStatusType.EventScheduled,
-        workPerformed: params.superEvent.workPerformed,
-        location: {
-            // 不要なので廃止(2022-12-19~)
-            // project: { typeOf: params.project.typeOf, id: params.project.id },
+    return Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.eventType.ScreeningEvent, id: id, identifier: id, name: params.superEvent.name, eventStatus: factory.eventStatusType.EventScheduled, location: {
             typeOf: params.screenRoom.typeOf,
             branchCode: params.screenRoom.branchCode,
             name: params.screenRoom.name
-        },
-        endDate: endDate,
-        startDate: startDate,
-        superEvent: params.superEvent,
-        coaInfo,
-        offers: offers,
-        checkInCount: 0,
-        attendeeCount: 0,
-        maximumAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity,
-        remainingAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity,
-        additionalProperty
-    };
+        }, endDate: endDate, startDate: startDate, superEvent: params.superEvent, coaInfo, offers: offers, checkInCount: 0, attendeeCount: 0, maximumAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity, remainingAttendeeCapacity: params.screenRoom.maximumAttendeeCapacity, additionalProperty }, (settings_1.settings.useEventWorkPerformed) ? { workPerformed: params.superEvent.workPerformed } : undefined);
 }
 function createScreeningEventAdditionalPropertyFromCOA(params) {
     const coaInfo = {

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

@@ -158,7 +158,6 @@ function processStartDepositTransaction(params) {
                     description: description,
                     pendingTransaction: {
                         typeOf: factory.account.transactionType.Deposit,
-                        id: '',
                         transactionNumber: params.transactionNumber
                     }
                 },

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

@@ -57,7 +57,6 @@ function returnMoneyTransfer(params) {
                         toLocation: depositTransaction.object.fromLocation,
                         pendingTransaction: {
                             typeOf: factory.account.transactionType.Withdraw,
-                            id: '',
                             transactionNumber: publishTransactionNumber4returnMoneyTransferResult.transactionNumber
                         }
                     }

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.6",
-    "@cinerino/sdk": "3.140.0-alpha.8",
+    "@chevre/factory": "4.289.0-alpha.8",
+    "@cinerino/sdk": "3.140.0-alpha.10",
     "@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.7"
+  "version": "20.4.0-alpha.9"
 }

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