@chevre/domain 20.1.0-alpha.37 → 20.1.0-alpha.39

package/example/src/chevre/migrateEventProjectAttributes.ts

@@ -0,0 +1,57 @@
+// 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);
+
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
+
+    const cursor = eventRepo.getCursor(
+        {
+            // 'project.id': { $eq: project.id },
+            'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
+            // typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries },
+            startDate: {
+                $gte: moment()
+                    .add(-1, 'month')
+                    .toDate()
+            }
+            // _id: { $eq: 'al6aff83w' }
+        },
+        {
+            // _id: 1,
+        }
+    );
+    console.log('events found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const event: chevre.factory.event.screeningEventSeries.IEvent = doc.toObject();
+
+        const locationProjectId = (<any>event.location).project?.id;
+        if (typeof locationProjectId !== 'string') {
+            console.log('already deleted', event.id, event.startDate, event.project.id, i);
+        } else {
+            updateCount += 1;
+            console.log('deleting project...', event.id, event.startDate, event.project.id, i);
+            await eventRepo.deleteUnnecessaryProjectAttributesById({ id: event.id });
+            console.log('project deleted', event.id, event.startDate, event.project.id, i);
+        }
+    });
+    console.log(i, 'events checked');
+    console.log(updateCount, 'events updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -106,4 +106,7 @@ export declare class MongoRepository {
     }, update: IUpdateAggregateReservationParams | IUpdateAggregateUseActionsParams): Promise<factory.event.IEvent<T>>;
     bulkWrite(bulkWriteOps: any[]): Promise<import("mongodb").BulkWriteOpResultObject>;
     getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
+    deleteUnnecessaryProjectAttributesById(params: {
+        id: string;
+    }): Promise<void>;
 }

package/lib/chevre/repo/event.js

@@ -649,5 +649,20 @@ class MongoRepository {
             .sort({ startDate: factory.sortType.Descending })
             .cursor();
     }
+    deleteUnnecessaryProjectAttributesById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.eventModel.updateOne({
+                _id: { $eq: params.id }
+            }, {
+                $unset: {
+                    'location.project': 1,
+                    'workPerformed.project': 1,
+                    'superEvent.location.project': 1,
+                    'superEvent.workPerformed.project': 1
+                }
+            })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -35,6 +35,11 @@ export declare class MongoRepository {
         underName?: factory.reservation.IUnderName<T>;
         reservedTicket?: factory.reservation.ITicket;
     }): Promise<factory.reservation.IReservation<T>>;
+    confirmByReservationNumber(params: {
+        reservationNumber: string;
+        previousReservationStatus: factory.reservationStatusType;
+        underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
+    }): Promise<void>;
     /**
      * 予約取消
      */

package/lib/chevre/repo/reservation.js

@@ -911,6 +911,19 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    confirmByReservationNumber(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = {
+                reservationNumber: { $eq: String(params.reservationNumber) },
+                reservationStatus: { $eq: params.previousReservationStatus }
+            };
+            const update = Object.assign({ reservationStatus: factory.reservationStatusType.ReservationConfirmed, modifiedTime: new Date() }, (params.underName !== undefined) ? { underName: params.underName } : undefined
+            // ...(params.reservedTicket !== undefined) ? { reservedTicket: params.reservedTicket } : undefined
+            );
+            yield this.reservationModel.updateMany(conditions, update)
+                .exec();
+        });
+    }
     /**
      * 予約取消
      */

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -8,6 +8,7 @@ const moment = require("moment");
 const factory = require("../../../factory");
 const accountTransactionIdentifier_1 = require("../../../factory/accountTransactionIdentifier");
 const price_1 = require("./factory/price");
+const USE_RESERVATION_PACKAGE_AS_OBJECT = process.env.USE_RESERVATION_PACKAGE_AS_OBJECT === '1';
 function createStartParams(params) {
     var _a;
     const reservationNumber = params.reservationNumber;
@@ -425,7 +426,9 @@ function createReservation(params) {
         : undefined);
 }
 exports.createReservation = createReservation;
