@chevre/domain 23.1.0-alpha.23 → 23.1.0-alpha.25

package/example/src/chevre/eventSeries/migrateEventSeriesUnacceptedPaymentMethod.ts

@@ -0,0 +1,93 @@
+// 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 DEFAULT_PAYMENT_METHOD_TYPE_FOR_MOVIE_TICKET = 'MovieTicket';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
+
+    const cursor = eventSeriesRepo.getCursor(
+        {
+            'project.id': { $eq: 'xxx' },
+            'offers.unacceptedPaymentMethod': {
+                $exists: true,
+                $ne: DEFAULT_PAYMENT_METHOD_TYPE_FOR_MOVIE_TICKET
+            },
+            startDate: {
+                $lte: moment()
+                    .add(-1, 'year')
+                    .toDate()
+            }
+            // _id: { $eq: 'bliy11ffa' }
+        },
+        {
+            // _id: 1,
+            // offers: 1,
+            // startDate: 1,
+            // project: 1,
+            // typeOf: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const eventSeries: Pick<
+            chevre.factory.eventSeries.IEvent,
+            'id' | 'offers' | 'startDate' | 'project' | 'typeOf'
+        > = doc.toObject();
+
+        console.log(
+            'alreadyMigrated?', eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
+        const unacceptedPaymentMethod = eventSeries.offers?.unacceptedPaymentMethod;
+        const alreadyMigrated = !Array.isArray(unacceptedPaymentMethod)
+            || (Array.isArray(unacceptedPaymentMethod)
+                && unacceptedPaymentMethod.every(
+                    (paymentMethodType) => paymentMethodType === DEFAULT_PAYMENT_METHOD_TYPE_FOR_MOVIE_TICKET
+                ));
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.', eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
+        } else {
+            if (Array.isArray(unacceptedPaymentMethod)) {
+                const newUnacceptedPaymentMethod = unacceptedPaymentMethod.filter(
+                    (paymentMethod) => paymentMethod === DEFAULT_PAYMENT_METHOD_TYPE_FOR_MOVIE_TICKET
+                );
+                console.log(
+                    'updating project...',
+                    newUnacceptedPaymentMethod,
+                    eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
+                await eventSeriesRepo.saveEventSeries({
+                    id: eventSeries.id,
+                    attributes: <any>{
+                        ...{
+                            typeOf: eventSeries.typeOf,
+                            'offers.unacceptedPaymentMethod': newUnacceptedPaymentMethod
+                        }
+                    }
+                });
+                updateCount += 1;
+                console.log(
+                    'updated.',
+                    eventSeries.project.id, eventSeries.typeOf, eventSeries.id, eventSeries.startDate, i);
+            }
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/reIndex.ts

@@ -12,7 +12,6 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     await chevre.repository.EventOffer.createInstance(mongoose.connection);
-    await chevre.repository.Member.createInstance(mongoose.connection);
     console.log('success!');
 }
 

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

@@ -75,41 +75,6 @@ export declare class EventRepo {
         attributes: factory.event.screeningEvent.IAttributes[];
         expectsNoContent: boolean;
     }): Promise<string[] | void>;
-    /**
-     * 特定の追加特性をキーにして、存在しなければ作成する(複数対応)
-     * 施設コンテンツとルームは1つに限定
-     * 存在すれば、特定の属性のみ更新する
-     * @deprecated migrate to upsertManyScreeningEventByIdentifier
-     */
-    upsertManyByAdditionalPropertyDeprecated(params: {
-        events: factory.event.screeningEvent.IAttributes[];
-        additionalPropertyFilter: {
-            name: string;
-        };
-        eventSeries: {
-            /**
-             * 施設コンテンツID
-             */
-            id: string;
-        };
-        screeningRoom: {
-            /**
-             * ルームコード
-             */
-            branchCode: string;
-        };
-    }, options: {
-        /**
-         * falseの場合setOnInsertのみ
-         * trueの場合setのみ
-         */
-        update: boolean;
-    }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedEvents: {
-            id: string;
-        }[];
-    } | void>;
     /**
      * イベントコードをキーにして冪等置換
      */

package/lib/chevre/repo/event.js

@@ -291,106 +291,6 @@ class EventRepo {
             return insertingDocs.map(({ _id }) => _id);
         });
     }
