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

package/example/src/chevre/aggregateEventReservation.ts

@@ -16,11 +16,12 @@ async function main() {
 
     // const now = new Date();
     await chevre.service.aggregation.event.aggregateScreeningEvent({
-        id: 'blaqxj0ak'
+        id: String(process.env.EVENT_ID)
     })({
         event: new chevre.repository.Event(mongoose.connection),
         eventAvailability: new chevre.repository.itemAvailability.ScreeningEvent(client),
         offer: new chevre.repository.Offer(mongoose.connection),
+        offerCatalog: new chevre.repository.OfferCatalog(mongoose.connection),
         offerRateLimit: new chevre.repository.rateLimit.Offer(client),
         place: new chevre.repository.Place(mongoose.connection),
         product: new chevre.repository.Product(mongoose.connection),

package/lib/chevre/errorHandler.js

@@ -19,6 +19,7 @@ function handleMongoError(error) {
     if (handledError instanceof mongoose_1.mongo.MongoError) {
         switch (handledError.code) {
             case MongoErrorCode.DuplicateKey:
+                handledError = new factory_1.errors.AlreadyInUse('', [], `Some fields already in use. code:${handledError.code} message:${handledError.message}`);
                 // no op
                 break;
             case MongoErrorCode.MaxTimeMSExpired:

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.d.ts

@@ -1,6 +1,7 @@
 import { MongoRepository as EventRepo } from '../../../repo/event';
 import { RedisRepository as EventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
+import { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { MongoRepository as PlaceRepo } from '../../../repo/place';
 import { MongoRepository as ProductRepo } from '../../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../../repo/project';
@@ -12,6 +13,7 @@ export declare type IAggregateScreeningEventOperation<T> = (repos: {
     event: EventRepo;
     eventAvailability: EventAvailabilityRepo;
     offer: OfferRepo;
+    offerCatalog: OfferCatalogRepo;
     offerRateLimit: OfferRateLimitRepo;
     place: PlaceRepo;
     product: ProductRepo;

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -89,18 +89,15 @@ function aggregateByEvent(params) {
             event: event,
             screeningRoom: screeningRoom
         })(repos);
-        // プロジェクト限定(2023-02-22~)
         // オファーごとの集計
         let aggregateOffer;
-        if (settings_1.settings.useAggregateOfferProjects.includes(event.project.id)) {
-            aggregateOffer = yield aggregateOfferByEvent({
-                aggregateDate: now,
-                event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
-                    remainingAttendeeCapacity }),
-                screeningRoom: screeningRoom
-            })(repos);
-            debug('offers aggregated', aggregateOffer);
-        }
+        aggregateOffer = yield aggregateOfferByEvent({
+            aggregateDate: now,
+            event: Object.assign(Object.assign({}, event), { maximumAttendeeCapacity,
+                remainingAttendeeCapacity }),
+            screeningRoom: screeningRoom
+        })(repos);
+        debug('offers aggregated', aggregateOffer);
         // 値がundefinedの場合に更新しないように注意
         const update = {
             $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
@@ -133,26 +130,36 @@ function reservedSeatsAvailable(params) {
 function aggregateOfferByEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        const availableOffers = yield findOffers(params)(repos);
-        // オファーごとの予約集計
-        const offersWithAggregateReservation = [];
-        for (const o of availableOffers) {
-            const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByOffer({
-                aggregateDate: params.aggregateDate,
-                event: params.event,
-                screeningRoom: params.screeningRoom,
-                offer: o
-            })(repos);
-            offersWithAggregateReservation.push(Object.assign(Object.assign(Object.assign({ typeOf: o.typeOf, id: o.id, identifier: o.identifier, aggregateReservation: aggregateReservation, name: {
-                    en: (_a = o.name) === null || _a === void 0 ? void 0 : _a.en,
-                    ja: (_b = o.name) === null || _b === void 0 ? void 0 : _b.ja
-                } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined), (typeof ((_c = o.category) === null || _c === void 0 ? void 0 : _c.codeValue) === 'string') ? { category: o.category } : undefined));
+        // プロジェクト限定(2023-02-22~)
+        if (settings_1.settings.useAggregateOfferProjects.includes(params.event.project.id)) {
+            const availableOffers = yield findOffers(params)(repos);
+            // オファーごとの予約集計
+            const offersWithAggregateReservation = [];
+            for (const o of availableOffers) {
+                const { maximumAttendeeCapacity, remainingAttendeeCapacity, aggregateReservation } = yield aggregateReservationByOffer({
+                    aggregateDate: params.aggregateDate,
+                    event: params.event,
+                    screeningRoom: params.screeningRoom,
+                    offer: o
+                })(repos);
+                offersWithAggregateReservation.push(Object.assign(Object.assign(Object.assign({ typeOf: o.typeOf, id: o.id, identifier: o.identifier, aggregateReservation: aggregateReservation, name: {
+                        en: (_a = o.name) === null || _a === void 0 ? void 0 : _a.en,
+                        ja: (_b = o.name) === null || _b === void 0 ? void 0 : _b.ja
+                    } }, (typeof maximumAttendeeCapacity === 'number') ? { maximumAttendeeCapacity } : undefined), (typeof remainingAttendeeCapacity === 'number') ? { remainingAttendeeCapacity } : undefined), (typeof ((_c = o.category) === null || _c === void 0 ? void 0 : _c.codeValue) === 'string') ? { category: o.category } : undefined));
+            }
+            return {
+                typeOf: factory.offerType.AggregateOffer,
+                offerCount: availableOffers.length,
+                offers: offersWithAggregateReservation
+            };
+        }
+        else {
+            const { offerCount } = yield calculateOfferCount({ event: params.event })(repos);
+            return {
+                typeOf: factory.offerType.AggregateOffer,
+                offerCount
+            };
         }
-        return {
-            typeOf: factory.offerType.AggregateOffer,
-            offerCount: availableOffers.length,
-            offers: offersWithAggregateReservation
-        };
     });
 }
 /**
@@ -194,6 +201,33 @@ function findOffers(params) {
         return availableOffers;
     });
 }
+function calculateOfferCount(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        let offerCount = 0;
+        try {
+            const eventOffers = params.event.offers;
+            if (typeof ((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+                const eventService = yield repos.product.findById({ id: eventOffers.itemOffered.id });
+                if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+                    const catalogs = yield repos.offerCatalog.search({
+                        limit: 1,
+                        page: 1,
+                        id: { $in: [eventService.hasOfferCatalog.id] }
+                    });
+                    const numberOfItems = (_c = catalogs.shift()) === null || _c === void 0 ? void 0 : _c.numberOfItems;
+                    if (typeof numberOfItems === 'number') {
+                        offerCount = numberOfItems;
+                    }
+                }
+            }
+        }
+        catch (error) {
+            throw error;
+        }
+        return { offerCount };
+    });
+}
 function aggregateReservationByOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let reservationCount4offer;

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

@@ -69,7 +69,8 @@ function createMovieTicket(params) {
         }
     };
     return {
-        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+        // optimize(2023-03-06~)
+        // project: { id: params.project.id, typeOf: factory.organizationType.Project },
         typeOf: params.typeOf,
         identifier: params.identifier,
         accessCode: params.accessCode,
@@ -85,22 +86,6 @@ function createAuthorizeResult(params) {
     if (typeof (totalPaymentDue === null || totalPaymentDue === void 0 ? void 0 : totalPaymentDue.typeOf) !== 'string') {
         throw new factory.errors.ServiceUnavailable('payTransaction.object.paymentMethod.totalPaymentDue undefined');
     }
-    // let serviceOutput: factory.action.authorize.paymentMethod.any.IPaymentServiceOutput | undefined;
-    // if (payTransactionObject.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket) {
-    //     const movieTicketsByPayTransaction = payTransactionObject.paymentMethod?.movieTickets;
-    //     if (Array.isArray(movieTicketsByPayTransaction)) {
-    //         serviceOutput = movieTicketsByPayTransaction.map((m) => {
-    //             // mask accessCode
-    //             return {
-    //                 identifier: m.identifier,
-    //                 project: m.project,
-    //                 serviceOutput: m.serviceOutput,
-    //                 serviceType: m.serviceType,
-    //                 typeOf: m.typeOf
-    //             };
-    //         });
-    //     }
-    // }
     return {
         accountId: (typeof ((_b = payTransactionObject.paymentMethod) === null || _b === void 0 ? void 0 : _b.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
@@ -109,9 +94,6 @@ function createAuthorizeResult(params) {
         issuedThrough: {
             typeOf: payTransactionObject.typeOf,
             id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : ''
-            // ↓不要になったのでいったん保留(2022-05-02~)
-            // MovieTicketの場合、カード情報としてserviceOutputを追加
-            // ...(serviceOutput !== undefined) ? { serviceOutput } : undefined
         },
         paymentMethod: params.object.paymentMethod,
         paymentStatus: factory.paymentStatusType.PaymentDue,

package/lib/chevre/service/payment/movieTicket/checkByIdentifier.d.ts

@@ -0,0 +1,22 @@
+import { IMinimizedIndividualEvent } from '../../../repo/event';
+import { MongoRepository as ProductRepo } from '../../../repo/product';
+import { MongoRepository as ProjectRepo } from '../../../repo/project';
+import * as factory from '../../../factory';
+interface ICheckResult {
+    purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
+    purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
+    movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
+}
+/**
+ * MovieTicket認証
+ */
+declare function checkByIdentifier(params: {
+    movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
+    seller: factory.seller.ISeller;
+    screeningEvent: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
+    paymentServiceId: string;
+}): (repos: {
+    product: ProductRepo;
+    project: ProjectRepo;
+}) => Promise<ICheckResult>;
+export { ICheckResult, checkByIdentifier };

package/lib/chevre/service/payment/movieTicket/checkByIdentifier.js

@@ -0,0 +1,183 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkByIdentifier = void 0;
+const surfrock = require("@surfrock/sdk");
+const moment = require("moment-timezone");
+const credentials_1 = require("../../../credentials");
+const factory = require("../../../factory");
+const getCredentials_1 = require("./getCredentials");
+/**
+ * MovieTicket認証
+ */
+function checkByIdentifier(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        let purchaseNumberAuthIn;
+        let purchaseNumberAuthResult;
+        // MovieTicket系統の決済方法タイプは動的
+        const paymentMethodType = (_a = params.movieTickets[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+        if (typeof paymentMethodType !== 'string') {
+            throw new factory.errors.ArgumentNull('movieTickets.typeOf');
+        }
+        const availableChannel = yield repos.product.findAvailableChannel({
+            project: params.screeningEvent.project,
+            typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
+            id: params.paymentServiceId
+        });
+        const movieTicketIdentifiers = [];
+        const knyknrNoInfoIn = [];
+        params.movieTickets.forEach((movieTicket) => {
+            if (movieTicketIdentifiers.indexOf(movieTicket.identifier) < 0) {
+                movieTicketIdentifiers.push(movieTicket.identifier);
+                knyknrNoInfoIn.push({
+                    knyknrNo: movieTicket.identifier,
+                    pinCd: String(movieTicket.accessCode)
+                });
+            }
+        });
+        let skhnCd = params.screeningEvent.superEvent.workPerformed.identifier;
+        const eventOffers = params.screeningEvent.offers;
+        if (eventOffers === undefined) {
+            throw new factory.errors.NotFound('EventOffers', 'Event offers undefined');
+        }
+        const offeredThrough = eventOffers.offeredThrough;
+        // イベントインポート元がCOAの場合、作品コード連携方法が異なる
+        if (offeredThrough !== undefined && offeredThrough.identifier === factory.service.webAPI.Identifier.COA) {
+            const DIGITS = -2;
+            let eventCOAInfo;
+            if (Array.isArray(params.screeningEvent.additionalProperty)) {
+                const coaInfoProperty = params.screeningEvent.additionalProperty.find((p) => p.name === 'coaInfo');
+                eventCOAInfo = (coaInfoProperty !== undefined) ? JSON.parse(coaInfoProperty.value) : undefined;
+            }
+            skhnCd = `${eventCOAInfo.titleCode}${`00${eventCOAInfo.titleBranchNum}`.slice(DIGITS)}`;
+        }
+        const sellerCredentials = yield (0, getCredentials_1.getCredentials)({
+            paymentMethodType,
+            seller: params.seller,
+            paymentServiceId: params.paymentServiceId
+        })(repos);
+        purchaseNumberAuthIn = {
+            kgygishCd: sellerCredentials.kgygishCd,
+            jhshbtsCd: surfrock.service.auth.factory.InformationTypeCode.All,
+            knyknrNoInfoIn: knyknrNoInfoIn,
+            skhnCd: skhnCd,
+            stCd: sellerCredentials.stCd,
+            jeiYmd: moment(params.screeningEvent.startDate)
+                .tz('Asia/Tokyo')
+                .format('YYYY/MM/DD')
+        };
+        const mvtkReserveAuthClient = new surfrock.auth.ClientCredentials({
+            domain: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.authorizeServerDomain),
+            clientId: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientId),
+            clientSecret: String((_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.clientSecret),
+            scopes: [],
+            state: ''
+        });
+        const authService = new surfrock.service.auth.AuthService({
+            endpoint: String(availableChannel.serviceUrl),
+            auth: mvtkReserveAuthClient
+        }, { timeout: credentials_1.credentials.movieticketReserve.timeout });
+        purchaseNumberAuthResult = yield authService.purchaseNumberAuth(purchaseNumberAuthIn);
+        // 決済カード配列に成形
+        const movieTickets = purchaseNumberAuthResult2movieTickets({
+            screeningEvent: params.screeningEvent,
+            paymentMethodType,
+            knyknrNoInfoIn,
+            purchaseNumberAuthResult
+        });
+        return { purchaseNumberAuthIn, purchaseNumberAuthResult, movieTickets };
+    });
+}
+exports.checkByIdentifier = checkByIdentifier;
+function purchaseNumberAuthResult2movieTickets(params) {
+    const movieTickets = [];
+    const paymentMethodType = params.paymentMethodType;
+    const knyknrNoInfoIn = params.knyknrNoInfoIn;
+    const purchaseNumberAuthResult = params.purchaseNumberAuthResult;
+    if (Array.isArray(purchaseNumberAuthResult.knyknrNoInfoOut)) {
+        purchaseNumberAuthResult.knyknrNoInfoOut.forEach((knyknrNoInfoOut) => {
+            const knyknrNoInfo = knyknrNoInfoIn.find((info) => info.knyknrNo === knyknrNoInfoOut.knyknrNo);
+            if (knyknrNoInfo !== undefined) {
+                const movieTicketCategoryCode = (typeof knyknrNoInfoOut.znkkkytsknGkjknTyp === 'string')
+                    ? knyknrNoInfoOut.znkkkytsknGkjknTyp
+                    : '';
+                if (Array.isArray(knyknrNoInfoOut.ykknInfo)) {
+                    knyknrNoInfoOut.ykknInfo.forEach((ykknInfo) => {
+                        // tslint:disable-next-line:prefer-array-literal
+                        [...Array(Number(ykknInfo.ykknKnshbtsmiNum))].forEach(() => {
+                            movieTickets.push({
+                                // project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id },
+                                typeOf: paymentMethodType,
+                                identifier: knyknrNoInfo.knyknrNo,
+                                accessCode: knyknrNoInfo.pinCd,
+                                category: {
+                                    codeValue: movieTicketCategoryCode // 追加(2023-02-08~)
+                                },
+                                serviceType: ykknInfo.ykknshTyp,
+                                serviceOutput: {
+                                    reservationFor: {
+                                        typeOf: params.screeningEvent.typeOf,
+                                        id: params.screeningEvent.id
+                                    }
+                                    // reservedTicket: {
+                                    //     ticketedSeat: {
+                                    //         typeOf: factory.placeType.Seat,
+                                    //         // seatingType: 'Default', // 情報空でよし
+                                    //         seatNumber: '', // 情報空でよし
+                                    //         seatRow: '', // 情報空でよし
+                                    //         seatSection: '' // 情報空でよし
+                                    //     }
+                                    // }
+                                }
+                            });
+                        });
+                    });
+                }
+                if (Array.isArray(knyknrNoInfoOut.mkknInfo)) {
+                    knyknrNoInfoOut.mkknInfo.forEach((mkknInfo) => {
+                        // tslint:disable-next-line:prefer-array-literal
+                        [...Array(Number(mkknInfo.mkknKnshbtsmiNum))].forEach(() => {
+                            movieTickets.push(Object.assign({ 
+                                // project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id },
+                                typeOf: paymentMethodType, identifier: knyknrNoInfo.knyknrNo, accessCode: knyknrNoInfo.pinCd, category: {
+                                    codeValue: movieTicketCategoryCode // 追加(2023-02-08~)
+                                }, amount: {
+                                    typeOf: 'MonetaryAmount',
+                                    // currency: factory.priceCurrency.JPY,
+                                    validThrough: moment(`${mkknInfo.yykDt}+09:00`, 'YYYY/MM/DD HH:mm:ssZ')
+                                        .toDate()
+                                }, serviceType: mkknInfo.mkknshTyp, serviceOutput: {
+                                    reservationFor: {
+                                        typeOf: params.screeningEvent.typeOf,
+                                        id: params.screeningEvent.id
+                                    }
+                                    // reservedTicket: {
+                                    //     ticketedSeat: {
+                                    //         typeOf: factory.placeType.Seat,
+                                    //         // seatingType: 'Default', // 情報空でよし
+                                    //         seatNumber: '', // 情報空でよし
+                                    //         seatRow: '', // 情報空でよし
+                                    //         seatSection: '' // 情報空でよし
+                                    //     }
+                                    // }
+                                } }, {
+                                validThrough: moment(`${mkknInfo.yykDt}+09:00`, 'YYYY/MM/DD HH:mm:ssZ')
+                                    .toDate()
+                            }));
+                        });
+                    });
+                }
+            }
+        });
+    }
+    return movieTickets;
+}

package/lib/chevre/service/payment/movieTicket/getCredentials.d.ts

@@ -0,0 +1,13 @@
+import { MongoRepository as ProductRepo } from '../../../repo/product';
+import * as factory from '../../../factory';
+declare function getCredentials(params: {
+    paymentMethodType: string;
+    seller: factory.seller.ISeller;
+    paymentServiceId: string;
+}): (repos: {
+    product: ProductRepo;
+}) => Promise<{
+    kgygishCd: string;
+    stCd: string;
+}>;
+export { getCredentials };

package/lib/chevre/service/payment/movieTicket/getCredentials.js

@@ -0,0 +1,45 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCredentials = void 0;
+const factory = require("../../../factory");
+function getCredentials(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        // 決済サービスからcredentialsを取得する
+        const paymentServices = yield repos.product.search({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: params.seller.project.id } },
+            typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
+            // serviceType: { codeValue: { $eq: params.paymentMethodType } },
+            id: { $eq: params.paymentServiceId }
+        });
+        const paymentService = paymentServices.shift();
+        if (paymentService === undefined) {
+            throw new factory.errors.NotFound('PaymentService');
+        }
+        const provider = (_a = paymentService.provider) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === params.seller.id);
+        if (provider === undefined) {
+            throw new factory.errors.NotFound('PaymentService provider');
+        }
+        const kgygishCd = (_b = provider.credentials) === null || _b === void 0 ? void 0 : _b.kgygishCd;
+        const stCd = (_c = provider.credentials) === null || _c === void 0 ? void 0 : _c.stCd;
+        if (typeof kgygishCd !== 'string' || typeof stCd !== 'string') {
+            throw new factory.errors.Argument('transaction', 'Provider credentials not enough');
+        }
+        return {
+            kgygishCd,
+            stCd
+        };
+    });
+}
+exports.getCredentials = getCredentials;

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 決済取引サービス
+ */
+import * as factory from '../../../factory';
+import { MongoRepository as EventRepo } from '../../../repo/event';
+import { MongoRepository as ProductRepo } from '../../../repo/product';
+import { MongoRepository as ProjectRepo } from '../../../repo/project';
+import { MongoRepository as SellerRepo } from '../../../repo/seller';
+import { ICheckResult } from './checkByIdentifier';
+export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
+    event: EventRepo;
+    product: ProductRepo;
+    project: ProjectRepo;
+    seller: SellerRepo;
+}) => Promise<ICheckResult | undefined>;

package/lib/chevre/service/{assetTransaction/pay → payment}/movieTicket/validation.js

@@ -13,8 +13,9 @@ exports.validateMovieTicket = void 0;
 /**
  * 決済取引サービス
  */
-const factory = require("../../../../factory");
-const movieTicket_1 = require("../../../payment/movieTicket");
+const factory = require("../../../factory");
+const checkByIdentifier_1 = require("./checkByIdentifier");
+const settings_1 = require("../../../settings");
 function validateMovieTicket(params, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
@@ -37,11 +38,7 @@ function validateMovieTicket(params, paymentServiceId) {
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
         }
-        // イベント情報取得
         // イベント取得属性最適化(2023-01-23~)
-        // const screeningEvent = await repos.event.findById<factory.eventType.ScreeningEvent>({
-        //     id: eventIds[0]
-        // });
         const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
             id: eventIds[0]
         });
