@chevre/domain 20.10.0 → 20.11.0-alpha.0

package/example/src/chevre/importCategoryCodesFromCOA.ts

@@ -0,0 +1,35 @@
+// tslint:disable:no-console
+// import * as redis from 'redis';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+const coaAuthClient = new chevre.COA.auth.RefreshToken({
+    endpoint: chevre.credentials.coa.endpoint,
+    refreshToken: chevre.credentials.coa.refreshToken
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const categoryCodeRepo = new chevre.repository.CategoryCode(mongoose.connection);
+    const masterService = new chevre.COA.service.Master(
+        {
+            endpoint: chevre.credentials.coa.endpoint,
+            auth: coaAuthClient
+        },
+        { timeout: chevre.credentials.coa.timeout }
+    );
+
+    await chevre.service.offer.event.importCategoryCodesFromCOA({
+        project,
+        theaterCode: '120'
+    })({ categoryCode: categoryCodeRepo, masterService });
+    console.log('imported');
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -19,6 +19,10 @@ export declare class MongoRepository {
         id?: string;
         attributes: factory.categoryCode.ICategoryCode;
     }): Promise<factory.categoryCode.ICategoryCode>;
+    saveManyByCodeValue(params: {
+        attributes: factory.categoryCode.ICategoryCode;
+        upsert?: boolean;
+    }[]): Promise<void>;
     /**
      * 削除する
      */

package/lib/chevre/repo/categoryCode.js

@@ -217,6 +217,39 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    saveManyByCodeValue(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach((p) => {
+                    const $set = Object.assign({}, p.attributes);
+                    if (typeof $set.id === 'string') {
+                        delete $set.id;
+                    }
+                    bulkWriteOps.push({
+                        updateOne: {
+                            filter: {
+                                'project.id': { $eq: p.attributes.project.id },
+                                codeValue: { $eq: p.attributes.codeValue },
+                                'inCodeSet.identifier': {
+                                    $exists: true,
+                                    $eq: p.attributes.inCodeSet.identifier
+                                }
+                            },
+                            update: {
+                                $set
+                                // $setOnInsert: {}
+                            },
+                            upsert: (p.upsert !== undefined) ? p.upsert : false
+                        }
+                    });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                yield this.categoryCodeModel.bulkWrite(bulkWriteOps, { ordered: false });
+            }
+        });
+    }
     /**
      * 削除する
      */

package/lib/chevre/service/offer/event/importFromCOA.d.ts

@@ -11,3 +11,15 @@ export declare function importFromCOA(params: {
     offer: OfferRepo;
     masterService: COA.service.Master;
 }) => Promise<void>;
+/**
+ * 区分をインポートする
+ */
+export declare function importCategoryCodesFromCOA(params: {
+    project: {
+        id: string;
+    };
+    theaterCode: string;
+}): (repos: {
+    categoryCode: CategoryCodeRepo;
+    masterService: COA.service.Master;
+}) => Promise<void>;

package/lib/chevre/service/offer/event/importFromCOA.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.importFromCOA = void 0;
+exports.importCategoryCodesFromCOA = exports.importFromCOA = void 0;
 const factory = require("../../../factory");
 const factory_1 = require("./factory");
 function importFromCOA(params) {
@@ -62,3 +62,72 @@ function importFromCOA(params) {
     });
 }
 exports.importFromCOA = importFromCOA;
+/**
+ * 区分をインポートする
+ */
+function importCategoryCodesFromCOA(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        try {
+            const joueihousikiKubuns = yield repos.masterService.kubunName({
+                theaterCode: params.theaterCode,
+                kubunClass: '045'
+            });
+            const seatKubuns = yield repos.masterService.kubunName({
+                theaterCode: params.theaterCode,
+                kubunClass: '050'
+            });
+            const saveParams = [];
+            joueihousikiKubuns.forEach((kubun) => {
+                saveParams.push({
+                    attributes: kubun2categoryCode({
+                        kubun,
+                        project: params.project,
+                        inCodeSet: { identifier: factory.categoryCode.CategorySetIdentifier.VideoFormatType }
+                    }),
+                    upsert: true
+                });
+            });
+            seatKubuns.forEach((kubun) => {
+                saveParams.push({
+                    attributes: kubun2categoryCode({
+                        kubun,
+                        project: params.project,
+                        inCodeSet: { identifier: factory.categoryCode.CategorySetIdentifier.SeatingType }
+                    }),
+                    upsert: true
+                });
+            });
+            yield repos.categoryCode.saveManyByCodeValue(saveParams);
+        }
+        catch (error) {
+            let throwsError = true;
+            // "name": "COAServiceError",
+            // "code": 500,
+            // "status": "",
+            // "message": "ESOCKETTIMEDOUT",
+            if (error.name === 'COAServiceError') {
+                if (error.message === 'ESOCKETTIMEDOUT') {
+                    throwsError = false;
+                }
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+    });
+}
+exports.importCategoryCodesFromCOA = importCategoryCodesFromCOA;
+function kubun2categoryCode(params) {
+    return {
+        additionalProperty: [
+            ...(typeof params.kubun.kubunAddPrice === 'number')
+                ? [{ name: 'kubunAddPrice', value: String(params.kubun.kubunAddPrice) }]
+                : []
+        ],
+        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+        typeOf: 'CategoryCode',
+        codeValue: params.kubun.kubunCode,
+        inCodeSet: { identifier: params.inCodeSet.identifier, typeOf: 'CategoryCodeSet' },
+        name: Object.assign({ ja: String(params.kubun.kubunName) }, (typeof params.kubun.kubunNameEng === 'string') ? { en: params.kubun.kubunNameEng } : undefined)
+    };
+}