+// tslint:disable-next-line:max-func-body-length
 function createPotentialActions(params) {
+    var _a;
     const transaction = params.transaction;
     const reservationFor = transaction.object.reservationFor;
     if (reservationFor === undefined) {
@@ -433,55 +436,70 @@ function createPotentialActions(params) {
     }
     // 予約アクション属性作成
     const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-    const reserveActionAttributes = pendingReservations.map((reservation) => {
-        var _a, _b;
-        const eventReservation = Object.assign(Object.assign({}, reservation), { reservationFor });
-        // 不要なので廃止(2022-12-14~)
-        // if (params.object !== undefined) {
-        //     // 予約属性の指定があれば上書き
-        //     const confirmingReservation = params.object.reservations.find((r) => r.id === eventReservation.id);
-        //     if (confirmingReservation !== undefined) {
-        //         if (confirmingReservation.underName !== undefined) {
-        //             eventReservation.underName = confirmingReservation.underName;
-        //             eventReservation.reservedTicket.underName = confirmingReservation.underName;
-        //         }
-        //         if (confirmingReservation.reservedTicket !== undefined) {
-        //             if (confirmingReservation.reservedTicket.issuedBy !== undefined) {
-        //                 eventReservation.reservedTicket.issuedBy = confirmingReservation.reservedTicket.issuedBy;
-        //             }
-        //         }
-        //     }
-        // }
-        // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
-        if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
-            const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
-            eventReservation.underName = ordre2reservationUnderNameResult.underName;
-            // 不要なので廃止(2022-12-19~)
-            // eventReservation.reservedTicket.underName = ordre2reservationUnderNameResult.underName;
-            eventReservation.reservedTicket.issuedBy = ordre2reservationUnderNameResult.issuedBy;
-        }
-        const acceptedOffer4reservation = (_b = transaction.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.find((o) => { var _a, _b; return ((_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id) === reservation.id; });
-        const moneyTransfer = createMoneyTransferActions({
-            acceptedOffer: acceptedOffer4reservation,
-            reservation: eventReservation,
-            transaction: params.transaction
-        });
-        return {
-            project: transaction.project,
-            typeOf: factory.actionType.ReserveAction,
-            result: {},
-            object: eventReservation,
-            // プロジェクトに変更(2022-05-26~)
-            agent: transaction.project,
-            potentialActions: {
-                moneyTransfer: moneyTransfer
-            },
-            purpose: {
-                typeOf: transaction.typeOf,
-                id: transaction.id
+    let reserveActionAttributes = [];
+    if (pendingReservations.length > 0) {
+        // ReservationPackageに対応(2022-12-22~)
+        if (USE_RESERVATION_PACKAGE_AS_OBJECT) {
+            let underName;
+            // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
+            if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
+                underName = ordre2reservationUnderNameResult.underName;
             }
-        };
-    });
+            const reservationPackage = {
+                reservationFor,
+                reservationNumber: pendingReservations[0].reservationNumber,
+                reservationStatus: pendingReservations[0].reservationStatus,
+                subReservation: pendingReservations,
+                underName,
+                typeOf: factory.reservationType.ReservationPackage
+            };
+            reserveActionAttributes = [{
+                    project: transaction.project,
+                    typeOf: factory.actionType.ReserveAction,
+                    // result: {},
+                    object: reservationPackage,
+                    agent: transaction.project,
+                    potentialActions: {
+                        // tslint:disable-next-line:no-suspicious-comment
+                        // TODO implement
+                        moneyTransfer: []
+                    },
+                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
+                }];
+        }
+        else {
+            reserveActionAttributes = pendingReservations.map((reservation) => {
+                var _a, _b;
+                const eventReservation = Object.assign(Object.assign({}, reservation), { reservationFor });
+                // purpose:Orderの指定があれば、underName,issuedByを調整(2022-05-23~)
+                if (typeof ((_a = params.order) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') {
+                    const ordre2reservationUnderNameResult = ordre2reservationUnderName({ order: params.order });
+                    eventReservation.underName = ordre2reservationUnderNameResult.underName;
+                    // 不要なので廃止(2022-12-19~)
+                    // eventReservation.reservedTicket.underName = ordre2reservationUnderNameResult.underName;
+                    eventReservation.reservedTicket.issuedBy = ordre2reservationUnderNameResult.issuedBy;
+                }
+                const acceptedOffer4reservation = (_b = transaction.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.find((o) => { var _a, _b; return ((_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id) === reservation.id; });
+                const moneyTransfer = createMoneyTransferActions({
+                    acceptedOffer: acceptedOffer4reservation,
+                    reservation: eventReservation,
+                    transaction: params.transaction
+                });
+                return {
+                    project: transaction.project,
+                    typeOf: factory.actionType.ReserveAction,
+                    // result: {},
+                    object: eventReservation,
+                    agent: transaction.project,
+                    potentialActions: {
+                        moneyTransfer: moneyTransfer
+                    },
+                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
+                };
+            });
+        }
+    }
     return {
         reserve: reserveActionAttributes
     };

package/lib/chevre/service/reserve/confirmReservation.js

@@ -19,6 +19,7 @@ const onReservationConfirmed_1 = require("./potentialActions/onReservationConfir
  * 予約を確定する
  */
 function confirmReservation(actionAttributesList) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let confirmedReservations = [];
         if (actionAttributesList.length > 0) {
@@ -26,19 +27,31 @@ function confirmReservation(actionAttributesList) {
                 const reservation = actionAttributes.object;
                 const action = yield repos.action.start(actionAttributes);
                 try {
-                    // 予約を確定状態に変更する
-                    // reservation = await repos.reservation.confirm<factory.reservationType.EventReservation>({
-                    yield repos.reservation.confirm({
-                        // 更新属性をwhitelist化(2022-06-13~)
-                        // ...actionAttributes.object,
-                        id: reservation.id,
-                        previousReservationStatus: reservation.reservationStatus,
-                        underName: reservation.underName,
-                        reservedTicket: reservation.reservedTicket
-                    });
-                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                    // delete (<any>reservation)._id;
-                    // confirmedReservations.push(reservation);
+                    // ReservationPackageに対応(2022-12-22~)
+                    if (reservation.typeOf === factory.reservationType.ReservationPackage) {
+                        // 予約を確定状態に変更する
+                        yield repos.reservation.confirmByReservationNumber({
+                            reservationNumber: reservation.reservationNumber,
+                            previousReservationStatus: reservation.reservationStatus,
+                            underName: reservation.underName
+                        });
+                    }
+                    else {
+                        // 予約を確定状態に変更する
+                        // reservation = await repos.reservation.confirm<factory.reservationType.EventReservation>({
+                        yield repos.reservation.confirm({
+                            // 更新属性をwhitelist化(2022-06-13~)
+                            // ...actionAttributes.object,
+                            id: reservation.id,
+                            previousReservationStatus: reservation.reservationStatus,
+                            underName: reservation.underName
+                            // issuedThroughは予約取引開始時に確定しているので更新不要(2022-12-21~)
+                            // reservedTicket: reservation.reservedTicket
+                        });
+                        // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                        // delete (<any>reservation)._id;
+                        // confirmedReservations.push(reservation);
+                    }
                 }
                 catch (error) {
                     // actionにエラー結果を追加
@@ -52,9 +65,7 @@ function confirmReservation(actionAttributesList) {
                     throw error;
                 }
                 // アクション完了
-                const actionResult = {
-                    confirmedReservationId: reservation.id
-                };
+                const actionResult = {};
                 yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
                 yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
             })));

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.280.0-alpha.8",
+    "@chevre/factory": "4.280.0-alpha.9",
     "@cinerino/sdk": "3.135.0-alpha.4",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.37"
+  "version": "20.1.0-alpha.39"
 }

package/example/src/chevre/migrateEventAdditionalProperties.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) };
-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);
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-    const additionalPropertyRepo = new chevre.repository.AdditionalProperty(mongoose.connection);
-
-    const cursor = eventRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID },
-            typeOf: { $eq: chevre.factory.eventType.ScreeningEvent },
-            startDate: {
-                $gte: moment()
-                    .add(-1, 'month')
-                    .toDate()
-            }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('events found');
-
-    const additionalPropertyNames: string[] = [];
-    const projectIds: string[] = [];
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const event: chevre.factory.event.screeningEvent.IEvent = doc.toObject();
-
-        const additionalPropertyNamesOnEvent = event.additionalProperty?.map((p) => p.name);
-        if (Array.isArray(additionalPropertyNamesOnEvent) && additionalPropertyNamesOnEvent.length > 0) {
-            console.log(additionalPropertyNamesOnEvent.length, 'additionalPropertyNamesOnEvent found', event.startDate, event.project.id);
-            additionalPropertyNames.push(...additionalPropertyNamesOnEvent);
-            projectIds.push(event.project.id);
-            additionalPropertyNamesOnEvent.forEach((name) => {
-                if (!name.match(/^[a-zA-Z]*$/)) {
-                    throw new Error(`not matched ${event.project.id} ${event.id}`);
-                }
-                // tslint:disable-next-line:no-magic-numbers
-                if (name.length < 8) {
-                    throw new Error(`length matched ${event.project.id} ${event.id} ${name}`);
-                }
-            });
-
-            for (const additionalPropertyNameOnEvent of additionalPropertyNamesOnEvent) {
-                const existings = await additionalPropertyRepo.search({
-                    project: { id: { $eq: event.project.id } },
-                    limit: 1,
-                    page: 1,
-                    name: { $regex: `^${additionalPropertyNameOnEvent}$` },
-                    inCodeSet: { identifier: { $eq: event.typeOf } }
-                });
-                if (existings.length > 0) {
-                    console.log('already existed', additionalPropertyNameOnEvent, event.id, event.startDate, event.project.id);
-                } else {
-                    updateCount += 1;
-                    await additionalPropertyRepo.save({
-                        attributes: {
-                            project: event.project,
-                            typeOf: 'CategoryCode',
-                            codeValue: additionalPropertyNameOnEvent,
-                            inCodeSet: {
-                                typeOf: 'CategoryCodeSet',
-                                identifier: <any>event.typeOf
-                            },
-                            name: { ja: additionalPropertyNameOnEvent }
-                        }
-                    });
-                    console.log('created', additionalPropertyNameOnEvent, event.id, event.startDate, event.project.id);
-                }
-            }
-        }
-    });
-    console.log(i, 'events checked');
-    console.log(updateCount, 'events updated');
-    console.log([...new Set(additionalPropertyNames)]);
-    console.log([...new Set(projectIds)]);
-}
-
-main()
-    .then()
-    .catch(console.error);