@chevre/domain 20.2.0-alpha.5 → 20.2.0-alpha.50

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

@@ -306,7 +306,7 @@ function validateAppliedReturnPolicy(params) {
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        let transaction = yield repos.transaction.findById({ typeOf: factory.transactionType.ReturnOrder, id: params.id });
+        const transaction = yield repos.transaction.findById({ typeOf: factory.transactionType.ReturnOrder, id: params.id });
         if (transaction.status === factory.transactionStatusType.Confirmed) {
             // すでに確定済の場合
             return transaction.result;
@@ -356,14 +356,14 @@ function confirm(params) {
             // useConfirmRefund: params.useConfirmRefund
         });
         // ステータス変更
-        transaction = yield repos.transaction.confirm({
+        yield repos.transaction.confirm({
             typeOf: transaction.typeOf,
             id: transaction.id,
             authorizeActions: [],
             result: result,
             potentialActions: potentialActions
         });
-        return transaction.result;
+        return result;
     });
 }
 exports.confirm = confirm;
@@ -386,9 +386,11 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        yield Promise.all(taskAttributes.map((taskAttribute) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.task.save(taskAttribute);
-        })));
+        // saveManyに変更(2023-02-01~)
+        yield repos.task.saveMany(taskAttributes);
+        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
+        //     await repos.task.save(taskAttribute);
+        // }));
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/settings.d.ts

@@ -23,6 +23,8 @@ export declare type ISettings = factory.project.ISettings & {
     maxNumCreditCardPaymentMethod?: number;
 };
 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;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = 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_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 factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(',')
@@ -14,9 +14,9 @@ const informOrderUrls = (typeof process.env.INFORM_ORDER_URL === 'string')
 const informReservationUrls = (typeof process.env.INFORM_RESERVATION_URL === 'string')
     ? process.env.INFORM_RESERVATION_URL.split(',')
     : [];
-const informUseReservationUrls = (typeof process.env.INFORM_USE_RESERVATION_URL === 'string')
-    ? process.env.INFORM_USE_RESERVATION_URL.split(',')
-    : [];
+// const informUseReservationUrls = (typeof process.env.INFORM_USE_RESERVATION_URL === 'string')
+//     ? process.env.INFORM_USE_RESERVATION_URL.split(',')
+//     : [];
 // tslint:disable-next-line:no-magic-numbers
 const triggerWebhookTimeout = (process.env.TRIGGER_WEBHOOK_TIMEOUT !== undefined) ? Number(process.env.TRIGGER_WEBHOOK_TIMEOUT) : 15000;
 const MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = (typeof process.env.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS === 'string')
@@ -43,9 +43,14 @@ exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = 365;
 /**
  * 取引保管期間(Canceled)
  */
-exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = 7;
+exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = (typeof process.env.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS === 'string')
+    ? Number(process.env.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS)
+    // tslint:disable-next-line:no-magic-numbers
+    : 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.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';
 /**
  * グローバル設定
  */
@@ -76,13 +81,16 @@ exports.settings = Object.assign({ transactionWebhookUrls, onOrderStatusChanged:
             .map((url) => {
             return { recipient: { url } };
         })
-    }, onReservationUsed: {
-        informAction: informUseReservationUrls
-            .filter((url) => url.length > 0)
-            .map((url) => {
-            return { recipient: { url } };
-        })
-    }, webhook: {
+    }, 
+    // 廃止(2023-01-30~)
+    // onReservationUsed: {
+    //     informAction: informUseReservationUrls
+    //         .filter((url) => url.length > 0)
+    //         .map((url) => {
+    //             return { recipient: { url } };
+    //         })
+    // },
+    webhook: {
         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 }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.281.0-alpha.2",
-    "@cinerino/sdk": "3.135.0-alpha.6",
+    "@chevre/factory": "4.284.0-alpha.4",
+    "@cinerino/sdk": "3.137.0-alpha.2",
     "@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.2.0-alpha.5"
+  "version": "20.2.0-alpha.50"
 }

package/example/src/chevre/aggregateReservationOnProject.ts

@@ -1,32 +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 };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    // const now = new Date();
-    await chevre.service.aggregation.project.aggregate({
-        project: { id: project.id },
-        reservationFor: {
-            startFrom: moment('2022-01-01T00:00:00+09:00')
-                .toDate(),
-            startThrough: moment('2022-01-31T23:59:59+09:00')
-                .toDate(),
-        }
-    })({
-        project: new chevre.repository.Project(mongoose.connection),
-        reservation: new chevre.repository.Reservation(mongoose.connection),
-        task: new chevre.repository.Task(mongoose.connection)
-    });
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);

package/example/src/chevre/migratePlaceAdditionalProperties.ts