package/lib/chevre/service/offer/event.d.ts

@@ -1,6 +1,6 @@
 import { authorize } from './event/authorize';
 import { cancel } from './event/cancel';
-import { importFromCOA } from './event/importFromCOA';
+import { importCategoryCodesFromCOA, importFromCOA } from './event/importFromCOA';
 import { searchEventTicketOffers } from './event/searchEventTicketOffers';
 import { voidTransaction } from './event/voidTransaction';
-export { authorize, cancel, importFromCOA, voidTransaction, searchEventTicketOffers };
+export { authorize, cancel, importCategoryCodesFromCOA, importFromCOA, voidTransaction, searchEventTicketOffers };

package/lib/chevre/service/offer/event.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchEventTicketOffers = exports.voidTransaction = exports.importFromCOA = exports.cancel = exports.authorize = void 0;
+exports.searchEventTicketOffers = exports.voidTransaction = exports.importFromCOA = exports.importCategoryCodesFromCOA = exports.cancel = exports.authorize = void 0;
 const authorize_1 = require("./event/authorize");
 Object.defineProperty(exports, "authorize", { enumerable: true, get: function () { return authorize_1.authorize; } });
 const cancel_1 = require("./event/cancel");
 Object.defineProperty(exports, "cancel", { enumerable: true, get: function () { return cancel_1.cancel; } });
 const importFromCOA_1 = require("./event/importFromCOA");
+Object.defineProperty(exports, "importCategoryCodesFromCOA", { enumerable: true, get: function () { return importFromCOA_1.importCategoryCodesFromCOA; } });
 Object.defineProperty(exports, "importFromCOA", { enumerable: true, get: function () { return importFromCOA_1.importFromCOA; } });
 const searchEventTicketOffers_1 = require("./event/searchEventTicketOffers");
 Object.defineProperty(exports, "searchEventTicketOffers", { enumerable: true, get: function () { return searchEventTicketOffers_1.searchEventTicketOffers; } });

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.d.ts

@@ -1,12 +1,13 @@
 import * as factory from '../../../factory';
 import { MongoRepository as OfferRepo } from '../../../repo/offer';
 import { IAcceptedOffer4COA } from './factory';
