@chevre/domain 20.1.0-alpha.36 → 20.1.0-alpha.38

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/service/reserve/confirmReservation.js

@@ -10,49 +10,71 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmReservation = void 0;
+/**
+ * 予約サービス
+ */
+const factory = require("../../factory");
 const onReservationConfirmed_1 = require("./potentialActions/onReservationConfirmed");
 /**
  * 予約を確定する
  */
 function confirmReservation(actionAttributesList) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const confirmedReservations = [];
-        yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
-            let reservation = actionAttributes.object;
-            const action = yield repos.action.start(actionAttributes);
-            try {
-                // 予約を確定状態に変更する
-                reservation = yield repos.reservation.confirm({
-                    // 更新属性をwhitelist化(2022-06-13~)
-                    // ...actionAttributes.object,
-                    id: reservation.id,
-                    previousReservationStatus: reservation.reservationStatus,
-                    underName: reservation.underName,
-                    reservedTicket: reservation.reservedTicket
-                });
-                // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
-                delete reservation._id;
-                confirmedReservations.push(reservation);
-            }
-            catch (error) {
-                // actionにエラー結果を追加
+        let confirmedReservations = [];
+        if (actionAttributesList.length > 0) {
+            yield Promise.all(actionAttributesList.map((actionAttributes) => __awaiter(this, void 0, void 0, function* () {
+                const reservation = actionAttributes.object;
+                const action = yield repos.action.start(actionAttributes);
                 try {
-                    const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                    yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                    // 予約を確定状態に変更する
+                    // 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 (__) {
-                    // 失敗したら仕方ない
+                catch (error) {
+                    // actionにエラー結果を追加
+                    try {
+                        const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                        yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                    }
+                    catch (__) {
+                        // 失敗したら仕方ない
+                    }
+                    throw error;
                 }
-                throw error;
+                // アクション完了
+                const actionResult = {
+                    confirmedReservationId: reservation.id
+                };
+                yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes)({ task: repos.task });
+            })));
+            // 確定予約通知タスクを予約番号単位で作成する(2022-12-21~)
+            const reservationNumber = actionAttributesList[0].object.reservationNumber;
+            if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
+                // 最新のconfirmedReservationsを検索
+                confirmedReservations = yield repos.reservation.search({
+                    reservationNumber: { $eq: reservationNumber },
+                    typeOf: factory.reservationType.EventReservation
+                });
+                confirmedReservations = confirmedReservations.map((r) => {
+                    // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
+                    delete r._id;
+                    return r;
+                });
             }
-            // アクション完了
-            const actionResult = {
-                confirmedReservationId: reservation.id
-            };
-            yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-            yield (0, onReservationConfirmed_1.onReservationConfirmedByAction)(actionAttributes, reservation)({ task: repos.task });
-        })));
-        yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task });
+            yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task });
+        }
     });
 }
 exports.confirmReservation = confirmReservation;

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.d.ts

@@ -7,7 +7,7 @@ declare type IEventReservation = factory.reservation.IReservation<factory.reserv
 /**
  * 予約確定後のアクション
  */