-    /**
-     * 特定の追加特性をキーにして、存在しなければ作成する(複数対応)
-     * 施設コンテンツとルームは1つに限定
-     * 存在すれば、特定の属性のみ更新する
-     * @deprecated migrate to upsertManyScreeningEventByIdentifier
-     */
-    // tslint:disable-next-line:max-func-body-length
-    upsertManyByAdditionalPropertyDeprecated(params, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { update } = options;
-            const bulkWriteOps = [];
-            const additionalProperties = [];
-            const { events, additionalPropertyFilter, eventSeries, screeningRoom } = params;
-            if (Array.isArray(events)) {
-                events.forEach((creatingEventParams) => {
-                    var _a, _b;
-                    if (creatingEventParams.typeOf !== factory.eventType.ScreeningEvent) {
-                        throw new factory.errors.NotImplemented(`only ${factory.eventType.ScreeningEvent} implemented`);
-                    }
-                    const additionalPropertyValue = (_b = (_a = creatingEventParams.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((property) => property.name === additionalPropertyFilter.name)) === null || _b === void 0 ? void 0 : _b.value;
-                    if (typeof additionalPropertyValue !== 'string' || additionalPropertyValue === '') {
-                        throw new factory.errors.ArgumentNull('additionalProperty.value');
-                    }
-                    additionalProperties.push({ name: additionalPropertyFilter.name, value: additionalPropertyValue });
-                    if (creatingEventParams.superEvent.id !== eventSeries.id) {
-                        throw new factory.errors.Argument('superEvent.id', 'superEvent.id not matched');
-                    }
-                    if (creatingEventParams.location.branchCode !== screeningRoom.branchCode) {
-                        throw new factory.errors.Argument('location.branchCode', 'location.branchCode not matched');
-                    }
-                    const filter = {
-                        typeOf: { $eq: creatingEventParams.typeOf },
-                        'project.id': { $eq: creatingEventParams.project.id },
-                        // 追加特性をキーに更新
-                        additionalProperty: {
-                            $exists: true,
-                            $all: [{ name: additionalPropertyFilter.name, value: additionalPropertyValue }]
-                        },
-                        'superEvent.id': { $exists: true, $eq: creatingEventParams.superEvent.id } // add superEvent.id(2024-09-15~)
-                    };
-                    if (update === true) {
-                        // implemente(2024-12-20~)
-                        const { eventStatus, superEvent, offers // <-上書き可能な属性を限定的に
-                         } = creatingEventParams;
-                        bulkWriteOps.push({
-                            updateOne: {
-                                filter,
-                                update: {
-                                    $set: {
-                                        eventStatus,
-                                        superEvent,
-                                        'offers.seller.makesOffer': offers.seller.makesOffer
-                                    }
-                                },
-                                upsert: false
-                            }
-                        });
-                    }
-                    else {
-                        const { coaInfo, // ←適用しない
-                        // identifier, // support identifier(2025-05-13~)
-                        maximumAttendeeCapacity, remainingAttendeeCapacity, checkInCount, attendeeCount, aggregateReservation, // ←適用しない
-                        eventStatus, superEvent } = creatingEventParams, // <-上書き可能な属性を限定的に
-                        setOnInsertFields = __rest(creatingEventParams, ["coaInfo", "maximumAttendeeCapacity", "remainingAttendeeCapacity", "checkInCount", "attendeeCount", "aggregateReservation", "eventStatus", "superEvent"]);
-                        const setOnInsert = Object.assign(Object.assign({}, setOnInsertFields), { _id: EventRepo.CREATE_ID() });
-                        bulkWriteOps.push({
-                            updateOne: {
-                                filter,
-                                update: {
-                                    $setOnInsert: setOnInsert,
-                                    // 変更可能な属性のみ上書き
-                                    $set: {
-                                        eventStatus,
-                                        superEvent // add superEvent(2024-09-15~)
-                                    }
-                                },
-                                upsert: true
-                            }
-                        });
-                    }
-                });
-            }
-            if (bulkWriteOps.length > 0) {
-                const bulkWriteResult = yield this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
-                // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedEvents = yield this.eventModel.find({
-                    typeOf: { $eq: params.events[0].typeOf },
-                    'project.id': { $eq: params.events[0].project.id },
-                    additionalProperty: { $exists: true, $in: additionalProperties },
-                    'superEvent.id': { $exists: true, $eq: eventSeries.id } // add superEvent.id(2024-09-15~)
-                }, {
-                    _id: 0,
-                    id: { $toString: '$_id' }
-                })
-                    .lean() // lean(2024-09-15~)
-                    .exec();
-                return { bulkWriteResult, modifiedEvents };
-            }
-        });
-    }
     /**
      * イベントコードをキーにして冪等置換
      */

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