@@ -55,7 +52,11 @@ function validateMovieTicket(params, paymentServiceId) {
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', 'payment not accepted');
         }
-        const checkResult = yield (0, movieTicket_1.checkByIdentifier)({
+        // オプション追加(2023-03-06~)
+        if (!settings_1.settings.useCheckMovieTicketBeforePay) {
+            return;
+        }
+        const checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)({
             movieTickets: movieTickets,
             seller: seller,
             screeningEvent: screeningEvent,

package/lib/chevre/service/payment/movieTicket.d.ts

@@ -1,16 +1,12 @@
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
-import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../repo/event';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { MongoRepository as SellerRepo } from '../../repo/seller';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import * as factory from '../../factory';
-interface ICheckResult {
-    purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
-    purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
-    movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
-}
+import { ICheckResult } from './movieTicket/checkByIdentifier';
 interface ICheckOperationRepos {
     action: ActionRepo;
     event: EventRepo;
@@ -43,18 +39,6 @@ declare type ICheckMovieTicketAction = factory.action.check.paymentMethod.movieT
  * MovieTicket認証
  */
 declare function checkMovieTicket(params: factory.action.check.paymentMethod.movieTicket.IAttributes): ICheckOperation<ICheckMovieTicketAction>;
-/**
- * MovieTicket認証
- */
-declare function checkByIdentifier(params: {
-    movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
-    seller: factory.seller.ISeller;
-    screeningEvent: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
-    paymentServiceId: string;
-}): (repos: {
-    product: ProductRepo;
-    project: ProjectRepo;
-}) => Promise<ICheckResult>;
 interface IAuthorizeResult {
     accountId: string;
     checkResult?: ICheckResult;
@@ -90,4 +74,4 @@ declare function payMovieTicket(params: factory.task.pay.IData): IPayOperation<I
  * MovieTicket着券取消
  */
 declare function refundMovieTicket(params: factory.task.refund.IData): IRefundOperation<factory.action.trade.refund.IAction>;
-export { ICheckResult, authorize, checkMovieTicket, checkByIdentifier, payMovieTicket, refundMovieTicket, voidTransaction };
+export { ICheckResult, authorize, checkMovieTicket, payMovieTicket, refundMovieTicket, voidTransaction };

package/lib/chevre/service/payment/movieTicket.js

@@ -9,17 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.voidTransaction = exports.refundMovieTicket = exports.payMovieTicket = exports.checkByIdentifier = exports.checkMovieTicket = exports.authorize = void 0;
+exports.voidTransaction = exports.refundMovieTicket = exports.payMovieTicket = exports.checkMovieTicket = exports.authorize = void 0;
 /**
  * 決済サービス
  */
 const surfrock = require("@surfrock/sdk");
-const moment = require("moment-timezone");
 const credentials_1 = require("../../credentials");
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
+const checkByIdentifier_1 = require("./movieTicket/checkByIdentifier");
 const factory_1 = require("./movieTicket/factory");
-const validation_1 = require("../assetTransaction/pay/movieTicket/validation");
+const getCredentials_1 = require("./movieTicket/getCredentials");
+const validation_1 = require("./movieTicket/validation");
 const errorHandler_1 = require("../../errorHandler");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
@@ -67,7 +67,7 @@ function checkMovieTicket(params) {
             if (paymentAccepted !== true) {
                 throw new factory.errors.Argument('transactionId', 'payment not accepted');
             }
-            checkResult = yield checkByIdentifier({
+            checkResult = yield (0, checkByIdentifier_1.checkByIdentifier)({
                 movieTickets: movieTickets,
                 seller: seller,
                 screeningEvent: screeningEvent,
@@ -95,172 +95,6 @@ function checkMovieTicket(params) {
     });
 }
 exports.checkMovieTicket = checkMovieTicket;
-/**
- * MovieTicket認証
- */
-function checkByIdentifier(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        let purchaseNumberAuthIn;
-        let purchaseNumberAuthResult;
-        // MovieTicket系統の決済方法タイプは動的
-        const paymentMethodType = (_a = params.movieTickets[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
-        if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('movieTickets.typeOf');
-        }
-        const availableChannel = yield repos.product.findAvailableChannel({
-            project: params.screeningEvent.project,
-            typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
-            id: params.paymentServiceId
-        });
-        const movieTicketIdentifiers = [];
-        const knyknrNoInfoIn = [];
-        params.movieTickets.forEach((movieTicket) => {
-            if (movieTicketIdentifiers.indexOf(movieTicket.identifier) < 0) {
-                movieTicketIdentifiers.push(movieTicket.identifier);
-                knyknrNoInfoIn.push({
-                    knyknrNo: movieTicket.identifier,
-                    pinCd: String(movieTicket.accessCode)
-                });
-            }
-        });
-        let skhnCd = params.screeningEvent.superEvent.workPerformed.identifier;
-        const eventOffers = params.screeningEvent.offers;
-        if (eventOffers === undefined) {
-            throw new factory.errors.NotFound('EventOffers', 'Event offers undefined');
-        }
-        const offeredThrough = eventOffers.offeredThrough;
-        // イベントインポート元がCOAの場合、作品コード連携方法が異なる
-        if (offeredThrough !== undefined && offeredThrough.identifier === factory.service.webAPI.Identifier.COA) {
-            const DIGITS = -2;
-            let eventCOAInfo;
-            if (Array.isArray(params.screeningEvent.additionalProperty)) {
-                const coaInfoProperty = params.screeningEvent.additionalProperty.find((p) => p.name === 'coaInfo');
-                eventCOAInfo = (coaInfoProperty !== undefined) ? JSON.parse(coaInfoProperty.value) : undefined;
-            }
-            skhnCd = `${eventCOAInfo.titleCode}${`00${eventCOAInfo.titleBranchNum}`.slice(DIGITS)}`;
-        }
-        const sellerCredentials = yield getCredentials({
-            paymentMethodType,
-            seller: params.seller,
-            paymentServiceId: params.paymentServiceId
-        })(repos);
-        purchaseNumberAuthIn = {
-            kgygishCd: sellerCredentials.kgygishCd,
-            jhshbtsCd: surfrock.service.auth.factory.InformationTypeCode.All,
-            knyknrNoInfoIn: knyknrNoInfoIn,
-            skhnCd: skhnCd,
-            stCd: sellerCredentials.stCd,
-            jeiYmd: moment(params.screeningEvent.startDate)
-                .tz('Asia/Tokyo')
-                .format('YYYY/MM/DD')
-        };
-        const mvtkReserveAuthClient = new surfrock.auth.ClientCredentials({
-            domain: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.authorizeServerDomain),
-            clientId: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientId),
-            clientSecret: String((_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.clientSecret),
-            scopes: [],
-            state: ''
-        });
-        const authService = new surfrock.service.auth.AuthService({
-            endpoint: String(availableChannel.serviceUrl),
-            auth: mvtkReserveAuthClient
-        }, { timeout: credentials_1.credentials.movieticketReserve.timeout });
-        purchaseNumberAuthResult = yield authService.purchaseNumberAuth(purchaseNumberAuthIn);
-        // 決済カード配列に成形
-        const movieTickets = purchaseNumberAuthResult2movieTickets({
-            screeningEvent: params.screeningEvent,
-            paymentMethodType,
-            knyknrNoInfoIn,
-            purchaseNumberAuthResult
-        });
-        return { purchaseNumberAuthIn, purchaseNumberAuthResult, movieTickets };
-    });
-}
-exports.checkByIdentifier = checkByIdentifier;
-function purchaseNumberAuthResult2movieTickets(params) {
-    const movieTickets = [];
-    const paymentMethodType = params.paymentMethodType;
-    const knyknrNoInfoIn = params.knyknrNoInfoIn;
-    const purchaseNumberAuthResult = params.purchaseNumberAuthResult;
-    if (Array.isArray(purchaseNumberAuthResult.knyknrNoInfoOut)) {
-        purchaseNumberAuthResult.knyknrNoInfoOut.forEach((knyknrNoInfoOut) => {
-            const knyknrNoInfo = knyknrNoInfoIn.find((info) => info.knyknrNo === knyknrNoInfoOut.knyknrNo);
-            if (knyknrNoInfo !== undefined) {
-                const movieTicketCategoryCode = (typeof knyknrNoInfoOut.znkkkytsknGkjknTyp === 'string')
-                    ? knyknrNoInfoOut.znkkkytsknGkjknTyp
-                    : '';
-                if (Array.isArray(knyknrNoInfoOut.ykknInfo)) {
-                    knyknrNoInfoOut.ykknInfo.forEach((ykknInfo) => {
-                        // tslint:disable-next-line:prefer-array-literal
-                        [...Array(Number(ykknInfo.ykknKnshbtsmiNum))].forEach(() => {
-                            movieTickets.push({
-                                // project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id },
-                                typeOf: paymentMethodType,
-                                identifier: knyknrNoInfo.knyknrNo,
-                                accessCode: knyknrNoInfo.pinCd,
-                                category: {
-                                    codeValue: movieTicketCategoryCode // 追加(2023-02-08~)
-                                },
-                                serviceType: ykknInfo.ykknshTyp,
-                                serviceOutput: {
-                                    reservationFor: {
-                                        typeOf: params.screeningEvent.typeOf,
-                                        id: params.screeningEvent.id
-                                    }
-                                    // reservedTicket: {
-                                    //     ticketedSeat: {
-                                    //         typeOf: factory.placeType.Seat,
-                                    //         // seatingType: 'Default', // 情報空でよし
-                                    //         seatNumber: '', // 情報空でよし
-                                    //         seatRow: '', // 情報空でよし
-                                    //         seatSection: '' // 情報空でよし
-                                    //     }
-                                    // }
-                                }
-                            });
-                        });
-                    });
-                }
-                if (Array.isArray(knyknrNoInfoOut.mkknInfo)) {
-                    knyknrNoInfoOut.mkknInfo.forEach((mkknInfo) => {
-                        // tslint:disable-next-line:prefer-array-literal
-                        [...Array(Number(mkknInfo.mkknKnshbtsmiNum))].forEach(() => {
-                            movieTickets.push(Object.assign({ 
-                                // project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id },
-                                typeOf: paymentMethodType, identifier: knyknrNoInfo.knyknrNo, accessCode: knyknrNoInfo.pinCd, category: {
-                                    codeValue: movieTicketCategoryCode // 追加(2023-02-08~)
-                                }, amount: {
-                                    typeOf: 'MonetaryAmount',
-                                    currency: factory.priceCurrency.JPY,
-                                    validThrough: moment(`${mkknInfo.yykDt}+09:00`, 'YYYY/MM/DD HH:mm:ssZ')
-                                        .toDate()
-                                }, serviceType: mkknInfo.mkknshTyp, serviceOutput: {
-                                    reservationFor: {
-                                        typeOf: params.screeningEvent.typeOf,
-                                        id: params.screeningEvent.id
-                                    }
-                                    // reservedTicket: {
-                                    //     ticketedSeat: {
-                                    //         typeOf: factory.placeType.Seat,
-                                    //         // seatingType: 'Default', // 情報空でよし
-                                    //         seatNumber: '', // 情報空でよし
-                                    //         seatRow: '', // 情報空でよし
-                                    //         seatSection: '' // 情報空でよし
-                                    //     }
-                                    // }
-                                } }, {
-                                validThrough: moment(`${mkknInfo.yykDt}+09:00`, 'YYYY/MM/DD HH:mm:ssZ')
-                                    .toDate()
-                            }));
-                        });
-                    });
-                }
-            }
-        });
-    }
-    return movieTickets;
-}
 /**
  * MovieTicket承認
  * オーソリサービスが存在するわけではないので、実質着券する
@@ -272,11 +106,8 @@ function authorize(params, transaction, paymentServiceId) {
         let checkResult;
         let payAction;
         try {
-            // オプション追加(2023-02-24~)
-            if (settings_1.settings.useCheckMovieTicketBeforePay) {
-                // MovieTicket決済の場合、認証
-                checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId)(repos);
-            }
+            // MovieTicket決済の場合、認証
+            checkResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId)(repos);
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
             const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
@@ -470,7 +301,7 @@ function payActionParams2seatInfoSyncIn(params) {
         const seller = yield repos.seller.findById({ id: String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id) });
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);
-        const sellerCredentials = yield getCredentials({ paymentMethodType, seller, paymentServiceId })(repos);
+        const sellerCredentials = yield (0, getCredentials_1.getCredentials)({ paymentMethodType, seller, paymentServiceId })(repos);
         return (0, factory_1.createSeatInfoSyncIn)({
             paymentMethodType: paymentMethodType,
             paymentMethodId: paymentMethodId,
@@ -581,43 +412,6 @@ function createSeatInfoSyncInOnRefund(params) {
         // instrument参照に統一(2022-05-02~)
         seatInfoSyncIn = Object.assign(Object.assign({}, seatInfoSyncInOnPay), { trkshFlg: surfrock.service.seat.factory.DeleteFlag.True // 取消フラグ
          });
-        // seatInfoSyncIn = {
-        //     ...(payAction.instrument?.seatInfoSyncIn !== undefined && payAction.instrument?.seatInfoSyncIn !== null)
-        //         ? <surfrock.service.seat.factory.ISeatInfoSyncIn>payAction.instrument?.seatInfoSyncIn
-        //         : <surfrock.service.seat.factory.ISeatInfoSyncIn>payAction.result?.seatInfoSyncIn,
-        //     trkshFlg: surfrock.service.seat.factory.DeleteFlag.True // 取消フラグ
-        // };
         return seatInfoSyncIn;
     });
 }
-function getCredentials(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        // 決済サービスからcredentialsを取得する
-        const paymentServices = yield repos.product.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.seller.project.id } },
-            typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
-            // serviceType: { codeValue: { $eq: params.paymentMethodType } },
-            id: { $eq: params.paymentServiceId }
-        });
-        const paymentService = paymentServices.shift();
-        if (paymentService === undefined) {
-            throw new factory.errors.NotFound('PaymentService');
-        }
-        const provider = (_a = paymentService.provider) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === params.seller.id);
-        if (provider === undefined) {
-            throw new factory.errors.NotFound('PaymentService provider');
-        }
-        const kgygishCd = (_b = provider.credentials) === null || _b === void 0 ? void 0 : _b.kgygishCd;
-        const stCd = (_c = provider.credentials) === null || _c === void 0 ? void 0 : _c.stCd;
-        if (typeof kgygishCd !== 'string' || typeof stCd !== 'string') {
-            throw new factory.errors.Argument('transaction', 'Provider credentials not enough');
-        }
-        return {
-            kgygishCd,
-            stCd
-        };
-    });
-}

package/lib/chevre/service/task/aggregateScreeningEvent.js

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const event_1 = require("../../repo/event");
 const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 const offer_1 = require("../../repo/offer");
+const offerCatalog_1 = require("../../repo/offerCatalog");
 const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
@@ -33,6 +34,7 @@ function call(data) {
             event: new event_1.MongoRepository(settings.connection),
             eventAvailability: new screeningEvent_1.RedisRepository(settings.redisClient),
             offer: new offer_1.MongoRepository(settings.connection),
+            offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),
             offerRateLimit: new offer_2.RedisRepository(settings.redisClient),
             place: new place_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.293.0-alpha.1",
-    "@cinerino/sdk": "3.144.0-alpha.1",
+    "@chevre/factory": "4.294.0",
+    "@cinerino/sdk": "3.144.1",
     "@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.36"
+  "version": "20.4.0-alpha.38"
 }

package/lib/chevre/service/assetTransaction/pay/movieTicket/validation.d.ts

@@ -1,14 +0,0 @@
-/**
- * 決済取引サービス
- */
-import * as factory from '../../../../factory';
-import { MongoRepository as EventRepo } from '../../../../repo/event';
-import { MongoRepository as ProductRepo } from '../../../../repo/product';
-import { MongoRepository as ProjectRepo } from '../../../../repo/project';
-import { MongoRepository as SellerRepo } from '../../../../repo/seller';
-export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
-    event: EventRepo;
-    product: ProductRepo;
-    project: ProjectRepo;
-    seller: SellerRepo;
-}) => Promise<import("../../../payment/movieTicket").ICheckResult>;