@chevre/domain 21.37.0-alpha.10 → 21.37.0-alpha.11

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

@@ -45,7 +45,7 @@ interface IAuthorizeRepos {
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
-type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail4chevre;
+type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail<factory.service.webAPI.Identifier.Chevre>;
 /**
  * 興行オファー承認
  */

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

@@ -8,17 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = void 0;
 const factory = require("../../../factory");
@@ -102,7 +91,7 @@ function authorize(params) {
             }
             throw error;
         }
-        const result = (0, factory_1.acceptedOffers2authorizeResult)({ acceptedOffers, acceptedOffers4result, noOfferSpecified });
+        const result = (0, factory_1.acceptedOffers2authorizeResult)({ acceptedOffers, acceptedOffers4result, noOfferSpecified, ticketOffers });
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
@@ -264,13 +253,21 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
         });
         const acceptedAppliesToMovieTicket = (_a = offerWithoutDetail.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToMovieTicket;
         // 承認アクションオブジェクトのacceptedOfferにappliesToMovieTicketを連携する(2022-08-02~)
-        const priceSpecification = Object.assign({ 
-            // 必要な属性のみに最適化(2024-04-09~)
-            // ...offer.priceSpecification,
-            typeOf: offer.priceSpecification.typeOf, priceCurrency: offer.priceSpecification.priceCurrency, valueAddedTaxIncluded: offer.priceSpecification.valueAddedTaxIncluded, priceComponent: offer.priceSpecification.priceComponent.map((_a) => {
-                var { name, accounting, id, priceCurrency, valueAddedTaxIncluded } = _a, necessaryComponentFields = __rest(_a, ["name", "accounting", "id", "priceCurrency", "valueAddedTaxIncluded"]);
-                return necessaryComponentFields;
-            }) }, (Array.isArray(acceptedAppliesToMovieTicket) || typeof (acceptedAppliesToMovieTicket === null || acceptedAppliesToMovieTicket === void 0 ? void 0 : acceptedAppliesToMovieTicket.identifier) === 'string')
+        // const priceSpecification: IAcceptedOfferPriceSpecification = {
+        //     // 必要な属性のみに最適化(2024-04-09~)
+        //     // ...offer.priceSpecification,
+        //     typeOf: offer.priceSpecification.typeOf,
+        //     priceCurrency: offer.priceSpecification.priceCurrency,
+        //     // valueAddedTaxIncluded: offer.priceSpecification.valueAddedTaxIncluded,
+        //     priceComponent: offer.priceSpecification.priceComponent.map(({
+        //         name, accounting, id, priceCurrency, valueAddedTaxIncluded, ...necessaryComponentFields
+        //     }) => necessaryComponentFields),
+        //     // appliesToMovieTicket.identifierを連携する
+        //     ...(Array.isArray(acceptedAppliesToMovieTicket) || typeof acceptedAppliesToMovieTicket?.identifier === 'string')
+        //         ? { appliesToMovieTicket: acceptedAppliesToMovieTicket }
+        //         : undefined
+        // };
+        const priceSpecification = Object.assign({}, (Array.isArray(acceptedAppliesToMovieTicket) || typeof (acceptedAppliesToMovieTicket === null || acceptedAppliesToMovieTicket === void 0 ? void 0 : acceptedAppliesToMovieTicket.identifier) === 'string')
             ? { appliesToMovieTicket: acceptedAppliesToMovieTicket }
             : undefined);
         const acceptedAddOns = (Array.isArray(offerWithoutDetail.addOn))
@@ -315,7 +312,12 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
         }
         const acceptedOffer = Object.assign({ 
             // オファーの中身を最適化する(必要最低限の情報のみに)
-            id: String(offer.id), identifier: offer.identifier, priceSpecification, typeOf: offer.typeOf, priceCurrency: offer.priceCurrency, itemOffered: Object.assign(Object.assign({ typeOf: factory.product.ProductType.EventService }, (itemOfferedServiceOutput !== undefined) ? { serviceOutput: itemOfferedServiceOutput } : undefined), (pointAward !== undefined) ? { pointAward } : undefined), addOn: acceptedAddOns, 
+            id: String(offer.id), 
+            // identifier: offer.identifier,
+            priceSpecification, 
+            // typeOf: offer.typeOf,
+            // priceCurrency: offer.priceCurrency,
+            itemOffered: Object.assign(Object.assign({}, (itemOfferedServiceOutput !== undefined) ? { serviceOutput: itemOfferedServiceOutput } : undefined), (pointAward !== undefined) ? { pointAward } : undefined), addOn: acceptedAddOns, 
             // 追加属性をマージ
             additionalProperty: [
                 ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],

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

@@ -31,6 +31,7 @@ export declare function acceptedOffers2authorizeResult(params: {
     acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
     acceptedOffers4result: IResultAcceptedOffer[];
     noOfferSpecified: boolean;
+    ticketOffers: factory.product.ITicketOffer[];
 }): factory.action.authorize.offer.eventService.IResult;
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultAcceptedOffer;

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

@@ -18,11 +18,12 @@ function createReserveTransactionStartParams(params) {
             };
             // 適用決済カード情報を連携(複数対応)(2022-08-02~)
             let appliesToMovieTicket;
-            if (Array.isArray(o.priceSpecification.appliesToMovieTicket)) {
-                appliesToMovieTicket = o.priceSpecification.appliesToMovieTicket;
+            const appliesToMovieTicketFromAcceptedOffer = (_b = o.priceSpecification) === null || _b === void 0 ? void 0 : _b.appliesToMovieTicket;
+            if (Array.isArray(appliesToMovieTicketFromAcceptedOffer)) {
+                appliesToMovieTicket = appliesToMovieTicketFromAcceptedOffer;
             }
-            else if (typeof ((_b = o.priceSpecification.appliesToMovieTicket) === null || _b === void 0 ? void 0 : _b.identifier) === 'string') {
-                appliesToMovieTicket = { identifier: o.priceSpecification.appliesToMovieTicket.identifier };
+            else if (typeof (appliesToMovieTicketFromAcceptedOffer === null || appliesToMovieTicketFromAcceptedOffer === void 0 ? void 0 : appliesToMovieTicketFromAcceptedOffer.identifier) === 'string') {
+                appliesToMovieTicket = { identifier: appliesToMovieTicketFromAcceptedOffer.identifier };
             }
             return Object.assign(Object.assign({ 
                 // 必要な属性のみ指定する
@@ -156,9 +157,9 @@ function acceptedOffers2amount(params) {
 }
 exports.acceptedOffers2amount = acceptedOffers2amount;
 function acceptedOffers2authorizeResult(params) {
-    var _a, _b;
-    const { acceptedOffers, acceptedOffers4result, noOfferSpecified } = params;
-    const priceCurrency = (_b = (_a = acceptedOffers[0]) === null || _a === void 0 ? void 0 : _a.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceCurrency;
+    const { acceptedOffers, acceptedOffers4result, noOfferSpecified, ticketOffers } = params;
+    // const priceCurrency = acceptedOffers[0]?.priceSpecification?.priceCurrency;
+    const priceCurrency = factory.priceCurrency.JPY; // fix(2024-07-03~)
     // redefine as typeOf: AggregateOffer(2024-06-18~)
     let offers;
     let price;
@@ -167,10 +168,14 @@ function acceptedOffers2authorizeResult(params) {
         // オファーIDごとに集計
         const offerIds = [...new Set(acceptedOffers.map((o) => o.id))];
         offers = offerIds.map((offerId) => {
-            const acceptedOffer = acceptedOffers.find(({ id }) => id === offerId);
+            const acceptedOffer = ticketOffers.find(({ id }) => id === offerId);
             if (acceptedOffer === undefined) {
                 throw new factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
             }
+            // const acceptedOffer = acceptedOffers.find(({ id }) => id === offerId);
+            // if (acceptedOffer === undefined) {
+            //     throw new factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
+            // }
             const amountOfThisGood = acceptedOffers.filter(({ id }) => id === offerId).length;
             const { acceptedPaymentMethod, priceSpecification } = acceptedOffer;
             const unitPriceSpec = priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification

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

@@ -1,12 +1,12 @@
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
 export import WebAPIIdentifier = factory.service.webAPI.Identifier;
-export type IAcceptedOffer4COA = factory.action.authorize.offer.eventService.IAcceptedOffer<factory.service.webAPI.Identifier.COA>;
+export type IAcceptedOffer4COA = factory.action.authorize.offer.eventService.IAcceptedOffer4COA;
 export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptAction: {
         id: string;
     };
-    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer<factory.service.webAPI.Identifier.COA>[];
+    acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4COA[];
     event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf'>;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
     pendingTransaction: factory.action.authorize.offer.eventService.ICOAPendingTransaction;
@@ -24,7 +24,7 @@ type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultA
  */
 export declare function responseBody2acceptedOffers4result(params: {
     responseBody: factory.action.authorize.offer.eventService.IResponseBody<factory.service.webAPI.Identifier.COA>;
-    acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer<factory.service.webAPI.Identifier.COA>[];
+    acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer4COA[];
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
     bookingTime: Date;

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.377.0-alpha.4",
-    "@cinerino/sdk": "8.1.0",
+    "@chevre/factory": "4.377.0-alpha.5",
+    "@cinerino/sdk": "8.2.0-alpha.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.37.0-alpha.10"
+  "version": "21.37.0-alpha.11"
 }

package/example/src/chevre/migrateAuthorizeEventServiceOfferResult.ts

@@ -1,163 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-type IUnitPriceSpecification =
-    chevre.factory.priceSpecification.IPriceSpecification<chevre.factory.priceSpecificationType.UnitPriceSpecification>;
-type IAuthorizeAction4chevre = chevre.factory.action.authorize.offer.eventService.IAction<chevre.factory.service.webAPI.Identifier.Chevre>;
-type IAcceptedOffer4chevre = chevre.factory.action.authorize.offer.eventService.IAcceptedOffer4chevre;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
-    const cursor = actionRepo.getCursor(
-        {
-            // _id: { $eq: '66697991037c9d7243208261' },
-            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
-            actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
-            startDate: {
-                $lte: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-180, 'days')
-                // $gte: moment()
-                //     // tslint:disable-next-line:no-magic-numbers
-                //     .add(-180, 'days')
-            },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.offer.eventService.ObjectType.SeatReservation }
-        },
-        {
-            __id: 1, startDate: 1, endDate: 1, result: 1, project: 1, typeOf: 1, actionStatus: 1, instrument: 1, object: 1
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    let updateCount = 0;
-    let saveResultCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const authorizeAction = <Pick<
-            chevre.factory.action.authorize.offer.eventService.IAction<chevre.factory.service.webAPI.Identifier>,
-            'id' | 'startDate' | 'endDate' | 'result' | 'project' | 'typeOf' | 'actionStatus' | 'instrument' | 'object'
-        >>doc.toObject();
-        const result = authorizeAction.result;
-        if (result === undefined) {
-            throw new Error(`result undefined [${authorizeAction.id}]`);
-        }
-
-        let migrated = false;
-        if (authorizeAction.instrument.typeOf === chevre.factory.assetTransactionType.COAReserveTransaction
-            || (<any>authorizeAction.instrument).identifier === chevre.factory.service.webAPI.Identifier.COA) {
-            migrated = true;
-        } else {
-            if (result.typeOf === chevre.factory.offerType.AggregateOffer && Array.isArray(result.offers)) {
-                migrated = true;
-            }
-            if (typeof result.price !== 'number') {
-                migrated = true;
-            }
-        }
-
-        if (migrated) {
-            console.log(
-                'already migrated.',
-                authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
-
-            // optimize action
-            if (Array.isArray((<any>authorizeAction.object).acceptedOffer)) {
-                let unsetResult: any;
-                unsetResult = await actionRepo.unsetUnnecessaryFields({
-                    filter: { _id: { $eq: authorizeAction.id } },
-                    $unset: {
-                        'object.acceptedOffer': 1
-                    }
-                });
-                updateCount += 1;
-                console.log(
-                    'result unset. unsetResult:', unsetResult,
-                    authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
-            }
-        } else {
-            console.log(
-                'redefining result as AggreagteOffer...',
-                authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
-            const acceptedOffers = <IAcceptedOffer4chevre[]>(<any>(<IAuthorizeAction4chevre>authorizeAction).object).acceptedOffer;
-            if (!Array.isArray(acceptedOffers)) {
-                throw new Error(`acceptedOffer undefined [${authorizeAction.id}]`);
-            }
-
-            let offers: chevre.factory.action.authorize.offer.eventService.IAcceptedOfferInResult[] | undefined;
-            if (typeof result.price === 'number') {
-                // オファーIDごとに集計
-                const offerIds = [...new Set(acceptedOffers.map((o) => o.id))];
-                offers = offerIds.map<chevre.factory.action.authorize.offer.eventService.IAcceptedOfferInResult>((offerId) => {
-                    const acceptedOfferInObject = acceptedOffers.find(({ id }) => id === offerId);
-                    if (acceptedOfferInObject === undefined) {
-                        throw new Error(`acceptedOffer not found [id:${offerId}]`);
-                    }
-                    const amountOfThisGood: number = acceptedOffers.filter(({ id }) => id === offerId).length;
-                    const { acceptedPaymentMethod, priceSpecification } = acceptedOfferInObject;
-
-                    const unitPriceSpec = <IUnitPriceSpecification | undefined>priceSpecification.priceComponent.find(
-                        (spec) => spec.typeOf === chevre.factory.priceSpecificationType.UnitPriceSpecification
-                            && (!Array.isArray(spec.appliesToAddOn)) // アドオン単価ではない
-                    );
-                    if (unitPriceSpec === undefined) {
-                        throw new Error(`unitPriceSpec not found [id:${offerId}]`);
-                    }
-                    const { eligibleQuantity, eligibleTransactionVolume } = unitPriceSpec;
-
-                    return {
-                        id: offerId,
-                        includesObject: { amountOfThisGood },
-                        typeOf: chevre.factory.offerType.Offer,
-                        priceSpecification: {
-                            ...(eligibleQuantity !== undefined) ? { eligibleQuantity } : undefined,
-                            ...(eligibleTransactionVolume !== undefined) ? { eligibleTransactionVolume } : undefined
-                        },
-                        ...(acceptedPaymentMethod !== undefined) ? { acceptedPaymentMethod } : undefined
-                    };
-                });
-            }
-            const resultAsAggregateOffer: chevre.factory.action.authorize.offer.eventService.IResultAsAggregateOffer = {
-                typeOf: chevre.factory.offerType.AggregateOffer,
-                offers
-            };
-            // const newResult: chevre.factory.action.authorize.offer.eventService.IResult = {
-            //     ...result,
-            //     ...resultAsAggregateOffer
-            // };
-            console.log(
-                'saving action...',
-                authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
-            // tslint:disable-next-line:no-null-keyword
-            console.dir(resultAsAggregateOffer, { depth: null });
-            await actionRepo.findByIdAndUpdate({
-                id: authorizeAction.id,
-                update: {
-                    $set: {
-                        'result.typeOf': resultAsAggregateOffer.typeOf,
-                        'result.offers': resultAsAggregateOffer.offers
-                    }
-                }
-            });
-            saveResultCount += 1;
-            console.log(
-                'action saved.',
-                authorizeAction.project.id, authorizeAction.id, authorizeAction.startDate, i, updateCount, saveResultCount);
-        }
-    });
-
-    console.log(i, 'actions checked');
-    console.log(updateCount, 'actions updated');
-    console.log(saveResultCount, 'result saved');
-}
-
-main()
-    .then()
-    .catch(console.error);