-export declare function onReservationConfirmedByAction(actionAttributes: factory.action.reserve.IAttributes, confirmedReservation: IEventReservation): (repos: {
+export declare function onReservationConfirmedByAction(actionAttributes: factory.action.reserve.IAttributes): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
 export declare function onReservationConfirmed(confirmedReservations: IEventReservation[]): (repos: {

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -21,7 +21,9 @@ const informReservations = settings_1.settings.onReservationStatusChanged.inform
 /**
  * 予約確定後のアクション
  */
-function onReservationConfirmedByAction(actionAttributes, confirmedReservation) {
+function onReservationConfirmedByAction(actionAttributes
+// confirmedReservation: IEventReservation
+) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const potentialActions = actionAttributes.potentialActions;
         const now = new Date();
@@ -45,35 +47,34 @@ function onReservationConfirmedByAction(actionAttributes, confirmedReservation)
             }
         }
         // inform galobally
-        if (Array.isArray(informReservations)) {
-            const reservation4inform = (0, factory_1.maskUnderName)(confirmedReservation);
-            taskAttributes.push(...informReservations.map((informReservation) => {
-                var _a;
-                const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
-                const informReservationAttributes = {
-                    agent: confirmedReservation.project,
-                    object: [reservation4inform],
-                    project: confirmedReservation.project,
-                    recipient: {
-                        id: '',
-                        name: informUrl,
-                        typeOf: factory.creativeWorkType.WebApplication,
-                        url: informUrl
-                    },
-                    typeOf: factory.actionType.InformAction
-                };
-                return {
-                    project: actionAttributes.project,
-                    name: factory.taskName.TriggerWebhook,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: factory_1.NUM_TRY_INFORM_RESERVATION,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: informReservationAttributes
-                };
-            }));
-        }
+        // if (Array.isArray(informReservations)) {
+        //     const reservation4inform: IReservation4informConfirmed = maskUnderName(confirmedReservation);
+        //     taskAttributes.push(...informReservations.map<ITriggerWebhookTaskAttributes>((informReservation) => {
+        //         const informUrl: string = String(informReservation.recipient?.url);
+        //         const informReservationAttributes: InformReservationActionattributes = {
+        //             agent: confirmedReservation.project,
+        //             object: [reservation4inform],
+        //             project: confirmedReservation.project,
+        //             recipient: {
+        //                 id: '',
+        //                 name: informUrl,
+        //                 typeOf: factory.creativeWorkType.WebApplication,
+        //                 url: informUrl
+        //             },
+        //             typeOf: factory.actionType.InformAction
+        //         };
+        //         return {
+        //             project: actionAttributes.project,
+        //             name: factory.taskName.TriggerWebhook,
+        //             status: factory.taskStatus.Ready,
+        //             runsAt: now,
+        //             remainingNumberOfTries: NUM_TRY_INFORM_RESERVATION,
+        //             numberOfTried: 0,
+        //             executionResults: [],
+        //             data: informReservationAttributes
+        //         };
+        //     }));
+        // }
         // タスク保管
         if (taskAttributes.length > 0) {
             yield repos.task.saveMany(taskAttributes);
@@ -88,6 +89,42 @@ function onReservationConfirmed(confirmedReservations) {
                 project: confirmedReservations[0].project,
                 reservationFor: { id: confirmedReservations[0].reservationFor.id }
             })({ task: repos.task });
+            const now = new Date();
+            const taskAttributes = [];
+            // inform galobally
+            if (Array.isArray(informReservations)) {
+                taskAttributes.push(...informReservations.map((informReservation) => {
+                    var _a;
+                    const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                    const informObject = confirmedReservations.map(factory_1.maskUnderName);
+                    const informReservationAttributes = {
+                        agent: confirmedReservations[0].project,
+                        object: informObject,
+                        project: confirmedReservations[0].project,
+                        recipient: {
+                            id: '',
+                            name: informUrl,
+                            typeOf: factory.creativeWorkType.WebApplication,
+                            url: informUrl
+                        },
+                        typeOf: factory.actionType.InformAction
+                    };
+                    return {
+                        project: confirmedReservations[0].project,
+                        name: factory.taskName.TriggerWebhook,
+                        status: factory.taskStatus.Ready,
+                        runsAt: now,
+                        remainingNumberOfTries: factory_1.NUM_TRY_INFORM_RESERVATION,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: informReservationAttributes
+                    };
+                }));
+            }
+            // タスク保管
+            if (taskAttributes.length > 0) {
+                yield repos.task.saveMany(taskAttributes);
+            }
         }
     });
 }

package/package.json

@@ -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.36"
+  "version": "20.1.0-alpha.38"
 }

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