@@ -38,5 +38,11 @@ export declare class TicketRepo {
      * 承認コードからチケットを発行する
      */
     issueByTicketToken(params: IIssueParams): Promise<Pick<ITicket, 'id'>>;
-    projectFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<ITicket[]>;
+    findTickets(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<ITicket[]>;
+    /**
+     * 発行日時を一定期間過ぎたチケットを削除する
+     */
+    deleteTicketsByDateIssued(params: {
+        dateIssuedLt: Date;
+    }): Promise<void>;
 }

package/lib/chevre/repo/ticket.js

@@ -69,7 +69,7 @@ class TicketRepo {
             return { id: insertedId };
         });
     }
-    projectFields(params, inclusion) {
+    findTickets(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const conditions = TicketRepo.CREATE_MONGO_CONDITIONS(params);
@@ -92,5 +92,18 @@ class TicketRepo {
                 .exec();
         });
     }
+    /**
+     * 発行日時を一定期間過ぎたチケットを削除する
+     */
+    deleteTicketsByDateIssued(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ticketModel.deleteMany({
+                dateIssued: {
+                    $lt: params.dateIssuedLt
+                }
+            })
+                .exec();
+        });
+    }
 }
 exports.TicketRepo = TicketRepo;

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/verifyTicketTokenAsNeeded.js

@@ -25,7 +25,7 @@ function verifyTicketTokenAsNeeded(params) {
             if (typeof placeOrderIdByInstrument !== 'string' || placeOrderIdByInstrument === '') {
                 throw new factory.errors.NotFound('instrument as placeOrder');
             }
-            const ticket = (yield repos.ticket.projectFields({
+            const ticket = (yield repos.ticket.findTickets({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: event.project.id } },

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre/requestedProgramMembershipUsed2permit.js

@@ -27,7 +27,7 @@ function requestedProgramMembershipUsed2permit(params) {
         else if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) === 'Ticket') {
             const { ticketToken } = programMembershipUsed;
             if (typeof ticketToken === 'string') {
-                const ticket = (yield repos.ticket.projectFields({
+                const ticket = (yield repos.ticket.findTickets({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },

package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js

@@ -58,7 +58,7 @@ function acceptAction2ticket(params) {
         const ticketToken = (_b = (_a = acceptPayAction.instrument) === null || _a === void 0 ? void 0 : _a.find((ticketAsInstrument) => ticketAsInstrument.typeOf === 'Ticket')) === null || _b === void 0 ? void 0 : _b.ticketToken;
         let acceptAction2ticketResult;
         if (typeof ticketToken === 'string' && ticketToken !== '') {
-            const ticket = (yield repos.ticket.projectFields({
+            const ticket = (yield repos.ticket.findTickets({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: project.id } },

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.js

@@ -25,7 +25,7 @@ function verifyTicketTokenAsNeeded(params) {
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
                 case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                    const ticket = (yield repos.ticket.projectFields({
+                    const ticket = (yield repos.ticket.findTickets({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: project.id } },

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.4.0-alpha.0",
-    "@cinerino/sdk": "12.11.0-alpha.0",
+    "@chevre/factory": "5.4.0-alpha.1",
+    "@cinerino/sdk": "12.11.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.23"
+  "version": "23.1.0-alpha.25"
 }

package/lib/chevre/service/code.d.ts

@@ -1,8 +0,0 @@
-/**
- * 承認サービス
- * ひとまず不要なので廃止(2025-07-18~)
- */
-/**
- * コードをトークンに変換する
- */
-export {};

package/lib/chevre/service/code.js

@@ -1,7 +0,0 @@
-"use strict";
-/**
- * 承認サービス
- * ひとまず不要なので廃止(2025-07-18~)
- */
-// import * as jwt from 'jsonwebtoken';
-Object.defineProperty(exports, "__esModule", { value: true });