@@ -1,162 +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 placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const cursor = placeRepo.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('creativeWorks found');
-
-    const additionalPropertyNames: string[] = [];
-    const additionalPropertyNamesOnSections: string[] = [];
-    const additionalPropertyNamesOnSeats: string[] = [];
-    const projectIds: string[] = [];
-    const unexpextedprojectIds: string[] = [];
-    const projectIdsOnSections: string[] = [];
-    const unexpextedprojectIdsOnSections: string[] = [];
-    const projectIdsOnSeats: string[] = [];
-    const unexpextedprojectIdsOnSeats: string[] = [];
-
-    let i = 0;
-    let updateCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const movieTheater: chevre.factory.place.movieTheater.IPlace = doc.toObject();
-
-        if (Array.isArray(movieTheater.containsPlace)) {
-            movieTheater.containsPlace.forEach((screeningRoom) => {
-                const additionalPropertyNamesOnResource = screeningRoom.additionalProperty?.map((p) => p.name);
-                console.log(
-                    (Array.isArray(additionalPropertyNamesOnResource)) ? additionalPropertyNamesOnResource.length : 0,
-                    'additionalPropertyNamesOnResource found',
-                    movieTheater.project.id,
-                    movieTheater.id
-                );
-                if (Array.isArray(additionalPropertyNamesOnResource) && additionalPropertyNamesOnResource.length > 0) {
-                    console.log(
-                        additionalPropertyNamesOnResource.length,
-                        'additionalPropertyNamesOnResource found',
-                        movieTheater.project.id,
-                        movieTheater.id
-                    );
-                    additionalPropertyNames.push(...additionalPropertyNamesOnResource);
-                    projectIds.push(movieTheater.project.id);
-                    additionalPropertyNamesOnResource.forEach((name) => {
-                        if (!name.match(/^[a-zA-Z]*$/)) {
-                            // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                            unexpextedprojectIds.push(movieTheater.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(movieTheater.project.id);
-                        }
-                    });
-                }
-
-                if (Array.isArray(screeningRoom.containsPlace)) {
-                    screeningRoom.containsPlace.forEach((section) => {
-                        const additionalPropertyNamesOnSection = section.additionalProperty?.map((p) => p.name);
-                        console.log(
-                            (Array.isArray(additionalPropertyNamesOnSection)) ? additionalPropertyNamesOnSection.length : 0,
-                            'additionalPropertyNamesOnSection found',
-                            movieTheater.project.id,
-                            movieTheater.id
-                        );
-                        if (Array.isArray(additionalPropertyNamesOnSection) && additionalPropertyNamesOnSection.length > 0) {
-                            console.log(
-                                additionalPropertyNamesOnSection.length,
-                                'additionalPropertyNamesOnSection found',
-                                movieTheater.project.id,
-                                movieTheater.id
-                            );
-                            additionalPropertyNamesOnSections.push(...additionalPropertyNamesOnSection);
-                            projectIdsOnSections.push(movieTheater.project.id);
-                            additionalPropertyNamesOnSection.forEach((name) => {
-                                if (!name.match(/^[a-zA-Z]*$/)) {
-                                    // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                                    unexpextedprojectIdsOnSections.push(movieTheater.project.id);
-                                }
-                                // tslint:disable-next-line:no-magic-numbers
-                                if (name.length < 5) {
-                                    // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                                    unexpextedprojectIdsOnSections.push(movieTheater.project.id);
-                                }
-                            });
-                        }
-
-                        if (Array.isArray(section.containsPlace)) {
-                            section.containsPlace.forEach((seat) => {
-                                const additionalPropertyNamesOnSeat = seat.additionalProperty?.map((p) => p.name);
-                                console.log(
-                                    (Array.isArray(additionalPropertyNamesOnSeat)) ? additionalPropertyNamesOnSeat.length : 0,
-                                    'additionalPropertyNamesOnSeat found',
-                                    movieTheater.project.id,
-                                    movieTheater.id
-                                );
-                                if (Array.isArray(additionalPropertyNamesOnSeat) && additionalPropertyNamesOnSeat.length > 0) {
-                                    console.log(
-                                        additionalPropertyNamesOnSeat.length,
-                                        'additionalPropertyNamesOnSeat found',
-                                        movieTheater.project.id,
-                                        movieTheater.id
-                                    );
-                                    additionalPropertyNamesOnSeats.push(...additionalPropertyNamesOnSeat);
-                                    projectIdsOnSeats.push(movieTheater.project.id);
-                                    additionalPropertyNamesOnSeat.forEach((name) => {
-                                        if (!name.match(/^[a-zA-Z]*$/)) {
-                                            // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                                            unexpextedprojectIdsOnSeats.push(movieTheater.project.id);
-                                        }
-                                        // tslint:disable-next-line:no-magic-numbers
-                                        if (name.length < 5) {
-                                            // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                                            unexpextedprojectIdsOnSeats.push(movieTheater.project.id);
-                                        }
-                                    });
-                                }
-
-                            });
-                        }
-                    });
-                }
-            });
-        }
-    });
-    console.log(i, 'places checked');
-    console.log(updateCount, 'places updated');
-    console.log([...new Set(additionalPropertyNames)], 'screeningRooms');
-    console.log([...new Set(projectIds)], 'screeningRooms');
-    console.log([...new Set(unexpextedprojectIds)], 'screeningRooms');
-    console.log([...new Set(additionalPropertyNamesOnSections)], 'sections');
-    console.log([...new Set(projectIdsOnSections)], 'sections');
-    console.log([...new Set(unexpextedprojectIdsOnSections)], 'sections');
-    console.log([...new Set(additionalPropertyNamesOnSeats)], 'seats');
-    console.log([...new Set(projectIdsOnSeats)], 'seats');
-    console.log([...new Set(unexpextedprojectIdsOnSeats)], 'seats');
-}
-
-main()
-    .then()
-    .catch(console.error);