+export declare type IAcceptedOfferBeforeAuthorize4COA = factory.action.authorize.offer.seatReservation.IAcceptedOfferBeforeAuthorize4COA;
 /**
  * 受け入れらたオファーの内容を検証
  */
 declare function validateAcceptedOffers(params: {
     object: {
-        acceptedOffer: IAcceptedOffer4COA[];
+        acceptedOffer: IAcceptedOfferBeforeAuthorize4COA[];
         event: {
             id: string;
         };
@@ -16,6 +17,7 @@ declare function validateAcceptedOffers(params: {
     };
     availablePaymentMethodTypes: factory.categoryCode.ICategoryCode[];
     screeningEvent: Pick<factory.event.screeningEvent.IEvent, 'id' | 'superEvent'>;
+    seatingTypes: factory.categoryCode.ICategoryCode[];
 }): (repos: {
     offer: OfferRepo;
 }) => Promise<{

package/lib/chevre/service/offer/eventServiceByCOA/validateAcceptedOffers.js

@@ -135,8 +135,10 @@ function createPriceComponent(params) {
                 name: {
                     en: (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunNameEng) === 'string')
                         ? kbnJoueihousiki.kubunNameEng
-                        : factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                    ja: (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunName) === 'string') ? kbnJoueihousiki.kubunName : '加算単価'
+                        : String(kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunCode),
+                    ja: (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunName) === 'string')
+                        ? `${kbnJoueihousiki.kubunName}加算料金`
+                        : '加算単価'
                 },
                 price: ticketInfo.addPrice,
                 priceCurrency: factory.priceCurrency.JPY,
@@ -155,10 +157,15 @@ function createPriceComponent(params) {
         }
     }
     if (ticketInfo.spseatAdd1 > 0) {
+        const existingSeatingType = params.seatingTypes.find((seatingType) => seatingType.codeValue === ticketInfo.spseatKbn);
         categoryCodeChargeSpecs.push({
             name: {
-                en: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                ja: '特別席加算額'
+                en: (typeof (existingSeatingType === null || existingSeatingType === void 0 ? void 0 : existingSeatingType.name.en) === 'string')
+                    ? `${existingSeatingType.name.en}`
+                    : ticketInfo.spseatKbn,
+                ja: (typeof (existingSeatingType === null || existingSeatingType === void 0 ? void 0 : existingSeatingType.name.ja) === 'string')
+                    ? `${existingSeatingType.name.ja}加算料金`
+                    : '特別席加算額'
             },
             price: ticketInfo.spseatAdd1,
             priceCurrency: factory.priceCurrency.JPY,
@@ -256,27 +263,46 @@ function validateAcceptedOffers(params) {
             var _a, _b, _c, _d, _e, _f;
             const availableUnitPriceOffer = availableUnitPriceOffers.find((unitPriceOffer) => unitPriceOffer.id === acceptedOffer.id);
             if (availableUnitPriceOffer === undefined) {
-                throw new factory.errors.NotFound(factory.offerType.Offer, `${acceptedOffer.identifier} not found`);
-            }
-            const { additionalProperty, itemOffered, name, price, priceSpecification, ticketInfo } = acceptedOffer;
-            if (priceSpecification === undefined) {
-                throw new factory.errors.NotFound('priceSpecification');
+                throw new factory.errors.NotFound(factory.offerType.Offer, `${acceptedOffer.id} not found`);
             }
+            const { additionalProperty, itemOffered, name, ticketInfo } = acceptedOffer;
+            // if (priceSpecification === undefined) {
+            //     throw new factory.errors.NotFound('priceSpecification');
+            // }
             // priceComponentを再生成(2023-03-14~)
             const { priceComponent, eligibleMonetaryAmount } = createPriceComponent({
                 project: { id: params.project.id },
                 availablePaymentMethodTypes: params.availablePaymentMethodTypes,
+                seatingTypes: params.seatingTypes,
                 acceptedOffer,
                 availableUnitPriceOffer,
                 screeningEvent: params.screeningEvent
             });
-            priceSpecification.priceComponent = priceComponent;
+            const priceSpecification = {
+                typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
+                priceCurrency: factory.priceCurrency.JPY,
+                priceComponent,
+                valueAddedTaxIncluded: true
+            };
+            // 実際の発生金額を算出
+            const price = [
+                ticketInfo.salesTicketSalePrice,
+                ticketInfo.addGlasses,
+                ticketInfo.spseatAdd1,
+                ticketInfo.spseatAdd2
+            ].reduce((a, b) => a + b, 0);
+            // COAに渡す販売金額については、特別席加算額は興収部分のみ加算
+            const salePrice = [
+                ticketInfo.salesTicketSalePrice,
+                ticketInfo.addGlasses,
+                ticketInfo.spseatAdd1
+            ].reduce((a, b) => a + b, 0);
             return Object.assign(Object.assign({ additionalProperty,
                 itemOffered,
                 name,
                 price,
-                priceSpecification,
-                ticketInfo, 
+                priceSpecification, ticketInfo: Object.assign(Object.assign({}, ticketInfo), { salePrice // COAに渡す販売金額を上書き(2023-03-20~)
+                 }), 
                 // 以下属性については単価オファーから読む(2023-03-09~)
                 priceCurrency: availableUnitPriceOffer.priceCurrency, id: String(availableUnitPriceOffer.id), identifier: String(availableUnitPriceOffer.identifier), typeOf: availableUnitPriceOffer.typeOf }, (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), {
                 // tslint:disable-next-line:no-suspicious-comment

package/lib/chevre/service/offer/eventServiceByCOA.d.ts

@@ -3,7 +3,7 @@ import { MongoRepository as CategoryCodeRepo } from '../../repo/categoryCode';
 import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OfferRepo } from '../../repo/offer';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
-import { IAcceptedOffer4COA } from './eventServiceByCOA/factory';
+import { IAcceptedOfferBeforeAuthorize4COA } from './eventServiceByCOA/validateAcceptedOffers';
 import * as factory from '../../factory';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 interface IAuthorizeRepos {
@@ -20,7 +20,7 @@ export declare type IAuthorizeOfferAction = factory.action.authorize.offer.seatR
  */
 export declare function authorize(params: {
     object: {
-        acceptedOffer: IAcceptedOffer4COA[];
+        acceptedOffer: IAcceptedOfferBeforeAuthorize4COA[];
         event: {
             id: string;
         };
@@ -74,7 +74,7 @@ export declare function cancel(params: {
 export declare function changeOffers(params: {
     id: string;
     object: {
-        acceptedOffer: IAcceptedOffer4COA[];
+        acceptedOffer: IAcceptedOfferBeforeAuthorize4COA[];
         event: {
             id: string;
         };

package/lib/chevre/service/offer/eventServiceByCOA.js

@@ -36,6 +36,10 @@ function authorize(params) {
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         });
+        const seatingTypes = yield repos.categoryCode.search({
+            project: { id: { $eq: transaction.project.id } },
+            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
+        });
         // COA仮予約後にリクエストが来る前提
         // validate acceptedOffer(2023-03-09~)
         // const acceptedOffer = params.object.acceptedOffer;
@@ -43,7 +47,8 @@ function authorize(params) {
             object: params.object,
             project: { id: transaction.project.id },
             availablePaymentMethodTypes,
-            screeningEvent
+            screeningEvent,
+            seatingTypes
         })(repos);
         const updTmpReserveSeatArgs = params.result.requestBody;
         const updTmpReserveSeatResult = params.result.responseBody;
@@ -149,6 +154,20 @@ function changeOffers(params) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
         validate4changeOffer({ action: authorizeAction, object: params.object });
+        // 座席情報に関しては元のacceptedOffersで自動補完する(リクエストでは正しく指定されないので注意)(2023-03-20~)
+        params.object.acceptedOffer = params.object.acceptedOffer.map((offer) => {
+            const originalAcceptedOfferBySeatNumber = authorizeAction.object.acceptedOffer.find((originalOffer) => {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+                return ((_d = (_c = (_b = (_a = originalOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatSection)
+                    === ((_g = (_f = (_e = offer.itemOffered.serviceOutput) === null || _e === void 0 ? void 0 : _e.reservedTicket) === null || _f === void 0 ? void 0 : _f.ticketedSeat) === null || _g === void 0 ? void 0 : _g.seatSection)
+                    && ((_k = (_j = (_h = originalOffer.itemOffered.serviceOutput) === null || _h === void 0 ? void 0 : _h.reservedTicket) === null || _j === void 0 ? void 0 : _j.ticketedSeat) === null || _k === void 0 ? void 0 : _k.seatNumber)
+                        === ((_o = (_m = (_l = offer.itemOffered.serviceOutput) === null || _l === void 0 ? void 0 : _l.reservedTicket) === null || _m === void 0 ? void 0 : _m.ticketedSeat) === null || _o === void 0 ? void 0 : _o.seatNumber);
+            });
+            if (originalAcceptedOfferBySeatNumber === undefined) {
+                throw new factory.errors.Argument('offers', 'seatSection or seatNumber not matched.');
+            }
+            return Object.assign(Object.assign({}, offer), { ticketInfo: Object.assign(Object.assign({}, offer.ticketInfo), { spseatAdd1: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd1, spseatAdd2: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd2, spseatKbn: originalAcceptedOfferBySeatNumber.ticketInfo.spseatKbn }) });
+        });
         // イベント取得属性最適化(2023-01-23~)
         const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
             id: params.object.event.id
@@ -157,6 +176,10 @@ function changeOffers(params) {
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         });
+        const seatingTypes = yield repos.categoryCode.search({
+            project: { id: { $eq: transaction.project.id } },
+            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
+        });
         // COA仮予約後にリクエストが来る前提
         // validate acceptedOffer(2023-03-09~)
         // const acceptedOffer = params.object.acceptedOffer;
@@ -164,7 +187,8 @@ function changeOffers(params) {
             object: params.object,
             project: { id: transaction.project.id },
             availablePaymentMethodTypes,
-            screeningEvent
+            screeningEvent,
+            seatingTypes
         })(repos);
         // 供給情報と価格を変更してからDB更新
         authorizeAction.object.acceptedOffer = acceptedOffers;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.303.0",
+    "@chevre/factory": "4.304.0",
     "@cinerino/sdk": "3.150.0",
     "@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.10.0"
+  "version": "20.11.0-alpha.0"
 }